From 364760d4a5501b5eac7b4009a5fbd89609b88ffb Mon Sep 17 00:00:00 2001 From: Ryan Stringham Date: Wed, 28 Jun 2017 08:21:34 -0600 Subject: [PATCH 001/710] Fix history navigator to change the position when adding an existing element. Fixes Microsoft/vscode#29762 --- src/vs/base/common/history.ts | 1 + src/vs/base/test/common/history.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/base/common/history.ts b/src/vs/base/common/history.ts index 82099d63c30..8347e69a6d7 100644 --- a/src/vs/base/common/history.ts +++ b/src/vs/base/common/history.ts @@ -18,6 +18,7 @@ export class HistoryNavigator implements INavigator { } public add(t: T) { + this._history.delete(t); this._history.add(t); this._onChange(); } diff --git a/src/vs/base/test/common/history.test.ts b/src/vs/base/test/common/history.test.ts index 2c55c1cd05f..27aef671ba3 100644 --- a/src/vs/base/test/common/history.test.ts +++ b/src/vs/base/test/common/history.test.ts @@ -83,11 +83,11 @@ suite('History Navigator', () => { }); test('adding existing element changes the position', function () { - let testObject = new HistoryNavigator(['1', '2', '3', '4'], 2); + let testObject = new HistoryNavigator(['1', '2', '3', '4'], 5); testObject.add('2'); - assert.deepEqual(['4', '2'], toArray(testObject)); + assert.deepEqual(['1', '3', '4', '2'], toArray(testObject)); }); test('add resets the navigator to last', function () { From eb90618d2ad23b67769183d97bf2bead37ba0da9 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 9 Nov 2017 11:59:34 -0800 Subject: [PATCH 002/710] Don't generate an apt Packages file We never used this in production. Related: Microsoft/vscode-update-server#13 --- build/gulpfile.vscode.linux.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js index ee92561849e..89fb9d95264 100644 --- a/build/gulpfile.vscode.linux.js +++ b/build/gulpfile.vscode.linux.js @@ -110,8 +110,7 @@ function buildDebPackage(arch) { return shell.task([ 'chmod 755 ' + product.applicationName + '-' + debArch + '/DEBIAN/postinst ' + product.applicationName + '-' + debArch + '/DEBIAN/prerm ' + product.applicationName + '-' + debArch + '/DEBIAN/postrm', 'mkdir -p deb', - 'fakeroot dpkg-deb -b ' + product.applicationName + '-' + debArch + ' deb', - 'dpkg-scanpackages deb /dev/null > Packages' + 'fakeroot dpkg-deb -b ' + product.applicationName + '-' + debArch + ' deb' ], { cwd: '.build/linux/deb/' + debArch }); } From e410cde37dc436816022d88ec8ca40c0273e9def Mon Sep 17 00:00:00 2001 From: DavidPortoUP Date: Wed, 22 Nov 2017 13:26:52 +0000 Subject: [PATCH 003/710] Added selectToBracket() --- .../bracketMatching/bracketMatching.ts | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index fbd1a37d39c..13026a7cf2d 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -148,6 +148,55 @@ export class BracketMatchingController extends Disposable implements editorCommo this._editor.revealRange(newSelections[0]); } + public selectToBracket(): void{ + //getting the model //trying to find + const model = this._editor.getModel(); + if (!model) { + return; + } + + //get the current position of the editor, so it can be + //used in the next step + let openBracket: Position; + let closeBracket: Position; + + let newSelections = this._editor.getSelections().map(selection => { + const position = selection.getStartPosition(); + const brackets = model.matchBracket(position); + let newCursorPosition: Position = null; + if (brackets) { + openBracket = brackets[0]; + closeBracket = brackets[1]; + if (openBracket.containsPosition(position)) { + newCursorPosition = closeBracket.getStartPosition(); + } else if (closeBracket.containsPosition(position)) { + newCursorPosition = openBracket.getStartPosition(); + } else { + // find the next bracket if the position isn't on a matching bracket + const nextBracket = model.findNextBracket(position); + if (nextBracket && nextBracket.range) { + newCursorPosition = nextBracket.range.getStartPosition(); + } + } + } + } + if (openBracket && closeBracket) { + this._selectContentWithinBrackets(openBracket, closeBracket); + } + } + +//By the first pull request guy +//selecting text between the open and close bracket +private _selectContentWithinBrackets(openBracket: Position, closeBracket: Position): void { + const bracketRange: Range = new Range( + openBracket.lineNumber, + openBracket.column, + closeBracket.lineNumber, + closeBracket.column + ); + this._editor.setSelection(bracketRange); +} + private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({ stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'bracket-match' From 8727487b158601f537bc1f21784eb56fc9843485 Mon Sep 17 00:00:00 2001 From: Afonso Pinto Date: Thu, 23 Nov 2017 22:16:23 +0000 Subject: [PATCH 004/710] basic select to bracket; unit tests --- .../bracketMatching/bracketMatching.ts | 102 +++++++++++------- .../test/bracketMatching.test.ts | 46 ++++++++ 2 files changed, 109 insertions(+), 39 deletions(-) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index 13026a7cf2d..4cb6957804c 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -14,14 +14,19 @@ import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; import { RunOnceScheduler } from 'vs/base/common/async'; import * as editorCommon from 'vs/editor/common/editorCommon'; -import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions'; +import { + EditorAction, + registerEditorAction, + registerEditorContribution, + ServicesAccessor +} from 'vs/editor/browser/editorExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -class SelectBracketAction extends EditorAction { +class JumpToBracketAction extends EditorAction { constructor() { super({ id: 'editor.action.jumpToBracket', @@ -44,6 +49,29 @@ class SelectBracketAction extends EditorAction { } } +class SelectToBracketAction extends EditorAction { + constructor() { + super({ + id: 'editor.action.selectToBracket', + label: nls.localize('smartSelect.selectToBracket', "Select to Bracket"), + alias: 'Select to Bracket', + precondition: null, + kbOpts: { + kbExpr: EditorContextKeys.textFocus, + primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Q + } + }); + } + + public run(accessor: ServicesAccessor, editor: ICodeEditor): void { + let controller = BracketMatchingController.get(editor); + if (!controller) { + return; + } + controller.selectToBracket(); + } +} + type Brackets = [Range, Range]; class BracketsData { @@ -148,54 +176,49 @@ export class BracketMatchingController extends Disposable implements editorCommo this._editor.revealRange(newSelections[0]); } - public selectToBracket(): void{ - //getting the model //trying to find + public selectToBracket(): void { const model = this._editor.getModel(); if (!model) { return; } + const selection = this._editor.getSelection(); + if (!selection.isEmpty()) { + return; + } - //get the current position of the editor, so it can be - //used in the next step - let openBracket: Position; - let closeBracket: Position; + const position = selection.getStartPosition(); - let newSelections = this._editor.getSelections().map(selection => { - const position = selection.getStartPosition(); - const brackets = model.matchBracket(position); - let newCursorPosition: Position = null; - if (brackets) { - openBracket = brackets[0]; - closeBracket = brackets[1]; - if (openBracket.containsPosition(position)) { - newCursorPosition = closeBracket.getStartPosition(); - } else if (closeBracket.containsPosition(position)) { - newCursorPosition = openBracket.getStartPosition(); - } else { - // find the next bracket if the position isn't on a matching bracket - const nextBracket = model.findNextBracket(position); - if (nextBracket && nextBracket.range) { - newCursorPosition = nextBracket.range.getStartPosition(); - } - } + let brackets = model.matchBracket(position); + + let openBracket: Position = null; + let closeBracket: Position = null; + + if (!brackets) { + const nextBracket = model.findNextBracket(position); + if (nextBracket && nextBracket.range) { + brackets = model.matchBracket(nextBracket.range.getStartPosition()); } } + + if (brackets) { + if (brackets[0].startLineNumber === brackets[1].startLineNumber) { + openBracket = brackets[1].startColumn < brackets[0].startColumn ? + brackets[1].getStartPosition() : brackets[0].getStartPosition(); + closeBracket = brackets[1].startColumn < brackets[0].startColumn ? + brackets[0].getEndPosition() : brackets[1].getEndPosition(); + } else { + openBracket = brackets[1].startLineNumber < brackets[0].startLineNumber ? + brackets[1].getStartPosition() : brackets[0].getStartPosition(); + closeBracket = brackets[1].startLineNumber < brackets[0].startLineNumber ? + brackets[0].getEndPosition() : brackets[1].getEndPosition(); + } + } + if (openBracket && closeBracket) { - this._selectContentWithinBrackets(openBracket, closeBracket); + this._editor.setSelection(new Range(openBracket.lineNumber, openBracket.column, closeBracket.lineNumber, closeBracket.column)); } } -//By the first pull request guy -//selecting text between the open and close bracket -private _selectContentWithinBrackets(openBracket: Position, closeBracket: Position): void { - const bracketRange: Range = new Range( - openBracket.lineNumber, - openBracket.column, - closeBracket.lineNumber, - closeBracket.column - ); - this._editor.setSelection(bracketRange); -} private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({ stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, @@ -276,7 +299,8 @@ private _selectContentWithinBrackets(openBracket: Position, closeBracket: Positi } registerEditorContribution(BracketMatchingController); -registerEditorAction(SelectBracketAction); +registerEditorAction(SelectToBracketAction); +registerEditorAction(JumpToBracketAction); registerThemingParticipant((theme, collector) => { let bracketMatchBackground = theme.getColor(editorBracketMatchBackground); if (bracketMatchBackground) { diff --git a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts index 7e7d5b977ec..57e72f34fd5 100644 --- a/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts +++ b/src/vs/editor/contrib/bracketMatching/test/bracketMatching.test.ts @@ -7,6 +7,7 @@ import * as assert from 'assert'; import { withTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor'; import { Position } from 'vs/editor/common/core/position'; +import { Selection } from 'vs/editor/common/core/selection'; import { Model } from 'vs/editor/common/model/model'; import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry'; import { MockMode } from 'vs/editor/test/common/mocks/mockMode'; @@ -98,4 +99,49 @@ suite('bracket matching', () => { model.dispose(); mode.dispose(); }); + + test('Select to next bracket', () => { + let mode = new BracketMode(); + let model = Model.createFromString('var x = (3 + (5-7)); y();', undefined, mode.getLanguageIdentifier()); + + withTestCodeEditor(null, { model: model }, (editor, cursor) => { + let bracketMatchingController = editor.registerAndInstantiateContribution(BracketMatchingController); + + + // start position in open brackets + editor.setPosition(new Position(1, 9)); + bracketMatchingController.selectToBracket(); + assert.deepEqual(editor.getPosition(), new Position(1, 20)); + assert.deepEqual(editor.getSelection(), new Selection(1, 9, 1, 20)); + + // start position in close brackets + editor.setPosition(new Position(1, 20)); + bracketMatchingController.selectToBracket(); + assert.deepEqual(editor.getPosition(), new Position(1, 20)); + assert.deepEqual(editor.getSelection(), new Selection(1, 9, 1, 20)); + + // start position between brackets + editor.setPosition(new Position(1, 16)); + bracketMatchingController.selectToBracket(); + assert.deepEqual(editor.getPosition(), new Position(1, 19)); + assert.deepEqual(editor.getSelection(), new Selection(1, 14, 1, 19)); + + // start position outside brackets + editor.setPosition(new Position(1, 21)); + bracketMatchingController.selectToBracket(); + assert.deepEqual(editor.getPosition(), new Position(1, 25)); + assert.deepEqual(editor.getSelection(), new Selection(1, 23, 1, 25)); + + // do not break if no brackets are available + editor.setPosition(new Position(1, 26)); + bracketMatchingController.selectToBracket(); + assert.deepEqual(editor.getPosition(), new Position(1, 26)); + assert.deepEqual(editor.getSelection(), new Selection(1, 26, 1, 26)); + + bracketMatchingController.dispose(); + }); + + model.dispose(); + mode.dispose(); + }); }); From 72e3cf950a0f7ba83e9160d0f066123097119aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Oliveira?= Date: Thu, 23 Nov 2017 22:57:03 +0000 Subject: [PATCH 005/710] Formatting --- src/vs/editor/contrib/bracketMatching/bracketMatching.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index 4cb6957804c..b6d5c1ace8d 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -14,12 +14,7 @@ import { Position } from 'vs/editor/common/core/position'; import { Selection } from 'vs/editor/common/core/selection'; import { RunOnceScheduler } from 'vs/base/common/async'; import * as editorCommon from 'vs/editor/common/editorCommon'; -import { - EditorAction, - registerEditorAction, - registerEditorContribution, - ServicesAccessor -} from 'vs/editor/browser/editorExtensions'; +import { EditorAction, registerEditorAction, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry'; From 86f0a340fe22cfc18bcfb1ffd4f065c83bd315cc Mon Sep 17 00:00:00 2001 From: Nelson Almeida Date: Wed, 29 Nov 2017 13:38:08 +0000 Subject: [PATCH 006/710] Update fontInfo.ts --- src/vs/editor/common/config/fontInfo.ts | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/common/config/fontInfo.ts b/src/vs/editor/common/config/fontInfo.ts index af6a2d82873..24b105bbd4e 100644 --- a/src/vs/editor/common/config/fontInfo.ts +++ b/src/vs/editor/common/config/fontInfo.ts @@ -14,6 +14,16 @@ import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions'; */ const GOLDEN_LINE_HEIGHT_RATIO = platform.isMacintosh ? 1.5 : 1.35; +/** + * Font settings maximum and minimum limits + */ +const MINIMUM_FONT_SIZE = 8; +const MAXIMUM_FONT_SIZE = 100; +const MINIMUM_LINE_HEIGHT = 8; +const MAXIMUM_LINE_HEIGHT = 150; +const MINIMUM_LETTER_SPACING = -5; +const MAXIMUM_LETTER_SPACING = 20; + function safeParseFloat(n: number | string, defaultValue: number): number { if (typeof n === 'number') { return n; @@ -70,24 +80,25 @@ export class BareFontInfo { let fontFamily = _string(opts.fontFamily, EDITOR_FONT_DEFAULTS.fontFamily); let fontWeight = _string(opts.fontWeight, EDITOR_FONT_DEFAULTS.fontWeight); + let fontSize = safeParseFloat(opts.fontSize, EDITOR_FONT_DEFAULTS.fontSize); - fontSize = clamp(fontSize, 0, 100); + fontSize = clamp(fontSize, 0, MAXIMUM_FONT_SIZE); if (fontSize === 0) { fontSize = EDITOR_FONT_DEFAULTS.fontSize; - } else if (fontSize < 8) { - fontSize = 8; + } else if (fontSize < MINIMUM_FONT_SIZE) { + fontSize = MINIMUM_FONT_SIZE; } let lineHeight = safeParseInt(opts.lineHeight, 0); - lineHeight = clamp(lineHeight, 0, 150); + lineHeight = clamp(lineHeight, 0, MAXIMUM_LINE_HEIGHT); if (lineHeight === 0) { lineHeight = Math.round(GOLDEN_LINE_HEIGHT_RATIO * fontSize); - } else if (lineHeight < 8) { - lineHeight = 8; + } else if (lineHeight < MINIMUM_LINE_HEIGHT) { + lineHeight = MINIMUM_LINE_HEIGHT; } let letterSpacing = safeParseFloat(opts.letterSpacing, 0); - letterSpacing = clamp(letterSpacing, -20, 20); + letterSpacing = clamp(letterSpacing, MINIMUM_LETTER_SPACING, MAXIMUM_LETTER_SPACING); let editorZoomLevelMultiplier = 1 + (EditorZoom.getZoomLevel() * 0.1); fontSize *= editorZoomLevelMultiplier; From cd8078c4df2df28aef6c194b255568579884df75 Mon Sep 17 00:00:00 2001 From: francis-andrade Date: Sun, 3 Dec 2017 16:40:15 +0000 Subject: [PATCH 007/710] Fixes issue #16228 --- .../bracketMatching/bracketMatching.ts | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index fbd1a37d39c..5df1f747a6f 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -16,10 +16,19 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; -import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; -import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry'; +import { registerThemingParticipant, themeColorFromId} from 'vs/platform/theme/common/themeService'; +import { editorBracketMatchBackground, editorBracketMatchBorder} from 'vs/editor/common/view/editorColorRegistry'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; +import { registerColor, overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; + + +export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); +export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable.')); + +export const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights.')); +export const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0', light: '#C0A0C0', hc: '#C0A0C0' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights.')); + class SelectBracketAction extends EditorAction { constructor() { @@ -150,7 +159,12 @@ export class BracketMatchingController extends Disposable implements editorCommo private static readonly _DECORATION_OPTIONS = ModelDecorationOptions.register({ stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, - className: 'bracket-match' + className: 'bracket-match', + overviewRuler: { + color: themeColorFromId(overviewRulerSelectionHighlightForeground), + darkColor: themeColorFromId(overviewRulerSelectionHighlightForeground), + position: editorCommon.OverviewRulerLane.Center + } }); private _updateBrackets(): void { From 8e93e7e47b632d0cbc91637720a4e6b034747087 Mon Sep 17 00:00:00 2001 From: francis-andrade Date: Wed, 6 Dec 2017 13:08:45 +0000 Subject: [PATCH 008/710] Fixed Identation --- src/vs/editor/contrib/bracketMatching/bracketMatching.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index 5df1f747a6f..5e6d3e66eed 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -16,11 +16,11 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; -import { registerThemingParticipant, themeColorFromId} from 'vs/platform/theme/common/themeService'; -import { editorBracketMatchBackground, editorBracketMatchBorder} from 'vs/editor/common/view/editorColorRegistry'; +import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService'; +import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModelWithDecorations'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { registerColor, overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; +import { registerColor, overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); From 94376927e496d27a6133072ace933dea764a6452 Mon Sep 17 00:00:00 2001 From: saighost Date: Sun, 24 Dec 2017 23:56:20 +0800 Subject: [PATCH 009/710] Add an option to display minimap to the left. --- .../editorScrollbar/editorScrollbar.ts | 8 ++- .../browser/viewParts/minimap/minimap.ts | 10 ++- .../common/config/commonEditorConfig.ts | 6 ++ src/vs/editor/common/config/editorOptions.ts | 41 +++++++++-- .../viewLayout/editorLayoutProvider.test.ts | 70 +++++++++++++++++++ src/vs/monaco.d.ts | 6 ++ .../telemetry/common/telemetryUtils.ts | 1 + 7 files changed, 134 insertions(+), 8 deletions(-) diff --git a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts index 73ae56f5e38..ed1121cfcdd 100644 --- a/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts +++ b/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.ts @@ -99,7 +99,13 @@ export class EditorScrollbar extends ViewPart { const layoutInfo = this._context.configuration.editor.layoutInfo; this.scrollbarDomNode.setLeft(layoutInfo.contentLeft); - this.scrollbarDomNode.setWidth(layoutInfo.contentWidth + layoutInfo.minimapWidth); + + const side = this._context.configuration.editor.viewInfo.minimap.side; + if (side === 'right') { + this.scrollbarDomNode.setWidth(layoutInfo.contentWidth + layoutInfo.minimapWidth); + } else { + this.scrollbarDomNode.setWidth(layoutInfo.contentWidth); + } this.scrollbarDomNode.setHeight(layoutInfo.contentHeight); } diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index 8b4cc2a9979..23ba983dd87 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts @@ -76,6 +76,8 @@ class MinimapOptions { public readonly showSlider: 'always' | 'mouseover'; + public readonly side: 'right' | 'left'; + public readonly pixelRatio: number; public readonly typicalHalfwidthCharacterWidth: number; @@ -118,6 +120,7 @@ class MinimapOptions { this.renderMinimap = layoutInfo.renderMinimap | 0; this.scrollBeyondLastLine = viewInfo.scrollBeyondLastLine; this.showSlider = viewInfo.minimap.showSlider; + this.side = viewInfo.minimap.side; this.pixelRatio = pixelRatio; this.typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth; this.lineHeight = configuration.editor.lineHeight; @@ -135,6 +138,7 @@ class MinimapOptions { return (this.renderMinimap === other.renderMinimap && this.scrollBeyondLastLine === other.scrollBeyondLastLine && this.showSlider === other.showSlider + && this.side === other.side && this.pixelRatio === other.pixelRatio && this.typicalHalfwidthCharacterWidth === other.typicalHalfwidthCharacterWidth && this.lineHeight === other.lineHeight @@ -456,7 +460,11 @@ export class Minimap extends ViewPart { this._domNode.setPosition('absolute'); this._domNode.setAttribute('role', 'presentation'); this._domNode.setAttribute('aria-hidden', 'true'); - this._domNode.setRight(this._context.configuration.editor.layoutInfo.verticalScrollbarWidth); + if (this._options.side === 'right') { + this._domNode.setRight(this._context.configuration.editor.layoutInfo.verticalScrollbarWidth); + } else { + this._domNode.setLeft(0); + } this._shadow = createFastDomNode(document.createElement('div')); this._shadow.setClassName('minimap-shadow-hidden'); diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index 7bf275a9b80..4d57a3fa2b8 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -264,6 +264,12 @@ const editorConfiguration: IConfigurationNode = { 'default': EDITOR_DEFAULTS.viewInfo.minimap.enabled, 'description': nls.localize('minimap.enabled', "Controls if the minimap is shown") }, + 'editor.minimap.side': { + 'type': 'string', + 'enum': ['left', 'right'], + 'default': EDITOR_DEFAULTS.viewInfo.minimap.side, + 'description': nls.localize('minimap.side', "Controls display minimap which side.Possible values are \'right\' and \'left\'") + }, 'editor.minimap.showSlider': { 'type': 'string', 'enum': ['always', 'mouseover'], diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 0b49b501f24..87bca6ec55b 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -102,6 +102,11 @@ export interface IEditorMinimapOptions { * Defaults to false. */ enabled?: boolean; + /** + * Control the side of the minimap in editor. + * Defaults to 'right'. + */ + side?: 'right' | 'left'; /** * Control the rendering of the minimap slider. * Defaults to 'mouseover'. @@ -736,6 +741,7 @@ export interface InternalEditorScrollbarOptions { export interface InternalEditorMinimapOptions { readonly enabled: boolean; + readonly side: 'right' | 'left'; readonly showSlider: 'always' | 'mouseover'; readonly renderCharacters: boolean; readonly maxColumn: number; @@ -1095,6 +1101,7 @@ export class InternalEditorOptions { private static _equalsMinimapOptions(a: InternalEditorMinimapOptions, b: InternalEditorMinimapOptions): boolean { return ( a.enabled === b.enabled + && a.side === b.side && a.showSlider === b.showSlider && a.renderCharacters === b.renderCharacters && a.maxColumn === b.maxColumn @@ -1547,6 +1554,7 @@ export class EditorOptionsValidator { } return { enabled: _boolean(opts.enabled, defaults.enabled), + side: _stringSet<'right' | 'left'>(opts.side, defaults.side, ['right', 'left']), showSlider: _stringSet<'always' | 'mouseover'>(opts.showSlider, defaults.showSlider, ['always', 'mouseover']), renderCharacters: _boolean(opts.renderCharacters, defaults.renderCharacters), maxColumn: _clampedInt(opts.maxColumn, defaults.maxColumn, 1, 10000), @@ -1761,6 +1769,7 @@ export class InternalEditorOptionsFactory { scrollbar: opts.viewInfo.scrollbar, minimap: { enabled: (accessibilityIsOn ? false : opts.viewInfo.minimap.enabled), // DISABLED WHEN SCREEN READER IS ATTACHED + side: opts.viewInfo.minimap.side, renderCharacters: opts.viewInfo.minimap.renderCharacters, showSlider: opts.viewInfo.minimap.showSlider, maxColumn: opts.viewInfo.minimap.maxColumn @@ -1842,6 +1851,7 @@ export class InternalEditorOptionsFactory { scrollbarArrowSize: opts.viewInfo.scrollbar.arrowSize, verticalScrollbarHasArrows: opts.viewInfo.scrollbar.verticalHasArrows, minimap: opts.viewInfo.minimap.enabled, + minimapSide: opts.viewInfo.minimap.side, minimapRenderCharacters: opts.viewInfo.minimap.renderCharacters, minimapMaxColumn: opts.viewInfo.minimap.maxColumn, pixelRatio: env.pixelRatio @@ -1974,6 +1984,7 @@ export interface IEditorLayoutProviderOpts { horizontalScrollbarHeight: number; minimap: boolean; + minimapSide: string; minimapRenderCharacters: boolean; minimapMaxColumn: number; pixelRatio: number; @@ -1994,11 +2005,12 @@ export class EditorLayoutProvider { const lineDecorationsWidth = _opts.lineDecorationsWidth | 0; const typicalHalfwidthCharacterWidth = _opts.typicalHalfwidthCharacterWidth; const maxDigitWidth = _opts.maxDigitWidth; - const verticalScrollbarWidth = _opts.verticalScrollbarWidth | 0; + let verticalScrollbarWidth = _opts.verticalScrollbarWidth | 0; const verticalScrollbarHasArrows = _opts.verticalScrollbarHasArrows; const scrollbarArrowSize = _opts.scrollbarArrowSize | 0; const horizontalScrollbarHeight = _opts.horizontalScrollbarHeight | 0; const minimap = _opts.minimap; + const minimapSide = _opts.minimapSide; const minimapRenderCharacters = _opts.minimapRenderCharacters; const minimapMaxColumn = _opts.minimapMaxColumn | 0; const pixelRatio = _opts.pixelRatio; @@ -2014,17 +2026,22 @@ export class EditorLayoutProvider { glyphMarginWidth = lineHeight; } - const glyphMarginLeft = 0; - const lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; - const decorationsLeft = lineNumbersLeft + lineNumbersWidth; - const contentLeft = decorationsLeft + lineDecorationsWidth; - const remainingWidth = outerWidth - glyphMarginWidth - lineNumbersWidth - lineDecorationsWidth; let renderMinimap: RenderMinimap; let minimapWidth: number; let contentWidth: number; + let contentLeft: number; + let glyphMarginLeft: number; + let lineNumbersLeft: number; + let decorationsLeft: number; + + glyphMarginLeft = 0; if (!minimap) { + lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; + decorationsLeft = lineNumbersLeft + lineNumbersWidth; + + contentLeft = decorationsLeft + lineDecorationsWidth; minimapWidth = 0; renderMinimap = RenderMinimap.None; contentWidth = remainingWidth; @@ -2056,6 +2073,17 @@ export class EditorLayoutProvider { minimapWidth = Math.floor(minimapMaxColumn * minimapCharWidth); } contentWidth = remainingWidth - minimapWidth; + + if (typeof minimapSide === 'string') { + if (minimapSide === 'left') { + glyphMarginLeft = minimapWidth; + } + } + + lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; + decorationsLeft = lineNumbersLeft + lineNumbersWidth; + contentLeft = decorationsLeft + lineDecorationsWidth; + } const viewportColumn = Math.max(1, Math.floor((contentWidth - verticalScrollbarWidth) / typicalHalfwidthCharacterWidth)); @@ -2197,6 +2225,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = { }, minimap: { enabled: true, + side: 'right', showSlider: 'mouseover', renderCharacters: true, maxColumn: 120 diff --git a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts index 53ac8d481a6..58760b1e5a0 100644 --- a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts +++ b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts @@ -31,6 +31,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -87,6 +88,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 13, verticalScrollbarHasArrows: true, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -143,6 +145,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -199,6 +202,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -255,6 +259,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -311,6 +316,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -367,6 +373,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -423,6 +430,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -479,6 +487,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -535,6 +544,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: false, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -591,6 +601,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: true, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 1, @@ -647,6 +658,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: true, + minimapSide: 'right', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 2, @@ -703,6 +715,64 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { scrollbarArrowSize: 0, verticalScrollbarHasArrows: false, minimap: true, + minimapSide: 'right', + minimapRenderCharacters: true, + minimapMaxColumn: 150, + pixelRatio: 4, + }, { + width: 1000, + height: 800, + + glyphMarginLeft: 0, + glyphMarginWidth: 0, + glyphMarginHeight: 800, + + lineNumbersLeft: 0, + lineNumbersWidth: 0, + lineNumbersHeight: 800, + + decorationsLeft: 0, + decorationsWidth: 10, + decorationsHeight: 800, + + contentLeft: 10, + contentWidth: 943, + contentHeight: 800, + + renderMinimap: RenderMinimap.Large, + minimapWidth: 47, + viewportColumn: 94, + + verticalScrollbarWidth: 0, + horizontalScrollbarHeight: 0, + + overviewRuler: { + top: 0, + width: 0, + height: 800, + right: 0 + } + }); + }); + + test('EditorLayoutProvider 10 - render minimap to left', () => { + doTest({ + outerWidth: 1000, + outerHeight: 800, + showGlyphMargin: false, + lineHeight: 16, + showLineNumbers: false, + lineNumbersMinChars: 0, + lineNumbersDigitCount: 1, + lineDecorationsWidth: 10, + typicalHalfwidthCharacterWidth: 10, + maxDigitWidth: 10, + verticalScrollbarWidth: 0, + horizontalScrollbarHeight: 0, + scrollbarArrowSize: 0, + verticalScrollbarHasArrows: false, + minimap: true, + minimapSide: 'left', minimapRenderCharacters: true, minimapMaxColumn: 150, pixelRatio: 4, diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index ef21f827a94..752db02cf8a 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -2431,6 +2431,11 @@ declare module monaco.editor { * Defaults to false. */ enabled?: boolean; + /** + * Control the side of the minimap in editor. + * Defaults to 'right'. + */ + side?: 'right' | 'left'; /** * Control the rendering of the minimap slider. * Defaults to 'mouseover'. @@ -2993,6 +2998,7 @@ declare module monaco.editor { export interface InternalEditorMinimapOptions { readonly enabled: boolean; + readonly side: 'right' | 'left'; readonly showSlider: 'always' | 'mouseover'; readonly renderCharacters: boolean; readonly maxColumn: number; diff --git a/src/vs/platform/telemetry/common/telemetryUtils.ts b/src/vs/platform/telemetry/common/telemetryUtils.ts index 41c3db8d63f..1b3b0233b7b 100644 --- a/src/vs/platform/telemetry/common/telemetryUtils.ts +++ b/src/vs/platform/telemetry/common/telemetryUtils.ts @@ -75,6 +75,7 @@ const configurationValueWhitelist = [ 'editor.roundedSelection', 'editor.scrollBeyondLastLine', 'editor.minimap.enabled', + 'editor.minimap.side', 'editor.minimap.renderCharacters', 'editor.minimap.maxColumn', 'editor.find.seedSearchStringFromSelection', From 13b1f7295a734d27a6577f9e71b9d9e97d41cceb Mon Sep 17 00:00:00 2001 From: saighost Date: Mon, 25 Dec 2017 00:26:45 +0800 Subject: [PATCH 010/710] fix test case --- .../test/common/viewLayout/editorLayoutProvider.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts index 58760b1e5a0..f25b151d595 100644 --- a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts +++ b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts @@ -780,19 +780,19 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { width: 1000, height: 800, - glyphMarginLeft: 0, + glyphMarginLeft: 47, glyphMarginWidth: 0, glyphMarginHeight: 800, - lineNumbersLeft: 0, + lineNumbersLeft: 47, lineNumbersWidth: 0, lineNumbersHeight: 800, - decorationsLeft: 0, + decorationsLeft: 47, decorationsWidth: 10, decorationsHeight: 800, - contentLeft: 10, + contentLeft: 57, contentWidth: 943, contentHeight: 800, From f4c8522dd1fab4e57822ecde4d640425c9a0954f Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Thu, 4 Jan 2018 19:23:09 -0800 Subject: [PATCH 011/710] safe point --- .../editor/common/model/indentationGuesser.ts | 25 +- src/vs/editor/common/model/modelLine.ts | 7 +- src/vs/editor/common/model/textBuffer.ts | 2 +- src/vs/editor/common/model/textBuffer2.ts | 1711 +++++++++++++++++ src/vs/editor/common/model/textModel.ts | 15 +- src/vs/editor/common/model/textSource.ts | 34 +- .../common/services/modelServiceImpl.ts | 19 +- .../common/viewModel/prefixSumComputer.ts | 2 +- .../common/editor/textEditorModel.ts | 4 +- .../node/walkThroughContentProvider.ts | 2 +- .../services/backup/node/backupFileService.ts | 2 +- .../textfile/electron-browser/modelBuilder.ts | 82 +- .../workbench/test/workbenchTestServices.ts | 2 +- 13 files changed, 1883 insertions(+), 24 deletions(-) create mode 100644 src/vs/editor/common/model/textBuffer2.ts diff --git a/src/vs/editor/common/model/indentationGuesser.ts b/src/vs/editor/common/model/indentationGuesser.ts index 56c6683c543..aa1dab5901a 100644 --- a/src/vs/editor/common/model/indentationGuesser.ts +++ b/src/vs/editor/common/model/indentationGuesser.ts @@ -6,6 +6,8 @@ import { CharCode } from 'vs/base/common/charCode'; import { TextBuffer } from 'vs/editor/common/model/textBuffer'; +import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2'; +import { IRawPTBuffer } from './textSource'; export interface IIndentationGuesserTarget { getLineCount(): number; @@ -15,7 +17,7 @@ export interface IIndentationGuesserTarget { export class IndentationGuesserTextBufferTarget implements IIndentationGuesserTarget { constructor( - private readonly _buffer: TextBuffer + private readonly _buffer: TextBuffer | TextBuffer2 ) { } public getLineCount(): number { @@ -42,6 +44,27 @@ export class IndentationGuesserStringArrayTarget implements IIndentationGuesserT } } +export class IndentationGuesserRawTextBufferTarget implements IIndentationGuesserTarget { + + constructor( + private readonly _rawBuffer: IRawPTBuffer + ) { } + + public getLineCount(): number { + return this._rawBuffer.length; + } + + public getLineContent(lineNumber: number): string { + if (lineNumber === 1) { + return this._rawBuffer.text.substring(0, this._rawBuffer.lineStarts[0]); + } else if (lineNumber === this._rawBuffer.lineStarts.length + 1) { + return this._rawBuffer.text.substring(this._rawBuffer.lineStarts[this._rawBuffer.lineStarts.length - 1] + 1); + } + + return this._rawBuffer.text.substring(this._rawBuffer.lineStarts[lineNumber - 2] + 1, this._rawBuffer.lineStarts[lineNumber - 1]); + } +} + /** * Compute the diff in spaces between two line's indentation. */ diff --git a/src/vs/editor/common/model/modelLine.ts b/src/vs/editor/common/model/modelLine.ts index 68c616b7dec..80eaef91233 100644 --- a/src/vs/editor/common/model/modelLine.ts +++ b/src/vs/editor/common/model/modelLine.ts @@ -13,6 +13,7 @@ import { Range } from 'vs/editor/common/core/range'; import { IModelTokensChangedEvent } from 'vs/editor/common/model/textModelEvents'; import { onUnexpectedError } from 'vs/base/common/errors'; import { TextBuffer } from 'vs/editor/common/model/textBuffer'; +import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2'; import { TokenizationResult2 } from 'vs/editor/common/core/token'; import { nullTokenize2 } from 'vs/editor/common/modes/nullMode'; @@ -253,7 +254,7 @@ export class ModelLinesTokens { return (firstInvalidLineNumber >= lineNumber); } - public hasLinesToTokenize(buffer: TextBuffer): boolean { + public hasLinesToTokenize(buffer: TextBuffer | TextBuffer2): boolean { return (this._invalidLineStartIndex < buffer.getLineCount()); } @@ -419,7 +420,7 @@ export class ModelLinesTokens { //#region Tokenization - public _tokenizeOneLine(buffer: TextBuffer, eventBuilder: ModelTokensChangedEventBuilder): number { + public _tokenizeOneLine(buffer: TextBuffer | TextBuffer2, eventBuilder: ModelTokensChangedEventBuilder): number { if (!this.hasLinesToTokenize(buffer)) { return buffer.getLineCount() + 1; } @@ -428,7 +429,7 @@ export class ModelLinesTokens { return lineNumber; } - public _updateTokensUntilLine(buffer: TextBuffer, eventBuilder: ModelTokensChangedEventBuilder, lineNumber: number): void { + public _updateTokensUntilLine(buffer: TextBuffer | TextBuffer2, eventBuilder: ModelTokensChangedEventBuilder, lineNumber: number): void { if (!this.tokenizationSupport) { this._invalidLineStartIndex = buffer.getLineCount(); return; diff --git a/src/vs/editor/common/model/textBuffer.ts b/src/vs/editor/common/model/textBuffer.ts index 87f19776d65..c8c70440b01 100644 --- a/src/vs/editor/common/model/textBuffer.ts +++ b/src/vs/editor/common/model/textBuffer.ts @@ -55,7 +55,7 @@ export class TextBuffer { private _lineStarts: PrefixSumComputer; constructor(textSource: ITextSource) { - this._lines = textSource.lines.slice(0); + this._lines = (textSource.lines).slice(0); this._BOM = textSource.BOM; this._EOL = textSource.EOL; this._mightContainRTL = textSource.containsRTL; diff --git a/src/vs/editor/common/model/textBuffer2.ts b/src/vs/editor/common/model/textBuffer2.ts new file mode 100644 index 00000000000..4b5a6da72a4 --- /dev/null +++ b/src/vs/editor/common/model/textBuffer2.ts @@ -0,0 +1,1711 @@ +/*--------------------------------------------------------------------------------------------- + * 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 editorCommon from 'vs/editor/common/editorCommon'; +import * as strings from 'vs/base/common/strings'; +import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; +import { ITextSource, IRawPTBuffer } from 'vs/editor/common/model/textSource'; +import { ApplyEditResult, IInternalModelContentChange } from 'vs/editor/common/model/textBuffer'; +import { IValidatedEditOperation } from 'vs/editor/common/model/editableTextModel'; +import { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; + +export const enum NodeColor { + Black = 0, + Red = 1, +} + +export let error = { + sizeLeft: false +}; + +function getNodeColor(node: TreeNode) { + return node.color; +} + +function setNodeColor(node: TreeNode, color: NodeColor) { + node.color = color; +} + +function leftest(node: TreeNode): TreeNode { + while (node.left !== SENTINEL) { + node = node.left; + } + return node; +} + +function righttest(node: TreeNode): TreeNode { + while (node.right !== SENTINEL) { + node = node.right; + } + return node; +} + +function calculateSize(node: TreeNode): number { + if (node === SENTINEL) { + return 0; + } + + return node.size_left + node.piece.length + calculateSize(node.right); +} + +function calculateLF(node: TreeNode): number { + if (node === SENTINEL) { + return 0; + } + + return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right); +} + +function resetSentinel(): void { + SENTINEL.parent = SENTINEL; +} + +export class TreeNode { + parent: TreeNode; + left: TreeNode; + right: TreeNode; + color: NodeColor; + + // Piece + piece: Piece; + size_left: number; // size of the left subtree (not inorder) + lf_left: number; // line feeds cnt in the left subtree (not in order) + + constructor(piece: Piece, color: NodeColor) { + this.piece = piece; + this.color = color; + this.size_left = 0; + this.lf_left = 0; + this.parent = null; + this.left = null; + this.right = null; + } + + public next(): TreeNode { + if (this.right !== SENTINEL) { + return leftest(this.right); + } + + let node: TreeNode = this; + + while (node.parent !== SENTINEL) { + if (node.parent.left === node) { + break; + } + + node = node.parent; + } + + if (node.parent === SENTINEL) { + // root + // if (node.right === SENTINEL) { + return SENTINEL; + // } + // return leftest(node.right); + } else { + return node.parent; + } + } + + public prev(): TreeNode { + if (this.left !== SENTINEL) { + return righttest(this.left); + } + + let node: TreeNode = this; + + while (node.parent !== SENTINEL) { + if (node.parent.right === node) { + break; + } + + node = node.parent; + } + + if (node.parent === SENTINEL) { + // root + // if (node.left === SENTINEL) { + return SENTINEL; + // } + // return righttest(node.left); + } else { + return node.parent; + } + } + + public detach(): void { + this.parent = null; + this.left = null; + this.right = null; + } +} + +export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black); +SENTINEL.parent = SENTINEL; +SENTINEL.left = SENTINEL; +SENTINEL.right = SENTINEL; +setNodeColor(SENTINEL, NodeColor.Black); + +export interface BufferCursor { + /** + * Piece Index + */ + node: TreeNode; + /** + * remainer in current piece. + */ + remainder: number; +} + +export class Piece { + isOriginalBuffer: boolean; + offset: number; + length: number; // size of current piece + + lineFeedCnt: number; + lineStarts: PrefixSumComputer; + + constructor(isOriginalBuffer: boolean, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { + this.isOriginalBuffer = isOriginalBuffer; + this.offset = offset; + this.length = length; + this.lineFeedCnt = lineFeedCnt; + this.lineStarts = null; + + if (lineLengthsVal) { + let newVal = new Uint32Array(lineLengthsVal.length); + newVal.set(lineLengthsVal); + this.lineStarts = new PrefixSumComputer(newVal); + } + } +} + +export class TextBuffer { + private _BOM: string; + private _EOL: string; + private _mightContainRTL: boolean; + private _mightContainNonBasicASCII: boolean; + + private _originalBuffer: string; + private _changeBuffer: string; + private _regex: RegExp; + root: TreeNode; + + constructor(textSource: ITextSource) { + let rawBuffer = textSource.lines; + this._originalBuffer = rawBuffer.text; + this._changeBuffer = ''; + this.root = SENTINEL; + this._BOM = textSource.BOM; + this._EOL = textSource.EOL; + this._mightContainNonBasicASCII = !textSource.isBasicASCII; + this._mightContainRTL = textSource.containsRTL; + this._regex = new RegExp(/\r\n|\r|\n/g); + + if (this._originalBuffer.length > 0) { + let { lineFeedCount, lineLengths } = this.calculateNewLineCount(this._originalBuffer); + let piece = new Piece(true, 0, this._originalBuffer.length, lineFeedCount, lineLengths); + this.rbInsertLeft(null, piece); + } + } + + // #region TextBuffer + public getLinesContent() { + return this.getContentOfSubTree(this.root); + } + + public getLineCount(): number { + let x = this.root; + + let ret = 1; + while (x !== SENTINEL) { + ret += x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + + return ret; + } + + public getValueInRange(range: Range, eol: editorCommon.EndOfLinePreference = editorCommon.EndOfLinePreference.TextDefined): string { + // todo, validate range. + if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { + return ''; + } + + let startPosition = this.nodeAt2(new Position(range.startLineNumber, range.startColumn)); + let endPosition = this.nodeAt2(new Position(range.endLineNumber, range.endColumn)); + + if (startPosition.node === endPosition.node) { + let node = startPosition.node; + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + return buffer.substring(node.piece.offset + startPosition.remainder, node.piece.offset + endPosition.remainder); + } + + + let x = startPosition.node; + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let ret = buffer.substring(x.piece.offset + startPosition.remainder, x.piece.offset + x.piece.length); + + x = x.next(); + while (x !== SENTINEL) { + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + if (x === endPosition.node) { + ret += buffer.substring(x.piece.offset, x.piece.offset + endPosition.remainder); + break; + } else { + ret += buffer.substr(x.piece.offset, x.piece.length); + } + + x = x.next(); + } + + return ret; + } + + public getLineContent(lineNumber: number): string { + let x = this.root; + + let ret = ''; + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); + } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); + break; + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + // if (x === SENTINEL) { + // throw('not possible'); + // } + + // search in order, to find the node contains end column + x = x.next(); + while (x !== SENTINEL) { + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + if (x.piece.lineFeedCnt > 0) { + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + + ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); + return ret; + } else { + ret += buffer.substr(x.piece.offset, x.piece.length); + } + + x = x.next(); + } + + return ret; + + } + + public getOffsetAt(position: Position): number { + return this.getOffsetAt2(position.lineNumber, position.column); + } + + public getOffsetAt2(lineNumber: number, column: number): number { + let leftLen = 0; // inorder + + let x = this.root; + + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left + 1 >= lineNumber) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt + 1 >= lineNumber) { + leftLen += x.size_left; + // lineNumber >= 2 + let accumualtedValInCurrentIndex = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + return leftLen += accumualtedValInCurrentIndex + column - 1; + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + leftLen += x.size_left + x.piece.length; + x = x.right; + } + } + + return leftLen; + } + + public getPositionAt(offset: number): Position { + let x = this.root; + let lfCnt = 0; + + while (x !== SENTINEL) { + if (x.size_left !== 0 && x.size_left >= offset) { + x = x.left; + } else if (x.size_left + x.piece.length >= offset) { + let out = x.piece.lineStarts.getIndexOf(offset - x.size_left); + + let column = 0; + + if (out.index === 0) { + let prev = x.prev(); + + if (prev !== SENTINEL) { + let lineLens = prev.piece.lineStarts.values; + column += lineLens[lineLens.length - 1]; + } + } + + lfCnt += x.lf_left + out.index; + return new Position(lfCnt + 1, column + out.remainder + 1); + } else { + offset -= x.size_left + x.piece.length; + lfCnt += x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + return null; + } + + public equals(other: ITextSource): boolean { + if (this._BOM !== other.BOM) { + return false; + } + if (this._EOL !== other.EOL) { + return false; + } + if (this.getLinesContent() !== (other.lines).text) { + 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 setEOL(newEOL: string): void { + this._EOL = newEOL; + // this._constructLineStarts(); + } + + public _applyEdits(rawOperations: editorCommon.IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditResult { + 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, + range: validatedRange, + rangeOffset: this.getOffsetAt(validatedRange.getStartPosition()), + rangeLength: this.getValueLengthInRange(validatedRange), + lines: op.text ? op.text.split(/\r\n|\r|\n/) : null, + forceMoveMarkers: op.forceMoveMarkers, + isAutoWhitespaceEdit: op.isAutoWhitespaceEdit || false + }; + } + + // Sort operations ascending + operations.sort(TextBuffer._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 = TextBuffer._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: editorCommon.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), + forceMoveMarkers: op.forceMoveMarkers + }; + } + + this._mightContainRTL = mightContainRTL; + this._mightContainNonBasicASCII = mightContainNonBasicASCII; + + const [rawContentChanges, 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 ApplyEditResult( + reverseOperations, + rawContentChanges, + contentChanges, + trimAutoWhitespaceLineNumbers + ); + } + + private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { + operations.sort(TextBuffer._sortOpsDescending); + + let rawContentChanges: ModelRawChange[] = []; + let contentChanges: IInternalModelContentChange[] = []; + + // operations are from bottom to top + for (let i = 0; i < operations.length; i++) { + let 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); + + const text = (op.lines ? op.lines.join(this.getEOL()) : ''); + + if (text) { + // replacement + this.delete(op.rangeOffset, op.rangeLength); + this.insert(text, op.rangeOffset); + + } else { + // deletion + this.delete(op.rangeOffset, op.rangeLength); + } + + for (let j = startLineNumber; j <= startLineNumber + editingLinesCnt; j++) { + rawContentChanges.push( + new ModelRawLineChanged(j, this.getLineContent(j)) + ); + } + + if (editingLinesCnt < deletingLinesCnt) { + rawContentChanges.push( + new ModelRawLinesDeleted(startLineNumber + editingLinesCnt + 1, endLineNumber) + ); + } + + if (editingLinesCnt < insertingLinesCnt) { + let newLinesContent: string[] = []; + for (let j = editingLinesCnt + 1; j <= insertingLinesCnt; j++) { + newLinesContent.push(op.lines[j]); + } + + newLinesContent[newLinesContent.length - 1] = this.getLineContent(startLineNumber + insertingLinesCnt - 1); + + rawContentChanges.push( + new ModelRawLinesInserted(startLineNumber + editingLinesCnt + 1, startLineNumber + insertingLinesCnt, newLinesContent.join('\n')) + ); + } + + const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn); + contentChanges.push({ + range: contentChangeRange, + rangeLength: op.rangeLength, + text: text, + lines: op.lines, + rangeOffset: op.rangeOffset, + forceMoveMarkers: op.forceMoveMarkers + }); + } + return [rawContentChanges, contentChanges]; + } + + public getValueLengthInRange(range: Range, eol: editorCommon.EndOfLinePreference = editorCommon.EndOfLinePreference.TextDefined): number { + if (range.isEmpty()) { + return 0; + } + + if (range.startLineNumber === range.endLineNumber) { + return (range.endColumn - range.startColumn); + } + + let startOffset = this.getOffsetAt(new Position(range.startLineNumber, range.startColumn)); + let endOffset = this.getOffsetAt(new Position(range.endLineNumber, range.endColumn)); + return endOffset - startOffset; + } + + public getLineCharCode(lineNumber: number, index: number): number { + return this.getLineContent(lineNumber).charCodeAt(index); + } + + public getLineLength(lineNumber: number): number { + return this.getLineContent(lineNumber).length; + } + + public getLineMinColumn(lineNumber: number): number { + return 1; + } + + public getLineMaxColumn(lineNumber: number): number { + return this.getLineLength(lineNumber) + 1; + } + + public getLineFirstNonWhitespaceColumn(lineNumber: number): number { + const result = strings.firstNonWhitespaceIndex(this.getLineContent(lineNumber)); + if (result === -1) { + return 0; + } + return result + 1; + } + + public getLineLastNonWhitespaceColumn(lineNumber: number): number { + const result = strings.lastNonWhitespaceIndex(this.getLineContent(lineNumber)); + if (result === -1) { + return 0; + } + return result + 2; + } + + public getRangeAt(start: number, end: number): Range { + const startPosition = this.getPositionAt(start); + const endPosition = this.getPositionAt(end); + return new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column); + } + + // #endregion + + // #region Piece Table + insert(value: string, offset: number): void { + // todo, validate value and offset. + if (this.root !== SENTINEL) { + let { node, remainder } = this.nodeAt(offset); + let insertPos = node.piece.lineStarts.getIndexOf(remainder); + let nodeOffsetInDocument = this.offsetOfNode(node); + const startOffset = this._changeBuffer.length; + + if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeOffsetInDocument + node.piece.length === offset)) { + // append content to this node, we don't want to keep adding node when users simply type in sequence + // unless we want to make the structure immutable + this.appendToNode(node, value); + } else { + if (nodeOffsetInDocument === offset) { + // we are inserting content to the beginning of node + let nodesToDel = []; + if (value.charCodeAt(value.length - 1) === 13) { + // inserted content ends with \r + if (node !== SENTINEL) { + if (this.nodeCharCodeAt(node, 0) === 10) { + // move `\n` forward + value += '\n'; + node.piece.offset++; + node.piece.length--; + node.piece.lineFeedCnt--; + node.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + this.updateMetadata(node, -1, -1); + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } + } + } + + this._changeBuffer += value; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + let newNode = this.rbInsertLeft(node, newPiece); + this.fixCRLFWithPrev(newNode); + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } else if (nodeOffsetInDocument + node.piece.length > offset) { + let nodesToDel = []; + + // we need to split node. Create the new piece first as we are reading current node info before modifying it. + let newRightPiece = new Piece( + node.piece.isOriginalBuffer, + node.piece.offset + offset - nodeOffsetInDocument, + nodeOffsetInDocument + node.piece.length - offset, + node.piece.lineFeedCnt - insertPos.index, + node.piece.lineStarts.values + ); + + if (value.charCodeAt(value.length - 1) === 13 /** \r */) { + let headOfRight = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument); + + if (headOfRight === 10 /** \n */) { + newRightPiece.offset++; + newRightPiece.length--; + newRightPiece.lineFeedCnt--; + newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); + value += '\n'; + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + + // reuse node + if (value.charCodeAt(0) === 10/** \n */) { + let tailOfLeft = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument - 1); + if (tailOfLeft === 13 /** \r */) { + let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); + this.deleteNodeTail(node, previousPos); + value = '\r' + value; + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } else { + this.deleteNodeTail(node, insertPos); + } + } else { + this.deleteNodeTail(node, insertPos); + } + + this._changeBuffer += value; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + + if (newRightPiece.length > 0) { + this.rbInsertRight(node, newRightPiece); + } + this.rbInsertRight(node, newPiece); + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } else { + // we are inserting to the right of this node. + if (this.adjustCarriageReturnFromNext(value, node)) { + value += '\n'; + } + + this._changeBuffer += value; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + let newNode = this.rbInsertRight(node, newPiece); + this.fixCRLFWithPrev(newNode); + } + } + } else { + // insert new node + const startOffset = this._changeBuffer.length; + this._changeBuffer += value; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + let piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + + this.rbInsertLeft(null, piece); + } + } + + delete(offset: number, cnt: number): void { + if (cnt <= 0) { + return; + } + + if (this.root !== SENTINEL) { + let startPosition = this.nodeAt(offset); + let endPosition = this.nodeAt(offset + cnt); + let startNode = startPosition.node; + let endNode = endPosition.node; + + let length = startNode.piece.length; + let startNodeOffsetInDocument = this.offsetOfNode(startNode); + let splitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument); + + if (startNode === endNode) { + // deletion falls into one node. + let endSplitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument + cnt); + + if (startNodeOffsetInDocument === offset) { + if (cnt === length) { // delete node + let next = startNode.next(); + this.rbDelete(startNode); + this.fixCRLFWithPrev(next); + return; + } + this.deleteNodeHead(startNode, endSplitPos); + this.fixCRLFWithPrev(startNode); + return; + } + + if (startNodeOffsetInDocument + length === offset + cnt) { + this.deleteNodeTail(startNode, splitPos); + this.fixCRLFWithNext(startNode); + return; + } + + // delete content in the middle, this node will be splitted to nodes + return this.shrinkNode(startNode, splitPos, endSplitPos); + } + + // perform read operations before any write operation. + let endNodeOffsetInDocument = this.offsetOfNode(endNode); + + // update first touched node + this.deleteNodeTail(startNode, splitPos); + let nodesToDel = []; + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } + + // update last touched node + let endSplitPos = endNode.piece.lineStarts.getIndexOf(offset - endNodeOffsetInDocument + cnt); + this.deleteNodeHead(endNode, endSplitPos); + + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } + + let secondNode = startNode.next(); + for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { + nodesToDel.push(node); + } + + let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + + if (prev !== SENTINEL) { + this.fixCRLFWithNext(prev); + } + } + } + + // #region node operations + deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { + // it's okay to delete CR in CRLF. + let cnt = node.piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; + node.piece.length -= cnt; + node.piece.offset += cnt; + node.piece.lineFeedCnt -= pos.index; + this.deletePrefixSumHead(node.piece.lineStarts, pos); + this.updateMetadata(node, -cnt, -pos.index); + } + + deleteNodeTail(node: TreeNode, start: PrefixSumIndexOfResult) { + let cnt = node.piece.length - node.piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; + let hitCRLF = this.hitTestCRLF(node, node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); + node.piece.length -= cnt; + let lf_delta = start.index - node.piece.lineFeedCnt; + node.piece.lineFeedCnt = start.index; + this.deletePrefixSumTail(node.piece.lineStarts, start); + + if (hitCRLF) { + node.piece.lineFeedCnt += 1; + lf_delta += 1; + node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + } + + this.updateMetadata(node, -cnt, lf_delta); + } + + // remove start-end from node. + shrinkNode(node: TreeNode, start: PrefixSumIndexOfResult, end?: PrefixSumIndexOfResult) { + // read operation first + let oldLineLengthsVal = node.piece.lineStarts.values; + let offset = node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; + let endOffset = node.piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; + + // write. + let startHitCRLF = this.hitTestCRLF(node, offset, start); + let nodeOldLength = node.piece.length; + node.piece.length = offset; + let lf_delta = start.index - node.piece.lineFeedCnt; + node.piece.lineFeedCnt = start.index; + node.piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); + node.piece.lineStarts.changeValue(start.index, start.remainder); + + if (startHitCRLF) { + node.piece.lineFeedCnt += 1; + lf_delta += 1; + node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + } + this.updateMetadata(node, offset - nodeOldLength, lf_delta); + + let newPieceLength = nodeOldLength - endOffset; + if (newPieceLength <= 0) { + return; + } + + let newPiece: Piece = new Piece( + node.piece.isOriginalBuffer, + endOffset + node.piece.offset, + newPieceLength, + oldLineLengthsVal.length - end.index - 1, + oldLineLengthsVal.slice(end.index) + ); + newPiece.lineStarts.changeValue(0, newPiece.lineStarts.values[0] - end.remainder); + + let newNode = this.rbInsertRight(node, newPiece); + this.fixCRLFWithPrev(newNode); + } + + appendToNode(node: TreeNode, value: string): void { + if (this.adjustCarriageReturnFromNext(value, node)) { + value += '\n'; + } + + let hitCRLF = value.charCodeAt(0) === 10 && this.nodeCharCodeAt(node, node.piece.length - 1) === 13; + this._changeBuffer += value; + node.piece.length += value.length; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + + let lf_delta = lineFeedCount; + if (hitCRLF) { + node.piece.lineFeedCnt += lineFeedCount - 1; + lf_delta--; + let lineStarts = node.piece.lineStarts; + lineStarts.removeValues(lineStarts.values.length - 1, 1); + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + 1); + lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); + } else { + node.piece.lineFeedCnt += lineFeedCount; + let lineStarts = node.piece.lineStarts; + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + lineLengths[0]); + lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); + } + + this.updateMetadata(node, value.length, lf_delta); + } + + nodeAt(offset: number): BufferCursor { + let x = this.root; + + while (x !== SENTINEL) { + if (x.size_left > offset) { + x = x.left; + } else if (x.size_left + x.piece.length >= offset) { + return { + node: x, + remainder: offset - x.size_left + }; + } else { + offset -= x.size_left + x.piece.length; + x = x.right; + } + } + + return null; + } + + nodeAt2(position: Position): BufferCursor { + let x = this.root; + let lineNumber = position.lineNumber; + let column = position.column; + + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + + return { + node: x, + remainder: Math.min(prevAccumualtedValue + column - 1, accumualtedValue) + }; + } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + if (prevAccumualtedValue + column - 1 <= x.piece.length) { + return { + node: x, + remainder: prevAccumualtedValue + column - 1 + }; + } else { + column -= x.piece.length - prevAccumualtedValue; + break; + } + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + // search in order, to find the node contains position.column + x = x.next(); + while (x !== SENTINEL) { + + if (x.piece.lineFeedCnt > 0) { + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + return { + node: x, + remainder: Math.min(column - 1, accumualtedValue) + }; + } else { + if (x.piece.length >= column - 1) { + return { + node: x, + remainder: column - 1 + }; + } else { + column -= x.piece.length; + } + } + + x = x.next(); + } + + return null; + } + + offsetOfNode(node: TreeNode): number { + if (!node) { + return 0; + } + let pos = node.size_left; + while (node !== this.root) { + if (node.parent.right === node) { + pos += node.parent.size_left + node.parent.piece.length; + } + + node = node.parent; + } + + return pos; + } + + getNodeContent(node: TreeNode): string { + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let currentContent = buffer.substr(node.piece.offset, node.piece.length); + + return currentContent; + } + + deletePrefixSumTail(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { + prefixSum.removeValues(position.index + 1, prefixSum.values.length - position.index - 1); + prefixSum.changeValue(position.index, position.remainder); + } + + deletePrefixSumHead(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { + prefixSum.changeValue(position.index, prefixSum.values[position.index] - position.remainder); + if (position.index > 0) { + prefixSum.removeValues(0, position.index); + } + } + + // #endregion + + // #region CRLF + hitTestCRLF(node: TreeNode, offset: number, position: PrefixSumIndexOfResult) { + if (node.piece.lineFeedCnt < 1) { + return false; + } + + let currentLineLen = node.piece.lineStarts.getAccumulatedValue(position.index); + if (offset === currentLineLen - 1) { + // charCodeAt becomes slow (single or even two digits ms) when the changed buffer is long + return this.nodeCharCodeAt(node, offset - 1) === 13/* \r */ && this.nodeCharCodeAt(node, offset) === 10 /* \n */; + } + return false; + } + + fixCRLFWithPrev(nextNode: TreeNode) { + if (nextNode === SENTINEL || nextNode.piece.lineFeedCnt === 0) { + return; + } + + if (nextNode.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { + return; + } + + if (this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + let node = nextNode.prev(); + + if (node === SENTINEL || node.piece.lineFeedCnt === 0) { + return; + } + + if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13) { + this.fixCRLF(node, nextNode); + } + } + } + + fixCRLFWithNext(node: TreeNode) { + if (node === SENTINEL) { + return; + } + + if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13 /* \r */) { + let nextNode = node.next(); + if (nextNode !== SENTINEL && this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + this.fixCRLF(node, nextNode); + } + } + } + + fixCRLF(prev: TreeNode, next: TreeNode) { + let nodesToDel = []; + // update node + prev.piece.length -= 1; + prev.piece.lineFeedCnt -= 1; + let lineStarts = prev.piece.lineStarts; + // lineStarts.values.length >= 2 due to a `\r` + lineStarts.removeValues(lineStarts.values.length - 1, 1); + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); + this.updateMetadata(prev, - 1, -1); + + if (prev.piece.length === 0) { + nodesToDel.push(prev); + } + + // update nextNode + next.piece.length -= 1; + next.piece.offset += 1; + next.piece.lineFeedCnt -= 1; + lineStarts = next.piece.lineStarts; + lineStarts.removeValues(0, 1); + this.updateMetadata(next, - 1, -1); + if (next.piece.length === 0) { + nodesToDel.push(next); + } + + // create new piece which contains \r\n + let startOffset = this._changeBuffer.length; + this._changeBuffer += '\r\n'; + const { lineFeedCount, lineLengths } = this.calculateNewLineCount('\r\n'); + let piece = new Piece(false, startOffset, 2, lineFeedCount, lineLengths); + this.rbInsertRight(prev, piece); + // delete empty nodes + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } + + adjustCarriageReturnFromNext(value: string, node: TreeNode): boolean { + if (value.charCodeAt(value.length - 1) === 13) { + // inserted content ends with \r + let nextNode = node.next(); + if (nextNode !== SENTINEL) { + if (this.nodeCharCodeAt(nextNode, 0) === 10) { + // move `\n` forward + value += '\n'; + + if (nextNode.piece.length === 1) { + this.rbDelete(nextNode); + } else { + nextNode.piece.offset += 1; + nextNode.piece.length -= 1; + nextNode.piece.lineFeedCnt -= 1; + nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + this.updateMetadata(nextNode, -1, -1); + } + return true; + } + } + } + + return false; + } + + nodeCharCodeAt(node: TreeNode, offset: number): number { + if (node.piece.lineFeedCnt < 1) { + return -1; + } + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.charCodeAt(node.piece.offset + offset); + } + // #endregion + + // #endregion + + // #region Red Black Tree + + leftRotate(x: TreeNode) { + let y = x.right; + + // fix size_left + y.size_left += x.size_left + (x.piece ? x.piece.length : 0); + y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); + x.right = y.left; + + if (y.left !== SENTINEL) { + y.left.parent = x; + } + y.parent = x.parent; + if (x.parent === SENTINEL) { + this.root = y; + } else if (x.parent.left === x) { + x.parent.left = y; + } else { + x.parent.right = y; + } + y.left = x; + x.parent = y; + } + + rightRotate(y: TreeNode) { + let x = y.left; + y.left = x.right; + if (x.right !== SENTINEL) { + x.right.parent = y; + } + x.parent = y.parent; + + // fix size_left + y.size_left -= x.size_left + (x.piece ? x.piece.length : 0); + y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); + + if (y.parent === SENTINEL) { + this.root = x; + } else if (y === y.parent.right) { + y.parent.right = x; + } else { + y.parent.left = x; + } + + x.right = y; + y.parent = x; + } + + /** + * node node + * / \ / \ + * a b <---- a b + * / + * z + */ + rbInsertRight(node: TreeNode, p: Piece): TreeNode { + let z = new TreeNode(p, NodeColor.Red); + z.left = SENTINEL; + z.right = SENTINEL; + z.parent = SENTINEL; + z.size_left = 0; + z.lf_left = 0; + + let x = this.root; + if (x === SENTINEL) { + this.root = z; + setNodeColor(z, NodeColor.Black); + } else if (node.right === SENTINEL) { + node.right = z; + z.parent = node; + } else { + let nextNode = leftest(node.right); + nextNode.left = z; + z.parent = nextNode; + } + + this.fixInsert(z); + return z; + } + + /** + * node node + * / \ / \ + * a b ----> a b + * \ + * z + */ + rbInsertLeft(node: TreeNode, p: Piece): TreeNode { + let z = new TreeNode(p, NodeColor.Red); + z.left = SENTINEL; + z.right = SENTINEL; + z.parent = SENTINEL; + z.size_left = 0; + z.lf_left = 0; + + let x = this.root; + if (x === SENTINEL) { + this.root = z; + setNodeColor(z, NodeColor.Black); + } else if (node.left === SENTINEL) { + node.left = z; + z.parent = node; + } else { + let prevNode = righttest(node.left); // a + prevNode.right = z; + z.parent = prevNode; + } + + this.fixInsert(z); + return z; + } + + rbDelete(z: TreeNode) { + let x: TreeNode; + let y: TreeNode; + + if (z.left === SENTINEL) { + y = z; + x = y.right; + } else if (z.right === SENTINEL) { + y = z; + x = y.left; + } else { + y = leftest(z.right); + x = y.right; + } + + if (y === this.root) { + this.root = x; + + // if x is null, we are removing the only node + setNodeColor(x, NodeColor.Black); + + z.detach(); + resetSentinel(); + this.root.parent = SENTINEL; + + return; + } + + let yWasRed = (getNodeColor(y) === NodeColor.Red); + + if (y === y.parent.left) { + y.parent.left = x; + } else { + y.parent.right = x; + } + + if (y === z) { + x.parent = y.parent; + this.recomputeMetadata(x); + } else { + if (y.parent === z) { + x.parent = y; + } else { + x.parent = y.parent; + } + + // as we make changes to x's hierarchy, update size_left of subtree first + this.recomputeMetadata(x); + + y.left = z.left; + y.right = z.right; + y.parent = z.parent; + setNodeColor(y, getNodeColor(z)); + + if (z === this.root) { + this.root = y; + } else { + if (z === z.parent.left) { + z.parent.left = y; + } else { + z.parent.right = y; + } + } + + if (y.left !== SENTINEL) { + y.left.parent = y; + } + if (y.right !== SENTINEL) { + y.right.parent = y; + } + // update metadata + // we replace z with y, so in this sub tree, the length change is z.item.length + y.size_left = z.size_left; + y.lf_left = z.lf_left; + this.recomputeMetadata(y); + } + + z.detach(); + + if (x.parent.left === x) { + let newSizeLeft = calculateSize(x); + let newLFLeft = calculateLF(x); + if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) { + let delta = newSizeLeft - x.parent.size_left; + let lf_delta = newLFLeft - x.parent.lf_left; + x.parent.size_left = newSizeLeft; + x.parent.lf_left = newLFLeft; + this.updateMetadata(x.parent, delta, lf_delta); + } + } + + this.recomputeMetadata(x.parent); + + if (yWasRed) { + resetSentinel(); + return; + } + + // RB-DELETE-FIXUP + let w: TreeNode; + while (x !== this.root && getNodeColor(x) === NodeColor.Black) { + if (x === x.parent.left) { + w = x.parent.right; + + if (getNodeColor(w) === NodeColor.Red) { + setNodeColor(w, NodeColor.Black); + setNodeColor(x.parent, NodeColor.Red); + this.leftRotate(x.parent); + w = x.parent.right; + } + + if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w, NodeColor.Red); + x = x.parent; + } else { + if (getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w.left, NodeColor.Black); + setNodeColor(w, NodeColor.Red); + this.rightRotate(w); + w = x.parent.right; + } + + setNodeColor(w, getNodeColor(x.parent)); + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(w.right, NodeColor.Black); + this.leftRotate(x.parent); + x = this.root; + } + } else { + w = x.parent.left; + + if (getNodeColor(w) === NodeColor.Red) { + setNodeColor(w, NodeColor.Black); + setNodeColor(x.parent, NodeColor.Red); + this.rightRotate(x.parent); + w = x.parent.left; + } + + if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w, NodeColor.Red); + x = x.parent; + + } else { + if (getNodeColor(w.left) === NodeColor.Black) { + setNodeColor(w.right, NodeColor.Black); + setNodeColor(w, NodeColor.Red); + this.leftRotate(w); + w = x.parent.left; + } + + setNodeColor(w, getNodeColor(x.parent)); + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(w.left, NodeColor.Black); + this.rightRotate(x.parent); + x = this.root; + } + } + } + setNodeColor(x, NodeColor.Black); + resetSentinel(); + } + + fixInsert(x: TreeNode) { + this.recomputeMetadata(x); + + while (x !== this.root && getNodeColor(x.parent) === NodeColor.Red) { + if (x.parent === x.parent.parent.left) { + const y = x.parent.parent.right; + + if (getNodeColor(y) === NodeColor.Red) { + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(y, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + x = x.parent.parent; + } else { + if (x === x.parent.right) { + x = x.parent; + this.leftRotate(x); + } + + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + this.rightRotate(x.parent.parent); + } + } else { + const y = x.parent.parent.left; + + if (getNodeColor(y) === NodeColor.Red) { + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(y, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + x = x.parent.parent; + } else { + if (x === x.parent.left) { + x = x.parent; + this.rightRotate(x); + } + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + this.leftRotate(x.parent.parent); + } + } + } + + setNodeColor(this.root, NodeColor.Black); + } + + updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { + // node length change, we need to update the roots of all subtrees containing this node. + while (x !== this.root && x !== SENTINEL) { + if (x.parent.left === x) { + x.parent.size_left += delta; + x.parent.lf_left += lineFeedCntDelta; + } + + x = x.parent; + } + } + + recomputeMetadata(x: TreeNode) { + let delta = 0; + let lf_delta = 0; + if (x === this.root) { + return; + } + + if (delta === 0) { + // go upwards till the node whose left subtree is changed. + while (x !== this.root && x === x.parent.right) { + x = x.parent; + } + + if (x === this.root) { + // well, it means we add a node to the end (inorder) + return; + } + + // x is the node whose right subtree is changed. + x = x.parent; + + delta = calculateSize(x.left) - x.size_left; + lf_delta = calculateLF(x.left) - x.lf_left; + x.size_left += delta; + x.lf_left += lf_delta; + } + + // go upwards till root. O(logN) + while (x !== this.root && (delta !== 0 || lf_delta !== 0)) { + if (x.parent.left === x) { + x.parent.size_left += delta; + x.parent.lf_left += lf_delta; + } + + x = x.parent; + } + } + + getContentOfSubTree(node: TreeNode): string { + if (node === SENTINEL) { + return ''; + } + + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let currentContent = buffer.substr(node.piece.offset, node.piece.length); + + return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); + } + + calculateNewLineCount(chunk: string): { lineFeedCount: number, lineLengths: Uint32Array } { + let lineStarts = [0]; + + // Reset regex to search from the beginning + this._regex.lastIndex = 0; + let prevMatchStartIndex = -1; + let prevMatchLength = 0; + + let m: RegExpExecArray; + do { + if (prevMatchStartIndex + prevMatchLength === chunk.length) { + // Reached the end of the line + break; + } + + m = this._regex.exec(chunk); + if (!m) { + break; + } + + const matchStartIndex = m.index; + const matchLength = m[0].length; + + if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { + // Exit early if the regex matches the same range twice + break; + } + + prevMatchStartIndex = matchStartIndex; + prevMatchLength = matchLength; + + lineStarts.push(matchStartIndex + matchLength); + + } while (m); + + const lineLengths = new Uint32Array(lineStarts.length); + for (let i = 1; i < lineStarts.length; i++) { + lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; + } + + lineLengths[lineStarts.length - 1] = chunk.length - lineStarts[lineStarts.length - 1]; + + return { + lineFeedCount: lineLengths.length - 1, + lineLengths: lineLengths + }; + } + // #endregion + + // #region helper + /** + * 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; + } + + 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; + } + // #endregion +} \ No newline at end of file diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 2fdc06ca5b4..575d26bedca 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -10,13 +10,14 @@ import { Position, IPosition } from 'vs/editor/common/core/position'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; import * as editorCommon from 'vs/editor/common/editorCommon'; -import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget } from 'vs/editor/common/model/indentationGuesser'; +import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget, IndentationGuesserRawTextBufferTarget } from 'vs/editor/common/model/indentationGuesser'; import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions'; import { TextModelSearch, SearchParams } from 'vs/editor/common/model/textModelSearch'; import { TextSource, ITextSource, IRawTextSource, RawTextSource } from 'vs/editor/common/model/textSource'; import { IModelContentChangedEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawEOLChanged, IModelOptionsChangedEvent, InternalModelContentChangeEvent } from 'vs/editor/common/model/textModelEvents'; import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; -import { TextBuffer } from 'vs/editor/common/model/textBuffer'; +// import { TextBuffer } from 'vs/editor/common/model/textBuffer'; +import { TextBuffer } from 'vs/editor/common/model/textBuffer2'; const LIMIT_FIND_COUNT = 999; export const LONG_LINE_BOUNDARY = 10000; @@ -48,7 +49,13 @@ export class TextModel extends Disposable implements editorCommon.ITextModel { let resolvedOpts: editorCommon.TextModelResolvedOptions; if (options.detectIndentation) { - const guessedIndentation = guessIndentation(new IndentationGuesserStringArrayTarget(textSource.lines), options.tabSize, options.insertSpaces); + const guessedIndentation = guessIndentation( + Array.isArray(textSource.lines) ? + new IndentationGuesserStringArrayTarget(textSource.lines) : + new IndentationGuesserRawTextBufferTarget(textSource.lines), + options.tabSize, + options.insertSpaces + ); resolvedOpts = new editorCommon.TextModelResolvedOptions({ tabSize: guessedIndentation.tabSize, insertSpaces: guessedIndentation.insertSpaces, @@ -412,7 +419,7 @@ export class TextModel extends Disposable implements editorCommon.ITextModel { public getLinesContent(): string[] { this._assertNotDisposed(); - return this._buffer.getLinesContent(); + return this._buffer.getLinesContent().split(/\r\n|\r|\n/); } public getEOL(): string { diff --git a/src/vs/editor/common/model/textSource.ts b/src/vs/editor/common/model/textSource.ts index 3eb9cf653e8..0bba12b196e 100644 --- a/src/vs/editor/common/model/textSource.ts +++ b/src/vs/editor/common/model/textSource.ts @@ -7,6 +7,18 @@ import * as strings from 'vs/base/common/strings'; import { DefaultEndOfLine } from 'vs/editor/common/editorCommon'; +/** + * Raw text buffer for Piece Table. + */ +export interface IRawPTBuffer { + text: string; + lineStarts: number[]; + /** + * lines count + */ + length: number; +} + /** * A processed string ready to be turned into an editor model. */ @@ -18,7 +30,7 @@ export interface IRawTextSource { /** * The text split into lines. */ - readonly lines: string[]; + readonly lines: string[] | IRawPTBuffer; /** * The BOM (leading character sequence of the file). */ @@ -51,18 +63,28 @@ export class RawTextSource { const isBasicASCII = (containsRTL ? false : strings.isBasicASCII(rawText)); // Split the text into lines - const lines = rawText.split(/\r\n|\r|\n/); + // const lines = rawText.split(/\r\n|\r|\n/); // Remove the BOM (if present) let BOM = ''; - if (strings.startsWithUTF8BOM(lines[0])) { + if (strings.startsWithUTF8BOM(rawText)) { BOM = strings.UTF8_BOM_CHARACTER; - lines[0] = lines[0].substr(1); + rawText = rawText.substr(1); + } + + let lastLineFeed = -1; + var lineStarts = []; + while ((lastLineFeed = rawText.indexOf('\n', lastLineFeed + 1)) !== -1) { + lineStarts.push(lastLineFeed + 1); } return { BOM: BOM, - lines: lines, + lines: { + text: rawText, + lineStarts: lineStarts, + length: lineStarts.length + }, length: rawText.length, containsRTL: containsRTL, isBasicASCII: isBasicASCII, @@ -83,7 +105,7 @@ export interface ITextSource { /** * The text split into lines. */ - readonly lines: string[]; + readonly lines: string[] | IRawPTBuffer; /** * The BOM (leading character sequence of the file). */ diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index bda67f4f9b5..9faaf788047 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/src/vs/editor/common/services/modelServiceImpl.ts @@ -409,10 +409,25 @@ export class ModelServiceImpl implements IModelService { }; const textSourceLineSequence = new class implements ISequence { public getLength(): number { - return textSource.lines.length; + return textSource.lines.length + 1; } public getElementHash(index: number): string { - return textSource.lines[index]; + if (Array.isArray(textSource.lines)) { + return textSource.lines[index]; + } else { + if (textSource.lines.length === 0) { + return textSource.lines.text; + } + if (index === 0) { + return textSource.lines.text.substring(0, textSource.lines.lineStarts[0]); + } + + if (index === textSource.lines.length) { + return textSource.lines.text.substring(textSource.lines.lineStarts[index - 1]); + } + + return textSource.lines.text.substring(textSource.lines.lineStarts[index - 1], textSource.lines.lineStarts[index]); + } } }; diff --git a/src/vs/editor/common/viewModel/prefixSumComputer.ts b/src/vs/editor/common/viewModel/prefixSumComputer.ts index 8730795093f..291ec21fa35 100644 --- a/src/vs/editor/common/viewModel/prefixSumComputer.ts +++ b/src/vs/editor/common/viewModel/prefixSumComputer.ts @@ -23,7 +23,7 @@ export class PrefixSumComputer { /** * values[i] is the value at index i */ - private values: Uint32Array; + values: Uint32Array; /** * prefixSum[i] = SUM(heights[j]), 0 <= j <= i diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts index 3a600630689..c4b2db3f082 100644 --- a/src/vs/workbench/common/editor/textEditorModel.ts +++ b/src/vs/workbench/common/editor/textEditorModel.ts @@ -106,8 +106,10 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd } return firstLineText.substr(0, Math.min(crIndex, lfIndex)); - } else { + } else if (Array.isArray(value.lines)) { return value.lines[0].substr(0, 100); + } else { + return value.lines.text.substr(0, 100); } } diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts index 5688f82055a..c2bd91ae574 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts @@ -81,7 +81,7 @@ export class WalkThroughSnippetContentProvider implements ITextModelContentProvi return ''; }; - const markdown = content.value.lines.join('\n'); + const markdown = Array.isArray(content.value.lines) ? content.value.lines.join('\n') : content.value.lines.text; marked(markdown, { renderer }); const modeId = this.modeService.getModeIdForLanguageName(languageName); diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts index 1a00d797b91..dfa8348aaf7 100644 --- a/src/vs/workbench/services/backup/node/backupFileService.ts +++ b/src/vs/workbench/services/backup/node/backupFileService.ts @@ -215,7 +215,7 @@ export class BackupFileService implements IBackupFileService { public parseBackupContent(rawTextSource: IRawTextSource): string { const textSource = TextSource.fromRawTextSource(rawTextSource, DefaultEndOfLine.LF); - return textSource.lines.slice(1).join(textSource.EOL); // The first line of a backup text file is the file name + return (textSource.lines).slice(1).join(textSource.EOL); // The first line of a backup text file is the file name } public toBackupResource(resource: Uri): Uri { diff --git a/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts b/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts index 2d5c9a2e694..ace7732de78 100644 --- a/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts +++ b/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts @@ -56,6 +56,61 @@ function optimizeStringMemory(buff: Buffer, s: string): string { return s; } +class PTBasedBuilder { + private lineStarts: number[]; + private text: string; + private BOM: string; + private chunkIndex: number; + private totalLength: number; + + constructor() { + this.text = ''; + this.BOM = ''; + this.chunkIndex = 0; + this.totalLength = 0; + this.lineStarts = []; + } + + public acceptChunk(chunk: string): void { + if (this.chunkIndex === 0) { + if (strings.startsWithUTF8BOM(chunk)) { + this.BOM = strings.UTF8_BOM_CHARACTER; + chunk = chunk.substr(1); + } + } + + let lastLineFeed = -1; + while ((lastLineFeed = chunk.indexOf('\n', lastLineFeed + 1)) !== -1) { + this.lineStarts.push(this.totalLength + lastLineFeed + 1); + } + + this.text += chunk; + this.chunkIndex++; + } + + public finish(containsRTL: boolean, isBasicASCII: boolean): ModelBuilderResult { + if (this.lineStarts[this.lineStarts.length - 1] > this.totalLength) { + this.lineStarts.pop(); + } + + return { + hash: null, + value: { + length: this.totalLength, + lines: { + text: this.text, + lineStarts: this.lineStarts, + length: this.lineStarts.length + }, + BOM: this.BOM, + totalCRCount: 0, + containsRTL: containsRTL, + isBasicASCII: isBasicASCII + } + }; + } +} + class ModelLineBasedBuilder { private computeHash: boolean; @@ -126,13 +181,15 @@ export class ModelBuilder { private containsRTL: boolean; private isBasicASCII: boolean; + private ptBasedBuilder: PTBasedBuilder; + public static fromStringStream(stream: IStringStream): TPromise { return new TPromise((c, e, p) => { let done = false; let builder = new ModelBuilder(false); stream.on('data', (chunk) => { - builder.acceptChunk(chunk); + builder.acceptChunk2(chunk); }); stream.on('error', (error) => { @@ -145,7 +202,7 @@ export class ModelBuilder { stream.on('end', () => { if (!done) { done = true; - c(builder.finish()); + c(builder.finish2()); } }); }); @@ -159,6 +216,7 @@ export class ModelBuilder { this.totalLength = 0; this.containsRTL = false; this.isBasicASCII = true; + this.ptBasedBuilder = new PTBasedBuilder(); } private _updateCRCount(chunk: string): void { @@ -210,6 +268,22 @@ export class ModelBuilder { this.leftoverPrevChunk = lines[lines.length - 1]; } + public acceptChunk2(chunk: string): void { + if (chunk.length === 0) { + return; + } + + // update lineStart to offset mapping + if (!this.containsRTL) { + this.containsRTL = strings.containsRTL(chunk); + } + if (this.isBasicASCII) { + this.isBasicASCII = strings.isBasicASCII(chunk); + } + + this.ptBasedBuilder.acceptChunk(chunk); + } + public finish(): ModelBuilderResult { let finalLines = [this.leftoverPrevChunk]; if (this.leftoverEndsInCR) { @@ -218,4 +292,8 @@ export class ModelBuilder { this.lineBasedBuilder.acceptLines(finalLines); return this.lineBasedBuilder.finish(this.totalLength, this.totalCRCount, this.containsRTL, this.isBasicASCII); } + + public finish2(): ModelBuilderResult { + return this.ptBasedBuilder.finish(this.containsRTL, this.isBasicASCII); + } } diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 0dcf628ee66..b12327198a3 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -859,7 +859,7 @@ export class TestBackupFileService implements IBackupFileService { } public parseBackupContent(rawText: IRawTextSource): string { - return rawText.lines.join('\n'); + return Array.isArray(rawText.lines) ? rawText.lines.join('\n') : rawText.lines.text; } public discardResourceBackup(resource: URI): TPromise { From 3fca169ced7a2fb5701b1ee0467303c223e171ba Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Thu, 4 Jan 2018 21:47:18 -0800 Subject: [PATCH 012/710] safe point --- src/vs/editor/common/model/textBuffer2.ts | 363 +++++++++--------- src/vs/editor/common/model/textModel.ts | 4 +- src/vs/editor/common/model/textSource.ts | 10 +- .../textfile/electron-browser/modelBuilder.ts | 43 ++- 4 files changed, 228 insertions(+), 192 deletions(-) diff --git a/src/vs/editor/common/model/textBuffer2.ts b/src/vs/editor/common/model/textBuffer2.ts index 4b5a6da72a4..ebb10e5f912 100644 --- a/src/vs/editor/common/model/textBuffer2.ts +++ b/src/vs/editor/common/model/textBuffer2.ts @@ -6,12 +6,11 @@ import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; -import * as editorCommon from 'vs/editor/common/editorCommon'; import * as strings from 'vs/base/common/strings'; import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; import { ITextSource, IRawPTBuffer } from 'vs/editor/common/model/textSource'; -import { ApplyEditResult, IInternalModelContentChange } from 'vs/editor/common/model/textBuffer'; -import { IValidatedEditOperation } from 'vs/editor/common/model/editableTextModel'; +import { IIdentifiedSingleEditOperation, EndOfLinePreference } from 'vs/editor/common/model'; +import { ITextBuffer, ApplyEditsResult, IInternalModelContentChange, IValidatedEditOperation } from 'vs/editor/common/model/textBuffer'; import { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; export const enum NodeColor { @@ -19,10 +18,6 @@ export const enum NodeColor { Red = 1, } -export let error = { - sizeLeft: false -}; - function getNodeColor(node: TreeNode) { return node.color; } @@ -65,6 +60,46 @@ function resetSentinel(): void { SENTINEL.parent = SENTINEL; } +const lfRegex = new RegExp(/\r\n|\r|\n/g); + +export function constructLineStarts(chunk: string): number[] { + let lineStarts = [0]; + + // Reset regex to search from the beginning + lfRegex.lastIndex = 0; + let prevMatchStartIndex = -1; + let prevMatchLength = 0; + + let m: RegExpExecArray; + do { + if (prevMatchStartIndex + prevMatchLength === chunk.length) { + // Reached the end of the line + break; + } + + m = lfRegex.exec(chunk); + if (!m) { + break; + } + + const matchStartIndex = m.index; + const matchLength = m[0].length; + + if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { + // Exit early if the regex matches the same range twice + break; + } + + prevMatchStartIndex = matchStartIndex; + prevMatchLength = matchLength; + + lineStarts.push(matchStartIndex + matchLength); + + } while (m); + + return lineStarts; +} + export class TreeNode { parent: TreeNode; left: TreeNode; @@ -102,11 +137,7 @@ export class TreeNode { } if (node.parent === SENTINEL) { - // root - // if (node.right === SENTINEL) { return SENTINEL; - // } - // return leftest(node.right); } else { return node.parent; } @@ -128,11 +159,7 @@ export class TreeNode { } if (node.parent === SENTINEL) { - // root - // if (node.left === SENTINEL) { return SENTINEL; - // } - // return righttest(node.left); } else { return node.parent; } @@ -185,7 +212,7 @@ export class Piece { } } -export class TextBuffer { +export class TextBuffer implements ITextBuffer { private _BOM: string; private _EOL: string; private _mightContainRTL: boolean; @@ -193,45 +220,53 @@ export class TextBuffer { private _originalBuffer: string; private _changeBuffer: string; - private _regex: RegExp; - root: TreeNode; + private _root: TreeNode; + private _lineCnt: number; constructor(textSource: ITextSource) { let rawBuffer = textSource.lines; this._originalBuffer = rawBuffer.text; this._changeBuffer = ''; - this.root = SENTINEL; + this._root = SENTINEL; this._BOM = textSource.BOM; this._EOL = textSource.EOL; this._mightContainNonBasicASCII = !textSource.isBasicASCII; this._mightContainRTL = textSource.containsRTL; - this._regex = new RegExp(/\r\n|\r|\n/g); + this._lineCnt = 1; if (this._originalBuffer.length > 0) { - let { lineFeedCount, lineLengths } = this.calculateNewLineCount(this._originalBuffer); - let piece = new Piece(true, 0, this._originalBuffer.length, lineFeedCount, lineLengths); + let lineLengths: Uint32Array; + if (rawBuffer.lineStarts) { + lineLengths = new Uint32Array(rawBuffer.lineStarts.length); + for (let i = 1; i < rawBuffer.lineStarts.length; i++) { + lineLengths[i - 1] = rawBuffer.lineStarts[i] - rawBuffer.lineStarts[i - 1]; + } + + lineLengths[rawBuffer.lineStarts.length - 1] = rawBuffer.text.length - rawBuffer.lineStarts[rawBuffer.lineStarts.length - 1]; + } else { + lineLengths = this.constructLineLengths(this._originalBuffer); + } + + let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); this.rbInsertLeft(null, piece); + this._lineCnt = lineLengths.length; } } // #region TextBuffer - public getLinesContent() { - return this.getContentOfSubTree(this.root); + public getLinesContent(): string[] { + return this.getContentOfSubTree(this._root).split(/\r\n|\r|\n/); + } + + public getLinesContent2(): string { + return this.getContentOfSubTree(this._root); } public getLineCount(): number { - let x = this.root; - - let ret = 1; - while (x !== SENTINEL) { - ret += x.lf_left + x.piece.lineFeedCnt; - x = x.right; - } - - return ret; + return this._lineCnt; } - public getValueInRange(range: Range, eol: editorCommon.EndOfLinePreference = editorCommon.EndOfLinePreference.TextDefined): string { + public getValueInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { // todo, validate range. if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { return ''; @@ -269,63 +304,13 @@ export class TextBuffer { } public getLineContent(lineNumber: number): string { - let x = this.root; - - let ret = ''; - while (x !== SENTINEL) { - if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { - x = x.left; - } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); - } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); - break; - } else { - lineNumber -= x.lf_left + x.piece.lineFeedCnt; - x = x.right; - } - } - - // if (x === SENTINEL) { - // throw('not possible'); - // } - - // search in order, to find the node contains end column - x = x.next(); - while (x !== SENTINEL) { - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - if (x.piece.lineFeedCnt > 0) { - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); - - ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); - return ret; - } else { - ret += buffer.substr(x.piece.offset, x.piece.length); - } - - x = x.next(); - } - - return ret; - + return this.getLineRawContent(lineNumber).replace(/(\r\n|\r|\n)$/, ''); } - public getOffsetAt(position: Position): number { - return this.getOffsetAt2(position.lineNumber, position.column); - } - - public getOffsetAt2(lineNumber: number, column: number): number { + public getOffsetAt(lineNumber: number, column: number): number { let leftLen = 0; // inorder - let x = this.root; + let x = this._root; while (x !== SENTINEL) { if (x.left !== SENTINEL && x.lf_left + 1 >= lineNumber) { @@ -346,7 +331,7 @@ export class TextBuffer { } public getPositionAt(offset: number): Position { - let x = this.root; + let x = this._root; let lfCnt = 0; while (x !== SENTINEL) { @@ -385,7 +370,7 @@ export class TextBuffer { if (this._EOL !== other.EOL) { return false; } - if (this.getLinesContent() !== (other.lines).text) { + if (this.getLinesContent2() !== (other.lines).text) { return false; } return true; @@ -412,7 +397,7 @@ export class TextBuffer { // this._constructLineStarts(); } - public _applyEdits(rawOperations: editorCommon.IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditResult { + public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { let mightContainRTL = this._mightContainRTL; let mightContainNonBasicASCII = this._mightContainNonBasicASCII; let canReduceOperations = true; @@ -435,7 +420,7 @@ export class TextBuffer { sortIndex: i, identifier: op.identifier, range: validatedRange, - rangeOffset: this.getOffsetAt(validatedRange.getStartPosition()), + rangeOffset: this.getOffsetAt(validatedRange.startLineNumber, validatedRange.startColumn), rangeLength: this.getValueLengthInRange(validatedRange), lines: op.text ? op.text.split(/\r\n|\r|\n/) : null, forceMoveMarkers: op.forceMoveMarkers, @@ -483,7 +468,7 @@ export class TextBuffer { } } - let reverseOperations: editorCommon.IIdentifiedSingleEditOperation[] = []; + let reverseOperations: IIdentifiedSingleEditOperation[] = []; for (let i = 0; i < operations.length; i++) { let op = operations[i]; let reverseRange = reverseRanges[i]; @@ -525,7 +510,7 @@ export class TextBuffer { } } - return new ApplyEditResult( + return new ApplyEditsResult( reverseOperations, rawContentChanges, contentChanges, @@ -590,7 +575,7 @@ export class TextBuffer { newLinesContent[newLinesContent.length - 1] = this.getLineContent(startLineNumber + insertingLinesCnt - 1); rawContentChanges.push( - new ModelRawLinesInserted(startLineNumber + editingLinesCnt + 1, startLineNumber + insertingLinesCnt, newLinesContent.join('\n')) + new ModelRawLinesInserted(startLineNumber + editingLinesCnt + 1, startLineNumber + insertingLinesCnt, newLinesContent) ); } @@ -607,7 +592,7 @@ export class TextBuffer { return [rawContentChanges, contentChanges]; } - public getValueLengthInRange(range: Range, eol: editorCommon.EndOfLinePreference = editorCommon.EndOfLinePreference.TextDefined): number { + public getValueLengthInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): number { if (range.isEmpty()) { return 0; } @@ -616,8 +601,8 @@ export class TextBuffer { return (range.endColumn - range.startColumn); } - let startOffset = this.getOffsetAt(new Position(range.startLineNumber, range.startColumn)); - let endOffset = this.getOffsetAt(new Position(range.endLineNumber, range.endColumn)); + let startOffset = this.getOffsetAt(range.startLineNumber, range.startColumn); + let endOffset = this.getOffsetAt(range.endLineNumber, range.endColumn); return endOffset - startOffset; } @@ -664,7 +649,7 @@ export class TextBuffer { // #region Piece Table insert(value: string, offset: number): void { // todo, validate value and offset. - if (this.root !== SENTINEL) { + if (this._root !== SENTINEL) { let { node, remainder } = this.nodeAt(offset); let insertPos = node.piece.lineStarts.getIndexOf(remainder); let nodeOffsetInDocument = this.offsetOfNode(node); @@ -698,8 +683,8 @@ export class TextBuffer { } this._changeBuffer += value; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); let newNode = this.rbInsertLeft(node, newPiece); this.fixCRLFWithPrev(newNode); @@ -753,8 +738,8 @@ export class TextBuffer { } this._changeBuffer += value; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); if (newRightPiece.length > 0) { this.rbInsertRight(node, newRightPiece); @@ -770,8 +755,8 @@ export class TextBuffer { } this._changeBuffer += value; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); let newNode = this.rbInsertRight(node, newPiece); this.fixCRLFWithPrev(newNode); } @@ -780,11 +765,14 @@ export class TextBuffer { // insert new node const startOffset = this._changeBuffer.length; this._changeBuffer += value; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); - let piece = new Piece(false, startOffset, value.length, lineFeedCount, lineLengths); + const lineLengths = this.constructLineLengths(value); + let piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); this.rbInsertLeft(null, piece); } + + // todo, this is too brutal. Total line feed count should be updated the same way as lf_left. + this.computeLineCount(); } delete(offset: number, cnt: number): void { @@ -792,7 +780,7 @@ export class TextBuffer { return; } - if (this.root !== SENTINEL) { + if (this._root !== SENTINEL) { let startPosition = this.nodeAt(offset); let endPosition = this.nodeAt(offset + cnt); let startNode = startPosition.node; @@ -815,17 +803,21 @@ export class TextBuffer { } this.deleteNodeHead(startNode, endSplitPos); this.fixCRLFWithPrev(startNode); + this.computeLineCount(); return; } if (startNodeOffsetInDocument + length === offset + cnt) { this.deleteNodeTail(startNode, splitPos); this.fixCRLFWithNext(startNode); + this.computeLineCount(); return; } // delete content in the middle, this node will be splitted to nodes - return this.shrinkNode(startNode, splitPos, endSplitPos); + this.shrinkNode(startNode, splitPos, endSplitPos); + this.computeLineCount(); + return; } // perform read operations before any write operation. @@ -860,9 +852,67 @@ export class TextBuffer { if (prev !== SENTINEL) { this.fixCRLFWithNext(prev); } + this.computeLineCount(); } } + getLineRawContent(lineNumber: number): string { + let x = this._root; + + let ret = ''; + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); + } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); + break; + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + // search in order, to find the node contains end column + x = x.next(); + while (x !== SENTINEL) { + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + if (x.piece.lineFeedCnt > 0) { + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + + ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); + return ret; + } else { + ret += buffer.substr(x.piece.offset, x.piece.length); + } + + x = x.next(); + } + + return ret; + } + + computeLineCount() { + let x = this._root; + + let ret = 1; + while (x !== SENTINEL) { + ret += x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + + this._lineCnt = ret; + } + // #region node operations deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { // it's okay to delete CR in CRLF. @@ -940,7 +990,8 @@ export class TextBuffer { let hitCRLF = value.charCodeAt(0) === 10 && this.nodeCharCodeAt(node, node.piece.length - 1) === 13; this._changeBuffer += value; node.piece.length += value.length; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount(value); + const lineLengths = this.constructLineLengths(value); + let lineFeedCount = lineLengths.length - 1; let lf_delta = lineFeedCount; if (hitCRLF) { @@ -961,7 +1012,7 @@ export class TextBuffer { } nodeAt(offset: number): BufferCursor { - let x = this.root; + let x = this._root; while (x !== SENTINEL) { if (x.size_left > offset) { @@ -981,7 +1032,7 @@ export class TextBuffer { } nodeAt2(position: Position): BufferCursor { - let x = this.root; + let x = this._root; let lineNumber = position.lineNumber; let column = position.column; @@ -1045,7 +1096,7 @@ export class TextBuffer { return 0; } let pos = node.size_left; - while (node !== this.root) { + while (node !== this._root) { if (node.parent.right === node) { pos += node.parent.size_left + node.parent.piece.length; } @@ -1155,7 +1206,8 @@ export class TextBuffer { // create new piece which contains \r\n let startOffset = this._changeBuffer.length; this._changeBuffer += '\r\n'; - const { lineFeedCount, lineLengths } = this.calculateNewLineCount('\r\n'); + const lineLengths = this.constructLineLengths('\r\n'); + let lineFeedCount = lineLengths.length - 1; let piece = new Piece(false, startOffset, 2, lineFeedCount, lineLengths); this.rbInsertRight(prev, piece); // delete empty nodes @@ -1218,7 +1270,7 @@ export class TextBuffer { } y.parent = x.parent; if (x.parent === SENTINEL) { - this.root = y; + this._root = y; } else if (x.parent.left === x) { x.parent.left = y; } else { @@ -1241,7 +1293,7 @@ export class TextBuffer { y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); if (y.parent === SENTINEL) { - this.root = x; + this._root = x; } else if (y === y.parent.right) { y.parent.right = x; } else { @@ -1267,9 +1319,9 @@ export class TextBuffer { z.size_left = 0; z.lf_left = 0; - let x = this.root; + let x = this._root; if (x === SENTINEL) { - this.root = z; + this._root = z; setNodeColor(z, NodeColor.Black); } else if (node.right === SENTINEL) { node.right = z; @@ -1299,9 +1351,9 @@ export class TextBuffer { z.size_left = 0; z.lf_left = 0; - let x = this.root; + let x = this._root; if (x === SENTINEL) { - this.root = z; + this._root = z; setNodeColor(z, NodeColor.Black); } else if (node.left === SENTINEL) { node.left = z; @@ -1331,15 +1383,15 @@ export class TextBuffer { x = y.right; } - if (y === this.root) { - this.root = x; + if (y === this._root) { + this._root = x; // if x is null, we are removing the only node setNodeColor(x, NodeColor.Black); z.detach(); resetSentinel(); - this.root.parent = SENTINEL; + this._root.parent = SENTINEL; return; } @@ -1370,8 +1422,8 @@ export class TextBuffer { y.parent = z.parent; setNodeColor(y, getNodeColor(z)); - if (z === this.root) { - this.root = y; + if (z === this._root) { + this._root = y; } else { if (z === z.parent.left) { z.parent.left = y; @@ -1416,7 +1468,7 @@ export class TextBuffer { // RB-DELETE-FIXUP let w: TreeNode; - while (x !== this.root && getNodeColor(x) === NodeColor.Black) { + while (x !== this._root && getNodeColor(x) === NodeColor.Black) { if (x === x.parent.left) { w = x.parent.right; @@ -1442,7 +1494,7 @@ export class TextBuffer { setNodeColor(x.parent, NodeColor.Black); setNodeColor(w.right, NodeColor.Black); this.leftRotate(x.parent); - x = this.root; + x = this._root; } } else { w = x.parent.left; @@ -1470,7 +1522,7 @@ export class TextBuffer { setNodeColor(x.parent, NodeColor.Black); setNodeColor(w.left, NodeColor.Black); this.rightRotate(x.parent); - x = this.root; + x = this._root; } } } @@ -1481,7 +1533,7 @@ export class TextBuffer { fixInsert(x: TreeNode) { this.recomputeMetadata(x); - while (x !== this.root && getNodeColor(x.parent) === NodeColor.Red) { + while (x !== this._root && getNodeColor(x.parent) === NodeColor.Red) { if (x.parent === x.parent.parent.left) { const y = x.parent.parent.right; @@ -1520,12 +1572,12 @@ export class TextBuffer { } } - setNodeColor(this.root, NodeColor.Black); + setNodeColor(this._root, NodeColor.Black); } updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { // node length change, we need to update the roots of all subtrees containing this node. - while (x !== this.root && x !== SENTINEL) { + while (x !== this._root && x !== SENTINEL) { if (x.parent.left === x) { x.parent.size_left += delta; x.parent.lf_left += lineFeedCntDelta; @@ -1538,17 +1590,17 @@ export class TextBuffer { recomputeMetadata(x: TreeNode) { let delta = 0; let lf_delta = 0; - if (x === this.root) { + if (x === this._root) { return; } if (delta === 0) { // go upwards till the node whose left subtree is changed. - while (x !== this.root && x === x.parent.right) { + while (x !== this._root && x === x.parent.right) { x = x.parent; } - if (x === this.root) { + if (x === this._root) { // well, it means we add a node to the end (inorder) return; } @@ -1563,7 +1615,7 @@ export class TextBuffer { } // go upwards till root. O(logN) - while (x !== this.root && (delta !== 0 || lf_delta !== 0)) { + while (x !== this._root && (delta !== 0 || lf_delta !== 0)) { if (x.parent.left === x) { x.parent.size_left += delta; x.parent.lf_left += lf_delta; @@ -1584,41 +1636,8 @@ export class TextBuffer { return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); } - calculateNewLineCount(chunk: string): { lineFeedCount: number, lineLengths: Uint32Array } { - let lineStarts = [0]; - - // Reset regex to search from the beginning - this._regex.lastIndex = 0; - let prevMatchStartIndex = -1; - let prevMatchLength = 0; - - let m: RegExpExecArray; - do { - if (prevMatchStartIndex + prevMatchLength === chunk.length) { - // Reached the end of the line - break; - } - - m = this._regex.exec(chunk); - if (!m) { - break; - } - - const matchStartIndex = m.index; - const matchLength = m[0].length; - - if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { - // Exit early if the regex matches the same range twice - break; - } - - prevMatchStartIndex = matchStartIndex; - prevMatchLength = matchLength; - - lineStarts.push(matchStartIndex + matchLength); - - } while (m); - + constructLineLengths(chunk: string): Uint32Array { + let lineStarts = constructLineStarts(chunk); const lineLengths = new Uint32Array(lineStarts.length); for (let i = 1; i < lineStarts.length; i++) { lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; @@ -1626,11 +1645,9 @@ export class TextBuffer { lineLengths[lineStarts.length - 1] = chunk.length - lineStarts[lineStarts.length - 1]; - return { - lineFeedCount: lineLengths.length - 1, - lineLengths: lineLengths - }; + return lineLengths; } + // #endregion // #region helper diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 95d4890c63c..e7482c1601a 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -32,8 +32,8 @@ import { ModelLinesTokens, computeIndentLevel, ModelTokensChangedEventBuilder } import { guessIndentation, IndentationGuesserTextBufferTarget, IndentationGuesserStringArrayTarget, IndentationGuesserRawTextBufferTarget } from 'vs/editor/common/model/indentationGuesser'; import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions'; import { TextModelSearch, SearchParams } from 'vs/editor/common/model/textModelSearch'; -import { TextBuffer, ITextBuffer } from 'vs/editor/common/model/textBuffer'; -// import { TextBuffer } from 'vs/editor/common/model/textBuffer2'; +import { ITextBuffer } from 'vs/editor/common/model/textBuffer'; +import { TextBuffer } from 'vs/editor/common/model/textBuffer2'; var MODEL_ID = 0; diff --git a/src/vs/editor/common/model/textSource.ts b/src/vs/editor/common/model/textSource.ts index 63e2984fb98..99b87ca3dcb 100644 --- a/src/vs/editor/common/model/textSource.ts +++ b/src/vs/editor/common/model/textSource.ts @@ -6,6 +6,7 @@ import * as strings from 'vs/base/common/strings'; import { DefaultEndOfLine } from 'vs/editor/common/model'; +import { constructLineStarts } from 'vs/editor/common/model/textBuffer2'; /** * Raw text buffer for Piece Table. @@ -62,9 +63,6 @@ export class RawTextSource { 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(rawText)) { @@ -72,11 +70,7 @@ export class RawTextSource { rawText = rawText.substr(1); } - let lastLineFeed = -1; - var lineStarts = []; - while ((lastLineFeed = rawText.indexOf('\n', lastLineFeed + 1)) !== -1) { - lineStarts.push(lastLineFeed + 1); - } + let lineStarts = constructLineStarts(rawText); return { BOM: BOM, diff --git a/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts b/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts index ace7732de78..ab55a9e3917 100644 --- a/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts +++ b/src/vs/workbench/services/textfile/electron-browser/modelBuilder.ts @@ -62,13 +62,15 @@ class PTBasedBuilder { private BOM: string; private chunkIndex: number; private totalLength: number; + private _regex: RegExp; constructor() { this.text = ''; this.BOM = ''; this.chunkIndex = 0; this.totalLength = 0; - this.lineStarts = []; + this.lineStarts = [0]; + this._regex = new RegExp(/\r\n|\r|\n/g); } public acceptChunk(chunk: string): void { @@ -79,20 +81,43 @@ class PTBasedBuilder { } } - let lastLineFeed = -1; - while ((lastLineFeed = chunk.indexOf('\n', lastLineFeed + 1)) !== -1) { - this.lineStarts.push(this.totalLength + lastLineFeed + 1); - } + // Reset regex to search from the beginning + this._regex.lastIndex = 0; + let prevMatchStartIndex = -1; + let prevMatchLength = 0; + + let m: RegExpExecArray; + do { + if (prevMatchStartIndex + prevMatchLength === chunk.length) { + // Reached the end of the line + break; + } + + m = this._regex.exec(chunk); + if (!m) { + break; + } + + const matchStartIndex = m.index; + const matchLength = m[0].length; + + if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { + // Exit early if the regex matches the same range twice + break; + } + + prevMatchStartIndex = matchStartIndex; + prevMatchLength = matchLength; + + this.lineStarts.push(matchStartIndex + matchLength); + + } while (m); this.text += chunk; this.chunkIndex++; } public finish(containsRTL: boolean, isBasicASCII: boolean): ModelBuilderResult { - if (this.lineStarts[this.lineStarts.length - 1] > this.totalLength) { - this.lineStarts.pop(); - } - return { hash: null, value: { From aa7d2a77a10a1b3b98e743b07903f664d72197a0 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Thu, 4 Jan 2018 21:49:01 -0800 Subject: [PATCH 013/710] adopt ITextBuffer --- src/vs/editor/common/model/modelLine.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/model/modelLine.ts b/src/vs/editor/common/model/modelLine.ts index cc38f0cc0be..e674fe4b5f4 100644 --- a/src/vs/editor/common/model/modelLine.ts +++ b/src/vs/editor/common/model/modelLine.ts @@ -13,7 +13,6 @@ import { Range } from 'vs/editor/common/core/range'; import { IModelTokensChangedEvent } from 'vs/editor/common/model/textModelEvents'; import { onUnexpectedError } from 'vs/base/common/errors'; import { ITextBuffer } from 'vs/editor/common/model/textBuffer'; -import { TextBuffer as TextBuffer2 } from 'vs/editor/common/model/textBuffer2'; import { TokenizationResult2 } from 'vs/editor/common/core/token'; import { nullTokenize2 } from 'vs/editor/common/modes/nullMode'; @@ -248,7 +247,7 @@ export class ModelLinesTokens { return (firstInvalidLineNumber >= lineNumber); } - public hasLinesToTokenize(buffer: ITextBuffer | TextBuffer2): boolean { + public hasLinesToTokenize(buffer: ITextBuffer): boolean { return (this._invalidLineStartIndex < buffer.getLineCount()); } @@ -414,7 +413,7 @@ export class ModelLinesTokens { //#region Tokenization - public _tokenizeOneLine(buffer: ITextBuffer | TextBuffer2, eventBuilder: ModelTokensChangedEventBuilder): number { + public _tokenizeOneLine(buffer: ITextBuffer, eventBuilder: ModelTokensChangedEventBuilder): number { if (!this.hasLinesToTokenize(buffer)) { return buffer.getLineCount() + 1; } @@ -423,7 +422,7 @@ export class ModelLinesTokens { return lineNumber; } - public _updateTokensUntilLine(buffer: ITextBuffer | TextBuffer2, eventBuilder: ModelTokensChangedEventBuilder, lineNumber: number): void { + public _updateTokensUntilLine(buffer: ITextBuffer, eventBuilder: ModelTokensChangedEventBuilder, lineNumber: number): void { if (!this.tokenizationSupport) { this._invalidLineStartIndex = buffer.getLineCount(); return; From aa5412eb92c6156d3e20c1f5e8f39860f312f24d Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 5 Jan 2018 18:46:16 +0200 Subject: [PATCH 014/710] Remove cast; organize & rename new code --- .../common/model/linesTextBuffer/linesTextBuffer.ts | 2 +- .../pieceTableTextBuffer.ts} | 10 +++++----- .../pieceTableTextBufferBuilder.ts | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/vs/editor/common/model/{textBuffer2.ts => pieceTableTextBuffer/pieceTableTextBuffer.ts} (99%) diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 2d89309e8a2..09cafe2246c 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -59,7 +59,7 @@ export class LinesTextBuffer implements ITextBuffer { private _lineStarts: PrefixSumComputer; constructor(textSource: ITextSource) { - this._lines = (textSource.lines).slice(0); + this._lines = textSource.lines.slice(0); this._BOM = textSource.BOM; this._EOL = textSource.EOL; this._mightContainRTL = textSource.containsRTL; diff --git a/src/vs/editor/common/model/textBuffer2.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts similarity index 99% rename from src/vs/editor/common/model/textBuffer2.ts rename to src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 6f39dffa8f1..4fd636d8a2f 100644 --- a/src/vs/editor/common/model/textBuffer2.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -222,7 +222,7 @@ export class Piece { } } -export class TextBuffer implements ITextBuffer { +export class PieceTableTextBuffer implements ITextBuffer { private _BOM: string; private _EOL: string; private _mightContainRTL: boolean; @@ -374,7 +374,7 @@ export class TextBuffer implements ITextBuffer { } public equals(other: ITextBuffer): boolean { - if (!(other instanceof TextBuffer)) { + if (!(other instanceof PieceTableTextBuffer)) { return false; } if (this._BOM !== other._BOM) { @@ -442,7 +442,7 @@ export class TextBuffer implements ITextBuffer { } // Sort operations ascending - operations.sort(TextBuffer._sortOpsAscending); + operations.sort(PieceTableTextBuffer._sortOpsAscending); for (let i = 0, count = operations.length - 1; i < count; i++) { let rangeEnd = operations[i].range.getEndPosition(); @@ -459,7 +459,7 @@ export class TextBuffer implements ITextBuffer { } // Delta encode operations - let reverseRanges = TextBuffer._getInverseEditRanges(operations); + let reverseRanges = PieceTableTextBuffer._getInverseEditRanges(operations); let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = []; for (let i = 0; i < operations.length; i++) { @@ -532,7 +532,7 @@ export class TextBuffer implements ITextBuffer { } private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { - operations.sort(TextBuffer._sortOpsDescending); + operations.sort(PieceTableTextBuffer._sortOpsDescending); let rawContentChanges: ModelRawChange[] = []; let contentChanges: IInternalModelContentChange[] = []; diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 205f5624560..9f05b08a7d2 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -7,7 +7,7 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } from 'vs/editor/common/model'; import { TextSource, IRawTextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; -import { TextBuffer } from 'vs/editor/common/model/textBuffer2'; +import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; export class PieceTableTextBufferFactory implements ITextBufferFactory { @@ -16,7 +16,7 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { public create(defaultEOL: DefaultEndOfLine): ITextBuffer { const textSource = TextSource.fromRawTextSource(this.rawTextSource, defaultEOL); - return new TextBuffer(textSource); + return new PieceTableTextBuffer(textSource); } public getFirstLineText(lengthLimit: number): string { From 7ecd56674e1e609880406498e1f5198dfeb257ae Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 11:47:06 -0800 Subject: [PATCH 015/710] normalize line feed. --- .../pieceTableTextBuffer.ts | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 4fd636d8a2f..6938e33bf4e 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -276,7 +276,42 @@ export class PieceTableTextBuffer implements ITextBuffer { return this._lineCnt; } + 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 = EndOfLinePreference.TextDefined): string { + if (range.isEmpty()) { + return ''; + } + + if (range.startLineNumber === range.endLineNumber) { + return this.getLineRawContent(range.startLineNumber).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.getLineContent(startLineIndex + 1).substring(range.startColumn - 1)); + for (let i = startLineIndex + 1; i < endLineIndex; i++) { + resultLines.push(this.getLineContent(i + 1)); + } + resultLines.push(this.getLineRawContent(endLineIndex + 1).substring(0, range.endColumn - 1)); + + return resultLines.join(lineEnding); + } + + public getValueInRange2(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { // todo, validate range. if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { return ''; From df49861d60a6857f2ae407dd75135a44b57465f1 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 5 Jan 2018 13:22:44 -0800 Subject: [PATCH 016/710] Move terminal instance config listening from service to instance Part of #41110 --- .../parts/terminal/common/terminal.ts | 1 - .../parts/terminal/common/terminalService.ts | 20 ------------------- .../electron-browser/terminalInstance.ts | 14 +++++++++++-- .../electron-browser/terminalService.ts | 4 ++-- 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index cd837dd9be5..5e4e079b43a 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -170,7 +170,6 @@ export interface ITerminalService { showPreviousFindTermFindWidget(): void; setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void; - updateConfig(): void; selectDefaultWindowsShell(): TPromise; setWorkspaceShellAllowed(isAllowed: boolean): void; } diff --git a/src/vs/workbench/parts/terminal/common/terminalService.ts b/src/vs/workbench/parts/terminal/common/terminalService.ts index 4683d7a6250..806e092c0a6 100644 --- a/src/vs/workbench/parts/terminal/common/terminalService.ts +++ b/src/vs/workbench/parts/terminal/common/terminalService.ts @@ -9,10 +9,8 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ITerminalService, ITerminalInstance, IShellLaunchConfig, ITerminalConfigHelper, KEYBINDING_CONTEXT_TERMINAL_FOCUS, KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; export abstract class TerminalService implements ITerminalService { public _serviceBrand: any; @@ -44,7 +42,6 @@ export abstract class TerminalService implements ITerminalService { constructor( @IContextKeyService private _contextKeyService: IContextKeyService, - @IConfigurationService protected _configurationService: IConfigurationService, @IPanelService protected _panelService: IPanelService, @IPartService private _partService: IPartService, @ILifecycleService lifecycleService: ILifecycleService @@ -60,14 +57,6 @@ export abstract class TerminalService implements ITerminalService { this._onInstanceTitleChanged = new Emitter(); this._onInstancesChanged = new Emitter(); - this._configurationService.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('terminal.integrated')) { - this.updateConfig(); - } - if (e.affectsConfiguration('editor.accessibilitySupport')) { - this.updateAccessibilitySupport(); - } - }); lifecycleService.onWillShutdown(event => event.veto(this._onWillShutdown())); lifecycleService.onShutdown(() => this._onShutdown()); this._terminalFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_FOCUS.bindTo(this._contextKeyService); @@ -240,15 +229,6 @@ export abstract class TerminalService implements ITerminalService { return terminalIndex; } - public updateConfig(): void { - this.terminalInstances.forEach(instance => instance.updateConfig()); - } - - public updateAccessibilitySupport(): void { - const isEnabled = this._configurationService.getValue('editor').accessibilitySupport === 'on'; - this.terminalInstances.forEach(instance => instance.updateAccessibilitySupport(isEnabled)); - } - public setWorkspaceShellAllowed(isAllowed: boolean): void { this.configHelper.setWorkspaceShellAllowed(isAllowed); } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index d9b982340fb..af7719ef9b4 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -171,6 +171,15 @@ export class TerminalInstance implements ITerminalInstance { this.attachToElement(_container); } }); + + this._configurationService.onDidChangeConfiguration(e => { + if (e.affectsConfiguration('terminal.integrated')) { + this.updateConfig(); + } + if (e.affectsConfiguration('editor.accessibilitySupport')) { + this.updateAccessibilitySupport(); + } + }); } public addDisposable(disposable: lifecycle.IDisposable): void { @@ -967,8 +976,9 @@ export class TerminalInstance implements ITerminalInstance { this._setEnableBell(this._configHelper.config.enableBell); } - public updateAccessibilitySupport(isEnabled: boolean): void { - this._xterm.setOption('screenReaderMode', isEnabled); + public updateAccessibilitySupport(): void { + const value = this._configurationService.getValue('editor.accessibilitySupport'); + this._xterm.setOption('screenReaderMode', value === 'on'); } private _setCursorBlink(blink: boolean): void { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts index 24eeeb6e16b..55dcaea3cd7 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts @@ -30,17 +30,17 @@ export class TerminalService extends AbstractTerminalService implements ITermina constructor( @IContextKeyService _contextKeyService: IContextKeyService, - @IConfigurationService _configurationService: IConfigurationService, @IPanelService _panelService: IPanelService, @IPartService _partService: IPartService, @ILifecycleService _lifecycleService: ILifecycleService, + @IConfigurationService private _configurationService: IConfigurationService, @IInstantiationService private _instantiationService: IInstantiationService, @IQuickOpenService private _quickOpenService: IQuickOpenService, @IChoiceService private _choiceService: IChoiceService, @IStorageService private _storageService: IStorageService, @IMessageService private _messageService: IMessageService ) { - super(_contextKeyService, _configurationService, _panelService, _partService, _lifecycleService); + super(_contextKeyService, _panelService, _partService, _lifecycleService); this._configHelper = this._instantiationService.createInstance(TerminalConfigHelper); } From d03cc545b5de67390ab5fcf254ec375d99e0e116 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 5 Jan 2018 13:34:19 -0800 Subject: [PATCH 017/710] Don't deepClone config every access --- .../parts/terminal/common/terminal.ts | 2 ++ .../electron-browser/terminalConfigHelper.ts | 23 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index 5e4e079b43a..6a277996ada 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -47,6 +47,8 @@ export const TerminalCursorStyle = { UNDERLINE: 'underline' }; +export const TERMINAL_CONFIG_SECTION = 'terminal.integrated'; + export interface ITerminalConfiguration { shell: { linux: string; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts index eaae70691f3..19e0a0b02fa 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts @@ -11,22 +11,15 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IChoiceService } from 'vs/platform/message/common/message'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; -import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY } from 'vs/workbench/parts/terminal/common/terminal'; +import { ITerminalConfiguration, ITerminalConfigHelper, ITerminalFont, IShellLaunchConfig, IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY, TERMINAL_CONFIG_SECTION } from 'vs/workbench/parts/terminal/common/terminal'; import { TPromise } from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal'; -import { deepClone } from 'vs/base/common/objects'; interface IEditorConfiguration { editor: IEditorOptions; } -interface IFullTerminalConfiguration { - terminal: { - integrated: ITerminalConfiguration; - }; -} - const DEFAULT_LINE_HEIGHT = 1.0; const MINIMUM_FONT_SIZE = 6; @@ -41,16 +34,24 @@ export class TerminalConfigHelper implements ITerminalConfigHelper { private _charMeasureElement: HTMLElement; private _lastFontMeasurement: ITerminalFont; + public config: ITerminalConfiguration; public constructor( @IConfigurationService private _configurationService: IConfigurationService, @IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService, @IChoiceService private _choiceService: IChoiceService, - @IStorageService private _storageService: IStorageService) { + @IStorageService private _storageService: IStorageService + ) { + this._updateConfig(); + this._configurationService.onDidChangeConfiguration(e => { + if (e.affectsConfiguration(TERMINAL_CONFIG_SECTION)) { + this._updateConfig(); + } + }); } - public get config(): ITerminalConfiguration { - return deepClone(this._configurationService.getValue().terminal.integrated); + private _updateConfig(): void { + this.config = this._configurationService.getValue(TERMINAL_CONFIG_SECTION); } private _measureFont(fontFamily: string, fontSize: number, lineHeight: number): ITerminalFont { From 423921905fcf7386bdd3105362fe28d21fd02a86 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 5 Jan 2018 14:08:46 -0800 Subject: [PATCH 018/710] Fix terminal config tests --- .../electron-browser/terminalConfigHelper.ts | 16 +- .../terminalConfigHelper.test.ts | 143 +++++++----------- .../electron-browser/terminalInstance.test.ts | 4 + 3 files changed, 66 insertions(+), 97 deletions(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts index 19e0a0b02fa..24a10026878 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts @@ -16,10 +16,6 @@ import { TPromise } from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal'; -interface IEditorConfiguration { - editor: IEditorOptions; -} - const DEFAULT_LINE_HEIGHT = 1.0; const MINIMUM_FONT_SIZE = 6; @@ -90,21 +86,19 @@ export class TerminalConfigHelper implements ITerminalConfigHelper { * terminal.integrated.fontSize, terminal.integrated.lineHeight configuration properties */ public getFont(excludeDimensions?: boolean): ITerminalFont { - const config = this._configurationService.getValue(); - const editorConfig = (config).editor; - const terminalConfig = this.config; + const editorConfig = this._configurationService.getValue('editor'); - let fontFamily = terminalConfig.fontFamily || editorConfig.fontFamily; + let fontFamily = this.config.fontFamily || editorConfig.fontFamily; // Work around bad font on Fedora - if (!terminalConfig.fontFamily) { + if (!this.config.fontFamily) { if (isFedora) { fontFamily = '\'DejaVu Sans Mono\''; } } - let fontSize = this._toInteger(terminalConfig.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize); - const lineHeight = terminalConfig.lineHeight ? Math.max(terminalConfig.lineHeight, 1) : DEFAULT_LINE_HEIGHT; + let fontSize = this._toInteger(this.config.fontSize, MINIMUM_FONT_SIZE, MAXIMUM_FONT_SIZE, EDITOR_FONT_DEFAULTS.fontSize); + const lineHeight = this.config.lineHeight ? Math.max(this.config.lineHeight, 1) : DEFAULT_LINE_HEIGHT; if (excludeDimensions) { return { diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts index caef93152b9..62a853a848f 100644 --- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts +++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts @@ -11,6 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper'; import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions'; import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal'; +import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; class MockConfigurationService implements IConfigurationService { public _serviceBrand: any; @@ -33,33 +34,17 @@ suite('Workbench - TerminalConfigHelper', () => { }); test('TerminalConfigHelper - getFont fontFamily', function () { - let configurationService: IConfigurationService; - let configHelper: TerminalConfigHelper; + const configurationService = new TestConfigurationService(); + configurationService.setUserConfiguration('editor', { fontFamily: 'foo' }); + configurationService.setUserConfiguration('terminal', { integrated: { fontFamily: 'bar' } }); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo' - }, - terminal: { - integrated: { - fontFamily: 'bar' - } - } - }); - configHelper = new TerminalConfigHelper(configurationService, null, null, null); + let configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; assert.equal(configHelper.getFont().fontFamily, 'bar', 'terminal.integrated.fontFamily should be selected over editor.fontFamily'); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo' - }, - terminal: { - integrated: { - fontFamily: 0 - } - } - }); + configurationService.setUserConfiguration('terminal', { integrated: { fontFamily: null } }); + + // Recreate config helper as onDidChangeConfiguration isn't implemented in TestConfigurationService configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; if (isFedora) { @@ -70,64 +55,55 @@ suite('Workbench - TerminalConfigHelper', () => { }); test('TerminalConfigHelper - getFont fontSize', function () { - let configurationService: IConfigurationService; - let configHelper: TerminalConfigHelper; + const configurationService = new TestConfigurationService(); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo', - fontSize: 9 - }, - terminal: { - integrated: { - fontFamily: 'bar', - fontSize: 10 - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo', + fontSize: 9 + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: 'bar', + fontSize: 10 } }); - configHelper = new TerminalConfigHelper(configurationService, null, null, null); + let configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; assert.equal(configHelper.getFont().fontSize, 10, 'terminal.integrated.fontSize should be selected over editor.fontSize'); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo' - }, - terminal: { - integrated: { - fontFamily: 0, - fontSize: 0 - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo' + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: null, + fontSize: 0 } }); configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; assert.equal(configHelper.getFont().fontSize, 6, 'The minimum terminal font size should be used when terminal.integrated.fontSize less than it'); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo' - }, - terminal: { - integrated: { - fontFamily: 0, - fontSize: 1500 - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo' + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: 0, + fontSize: 1500 } }); configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; assert.equal(configHelper.getFont().fontSize, 25, 'The maximum terminal font size should be used when terminal.integrated.fontSize more than it'); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo', - }, - terminal: { - integrated: { - fontFamily: 0, - fontSize: null - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo' + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: 0, + fontSize: null } }); configHelper = new TerminalConfigHelper(configurationService, null, null, null); @@ -136,35 +112,30 @@ suite('Workbench - TerminalConfigHelper', () => { }); test('TerminalConfigHelper - getFont lineHeight', function () { - let configurationService: IConfigurationService; - let configHelper: TerminalConfigHelper; + const configurationService = new TestConfigurationService(); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo', - lineHeight: 1 - }, - terminal: { - integrated: { - fontFamily: 0, - lineHeight: 2 - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo', + lineHeight: 1 + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: 0, + lineHeight: 2 } }); - configHelper = new TerminalConfigHelper(configurationService, null, null, null); + let configHelper = new TerminalConfigHelper(configurationService, null, null, null); configHelper.panelContainer = fixture; assert.equal(configHelper.getFont().lineHeight, 2, 'terminal.integrated.lineHeight should be selected over editor.lineHeight'); - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo', - lineHeight: 1 - }, - terminal: { - integrated: { - fontFamily: 0, - lineHeight: 0 - } + configurationService.setUserConfiguration('editor', { + fontFamily: 'foo', + lineHeight: 1 + }); + configurationService.setUserConfiguration('terminal', { + integrated: { + fontFamily: 0, + lineHeight: 0 } }); configHelper = new TerminalConfigHelper(configurationService, null, null, null); diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts index a7f066b25bd..1dadac1f411 100644 --- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts +++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalInstance.test.ts @@ -21,8 +21,11 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { TPromise } from 'vs/base/common/winjs.base'; +import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; class TestTerminalInstance extends TerminalInstance { + public _getCwd(shell: IShellLaunchConfig, root: Uri): string { return super._getCwd(shell, root); } @@ -152,6 +155,7 @@ suite('Workbench - TerminalInstance', () => { let keybindingService = new MockKeybindingService(); let terminalFocusContextKey = contextKeyService.createKey('test', false); instantiationService = new TestInstantiationService(); + instantiationService.stub(IConfigurationService, new TestConfigurationService()); instantiationService.stub(IMessageService, new TestMessageService()); instantiationService.stub(IWorkspaceContextService, new TestContextService()); instantiationService.stub(IKeybindingService, keybindingService); From 447690936321bb2a6552b433e7628871eb8e05d2 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 15:06:20 -0800 Subject: [PATCH 019/710] Update CR Count. --- .../pieceTableTextBuffer/pieceTableTextBufferBuilder.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 9f05b08a7d2..e9e3bafec2e 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -29,6 +29,7 @@ class PTBasedBuilder { private text: string; private BOM: string; private chunkIndex: number; + private totalCRCount: number; private _regex: RegExp; constructor() { @@ -36,6 +37,7 @@ class PTBasedBuilder { this.BOM = ''; this.chunkIndex = 0; this.lineStarts = [0]; + this.totalCRCount = 0; this._regex = new RegExp(/\r\n|\r|\n/g); } @@ -72,6 +74,10 @@ class PTBasedBuilder { break; } + if (matchLength === 2 || m[0] === '\r') { + this.totalCRCount++; + } + prevMatchStartIndex = matchStartIndex; prevMatchLength = matchLength; @@ -91,7 +97,7 @@ class PTBasedBuilder { length: this.lineStarts.length }, BOM: this.BOM, - totalCRCount: 0, + totalCRCount: this.totalCRCount, containsRTL: containsRTL, isBasicASCII: isBasicASCII }); From 06a8392974bb4fe3592642ee0fb438f3b0c1270f Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 15:06:45 -0800 Subject: [PATCH 020/710] Get Value in range should normalize line feed. --- .../common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 6938e33bf4e..e20a6a35d8e 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -306,7 +306,7 @@ export class PieceTableTextBuffer implements ITextBuffer { for (let i = startLineIndex + 1; i < endLineIndex; i++) { resultLines.push(this.getLineContent(i + 1)); } - resultLines.push(this.getLineRawContent(endLineIndex + 1).substring(0, range.endColumn - 1)); + resultLines.push(this.getLineContent(endLineIndex + 1).substring(0, range.endColumn - 1)); return resultLines.join(lineEnding); } From 118bb8a33cab3e7a5db8760f9b47ef0bab4498b6 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 15:06:59 -0800 Subject: [PATCH 021/710] Fix getPositionAt. --- .../pieceTableTextBuffer/pieceTableTextBuffer.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index e20a6a35d8e..abb20854991 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -378,6 +378,7 @@ export class PieceTableTextBuffer implements ITextBuffer { public getPositionAt(offset: number): Position { let x = this._root; let lfCnt = 0; + let originalOffset = offset; while (x !== SENTINEL) { if (x.size_left !== 0 && x.size_left >= offset) { @@ -385,19 +386,15 @@ export class PieceTableTextBuffer implements ITextBuffer { } else if (x.size_left + x.piece.length >= offset) { let out = x.piece.lineStarts.getIndexOf(offset - x.size_left); - let column = 0; + lfCnt += x.lf_left + out.index; if (out.index === 0) { - let prev = x.prev(); - - if (prev !== SENTINEL) { - let lineLens = prev.piece.lineStarts.values; - column += lineLens[lineLens.length - 1]; - } + let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); + let column = originalOffset - lineStartOffset + 1; + return new Position(lfCnt + 1, column); } - lfCnt += x.lf_left + out.index; - return new Position(lfCnt + 1, column + out.remainder + 1); + return new Position(lfCnt + 1, out.remainder + 1); } else { offset -= x.size_left + x.piece.length; lfCnt += x.lf_left + x.piece.lineFeedCnt; @@ -847,6 +844,7 @@ export class PieceTableTextBuffer implements ITextBuffer { let next = startNode.next(); this.rbDelete(startNode); this.fixCRLFWithPrev(next); + this.computeLineCount(); return; } this.deleteNodeHead(startNode, endSplitPos); From 06a66b70177d56b46333ae579cbdf641a8258ad3 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 16:07:29 -0800 Subject: [PATCH 022/710] getRangeAt parameters are start+len, not start+end. --- .../common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index abb20854991..6edf9eb54b0 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -683,7 +683,8 @@ export class PieceTableTextBuffer implements ITextBuffer { return result + 2; } - public getRangeAt(start: number, end: number): Range { + public getRangeAt(start: number, length: number): Range { + let end = start + length; const startPosition = this.getPositionAt(start); const endPosition = this.getPositionAt(end); return new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column); From 7426b1a3af29fe8ece8ffe71ebdc70da12571e3e Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 16:47:20 -0800 Subject: [PATCH 023/710] Ensure getPostion returns valid value. --- .../pieceTableTextBuffer.ts | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 6edf9eb54b0..fed2dc9fc84 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -376,6 +376,9 @@ export class PieceTableTextBuffer implements ITextBuffer { } public getPositionAt(offset: number): Position { + offset = Math.floor(offset); + offset = Math.max(0, offset); + let x = this._root; let lfCnt = 0; let originalOffset = offset; @@ -390,19 +393,27 @@ export class PieceTableTextBuffer implements ITextBuffer { if (out.index === 0) { let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); - let column = originalOffset - lineStartOffset + 1; - return new Position(lfCnt + 1, column); + let column = originalOffset - lineStartOffset; + return new Position(lfCnt + 1, column + 1); } return new Position(lfCnt + 1, out.remainder + 1); } else { offset -= x.size_left + x.piece.length; lfCnt += x.lf_left + x.piece.lineFeedCnt; - x = x.right; + + if (x.right === SENTINEL) { + // last node + let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); + let column = originalOffset - offset - lineStartOffset; + return new Position(lfCnt + 1, column + 1); + } else { + x = x.right; + } } } - return null; + return new Position(1, 1); } public equals(other: ITextBuffer): boolean { From 63ce4b510049b44c65724d710c1368212657d01a Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 5 Jan 2018 18:41:14 -0800 Subject: [PATCH 024/710] fix wrong linestarts --- .../model/pieceTableTextBuffer/pieceTableTextBuffer.ts | 2 ++ .../pieceTableTextBuffer/pieceTableTextBufferBuilder.ts | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index fed2dc9fc84..da80d7efaab 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -349,6 +349,7 @@ export class PieceTableTextBuffer implements ITextBuffer { } public getLineContent(lineNumber: number): string { + // console.log('getLineContent ' + lineNumber); return this.getLineRawContent(lineNumber).replace(/(\r\n|\r|\n)$/, ''); } @@ -384,6 +385,7 @@ export class PieceTableTextBuffer implements ITextBuffer { let originalOffset = offset; while (x !== SENTINEL) { + // console.log('getPositionAt while loop'); if (x.size_left !== 0 && x.size_left >= offset) { x = x.left; } else if (x.size_left + x.piece.length >= offset) { diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index e9e3bafec2e..2e17544cc33 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -31,6 +31,7 @@ class PTBasedBuilder { private chunkIndex: number; private totalCRCount: number; private _regex: RegExp; + private totalLength: number; constructor() { this.text = ''; @@ -39,6 +40,7 @@ class PTBasedBuilder { this.lineStarts = [0]; this.totalCRCount = 0; this._regex = new RegExp(/\r\n|\r|\n/g); + this.totalLength = 0; } public acceptChunk(chunk: string): void { @@ -81,11 +83,11 @@ class PTBasedBuilder { prevMatchStartIndex = matchStartIndex; prevMatchLength = matchLength; - this.lineStarts.push(matchStartIndex + matchLength); - + this.lineStarts.push(this.totalLength + matchStartIndex + matchLength); } while (m); this.text += chunk; + this.totalLength += chunk.length; this.chunkIndex++; } From b02b2b58c6b9e85cfb29d930a912b381ef6c83b4 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Sun, 7 Jan 2018 18:13:04 -0800 Subject: [PATCH 025/710] move piecetable logic out of text buffer --- .../pieceTableTextBuffer/pieceTableBase.ts | 1244 ++++++++++++++++ .../pieceTableTextBuffer.ts | 1253 +---------------- 2 files changed, 1249 insertions(+), 1248 deletions(-) create mode 100644 src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts new file mode 100644 index 00000000000..74410953b67 --- /dev/null +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -0,0 +1,1244 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { Position } from 'vs/editor/common/core/position'; +import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; + +export const enum NodeColor { + Black = 0, + Red = 1, +} + +function getNodeColor(node: TreeNode) { + return node.color; +} + +function setNodeColor(node: TreeNode, color: NodeColor) { + node.color = color; +} + +function leftest(node: TreeNode): TreeNode { + while (node.left !== SENTINEL) { + node = node.left; + } + return node; +} + +function righttest(node: TreeNode): TreeNode { + while (node.right !== SENTINEL) { + node = node.right; + } + return node; +} + +function calculateSize(node: TreeNode): number { + if (node === SENTINEL) { + return 0; + } + + return node.size_left + node.piece.length + calculateSize(node.right); +} + +function calculateLF(node: TreeNode): number { + if (node === SENTINEL) { + return 0; + } + + return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right); +} + +function resetSentinel(): void { + SENTINEL.parent = SENTINEL; +} + +const lfRegex = new RegExp(/\r\n|\r|\n/g); + +export function constructLineStarts(chunk: string): number[] { + let lineStarts = [0]; + + // Reset regex to search from the beginning + lfRegex.lastIndex = 0; + let prevMatchStartIndex = -1; + let prevMatchLength = 0; + + let m: RegExpExecArray; + do { + if (prevMatchStartIndex + prevMatchLength === chunk.length) { + // Reached the end of the line + break; + } + + m = lfRegex.exec(chunk); + if (!m) { + break; + } + + const matchStartIndex = m.index; + const matchLength = m[0].length; + + if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { + // Exit early if the regex matches the same range twice + break; + } + + prevMatchStartIndex = matchStartIndex; + prevMatchLength = matchLength; + + lineStarts.push(matchStartIndex + matchLength); + + } while (m); + + return lineStarts; +} + +export class TreeNode { + parent: TreeNode; + left: TreeNode; + right: TreeNode; + color: NodeColor; + + // Piece + piece: Piece; + size_left: number; // size of the left subtree (not inorder) + lf_left: number; // line feeds cnt in the left subtree (not in order) + + constructor(piece: Piece, color: NodeColor) { + this.piece = piece; + this.color = color; + this.size_left = 0; + this.lf_left = 0; + this.parent = null; + this.left = null; + this.right = null; + } + + public next(): TreeNode { + if (this.right !== SENTINEL) { + return leftest(this.right); + } + + let node: TreeNode = this; + + while (node.parent !== SENTINEL) { + if (node.parent.left === node) { + break; + } + + node = node.parent; + } + + if (node.parent === SENTINEL) { + return SENTINEL; + } else { + return node.parent; + } + } + + public prev(): TreeNode { + if (this.left !== SENTINEL) { + return righttest(this.left); + } + + let node: TreeNode = this; + + while (node.parent !== SENTINEL) { + if (node.parent.right === node) { + break; + } + + node = node.parent; + } + + if (node.parent === SENTINEL) { + return SENTINEL; + } else { + return node.parent; + } + } + + public detach(): void { + this.parent = null; + this.left = null; + this.right = null; + } +} + +export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black); +SENTINEL.parent = SENTINEL; +SENTINEL.left = SENTINEL; +SENTINEL.right = SENTINEL; +setNodeColor(SENTINEL, NodeColor.Black); + +export interface BufferCursor { + /** + * Piece Index + */ + node: TreeNode; + /** + * remainer in current piece. + */ + remainder: number; +} + +export class Piece { + isOriginalBuffer: boolean; + offset: number; + length: number; // size of current piece + + lineFeedCnt: number; + lineStarts: PrefixSumComputer; + + constructor(isOriginalBuffer: boolean, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { + this.isOriginalBuffer = isOriginalBuffer; + this.offset = offset; + this.length = length; + this.lineFeedCnt = lineFeedCnt; + this.lineStarts = null; + + if (lineLengthsVal) { + let newVal = new Uint32Array(lineLengthsVal.length); + newVal.set(lineLengthsVal); + this.lineStarts = new PrefixSumComputer(newVal); + } + } +} + +export class PieceTableBase { + protected _originalBuffer: string; + protected _changeBuffer: string; + protected _root: TreeNode; + protected _lineCnt: number; + + constructor(originalBuffer: string, lineStarts?: number[]) { + this._originalBuffer = originalBuffer; + this._changeBuffer = ''; + this._root = SENTINEL; + this._lineCnt = 1; + + if (this._originalBuffer.length > 0) { + let lineLengths: Uint32Array; + if (lineStarts) { + lineLengths = new Uint32Array(lineStarts.length); + for (let i = 1; i < lineStarts.length; i++) { + lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; + } + + lineLengths[lineStarts.length - 1] = this._originalBuffer.length - lineStarts[lineStarts.length - 1]; + } else { + lineLengths = this.constructLineLengths(this._originalBuffer); + } + + let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); + this.rbInsertLeft(null, piece); + this._lineCnt = lineLengths.length; + } + } + + // #region Piece Table + insert(value: string, offset: number): void { + // todo, validate value and offset. + if (this._root !== SENTINEL) { + let { node, remainder } = this.nodeAt(offset); + let insertPos = node.piece.lineStarts.getIndexOf(remainder); + let nodeOffsetInDocument = this.offsetOfNode(node); + const startOffset = this._changeBuffer.length; + + if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeOffsetInDocument + node.piece.length === offset)) { + // append content to this node, we don't want to keep adding node when users simply type in sequence + // unless we want to make the structure immutable + this.appendToNode(node, value); + } else { + if (nodeOffsetInDocument === offset) { + // we are inserting content to the beginning of node + let nodesToDel = []; + if (value.charCodeAt(value.length - 1) === 13) { + // inserted content ends with \r + if (node !== SENTINEL) { + if (this.nodeCharCodeAt(node, 0) === 10) { + // move `\n` forward + value += '\n'; + node.piece.offset++; + node.piece.length--; + node.piece.lineFeedCnt--; + node.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + this.updateMetadata(node, -1, -1); + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } + } + } + + this._changeBuffer += value; + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + let newNode = this.rbInsertLeft(node, newPiece); + this.fixCRLFWithPrev(newNode); + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } else if (nodeOffsetInDocument + node.piece.length > offset) { + let nodesToDel = []; + + // we need to split node. Create the new piece first as we are reading current node info before modifying it. + let newRightPiece = new Piece( + node.piece.isOriginalBuffer, + node.piece.offset + offset - nodeOffsetInDocument, + nodeOffsetInDocument + node.piece.length - offset, + node.piece.lineFeedCnt - insertPos.index, + node.piece.lineStarts.values + ); + + if (value.charCodeAt(value.length - 1) === 13 /** \r */) { + let headOfRight = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument); + + if (headOfRight === 10 /** \n */) { + newRightPiece.offset++; + newRightPiece.length--; + newRightPiece.lineFeedCnt--; + newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); + value += '\n'; + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + + // reuse node + if (value.charCodeAt(0) === 10/** \n */) { + let tailOfLeft = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument - 1); + if (tailOfLeft === 13 /** \r */) { + let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); + this.deleteNodeTail(node, previousPos); + value = '\r' + value; + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } else { + this.deleteNodeTail(node, insertPos); + } + } else { + this.deleteNodeTail(node, insertPos); + } + + this._changeBuffer += value; + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + + if (newRightPiece.length > 0) { + this.rbInsertRight(node, newRightPiece); + } + this.rbInsertRight(node, newPiece); + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } else { + // we are inserting to the right of this node. + if (this.adjustCarriageReturnFromNext(value, node)) { + value += '\n'; + } + + this._changeBuffer += value; + const lineLengths = this.constructLineLengths(value); + let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + let newNode = this.rbInsertRight(node, newPiece); + this.fixCRLFWithPrev(newNode); + } + } + } else { + // insert new node + const startOffset = this._changeBuffer.length; + this._changeBuffer += value; + const lineLengths = this.constructLineLengths(value); + let piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + + this.rbInsertLeft(null, piece); + } + + // todo, this is too brutal. Total line feed count should be updated the same way as lf_left. + this.computeLineCount(); + } + + delete(offset: number, cnt: number): void { + if (cnt <= 0) { + return; + } + + if (this._root !== SENTINEL) { + let startPosition = this.nodeAt(offset); + let endPosition = this.nodeAt(offset + cnt); + let startNode = startPosition.node; + let endNode = endPosition.node; + + let length = startNode.piece.length; + let startNodeOffsetInDocument = this.offsetOfNode(startNode); + let splitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument); + + if (startNode === endNode) { + // deletion falls into one node. + let endSplitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument + cnt); + + if (startNodeOffsetInDocument === offset) { + if (cnt === length) { // delete node + let next = startNode.next(); + this.rbDelete(startNode); + this.fixCRLFWithPrev(next); + this.computeLineCount(); + return; + } + this.deleteNodeHead(startNode, endSplitPos); + this.fixCRLFWithPrev(startNode); + this.computeLineCount(); + return; + } + + if (startNodeOffsetInDocument + length === offset + cnt) { + this.deleteNodeTail(startNode, splitPos); + this.fixCRLFWithNext(startNode); + this.computeLineCount(); + return; + } + + // delete content in the middle, this node will be splitted to nodes + this.shrinkNode(startNode, splitPos, endSplitPos); + this.computeLineCount(); + return; + } + + // perform read operations before any write operation. + let endNodeOffsetInDocument = this.offsetOfNode(endNode); + + // update first touched node + this.deleteNodeTail(startNode, splitPos); + let nodesToDel = []; + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } + + // update last touched node + let endSplitPos = endNode.piece.lineStarts.getIndexOf(offset - endNodeOffsetInDocument + cnt); + this.deleteNodeHead(endNode, endSplitPos); + + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } + + let secondNode = startNode.next(); + for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { + nodesToDel.push(node); + } + + let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + + if (prev !== SENTINEL) { + this.fixCRLFWithNext(prev); + } + this.computeLineCount(); + } + } + + getLineRawContent(lineNumber: number): string { + let x = this._root; + + let ret = ''; + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); + } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); + break; + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + // search in order, to find the node contains end column + x = x.next(); + while (x !== SENTINEL) { + let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + if (x.piece.lineFeedCnt > 0) { + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + + ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); + return ret; + } else { + ret += buffer.substr(x.piece.offset, x.piece.length); + } + + x = x.next(); + } + + return ret; + } + + computeLineCount() { + let x = this._root; + + let ret = 1; + while (x !== SENTINEL) { + ret += x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + + this._lineCnt = ret; + } + + // #region node operations + deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { + // it's okay to delete CR in CRLF. + let cnt = node.piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; + node.piece.length -= cnt; + node.piece.offset += cnt; + node.piece.lineFeedCnt -= pos.index; + this.deletePrefixSumHead(node.piece.lineStarts, pos); + this.updateMetadata(node, -cnt, -pos.index); + } + + deleteNodeTail(node: TreeNode, start: PrefixSumIndexOfResult) { + let cnt = node.piece.length - node.piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; + let hitCRLF = this.hitTestCRLF(node, node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); + node.piece.length -= cnt; + let lf_delta = start.index - node.piece.lineFeedCnt; + node.piece.lineFeedCnt = start.index; + this.deletePrefixSumTail(node.piece.lineStarts, start); + + if (hitCRLF) { + node.piece.lineFeedCnt += 1; + lf_delta += 1; + node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + } + + this.updateMetadata(node, -cnt, lf_delta); + } + + // remove start-end from node. + shrinkNode(node: TreeNode, start: PrefixSumIndexOfResult, end?: PrefixSumIndexOfResult) { + // read operation first + let oldLineLengthsVal = node.piece.lineStarts.values; + let offset = node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; + let endOffset = node.piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; + + // write. + let startHitCRLF = this.hitTestCRLF(node, offset, start); + let nodeOldLength = node.piece.length; + node.piece.length = offset; + let lf_delta = start.index - node.piece.lineFeedCnt; + node.piece.lineFeedCnt = start.index; + node.piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); + node.piece.lineStarts.changeValue(start.index, start.remainder); + + if (startHitCRLF) { + node.piece.lineFeedCnt += 1; + lf_delta += 1; + node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + } + this.updateMetadata(node, offset - nodeOldLength, lf_delta); + + let newPieceLength = nodeOldLength - endOffset; + if (newPieceLength <= 0) { + return; + } + + let newPiece: Piece = new Piece( + node.piece.isOriginalBuffer, + endOffset + node.piece.offset, + newPieceLength, + oldLineLengthsVal.length - end.index - 1, + oldLineLengthsVal.slice(end.index) + ); + newPiece.lineStarts.changeValue(0, newPiece.lineStarts.values[0] - end.remainder); + + let newNode = this.rbInsertRight(node, newPiece); + this.fixCRLFWithPrev(newNode); + } + + appendToNode(node: TreeNode, value: string): void { + if (this.adjustCarriageReturnFromNext(value, node)) { + value += '\n'; + } + + let hitCRLF = value.charCodeAt(0) === 10 && this.nodeCharCodeAt(node, node.piece.length - 1) === 13; + this._changeBuffer += value; + node.piece.length += value.length; + const lineLengths = this.constructLineLengths(value); + let lineFeedCount = lineLengths.length - 1; + + let lf_delta = lineFeedCount; + if (hitCRLF) { + node.piece.lineFeedCnt += lineFeedCount - 1; + lf_delta--; + let lineStarts = node.piece.lineStarts; + lineStarts.removeValues(lineStarts.values.length - 1, 1); + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + 1); + lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); + } else { + node.piece.lineFeedCnt += lineFeedCount; + let lineStarts = node.piece.lineStarts; + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + lineLengths[0]); + lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); + } + + this.updateMetadata(node, value.length, lf_delta); + } + + nodeAt(offset: number): BufferCursor { + let x = this._root; + + while (x !== SENTINEL) { + if (x.size_left > offset) { + x = x.left; + } else if (x.size_left + x.piece.length >= offset) { + return { + node: x, + remainder: offset - x.size_left + }; + } else { + offset -= x.size_left + x.piece.length; + x = x.right; + } + } + + return null; + } + + nodeAt2(position: Position): BufferCursor { + let x = this._root; + let lineNumber = position.lineNumber; + let column = position.column; + + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + + return { + node: x, + remainder: Math.min(prevAccumualtedValue + column - 1, accumualtedValue) + }; + } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { + let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + if (prevAccumualtedValue + column - 1 <= x.piece.length) { + return { + node: x, + remainder: prevAccumualtedValue + column - 1 + }; + } else { + column -= x.piece.length - prevAccumualtedValue; + break; + } + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + x = x.right; + } + } + + // search in order, to find the node contains position.column + x = x.next(); + while (x !== SENTINEL) { + + if (x.piece.lineFeedCnt > 0) { + let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + return { + node: x, + remainder: Math.min(column - 1, accumualtedValue) + }; + } else { + if (x.piece.length >= column - 1) { + return { + node: x, + remainder: column - 1 + }; + } else { + column -= x.piece.length; + } + } + + x = x.next(); + } + + return null; + } + + offsetOfNode(node: TreeNode): number { + if (!node) { + return 0; + } + let pos = node.size_left; + while (node !== this._root) { + if (node.parent.right === node) { + pos += node.parent.size_left + node.parent.piece.length; + } + + node = node.parent; + } + + return pos; + } + + getNodeContent(node: TreeNode): string { + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let currentContent = buffer.substr(node.piece.offset, node.piece.length); + + return currentContent; + } + + deletePrefixSumTail(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { + prefixSum.removeValues(position.index + 1, prefixSum.values.length - position.index - 1); + prefixSum.changeValue(position.index, position.remainder); + } + + deletePrefixSumHead(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { + prefixSum.changeValue(position.index, prefixSum.values[position.index] - position.remainder); + if (position.index > 0) { + prefixSum.removeValues(0, position.index); + } + } + + // #endregion + + // #region CRLF + hitTestCRLF(node: TreeNode, offset: number, position: PrefixSumIndexOfResult) { + if (node.piece.lineFeedCnt < 1) { + return false; + } + + let currentLineLen = node.piece.lineStarts.getAccumulatedValue(position.index); + if (offset === currentLineLen - 1) { + // charCodeAt becomes slow (single or even two digits ms) when the changed buffer is long + return this.nodeCharCodeAt(node, offset - 1) === 13/* \r */ && this.nodeCharCodeAt(node, offset) === 10 /* \n */; + } + return false; + } + + fixCRLFWithPrev(nextNode: TreeNode) { + if (nextNode === SENTINEL || nextNode.piece.lineFeedCnt === 0) { + return; + } + + if (nextNode.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { + return; + } + + if (this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + let node = nextNode.prev(); + + if (node === SENTINEL || node.piece.lineFeedCnt === 0) { + return; + } + + if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13) { + this.fixCRLF(node, nextNode); + } + } + } + + fixCRLFWithNext(node: TreeNode) { + if (node === SENTINEL) { + return; + } + + if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13 /* \r */) { + let nextNode = node.next(); + if (nextNode !== SENTINEL && this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + this.fixCRLF(node, nextNode); + } + } + } + + fixCRLF(prev: TreeNode, next: TreeNode) { + let nodesToDel = []; + // update node + prev.piece.length -= 1; + prev.piece.lineFeedCnt -= 1; + let lineStarts = prev.piece.lineStarts; + // lineStarts.values.length >= 2 due to a `\r` + lineStarts.removeValues(lineStarts.values.length - 1, 1); + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); + this.updateMetadata(prev, - 1, -1); + + if (prev.piece.length === 0) { + nodesToDel.push(prev); + } + + // update nextNode + next.piece.length -= 1; + next.piece.offset += 1; + next.piece.lineFeedCnt -= 1; + lineStarts = next.piece.lineStarts; + lineStarts.removeValues(0, 1); + this.updateMetadata(next, - 1, -1); + if (next.piece.length === 0) { + nodesToDel.push(next); + } + + // create new piece which contains \r\n + let startOffset = this._changeBuffer.length; + this._changeBuffer += '\r\n'; + const lineLengths = this.constructLineLengths('\r\n'); + let lineFeedCount = lineLengths.length - 1; + let piece = new Piece(false, startOffset, 2, lineFeedCount, lineLengths); + this.rbInsertRight(prev, piece); + // delete empty nodes + + for (let i = 0; i < nodesToDel.length; i++) { + this.rbDelete(nodesToDel[i]); + } + } + + adjustCarriageReturnFromNext(value: string, node: TreeNode): boolean { + if (value.charCodeAt(value.length - 1) === 13) { + // inserted content ends with \r + let nextNode = node.next(); + if (nextNode !== SENTINEL) { + if (this.nodeCharCodeAt(nextNode, 0) === 10) { + // move `\n` forward + value += '\n'; + + if (nextNode.piece.length === 1) { + this.rbDelete(nextNode); + } else { + nextNode.piece.offset += 1; + nextNode.piece.length -= 1; + nextNode.piece.lineFeedCnt -= 1; + nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + this.updateMetadata(nextNode, -1, -1); + } + return true; + } + } + } + + return false; + } + + nodeCharCodeAt(node: TreeNode, offset: number): number { + if (node.piece.lineFeedCnt < 1) { + return -1; + } + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.charCodeAt(node.piece.offset + offset); + } + // #endregion + + // #endregion + + // #region Red Black Tree + + leftRotate(x: TreeNode) { + let y = x.right; + + // fix size_left + y.size_left += x.size_left + (x.piece ? x.piece.length : 0); + y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); + x.right = y.left; + + if (y.left !== SENTINEL) { + y.left.parent = x; + } + y.parent = x.parent; + if (x.parent === SENTINEL) { + this._root = y; + } else if (x.parent.left === x) { + x.parent.left = y; + } else { + x.parent.right = y; + } + y.left = x; + x.parent = y; + } + + rightRotate(y: TreeNode) { + let x = y.left; + y.left = x.right; + if (x.right !== SENTINEL) { + x.right.parent = y; + } + x.parent = y.parent; + + // fix size_left + y.size_left -= x.size_left + (x.piece ? x.piece.length : 0); + y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); + + if (y.parent === SENTINEL) { + this._root = x; + } else if (y === y.parent.right) { + y.parent.right = x; + } else { + y.parent.left = x; + } + + x.right = y; + y.parent = x; + } + + /** + * node node + * / \ / \ + * a b <---- a b + * / + * z + */ + rbInsertRight(node: TreeNode, p: Piece): TreeNode { + let z = new TreeNode(p, NodeColor.Red); + z.left = SENTINEL; + z.right = SENTINEL; + z.parent = SENTINEL; + z.size_left = 0; + z.lf_left = 0; + + let x = this._root; + if (x === SENTINEL) { + this._root = z; + setNodeColor(z, NodeColor.Black); + } else if (node.right === SENTINEL) { + node.right = z; + z.parent = node; + } else { + let nextNode = leftest(node.right); + nextNode.left = z; + z.parent = nextNode; + } + + this.fixInsert(z); + return z; + } + + /** + * node node + * / \ / \ + * a b ----> a b + * \ + * z + */ + rbInsertLeft(node: TreeNode, p: Piece): TreeNode { + let z = new TreeNode(p, NodeColor.Red); + z.left = SENTINEL; + z.right = SENTINEL; + z.parent = SENTINEL; + z.size_left = 0; + z.lf_left = 0; + + let x = this._root; + if (x === SENTINEL) { + this._root = z; + setNodeColor(z, NodeColor.Black); + } else if (node.left === SENTINEL) { + node.left = z; + z.parent = node; + } else { + let prevNode = righttest(node.left); // a + prevNode.right = z; + z.parent = prevNode; + } + + this.fixInsert(z); + return z; + } + + rbDelete(z: TreeNode) { + let x: TreeNode; + let y: TreeNode; + + if (z.left === SENTINEL) { + y = z; + x = y.right; + } else if (z.right === SENTINEL) { + y = z; + x = y.left; + } else { + y = leftest(z.right); + x = y.right; + } + + if (y === this._root) { + this._root = x; + + // if x is null, we are removing the only node + setNodeColor(x, NodeColor.Black); + + z.detach(); + resetSentinel(); + this._root.parent = SENTINEL; + + return; + } + + let yWasRed = (getNodeColor(y) === NodeColor.Red); + + if (y === y.parent.left) { + y.parent.left = x; + } else { + y.parent.right = x; + } + + if (y === z) { + x.parent = y.parent; + this.recomputeMetadata(x); + } else { + if (y.parent === z) { + x.parent = y; + } else { + x.parent = y.parent; + } + + // as we make changes to x's hierarchy, update size_left of subtree first + this.recomputeMetadata(x); + + y.left = z.left; + y.right = z.right; + y.parent = z.parent; + setNodeColor(y, getNodeColor(z)); + + if (z === this._root) { + this._root = y; + } else { + if (z === z.parent.left) { + z.parent.left = y; + } else { + z.parent.right = y; + } + } + + if (y.left !== SENTINEL) { + y.left.parent = y; + } + if (y.right !== SENTINEL) { + y.right.parent = y; + } + // update metadata + // we replace z with y, so in this sub tree, the length change is z.item.length + y.size_left = z.size_left; + y.lf_left = z.lf_left; + this.recomputeMetadata(y); + } + + z.detach(); + + if (x.parent.left === x) { + let newSizeLeft = calculateSize(x); + let newLFLeft = calculateLF(x); + if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) { + let delta = newSizeLeft - x.parent.size_left; + let lf_delta = newLFLeft - x.parent.lf_left; + x.parent.size_left = newSizeLeft; + x.parent.lf_left = newLFLeft; + this.updateMetadata(x.parent, delta, lf_delta); + } + } + + this.recomputeMetadata(x.parent); + + if (yWasRed) { + resetSentinel(); + return; + } + + // RB-DELETE-FIXUP + let w: TreeNode; + while (x !== this._root && getNodeColor(x) === NodeColor.Black) { + if (x === x.parent.left) { + w = x.parent.right; + + if (getNodeColor(w) === NodeColor.Red) { + setNodeColor(w, NodeColor.Black); + setNodeColor(x.parent, NodeColor.Red); + this.leftRotate(x.parent); + w = x.parent.right; + } + + if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w, NodeColor.Red); + x = x.parent; + } else { + if (getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w.left, NodeColor.Black); + setNodeColor(w, NodeColor.Red); + this.rightRotate(w); + w = x.parent.right; + } + + setNodeColor(w, getNodeColor(x.parent)); + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(w.right, NodeColor.Black); + this.leftRotate(x.parent); + x = this._root; + } + } else { + w = x.parent.left; + + if (getNodeColor(w) === NodeColor.Red) { + setNodeColor(w, NodeColor.Black); + setNodeColor(x.parent, NodeColor.Red); + this.rightRotate(x.parent); + w = x.parent.left; + } + + if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { + setNodeColor(w, NodeColor.Red); + x = x.parent; + + } else { + if (getNodeColor(w.left) === NodeColor.Black) { + setNodeColor(w.right, NodeColor.Black); + setNodeColor(w, NodeColor.Red); + this.leftRotate(w); + w = x.parent.left; + } + + setNodeColor(w, getNodeColor(x.parent)); + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(w.left, NodeColor.Black); + this.rightRotate(x.parent); + x = this._root; + } + } + } + setNodeColor(x, NodeColor.Black); + resetSentinel(); + } + + fixInsert(x: TreeNode) { + this.recomputeMetadata(x); + + while (x !== this._root && getNodeColor(x.parent) === NodeColor.Red) { + if (x.parent === x.parent.parent.left) { + const y = x.parent.parent.right; + + if (getNodeColor(y) === NodeColor.Red) { + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(y, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + x = x.parent.parent; + } else { + if (x === x.parent.right) { + x = x.parent; + this.leftRotate(x); + } + + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + this.rightRotate(x.parent.parent); + } + } else { + const y = x.parent.parent.left; + + if (getNodeColor(y) === NodeColor.Red) { + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(y, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + x = x.parent.parent; + } else { + if (x === x.parent.left) { + x = x.parent; + this.rightRotate(x); + } + setNodeColor(x.parent, NodeColor.Black); + setNodeColor(x.parent.parent, NodeColor.Red); + this.leftRotate(x.parent.parent); + } + } + } + + setNodeColor(this._root, NodeColor.Black); + } + + updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { + // node length change, we need to update the roots of all subtrees containing this node. + while (x !== this._root && x !== SENTINEL) { + if (x.parent.left === x) { + x.parent.size_left += delta; + x.parent.lf_left += lineFeedCntDelta; + } + + x = x.parent; + } + } + + recomputeMetadata(x: TreeNode) { + let delta = 0; + let lf_delta = 0; + if (x === this._root) { + return; + } + + if (delta === 0) { + // go upwards till the node whose left subtree is changed. + while (x !== this._root && x === x.parent.right) { + x = x.parent; + } + + if (x === this._root) { + // well, it means we add a node to the end (inorder) + return; + } + + // x is the node whose right subtree is changed. + x = x.parent; + + delta = calculateSize(x.left) - x.size_left; + lf_delta = calculateLF(x.left) - x.lf_left; + x.size_left += delta; + x.lf_left += lf_delta; + } + + // go upwards till root. O(logN) + while (x !== this._root && (delta !== 0 || lf_delta !== 0)) { + if (x.parent.left === x) { + x.parent.size_left += delta; + x.parent.lf_left += lf_delta; + } + + x = x.parent; + } + } + + getContentOfSubTree(node: TreeNode): string { + if (node === SENTINEL) { + return ''; + } + + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let currentContent = buffer.substr(node.piece.offset, node.piece.length); + + return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); + } + + constructLineLengths(chunk: string): Uint32Array { + let lineStarts = constructLineStarts(chunk); + const lineLengths = new Uint32Array(lineStarts.length); + for (let i = 1; i < lineStarts.length; i++) { + lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; + } + + lineLengths[lineStarts.length - 1] = chunk.length - lineStarts[lineStarts.length - 1]; + + return lineLengths; + } + + // #endregion +} diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index da80d7efaab..29bc981bf76 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -7,260 +7,24 @@ 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 { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; import { ITextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; -import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange, ISingleEditOperationIdentifier } from 'vs/editor/common/model'; +import { IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer'; +import { PieceTableBase, SENTINEL } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; import { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; -export interface IValidatedEditOperation { - sortIndex: number; - identifier: ISingleEditOperationIdentifier; - range: Range; - rangeOffset: number; - rangeLength: number; - lines: string[]; - forceMoveMarkers: boolean; - isAutoWhitespaceEdit: boolean; -} - -export const enum NodeColor { - Black = 0, - Red = 1, -} - -function getNodeColor(node: TreeNode) { - return node.color; -} - -function setNodeColor(node: TreeNode, color: NodeColor) { - node.color = color; -} - -function leftest(node: TreeNode): TreeNode { - while (node.left !== SENTINEL) { - node = node.left; - } - return node; -} - -function righttest(node: TreeNode): TreeNode { - while (node.right !== SENTINEL) { - node = node.right; - } - return node; -} - -function calculateSize(node: TreeNode): number { - if (node === SENTINEL) { - return 0; - } - - return node.size_left + node.piece.length + calculateSize(node.right); -} - -function calculateLF(node: TreeNode): number { - if (node === SENTINEL) { - return 0; - } - - return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right); -} - -function resetSentinel(): void { - SENTINEL.parent = SENTINEL; -} - -const lfRegex = new RegExp(/\r\n|\r|\n/g); - -export function constructLineStarts(chunk: string): number[] { - let lineStarts = [0]; - - // Reset regex to search from the beginning - lfRegex.lastIndex = 0; - let prevMatchStartIndex = -1; - let prevMatchLength = 0; - - let m: RegExpExecArray; - do { - if (prevMatchStartIndex + prevMatchLength === chunk.length) { - // Reached the end of the line - break; - } - - m = lfRegex.exec(chunk); - if (!m) { - break; - } - - const matchStartIndex = m.index; - const matchLength = m[0].length; - - if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { - // Exit early if the regex matches the same range twice - break; - } - - prevMatchStartIndex = matchStartIndex; - prevMatchLength = matchLength; - - lineStarts.push(matchStartIndex + matchLength); - - } while (m); - - return lineStarts; -} - -export class TreeNode { - parent: TreeNode; - left: TreeNode; - right: TreeNode; - color: NodeColor; - - // Piece - piece: Piece; - size_left: number; // size of the left subtree (not inorder) - lf_left: number; // line feeds cnt in the left subtree (not in order) - - constructor(piece: Piece, color: NodeColor) { - this.piece = piece; - this.color = color; - this.size_left = 0; - this.lf_left = 0; - this.parent = null; - this.left = null; - this.right = null; - } - - public next(): TreeNode { - if (this.right !== SENTINEL) { - return leftest(this.right); - } - - let node: TreeNode = this; - - while (node.parent !== SENTINEL) { - if (node.parent.left === node) { - break; - } - - node = node.parent; - } - - if (node.parent === SENTINEL) { - return SENTINEL; - } else { - return node.parent; - } - } - - public prev(): TreeNode { - if (this.left !== SENTINEL) { - return righttest(this.left); - } - - let node: TreeNode = this; - - while (node.parent !== SENTINEL) { - if (node.parent.right === node) { - break; - } - - node = node.parent; - } - - if (node.parent === SENTINEL) { - return SENTINEL; - } else { - return node.parent; - } - } - - public detach(): void { - this.parent = null; - this.left = null; - this.right = null; - } -} - -export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black); -SENTINEL.parent = SENTINEL; -SENTINEL.left = SENTINEL; -SENTINEL.right = SENTINEL; -setNodeColor(SENTINEL, NodeColor.Black); - -export interface BufferCursor { - /** - * Piece Index - */ - node: TreeNode; - /** - * remainer in current piece. - */ - remainder: number; -} - -export class Piece { - isOriginalBuffer: boolean; - offset: number; - length: number; // size of current piece - - lineFeedCnt: number; - lineStarts: PrefixSumComputer; - - constructor(isOriginalBuffer: boolean, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { - this.isOriginalBuffer = isOriginalBuffer; - this.offset = offset; - this.length = length; - this.lineFeedCnt = lineFeedCnt; - this.lineStarts = null; - - if (lineLengthsVal) { - let newVal = new Uint32Array(lineLengthsVal.length); - newVal.set(lineLengthsVal); - this.lineStarts = new PrefixSumComputer(newVal); - } - } -} - -export class PieceTableTextBuffer implements ITextBuffer { +export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer { private _BOM: string; private _EOL: string; private _mightContainRTL: boolean; private _mightContainNonBasicASCII: boolean; - private _originalBuffer: string; - private _changeBuffer: string; - private _root: TreeNode; - private _lineCnt: number; - constructor(textSource: ITextSource) { - let rawBuffer = textSource.lines; - this._originalBuffer = rawBuffer.text; - this._changeBuffer = ''; - this._root = SENTINEL; + super(textSource.lines.text, textSource.lines.lineStarts); this._BOM = textSource.BOM; this._EOL = textSource.EOL; this._mightContainNonBasicASCII = !textSource.isBasicASCII; this._mightContainRTL = textSource.containsRTL; - this._lineCnt = 1; - - if (this._originalBuffer.length > 0) { - let lineLengths: Uint32Array; - if (rawBuffer.lineStarts) { - lineLengths = new Uint32Array(rawBuffer.lineStarts.length); - for (let i = 1; i < rawBuffer.lineStarts.length; i++) { - lineLengths[i - 1] = rawBuffer.lineStarts[i] - rawBuffer.lineStarts[i - 1]; - } - - lineLengths[rawBuffer.lineStarts.length - 1] = rawBuffer.text.length - rawBuffer.lineStarts[rawBuffer.lineStarts.length - 1]; - } else { - lineLengths = this.constructLineLengths(this._originalBuffer); - } - - let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); - this.rbInsertLeft(null, piece); - this._lineCnt = lineLengths.length; - } } // #region TextBuffer @@ -349,7 +113,6 @@ export class PieceTableTextBuffer implements ITextBuffer { } public getLineContent(lineNumber: number): string { - // console.log('getLineContent ' + lineNumber); return this.getLineRawContent(lineNumber).replace(/(\r\n|\r|\n)$/, ''); } @@ -452,7 +215,6 @@ export class PieceTableTextBuffer implements ITextBuffer { public setEOL(newEOL: string): void { this._EOL = newEOL; - // this._constructLineStarts(); } public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { @@ -705,1011 +467,6 @@ export class PieceTableTextBuffer implements ITextBuffer { // #endregion - // #region Piece Table - insert(value: string, offset: number): void { - // todo, validate value and offset. - if (this._root !== SENTINEL) { - let { node, remainder } = this.nodeAt(offset); - let insertPos = node.piece.lineStarts.getIndexOf(remainder); - let nodeOffsetInDocument = this.offsetOfNode(node); - const startOffset = this._changeBuffer.length; - - if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeOffsetInDocument + node.piece.length === offset)) { - // append content to this node, we don't want to keep adding node when users simply type in sequence - // unless we want to make the structure immutable - this.appendToNode(node, value); - } else { - if (nodeOffsetInDocument === offset) { - // we are inserting content to the beginning of node - let nodesToDel = []; - if (value.charCodeAt(value.length - 1) === 13) { - // inserted content ends with \r - if (node !== SENTINEL) { - if (this.nodeCharCodeAt(node, 0) === 10) { - // move `\n` forward - value += '\n'; - node.piece.offset++; - node.piece.length--; - node.piece.lineFeedCnt--; - node.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. - this.updateMetadata(node, -1, -1); - - if (node.piece.length === 0) { - nodesToDel.push(node); - } - } - } - } - - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - let newNode = this.rbInsertLeft(node, newPiece); - this.fixCRLFWithPrev(newNode); - - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - } else if (nodeOffsetInDocument + node.piece.length > offset) { - let nodesToDel = []; - - // we need to split node. Create the new piece first as we are reading current node info before modifying it. - let newRightPiece = new Piece( - node.piece.isOriginalBuffer, - node.piece.offset + offset - nodeOffsetInDocument, - nodeOffsetInDocument + node.piece.length - offset, - node.piece.lineFeedCnt - insertPos.index, - node.piece.lineStarts.values - ); - - if (value.charCodeAt(value.length - 1) === 13 /** \r */) { - let headOfRight = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument); - - if (headOfRight === 10 /** \n */) { - newRightPiece.offset++; - newRightPiece.length--; - newRightPiece.lineFeedCnt--; - newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); - value += '\n'; - } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); - } - } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); - } - - // reuse node - if (value.charCodeAt(0) === 10/** \n */) { - let tailOfLeft = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument - 1); - if (tailOfLeft === 13 /** \r */) { - let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); - this.deleteNodeTail(node, previousPos); - value = '\r' + value; - - if (node.piece.length === 0) { - nodesToDel.push(node); - } - } else { - this.deleteNodeTail(node, insertPos); - } - } else { - this.deleteNodeTail(node, insertPos); - } - - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - - if (newRightPiece.length > 0) { - this.rbInsertRight(node, newRightPiece); - } - this.rbInsertRight(node, newPiece); - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - } else { - // we are inserting to the right of this node. - if (this.adjustCarriageReturnFromNext(value, node)) { - value += '\n'; - } - - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - let newNode = this.rbInsertRight(node, newPiece); - this.fixCRLFWithPrev(newNode); - } - } - } else { - // insert new node - const startOffset = this._changeBuffer.length; - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - - this.rbInsertLeft(null, piece); - } - - // todo, this is too brutal. Total line feed count should be updated the same way as lf_left. - this.computeLineCount(); - } - - delete(offset: number, cnt: number): void { - if (cnt <= 0) { - return; - } - - if (this._root !== SENTINEL) { - let startPosition = this.nodeAt(offset); - let endPosition = this.nodeAt(offset + cnt); - let startNode = startPosition.node; - let endNode = endPosition.node; - - let length = startNode.piece.length; - let startNodeOffsetInDocument = this.offsetOfNode(startNode); - let splitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument); - - if (startNode === endNode) { - // deletion falls into one node. - let endSplitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument + cnt); - - if (startNodeOffsetInDocument === offset) { - if (cnt === length) { // delete node - let next = startNode.next(); - this.rbDelete(startNode); - this.fixCRLFWithPrev(next); - this.computeLineCount(); - return; - } - this.deleteNodeHead(startNode, endSplitPos); - this.fixCRLFWithPrev(startNode); - this.computeLineCount(); - return; - } - - if (startNodeOffsetInDocument + length === offset + cnt) { - this.deleteNodeTail(startNode, splitPos); - this.fixCRLFWithNext(startNode); - this.computeLineCount(); - return; - } - - // delete content in the middle, this node will be splitted to nodes - this.shrinkNode(startNode, splitPos, endSplitPos); - this.computeLineCount(); - return; - } - - // perform read operations before any write operation. - let endNodeOffsetInDocument = this.offsetOfNode(endNode); - - // update first touched node - this.deleteNodeTail(startNode, splitPos); - let nodesToDel = []; - if (startNode.piece.length === 0) { - nodesToDel.push(startNode); - } - - // update last touched node - let endSplitPos = endNode.piece.lineStarts.getIndexOf(offset - endNodeOffsetInDocument + cnt); - this.deleteNodeHead(endNode, endSplitPos); - - if (endNode.piece.length === 0) { - nodesToDel.push(endNode); - } - - let secondNode = startNode.next(); - for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { - nodesToDel.push(node); - } - - let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; - - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - - if (prev !== SENTINEL) { - this.fixCRLFWithNext(prev); - } - this.computeLineCount(); - } - } - - getLineRawContent(lineNumber: number): string { - let x = this._root; - - let ret = ''; - while (x !== SENTINEL) { - if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { - x = x.left; - } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); - } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); - break; - } else { - lineNumber -= x.lf_left + x.piece.lineFeedCnt; - x = x.right; - } - } - - // search in order, to find the node contains end column - x = x.next(); - while (x !== SENTINEL) { - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - if (x.piece.lineFeedCnt > 0) { - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); - - ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); - return ret; - } else { - ret += buffer.substr(x.piece.offset, x.piece.length); - } - - x = x.next(); - } - - return ret; - } - - computeLineCount() { - let x = this._root; - - let ret = 1; - while (x !== SENTINEL) { - ret += x.lf_left + x.piece.lineFeedCnt; - x = x.right; - } - - this._lineCnt = ret; - } - - // #region node operations - deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { - // it's okay to delete CR in CRLF. - let cnt = node.piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; - node.piece.length -= cnt; - node.piece.offset += cnt; - node.piece.lineFeedCnt -= pos.index; - this.deletePrefixSumHead(node.piece.lineStarts, pos); - this.updateMetadata(node, -cnt, -pos.index); - } - - deleteNodeTail(node: TreeNode, start: PrefixSumIndexOfResult) { - let cnt = node.piece.length - node.piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; - let hitCRLF = this.hitTestCRLF(node, node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); - node.piece.length -= cnt; - let lf_delta = start.index - node.piece.lineFeedCnt; - node.piece.lineFeedCnt = start.index; - this.deletePrefixSumTail(node.piece.lineStarts, start); - - if (hitCRLF) { - node.piece.lineFeedCnt += 1; - lf_delta += 1; - node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); - } - - this.updateMetadata(node, -cnt, lf_delta); - } - - // remove start-end from node. - shrinkNode(node: TreeNode, start: PrefixSumIndexOfResult, end?: PrefixSumIndexOfResult) { - // read operation first - let oldLineLengthsVal = node.piece.lineStarts.values; - let offset = node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; - let endOffset = node.piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; - - // write. - let startHitCRLF = this.hitTestCRLF(node, offset, start); - let nodeOldLength = node.piece.length; - node.piece.length = offset; - let lf_delta = start.index - node.piece.lineFeedCnt; - node.piece.lineFeedCnt = start.index; - node.piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); - node.piece.lineStarts.changeValue(start.index, start.remainder); - - if (startHitCRLF) { - node.piece.lineFeedCnt += 1; - lf_delta += 1; - node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); - } - this.updateMetadata(node, offset - nodeOldLength, lf_delta); - - let newPieceLength = nodeOldLength - endOffset; - if (newPieceLength <= 0) { - return; - } - - let newPiece: Piece = new Piece( - node.piece.isOriginalBuffer, - endOffset + node.piece.offset, - newPieceLength, - oldLineLengthsVal.length - end.index - 1, - oldLineLengthsVal.slice(end.index) - ); - newPiece.lineStarts.changeValue(0, newPiece.lineStarts.values[0] - end.remainder); - - let newNode = this.rbInsertRight(node, newPiece); - this.fixCRLFWithPrev(newNode); - } - - appendToNode(node: TreeNode, value: string): void { - if (this.adjustCarriageReturnFromNext(value, node)) { - value += '\n'; - } - - let hitCRLF = value.charCodeAt(0) === 10 && this.nodeCharCodeAt(node, node.piece.length - 1) === 13; - this._changeBuffer += value; - node.piece.length += value.length; - const lineLengths = this.constructLineLengths(value); - let lineFeedCount = lineLengths.length - 1; - - let lf_delta = lineFeedCount; - if (hitCRLF) { - node.piece.lineFeedCnt += lineFeedCount - 1; - lf_delta--; - let lineStarts = node.piece.lineStarts; - lineStarts.removeValues(lineStarts.values.length - 1, 1); - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + 1); - lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); - } else { - node.piece.lineFeedCnt += lineFeedCount; - let lineStarts = node.piece.lineStarts; - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + lineLengths[0]); - lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); - } - - this.updateMetadata(node, value.length, lf_delta); - } - - nodeAt(offset: number): BufferCursor { - let x = this._root; - - while (x !== SENTINEL) { - if (x.size_left > offset) { - x = x.left; - } else if (x.size_left + x.piece.length >= offset) { - return { - node: x, - remainder: offset - x.size_left - }; - } else { - offset -= x.size_left + x.piece.length; - x = x.right; - } - } - - return null; - } - - nodeAt2(position: Position): BufferCursor { - let x = this._root; - let lineNumber = position.lineNumber; - let column = position.column; - - while (x !== SENTINEL) { - if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { - x = x.left; - } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); - - return { - node: x, - remainder: Math.min(prevAccumualtedValue + column - 1, accumualtedValue) - }; - } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - if (prevAccumualtedValue + column - 1 <= x.piece.length) { - return { - node: x, - remainder: prevAccumualtedValue + column - 1 - }; - } else { - column -= x.piece.length - prevAccumualtedValue; - break; - } - } else { - lineNumber -= x.lf_left + x.piece.lineFeedCnt; - x = x.right; - } - } - - // search in order, to find the node contains position.column - x = x.next(); - while (x !== SENTINEL) { - - if (x.piece.lineFeedCnt > 0) { - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); - return { - node: x, - remainder: Math.min(column - 1, accumualtedValue) - }; - } else { - if (x.piece.length >= column - 1) { - return { - node: x, - remainder: column - 1 - }; - } else { - column -= x.piece.length; - } - } - - x = x.next(); - } - - return null; - } - - offsetOfNode(node: TreeNode): number { - if (!node) { - return 0; - } - let pos = node.size_left; - while (node !== this._root) { - if (node.parent.right === node) { - pos += node.parent.size_left + node.parent.piece.length; - } - - node = node.parent; - } - - return pos; - } - - getNodeContent(node: TreeNode): string { - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - let currentContent = buffer.substr(node.piece.offset, node.piece.length); - - return currentContent; - } - - deletePrefixSumTail(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { - prefixSum.removeValues(position.index + 1, prefixSum.values.length - position.index - 1); - prefixSum.changeValue(position.index, position.remainder); - } - - deletePrefixSumHead(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { - prefixSum.changeValue(position.index, prefixSum.values[position.index] - position.remainder); - if (position.index > 0) { - prefixSum.removeValues(0, position.index); - } - } - - // #endregion - - // #region CRLF - hitTestCRLF(node: TreeNode, offset: number, position: PrefixSumIndexOfResult) { - if (node.piece.lineFeedCnt < 1) { - return false; - } - - let currentLineLen = node.piece.lineStarts.getAccumulatedValue(position.index); - if (offset === currentLineLen - 1) { - // charCodeAt becomes slow (single or even two digits ms) when the changed buffer is long - return this.nodeCharCodeAt(node, offset - 1) === 13/* \r */ && this.nodeCharCodeAt(node, offset) === 10 /* \n */; - } - return false; - } - - fixCRLFWithPrev(nextNode: TreeNode) { - if (nextNode === SENTINEL || nextNode.piece.lineFeedCnt === 0) { - return; - } - - if (nextNode.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { - return; - } - - if (this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { - let node = nextNode.prev(); - - if (node === SENTINEL || node.piece.lineFeedCnt === 0) { - return; - } - - if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13) { - this.fixCRLF(node, nextNode); - } - } - } - - fixCRLFWithNext(node: TreeNode) { - if (node === SENTINEL) { - return; - } - - if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13 /* \r */) { - let nextNode = node.next(); - if (nextNode !== SENTINEL && this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { - this.fixCRLF(node, nextNode); - } - } - } - - fixCRLF(prev: TreeNode, next: TreeNode) { - let nodesToDel = []; - // update node - prev.piece.length -= 1; - prev.piece.lineFeedCnt -= 1; - let lineStarts = prev.piece.lineStarts; - // lineStarts.values.length >= 2 due to a `\r` - lineStarts.removeValues(lineStarts.values.length - 1, 1); - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); - this.updateMetadata(prev, - 1, -1); - - if (prev.piece.length === 0) { - nodesToDel.push(prev); - } - - // update nextNode - next.piece.length -= 1; - next.piece.offset += 1; - next.piece.lineFeedCnt -= 1; - lineStarts = next.piece.lineStarts; - lineStarts.removeValues(0, 1); - this.updateMetadata(next, - 1, -1); - if (next.piece.length === 0) { - nodesToDel.push(next); - } - - // create new piece which contains \r\n - let startOffset = this._changeBuffer.length; - this._changeBuffer += '\r\n'; - const lineLengths = this.constructLineLengths('\r\n'); - let lineFeedCount = lineLengths.length - 1; - let piece = new Piece(false, startOffset, 2, lineFeedCount, lineLengths); - this.rbInsertRight(prev, piece); - // delete empty nodes - - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - } - - adjustCarriageReturnFromNext(value: string, node: TreeNode): boolean { - if (value.charCodeAt(value.length - 1) === 13) { - // inserted content ends with \r - let nextNode = node.next(); - if (nextNode !== SENTINEL) { - if (this.nodeCharCodeAt(nextNode, 0) === 10) { - // move `\n` forward - value += '\n'; - - if (nextNode.piece.length === 1) { - this.rbDelete(nextNode); - } else { - nextNode.piece.offset += 1; - nextNode.piece.length -= 1; - nextNode.piece.lineFeedCnt -= 1; - nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. - this.updateMetadata(nextNode, -1, -1); - } - return true; - } - } - } - - return false; - } - - nodeCharCodeAt(node: TreeNode, offset: number): number { - if (node.piece.lineFeedCnt < 1) { - return -1; - } - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - return buffer.charCodeAt(node.piece.offset + offset); - } - // #endregion - - // #endregion - - // #region Red Black Tree - - leftRotate(x: TreeNode) { - let y = x.right; - - // fix size_left - y.size_left += x.size_left + (x.piece ? x.piece.length : 0); - y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); - x.right = y.left; - - if (y.left !== SENTINEL) { - y.left.parent = x; - } - y.parent = x.parent; - if (x.parent === SENTINEL) { - this._root = y; - } else if (x.parent.left === x) { - x.parent.left = y; - } else { - x.parent.right = y; - } - y.left = x; - x.parent = y; - } - - rightRotate(y: TreeNode) { - let x = y.left; - y.left = x.right; - if (x.right !== SENTINEL) { - x.right.parent = y; - } - x.parent = y.parent; - - // fix size_left - y.size_left -= x.size_left + (x.piece ? x.piece.length : 0); - y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); - - if (y.parent === SENTINEL) { - this._root = x; - } else if (y === y.parent.right) { - y.parent.right = x; - } else { - y.parent.left = x; - } - - x.right = y; - y.parent = x; - } - - /** - * node node - * / \ / \ - * a b <---- a b - * / - * z - */ - rbInsertRight(node: TreeNode, p: Piece): TreeNode { - let z = new TreeNode(p, NodeColor.Red); - z.left = SENTINEL; - z.right = SENTINEL; - z.parent = SENTINEL; - z.size_left = 0; - z.lf_left = 0; - - let x = this._root; - if (x === SENTINEL) { - this._root = z; - setNodeColor(z, NodeColor.Black); - } else if (node.right === SENTINEL) { - node.right = z; - z.parent = node; - } else { - let nextNode = leftest(node.right); - nextNode.left = z; - z.parent = nextNode; - } - - this.fixInsert(z); - return z; - } - - /** - * node node - * / \ / \ - * a b ----> a b - * \ - * z - */ - rbInsertLeft(node: TreeNode, p: Piece): TreeNode { - let z = new TreeNode(p, NodeColor.Red); - z.left = SENTINEL; - z.right = SENTINEL; - z.parent = SENTINEL; - z.size_left = 0; - z.lf_left = 0; - - let x = this._root; - if (x === SENTINEL) { - this._root = z; - setNodeColor(z, NodeColor.Black); - } else if (node.left === SENTINEL) { - node.left = z; - z.parent = node; - } else { - let prevNode = righttest(node.left); // a - prevNode.right = z; - z.parent = prevNode; - } - - this.fixInsert(z); - return z; - } - - rbDelete(z: TreeNode) { - let x: TreeNode; - let y: TreeNode; - - if (z.left === SENTINEL) { - y = z; - x = y.right; - } else if (z.right === SENTINEL) { - y = z; - x = y.left; - } else { - y = leftest(z.right); - x = y.right; - } - - if (y === this._root) { - this._root = x; - - // if x is null, we are removing the only node - setNodeColor(x, NodeColor.Black); - - z.detach(); - resetSentinel(); - this._root.parent = SENTINEL; - - return; - } - - let yWasRed = (getNodeColor(y) === NodeColor.Red); - - if (y === y.parent.left) { - y.parent.left = x; - } else { - y.parent.right = x; - } - - if (y === z) { - x.parent = y.parent; - this.recomputeMetadata(x); - } else { - if (y.parent === z) { - x.parent = y; - } else { - x.parent = y.parent; - } - - // as we make changes to x's hierarchy, update size_left of subtree first - this.recomputeMetadata(x); - - y.left = z.left; - y.right = z.right; - y.parent = z.parent; - setNodeColor(y, getNodeColor(z)); - - if (z === this._root) { - this._root = y; - } else { - if (z === z.parent.left) { - z.parent.left = y; - } else { - z.parent.right = y; - } - } - - if (y.left !== SENTINEL) { - y.left.parent = y; - } - if (y.right !== SENTINEL) { - y.right.parent = y; - } - // update metadata - // we replace z with y, so in this sub tree, the length change is z.item.length - y.size_left = z.size_left; - y.lf_left = z.lf_left; - this.recomputeMetadata(y); - } - - z.detach(); - - if (x.parent.left === x) { - let newSizeLeft = calculateSize(x); - let newLFLeft = calculateLF(x); - if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) { - let delta = newSizeLeft - x.parent.size_left; - let lf_delta = newLFLeft - x.parent.lf_left; - x.parent.size_left = newSizeLeft; - x.parent.lf_left = newLFLeft; - this.updateMetadata(x.parent, delta, lf_delta); - } - } - - this.recomputeMetadata(x.parent); - - if (yWasRed) { - resetSentinel(); - return; - } - - // RB-DELETE-FIXUP - let w: TreeNode; - while (x !== this._root && getNodeColor(x) === NodeColor.Black) { - if (x === x.parent.left) { - w = x.parent.right; - - if (getNodeColor(w) === NodeColor.Red) { - setNodeColor(w, NodeColor.Black); - setNodeColor(x.parent, NodeColor.Red); - this.leftRotate(x.parent); - w = x.parent.right; - } - - if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { - setNodeColor(w, NodeColor.Red); - x = x.parent; - } else { - if (getNodeColor(w.right) === NodeColor.Black) { - setNodeColor(w.left, NodeColor.Black); - setNodeColor(w, NodeColor.Red); - this.rightRotate(w); - w = x.parent.right; - } - - setNodeColor(w, getNodeColor(x.parent)); - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(w.right, NodeColor.Black); - this.leftRotate(x.parent); - x = this._root; - } - } else { - w = x.parent.left; - - if (getNodeColor(w) === NodeColor.Red) { - setNodeColor(w, NodeColor.Black); - setNodeColor(x.parent, NodeColor.Red); - this.rightRotate(x.parent); - w = x.parent.left; - } - - if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) { - setNodeColor(w, NodeColor.Red); - x = x.parent; - - } else { - if (getNodeColor(w.left) === NodeColor.Black) { - setNodeColor(w.right, NodeColor.Black); - setNodeColor(w, NodeColor.Red); - this.leftRotate(w); - w = x.parent.left; - } - - setNodeColor(w, getNodeColor(x.parent)); - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(w.left, NodeColor.Black); - this.rightRotate(x.parent); - x = this._root; - } - } - } - setNodeColor(x, NodeColor.Black); - resetSentinel(); - } - - fixInsert(x: TreeNode) { - this.recomputeMetadata(x); - - while (x !== this._root && getNodeColor(x.parent) === NodeColor.Red) { - if (x.parent === x.parent.parent.left) { - const y = x.parent.parent.right; - - if (getNodeColor(y) === NodeColor.Red) { - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(y, NodeColor.Black); - setNodeColor(x.parent.parent, NodeColor.Red); - x = x.parent.parent; - } else { - if (x === x.parent.right) { - x = x.parent; - this.leftRotate(x); - } - - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(x.parent.parent, NodeColor.Red); - this.rightRotate(x.parent.parent); - } - } else { - const y = x.parent.parent.left; - - if (getNodeColor(y) === NodeColor.Red) { - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(y, NodeColor.Black); - setNodeColor(x.parent.parent, NodeColor.Red); - x = x.parent.parent; - } else { - if (x === x.parent.left) { - x = x.parent; - this.rightRotate(x); - } - setNodeColor(x.parent, NodeColor.Black); - setNodeColor(x.parent.parent, NodeColor.Red); - this.leftRotate(x.parent.parent); - } - } - } - - setNodeColor(this._root, NodeColor.Black); - } - - updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { - // node length change, we need to update the roots of all subtrees containing this node. - while (x !== this._root && x !== SENTINEL) { - if (x.parent.left === x) { - x.parent.size_left += delta; - x.parent.lf_left += lineFeedCntDelta; - } - - x = x.parent; - } - } - - recomputeMetadata(x: TreeNode) { - let delta = 0; - let lf_delta = 0; - if (x === this._root) { - return; - } - - if (delta === 0) { - // go upwards till the node whose left subtree is changed. - while (x !== this._root && x === x.parent.right) { - x = x.parent; - } - - if (x === this._root) { - // well, it means we add a node to the end (inorder) - return; - } - - // x is the node whose right subtree is changed. - x = x.parent; - - delta = calculateSize(x.left) - x.size_left; - lf_delta = calculateLF(x.left) - x.lf_left; - x.size_left += delta; - x.lf_left += lf_delta; - } - - // go upwards till root. O(logN) - while (x !== this._root && (delta !== 0 || lf_delta !== 0)) { - if (x.parent.left === x) { - x.parent.size_left += delta; - x.parent.lf_left += lf_delta; - } - - x = x.parent; - } - } - - getContentOfSubTree(node: TreeNode): string { - if (node === SENTINEL) { - return ''; - } - - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - let currentContent = buffer.substr(node.piece.offset, node.piece.length); - - return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); - } - - constructLineLengths(chunk: string): Uint32Array { - let lineStarts = constructLineStarts(chunk); - const lineLengths = new Uint32Array(lineStarts.length); - for (let i = 1; i < lineStarts.length; i++) { - lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; - } - - lineLengths[lineStarts.length - 1] = chunk.length - lineStarts[lineStarts.length - 1]; - - return lineLengths; - } - - // #endregion - // #region helper /** * Assumes `operations` are validated and sorted ascending From c167bf477cdff8f3246217109b194296019d9094 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 8 Jan 2018 11:38:02 +0100 Subject: [PATCH 026/710] Adopt list commands for editor's "Find References" peek UI (fixes #21692) --- .../referenceSearch/referenceSearch.ts | 30 +++- .../referenceSearch/referencesController.ts | 10 +- .../referenceSearch/referencesWidget.ts | 129 ++++++------------ 3 files changed, 72 insertions(+), 97 deletions(-) diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts index c5d0970fc5e..a7daa77b6e1 100644 --- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts @@ -18,14 +18,15 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions'; import { Location, ReferenceProviderRegistry } from 'vs/editor/common/modes'; import { PeekContext, getOuterEditor } from './peekViewWidget'; -import { ReferencesController, RequestOptions, ctxReferenceSearchVisible } from './referencesController'; -import { ReferencesModel } from './referencesModel'; +import { ReferencesController, RequestOptions, ctxReferenceSearchVisible, ctxReferenceSearchTreeFocused } from './referencesController'; +import { ReferencesModel, OneReference } from './referencesModel'; import { asWinJsPromise } from 'vs/base/common/async'; import { onUnexpectedExternalError } from 'vs/base/common/errors'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { ITextModel } from 'vs/editor/common/model'; +import { IListService } from 'vs/platform/list/browser/listService'; const defaultReferenceSearchOptions: RequestOptions = { getMetaTitle(model) { @@ -166,6 +167,19 @@ CommandsRegistry.registerCommand({ }); function closeActiveReferenceSearch(accessor: ServicesAccessor, args: any) { + withController(accessor, controller => controller.closeWidget()); +} + +function openReferenceToSide(accessor: ServicesAccessor, args: any) { + const listService = accessor.get(IListService); + + const focus = listService.lastFocusedList && listService.lastFocusedList.getFocus(); + if (focus instanceof OneReference) { + withController(accessor, controller => controller.openReference(focus, true)); + } +} + +function withController(accessor: ServicesAccessor, fn: (controller: ReferencesController) => void): void { var outerEditor = getOuterEditor(accessor); if (!outerEditor) { return; @@ -176,12 +190,12 @@ function closeActiveReferenceSearch(accessor: ServicesAccessor, args: any) { return; } - controller.closeWidget(); + fn(controller); } KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'closeReferenceSearch', - weight: KeybindingsRegistry.WEIGHT.editorContrib(50), + weight: KeybindingsRegistry.WEIGHT.editorContrib(350), primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape], when: ContextKeyExpr.and(ctxReferenceSearchVisible, ContextKeyExpr.not('config.editor.stablePeek')), @@ -197,6 +211,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ handler: closeActiveReferenceSearch }); +KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: 'openReferenceToSide', + weight: KeybindingsRegistry.WEIGHT.editorContrib(350), + primary: KeyMod.CtrlCmd | KeyCode.Enter, + secondary: [KeyMod.WinCtrl | KeyCode.Enter], + when: ContextKeyExpr.and(ctxReferenceSearchVisible, ctxReferenceSearchTreeFocused), + handler: openReferenceToSide +}); export function provideReferences(model: ITextModel, position: Position): TPromise { diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts index fac06e8beb0..6b084b3bcf9 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesController.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts @@ -28,6 +28,7 @@ import { Position } from 'vs/editor/common/core/position'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; export const ctxReferenceSearchVisible = new RawContextKey('referenceSearchVisible', false); +export const ctxReferenceSearchTreeFocused = new RawContextKey('referenceSearchTreeFocused', false); export interface RequestOptions { getMetaTitle(model: ReferencesModel): string; @@ -46,6 +47,7 @@ export class ReferencesController implements editorCommon.IEditorContribution { private _ignoreModelChangeEvent = false; private _referenceSearchVisible: IContextKey; + private _referenceSearchTreeFocused: IContextKey; public static get(editor: ICodeEditor): ReferencesController { return editor.getContribution(ReferencesController.ID); @@ -66,6 +68,7 @@ export class ReferencesController implements editorCommon.IEditorContribution { ) { this._editor = editor; this._referenceSearchVisible = ctxReferenceSearchVisible.bindTo(contextKeyService); + this._referenceSearchTreeFocused = ctxReferenceSearchTreeFocused.bindTo(contextKeyService); } public getId(): string { @@ -126,7 +129,7 @@ export class ReferencesController implements editorCommon.IEditorContribution { break; } case 'side': - this._openReference(element, kind === 'side'); + this.openReference(element, kind === 'side'); break; case 'goto': if (options.onGoto) { @@ -138,6 +141,8 @@ export class ReferencesController implements editorCommon.IEditorContribution { } })); + this._disposables.push(this._widget.onDidChangeTreeDOMFocus(focus => this._referenceSearchTreeFocused.set(focus))); + const requestId = ++this._requestIdPool; modelPromise.then(model => { @@ -180,6 +185,7 @@ export class ReferencesController implements editorCommon.IEditorContribution { this._widget = null; } this._referenceSearchVisible.reset(); + this._referenceSearchTreeFocused.reset(); this._disposables = dispose(this._disposables); if (this._model) { this._model.dispose(); @@ -222,7 +228,7 @@ export class ReferencesController implements editorCommon.IEditorContribution { }); } - private _openReference(ref: OneReference, sideBySide: boolean): void { + public openReference(ref: OneReference, sideBySide: boolean): void { const { uri, range } = ref; this._editorService.openEditor({ resource: uri, diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index 04be05bbd5f..43fca73e846 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -24,7 +24,6 @@ import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge'; import { FileLabel } from 'vs/base/browser/ui/iconLabel/iconLabel'; import * as tree from 'vs/base/parts/tree/browser/tree'; import { DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; -import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { Range, IRange } from 'vs/editor/common/core/range'; @@ -42,6 +41,7 @@ import { IEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import URI from 'vs/base/common/uri'; import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model'; +import { WorkbenchTree } from 'vs/platform/list/browser/listService'; class DecorationsManager implements IDisposable { @@ -284,65 +284,6 @@ class Controller extends DefaultController { return false; } - public onEnter(tree: tree.ITree, event: IKeyboardEvent): boolean { - var element = tree.getFocus(); - if (element instanceof FileReferences) { - return this._expandCollapse(tree, element); - } - - var result = super.onEnter(tree, event); - if (event.ctrlKey || event.metaKey) { - this._onDidOpenToSide.fire(element); - } else { - this._onDidSelect.fire(element); - } - return result; - } - - public onUp(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onUp(tree, event); - this._fakeFocus(tree, event); - return true; - } - - public onPageUp(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onPageUp(tree, event); - this._fakeFocus(tree, event); - return true; - } - - public onLeft(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onLeft(tree, event); - this._fakeFocus(tree, event); - return true; - } - - public onDown(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onDown(tree, event); - this._fakeFocus(tree, event); - return true; - } - - public onPageDown(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onPageDown(tree, event); - this._fakeFocus(tree, event); - return true; - } - - public onRight(tree: tree.ITree, event: IKeyboardEvent): boolean { - super.onRight(tree, event); - this._fakeFocus(tree, event); - return true; - } - - private _fakeFocus(tree: tree.ITree, event: IKeyboardEvent): void { - // focus next item - var focus = tree.getFocus(); - tree.setSelection([focus]); - // send out event - this._onDidFocus.fire(focus); - } - dispose(): void { this._onDidFocus.dispose(); this._onDidSelect.dispose(); @@ -572,8 +513,9 @@ export class ReferenceWidget extends PeekViewWidget { private _disposeOnNewModel: IDisposable[] = []; private _callOnDispose: IDisposable[] = []; private _onDidSelectReference = new Emitter(); + private _onDidChangeTreeDOMFocus = new Emitter(); - private _tree: Tree; + private _tree: WorkbenchTree; private _treeContainer: Builder; private _sash: VSash; private _preview: ICodeEditor; @@ -620,6 +562,10 @@ export class ReferenceWidget extends PeekViewWidget { return this._onDidSelectReference.event; } + get onDidChangeTreeDOMFocus(): Event { + return this._onDidChangeTreeDOMFocus.event; + } + show(where: IRange) { this.editor.revealRangeInCenterIfOutsideViewport(where, editorCommon.ScrollType.Smooth); super.show(where, this.layoutData.heightInLines || 18); @@ -694,33 +640,34 @@ export class ReferenceWidget extends PeekViewWidget { accessibilityProvider: new AriaProvider() }; - // listen on selection and focus - this._disposables.push(controller.onDidFocus((element) => { - if (element instanceof OneReference) { - this._revealReference(element); - this._onDidSelectReference.fire({ element, kind: 'show', source: 'tree' }); - } - })); - - this._disposables.push(controller.onDidSelect((element: any) => { - if (element instanceof OneReference) { - this._onDidSelectReference.fire({ element, kind: 'goto', source: 'tree' }); - } - })); - this._disposables.push(controller.onDidOpenToSide((element: any) => { - if (element instanceof OneReference) { - this._onDidSelectReference.fire({ element, kind: 'side', source: 'tree' }); - } - })); - - var options = { - allowHorizontalScroll: false, + var options: tree.ITreeOptions = { twistiePixels: 20, - ariaLabel: nls.localize('treeAriaLabel', "References") + ariaLabel: nls.localize('treeAriaLabel', "References"), + keyboardSupport: false }; - this._tree = new Tree(div.getHTMLElement(), config, options); + + this._tree = this._instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), config, options); this._callOnDispose.push(attachListStyler(this._tree, this._themeService)); + // listen on selection and focus + var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => { + if (element instanceof OneReference) { + if (kind === 'show') { + this._revealReference(element); + } + this._onDidSelectReference.fire({ element, kind, source: 'tree' }); + } + }; + this._disposables.push(this._tree.onDidChangeFocus(event => onEvent(event.focus, 'show'))); + this._disposables.push(this._tree.onDidChangeSelection(event => onEvent(event.selection[0], event && event.payload && event.payload.origin === 'keyboard' ? 'goto' : 'show'))); + this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show'))); + this._disposables.push(controller.onDidSelect(event => onEvent(event.focus, 'goto'))); + this._disposables.push(controller.onDidOpenToSide(event => onEvent(event.focus, 'side'))); + + // listen to DOM focus changes + this._disposables.push(this._tree.onDidFocus(() => this._onDidChangeTreeDOMFocus.fire(true))); + this._disposables.push(this._tree.onDidBlur(() => this._onDidChangeTreeDOMFocus.fire(false))); + this._treeContainer = div.hide(); }); } @@ -754,7 +701,12 @@ export class ReferenceWidget extends PeekViewWidget { } public setSelection(selection: OneReference): TPromise { - return this._revealReference(selection); + return this._revealReference(selection).then(() => { + + // show in tree + this._tree.setSelection([selection]); + this._tree.setFocus(selection); + }); } public setModel(newModel: ReferencesModel): TPromise { @@ -818,7 +770,7 @@ export class ReferenceWidget extends PeekViewWidget { return undefined; } - private _revealReference(reference: OneReference) { + private _revealReference(reference: OneReference): TPromise { // Update widget header if (reference.uri.scheme !== Schemas.inMemory) { @@ -853,11 +805,6 @@ export class ReferenceWidget extends PeekViewWidget { this._preview.setModel(this._previewNotAvailableMessage); ref.dispose(); } - - // show in tree - this._tree.setSelection([reference]); - this._tree.setFocus(reference); - }, onUnexpectedError); } } From 278b78fc5c81258c26a6e3d553edae58e38ca152 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 8 Jan 2018 15:46:58 +0100 Subject: [PATCH 027/710] cleanup --- .../contrib/referenceSearch/referenceSearch.ts | 13 ++++++++----- .../referenceSearch/referencesController.ts | 6 ------ .../contrib/referenceSearch/referencesWidget.ts | 14 +++++--------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts index a7daa77b6e1..6123655623b 100644 --- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts @@ -18,7 +18,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import { registerEditorAction, ServicesAccessor, EditorAction, registerEditorContribution, registerDefaultLanguageCommand } from 'vs/editor/browser/editorExtensions'; import { Location, ReferenceProviderRegistry } from 'vs/editor/common/modes'; import { PeekContext, getOuterEditor } from './peekViewWidget'; -import { ReferencesController, RequestOptions, ctxReferenceSearchVisible, ctxReferenceSearchTreeFocused } from './referencesController'; +import { ReferencesController, RequestOptions, ctxReferenceSearchVisible } from './referencesController'; import { ReferencesModel, OneReference } from './referencesModel'; import { asWinJsPromise } from 'vs/base/common/async'; import { onUnexpectedExternalError } from 'vs/base/common/errors'; @@ -27,6 +27,7 @@ import { EmbeddedCodeEditorWidget } from 'vs/editor/browser/widget/embeddedCodeE import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { ITextModel } from 'vs/editor/common/model'; import { IListService } from 'vs/platform/list/browser/listService'; +import { ctxReferenceWidgetSearchTreeFocused } from 'vs/editor/contrib/referenceSearch/referencesWidget'; const defaultReferenceSearchOptions: RequestOptions = { getMetaTitle(model) { @@ -195,7 +196,7 @@ function withController(accessor: ServicesAccessor, fn: (controller: ReferencesC KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'closeReferenceSearch', - weight: KeybindingsRegistry.WEIGHT.editorContrib(350), + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50), primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape], when: ContextKeyExpr.and(ctxReferenceSearchVisible, ContextKeyExpr.not('config.editor.stablePeek')), @@ -213,10 +214,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'openReferenceToSide', - weight: KeybindingsRegistry.WEIGHT.editorContrib(350), + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50), primary: KeyMod.CtrlCmd | KeyCode.Enter, - secondary: [KeyMod.WinCtrl | KeyCode.Enter], - when: ContextKeyExpr.and(ctxReferenceSearchVisible, ctxReferenceSearchTreeFocused), + mac: { + primary: KeyMod.WinCtrl | KeyCode.Enter + }, + when: ContextKeyExpr.and(ctxReferenceSearchVisible, ctxReferenceWidgetSearchTreeFocused), handler: openReferenceToSide }); diff --git a/src/vs/editor/contrib/referenceSearch/referencesController.ts b/src/vs/editor/contrib/referenceSearch/referencesController.ts index 6b084b3bcf9..3dba8e0f90e 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesController.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesController.ts @@ -28,7 +28,6 @@ import { Position } from 'vs/editor/common/core/position'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; export const ctxReferenceSearchVisible = new RawContextKey('referenceSearchVisible', false); -export const ctxReferenceSearchTreeFocused = new RawContextKey('referenceSearchTreeFocused', false); export interface RequestOptions { getMetaTitle(model: ReferencesModel): string; @@ -47,7 +46,6 @@ export class ReferencesController implements editorCommon.IEditorContribution { private _ignoreModelChangeEvent = false; private _referenceSearchVisible: IContextKey; - private _referenceSearchTreeFocused: IContextKey; public static get(editor: ICodeEditor): ReferencesController { return editor.getContribution(ReferencesController.ID); @@ -68,7 +66,6 @@ export class ReferencesController implements editorCommon.IEditorContribution { ) { this._editor = editor; this._referenceSearchVisible = ctxReferenceSearchVisible.bindTo(contextKeyService); - this._referenceSearchTreeFocused = ctxReferenceSearchTreeFocused.bindTo(contextKeyService); } public getId(): string { @@ -141,8 +138,6 @@ export class ReferencesController implements editorCommon.IEditorContribution { } })); - this._disposables.push(this._widget.onDidChangeTreeDOMFocus(focus => this._referenceSearchTreeFocused.set(focus))); - const requestId = ++this._requestIdPool; modelPromise.then(model => { @@ -185,7 +180,6 @@ export class ReferencesController implements editorCommon.IEditorContribution { this._widget = null; } this._referenceSearchVisible.reset(); - this._referenceSearchTreeFocused.reset(); this._disposables = dispose(this._disposables); if (this._model) { this._model.dispose(); diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index 43fca73e846..ba4406017a6 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -42,6 +42,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import URI from 'vs/base/common/uri'; import { TrackedRangeStickiness, IModelDeltaDecoration } from 'vs/editor/common/model'; import { WorkbenchTree } from 'vs/platform/list/browser/listService'; +import { RawContextKey } from 'vs/platform/contextkey/common/contextkey'; class DecorationsManager implements IDisposable { @@ -502,6 +503,8 @@ export interface SelectionEvent { element: OneReference; } +export const ctxReferenceWidgetSearchTreeFocused = new RawContextKey('referenceSearchTreeFocused', true); + /** * ZoneWidget that is shown inside the editor */ @@ -513,7 +516,6 @@ export class ReferenceWidget extends PeekViewWidget { private _disposeOnNewModel: IDisposable[] = []; private _callOnDispose: IDisposable[] = []; private _onDidSelectReference = new Emitter(); - private _onDidChangeTreeDOMFocus = new Emitter(); private _tree: WorkbenchTree; private _treeContainer: Builder; @@ -562,10 +564,6 @@ export class ReferenceWidget extends PeekViewWidget { return this._onDidSelectReference.event; } - get onDidChangeTreeDOMFocus(): Event { - return this._onDidChangeTreeDOMFocus.event; - } - show(where: IRange) { this.editor.revealRangeInCenterIfOutsideViewport(where, editorCommon.ScrollType.Smooth); super.show(where, this.layoutData.heightInLines || 18); @@ -649,6 +647,8 @@ export class ReferenceWidget extends PeekViewWidget { this._tree = this._instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), config, options); this._callOnDispose.push(attachListStyler(this._tree, this._themeService)); + ctxReferenceWidgetSearchTreeFocused.bindTo(this._tree.contextKeyService); + // listen on selection and focus var onEvent = (element: any, kind: 'show' | 'goto' | 'side') => { if (element instanceof OneReference) { @@ -664,10 +664,6 @@ export class ReferenceWidget extends PeekViewWidget { this._disposables.push(controller.onDidSelect(event => onEvent(event.focus, 'goto'))); this._disposables.push(controller.onDidOpenToSide(event => onEvent(event.focus, 'side'))); - // listen to DOM focus changes - this._disposables.push(this._tree.onDidFocus(() => this._onDidChangeTreeDOMFocus.fire(true))); - this._disposables.push(this._tree.onDidBlur(() => this._onDidChangeTreeDOMFocus.fire(false))); - this._treeContainer = div.hide(); }); } From 96e79f729e1e63e5a09102793aabbc1963ddbe71 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 8 Jan 2018 08:24:26 -0800 Subject: [PATCH 028/710] disable failing CR test cases temporarily for custom build. will revert later. --- .../multicursor/test/multicursor.test.ts | 60 +++--- src/vs/editor/test/common/model/model.test.ts | 124 +++++------ .../test/common/model/textModel.test.ts | 4 +- .../test/common/model/textModelSearch.test.ts | 192 +++++++++--------- 4 files changed, 190 insertions(+), 190 deletions(-) diff --git a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts index 56a43c01f36..f57b5dfd740 100644 --- a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts +++ b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts @@ -10,8 +10,8 @@ import { Selection } from 'vs/editor/common/core/selection'; import { Range } from 'vs/editor/common/core/range'; import { InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, SelectHighlightsAction, AddSelectionToNextFindMatchAction } from 'vs/editor/contrib/multicursor/multicursor'; import { Handler } from 'vs/editor/common/editorCommon'; -import { EndOfLineSequence } from 'vs/editor/common/model'; -import { IStorageService } from 'vs/platform/storage/common/storage'; +/* import { EndOfLineSequence } from 'vs/editor/common/model'; + */import { IStorageService } from 'vs/platform/storage/common/storage'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { CommonFindController } from 'vs/editor/contrib/find/findController'; @@ -209,41 +209,41 @@ suite('Multicursor selection', () => { }); }); - test('issue #23541: Multiline Ctrl+D does not work in CRLF files', () => { - withTestCodeEditor([ - '', - 'qwe', - 'rty', - '', - 'qwe', - '', - 'rty', - 'qwe', - 'rty' - ], { serviceCollection: serviceCollection }, (editor, cursor) => { + /* test('issue #23541: Multiline Ctrl+D does not work in CRLF files', () => { + withTestCodeEditor([ + '', + 'qwe', + 'rty', + '', + 'qwe', + '', + 'rty', + 'qwe', + 'rty' + ], { serviceCollection: serviceCollection }, (editor, cursor) => { - editor.getModel().setEOL(EndOfLineSequence.CRLF); + editor.getModel().setEOL(EndOfLineSequence.CRLF); - let findController = editor.registerAndInstantiateContribution(CommonFindController); - let multiCursorSelectController = editor.registerAndInstantiateContribution(MultiCursorSelectionController); - let addSelectionToNextFindMatch = new AddSelectionToNextFindMatchAction(); + let findController = editor.registerAndInstantiateContribution(CommonFindController); + let multiCursorSelectController = editor.registerAndInstantiateContribution(MultiCursorSelectionController); + let addSelectionToNextFindMatch = new AddSelectionToNextFindMatchAction(); - editor.setSelection(new Selection(2, 1, 3, 4)); + editor.setSelection(new Selection(2, 1, 3, 4)); - addSelectionToNextFindMatch.run(null, editor); - assert.deepEqual(editor.getSelections().map(fromRange), [ - [2, 1, 3, 4], - [8, 1, 9, 4] - ]); + addSelectionToNextFindMatch.run(null, editor); + assert.deepEqual(editor.getSelections().map(fromRange), [ + [2, 1, 3, 4], + [8, 1, 9, 4] + ]); - editor.trigger('test', 'removeSecondaryCursors', null); + editor.trigger('test', 'removeSecondaryCursors', null); - assert.deepEqual(fromRange(editor.getSelection()), [2, 1, 3, 4]); + assert.deepEqual(fromRange(editor.getSelection()), [2, 1, 3, 4]); - multiCursorSelectController.dispose(); - findController.dispose(); - }); - }); + multiCursorSelectController.dispose(); + findController.dispose(); + }); + }); */ function testMulticursor(text: string[], callback: (editor: TestCodeEditor, findController: CommonFindController) => void): void { withTestCodeEditor(text, { serviceCollection: serviceCollection }, (editor, cursor) => { diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index 92b7e5b714a..6402457ca3d 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -10,7 +10,7 @@ import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { ModelRawContentChangedEvent, ModelRawFlush, ModelRawLineChanged, - ModelRawLinesDeleted, ModelRawLinesInserted + /* ModelRawLinesDeleted, ModelRawLinesInserted */ } from 'vs/editor/common/model/textModelEvents'; import { TextModel } from 'vs/editor/common/model/textModel'; @@ -118,7 +118,7 @@ suite('Editor Model - Model', () => { )); }); - test('model insert text with one newline eventing', () => { + /* test('model insert text with one newline eventing', () => { let e: ModelRawContentChangedEvent = null; thisModel.onDidChangeRawContent((_e) => { if (e !== null) { @@ -137,7 +137,7 @@ suite('Editor Model - Model', () => { false, false )); - }); + }); */ // --------- delete text @@ -196,24 +196,24 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 1))]); }); - test('model delete text from one line eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; - }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'y First Line'), - ], - 2, - false, - false - )); - }); + /* test('model delete text from one line eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; + }); + thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'y First Line'), + ], + 2, + false, + false + )); + }); */ test('model delete all text from a line eventing', () => { let e: ModelRawContentChangedEvent = null; @@ -234,48 +234,48 @@ suite('Editor Model - Model', () => { )); }); - test('model delete text from two lines eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; + /* test('model delete text from two lines eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; + }); + thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'My '), + new ModelRawLineChanged(1, 'My Second Line'), + new ModelRawLinesDeleted(2, 2), + ], + 2, + false, + false + )); }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'My '), - new ModelRawLineChanged(1, 'My Second Line'), - new ModelRawLinesDeleted(2, 2), - ], - 2, - false, - false - )); - }); - test('model delete text from many lines eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; + test('model delete text from many lines eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; + }); + thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'My '), + new ModelRawLineChanged(1, 'My Third Line'), + new ModelRawLinesDeleted(2, 3), + ], + 2, + false, + false + )); }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'My '), - new ModelRawLineChanged(1, 'My Third Line'), - new ModelRawLinesDeleted(2, 3), - ], - 2, - false, - false - )); - }); - + */ // --------- getValueInRange test('getValueInRange', () => { @@ -293,7 +293,7 @@ suite('Editor Model - Model', () => { // --------- getValueLengthInRange - test('getValueLengthInRange', () => { + /* test('getValueLengthInRange', () => { assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length); @@ -304,7 +304,7 @@ suite('Editor Model - Model', () => { assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n Third Line\n'.length); - }); + }); */ // --------- setValue test('setValue eventing', () => { diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts index 323ca9886b3..fc5ebf404da 100644 --- a/src/vs/editor/test/common/model/textModel.test.ts +++ b/src/vs/editor/test/common/model/textModel.test.ts @@ -150,7 +150,7 @@ suite('TextModelData.fromString', () => { suite('Editor Model - TextModel', () => { - test('getValueLengthInRange', () => { + /* test('getValueLengthInRange', () => { var m = TextModel.createFromString('My First Line\r\nMy Second Line\r\nMy Third Line'); assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length); @@ -177,7 +177,7 @@ suite('Editor Model - TextModel', () => { assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\nMy Second Line\n'.length); assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\nMy Second Line\nMy Third Line'.length); assert.equal(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\nMy Second Line\nMy Third Line'.length); - }); + }); */ test('guess indentation 1', () => { diff --git a/src/vs/editor/test/common/model/textModelSearch.test.ts b/src/vs/editor/test/common/model/textModelSearch.test.ts index 175c90aac7f..1d5327b5215 100644 --- a/src/vs/editor/test/common/model/textModelSearch.test.ts +++ b/src/vs/editor/test/common/model/textModelSearch.test.ts @@ -168,103 +168,103 @@ suite('TextModelSearch', () => { ); }); - test('multiline find 1', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - 'text\\n', true, false, null, - [ - [1, 16, 2, 1], - [2, 16, 3, 1], - ] - ); - }); + /* test('multiline find 1', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + 'text\\n', true, false, null, + [ + [1, 16, 2, 1], + [2, 16, 3, 1], + ] + ); + }); - test('multiline find 2', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - 'text\\nJust', true, false, null, - [ - [1, 16, 2, 5] - ] - ); - }); + test('multiline find 2', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + 'text\\nJust', true, false, null, + [ + [1, 16, 2, 5] + ] + ); + }); - test('multiline find 3', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - '\\nagain', true, false, null, - [ - [3, 16, 4, 6] - ] - ); - }); + test('multiline find 3', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + '\\nagain', true, false, null, + [ + [3, 16, 4, 6] + ] + ); + }); - test('multiline find 4', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - '.*\\nJust.*\\n', true, false, null, - [ - [1, 1, 3, 1] - ] - ); - }); + test('multiline find 4', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + '.*\\nJust.*\\n', true, false, null, + [ + [1, 1, 3, 1] + ] + ); + }); - test('multiline find with line beginning regex', () => { - assertFindMatches( - [ - 'if', - 'else', - '', - 'if', - 'else' - ].join('\n'), - '^if\\nelse', true, false, null, - [ - [1, 1, 2, 5], - [4, 1, 5, 5] - ] - ); - }); + test('multiline find with line beginning regex', () => { + assertFindMatches( + [ + 'if', + 'else', + '', + 'if', + 'else' + ].join('\n'), + '^if\\nelse', true, false, null, + [ + [1, 1, 2, 5], + [4, 1, 5, 5] + ] + ); + }); - test('matching empty lines using boundary expression', () => { - assertFindMatches( - [ - 'if', - '', - 'else', - ' ', - 'if', - ' ', - 'else' - ].join('\n'), - '^\\s*$\\n', true, false, null, - [ - [2, 1, 3, 1], - [4, 1, 5, 1], - [6, 1, 7, 1] - ] - ); - }); + test('matching empty lines using boundary expression', () => { + assertFindMatches( + [ + 'if', + '', + 'else', + ' ', + 'if', + ' ', + 'else' + ].join('\n'), + '^\\s*$\\n', true, false, null, + [ + [2, 1, 3, 1], + [4, 1, 5, 1], + [6, 1, 7, 1] + ] + ); + }); */ test('matching lines starting with A and ending with B', () => { assertFindMatches( @@ -282,7 +282,7 @@ suite('TextModelSearch', () => { ); }); - test('multiline find with line ending regex', () => { + /* test('multiline find with line ending regex', () => { assertFindMatches( [ 'if', @@ -298,7 +298,7 @@ suite('TextModelSearch', () => { [5, 5, 6, 5] ] ); - }); + }); */ test('issue #4836 - ^.*$', () => { assertFindMatches( @@ -320,7 +320,7 @@ suite('TextModelSearch', () => { ); }); - test('multiline find for non-regex string', () => { + /* test('multiline find for non-regex string', () => { assertFindMatches( [ 'Just some text text', @@ -335,7 +335,7 @@ suite('TextModelSearch', () => { [2, 11, 3, 5], ] ); - }); + }); */ test('issue #3623: Match whole word does not work for not latin characters', () => { assertFindMatches( From 78cebea1e927a92b34913574bbdabe4bd6f3b293 Mon Sep 17 00:00:00 2001 From: Sean Poulter Date: Mon, 8 Jan 2018 14:03:19 -0500 Subject: [PATCH 029/710] Add note to differentiate btw TextDoc & TextEditor These are some of the things I wish I had known before using the TextDocument event listeners. cc @jrieken, Microsoft/vscode#40653 --- src/vs/vscode.d.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 515a5e62cfc..dabc8520277 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -5418,11 +5418,23 @@ declare module 'vscode' { /** * An event that is emitted when a [text document](#TextDocument) is opened. + * + * To add an event listener when a visible text document is opened, use the [TextEditor](#TextEditor) events in the + * [window](#_window) namespace. Note that: + * + * - The event is emitted before the [document](#TextDocument) is updated in the + * [active text editor](#window.activeTextEditor) + * - When a [text document](#TextDocument) is already open (e.g.: open in another [visible text editor](#window.visibleTextEditors)) this event is not emitted + * */ export const onDidOpenTextDocument: Event; /** * An event that is emitted when a [text document](#TextDocument) is disposed. + * + * To add an event listener when a visible text document is closed, use the [TextEditor](#TextEditor) events in the + * [window](#_window) namespace. Note that this event is not emitted when a [text document]#TextDocument is closed + * but remains open in another [visible text editor](#window.visibleTextEditors). */ export const onDidCloseTextDocument: Event; From d6a2cf416878117cffdff18b46a1cd291c60a170 Mon Sep 17 00:00:00 2001 From: Mathieu Bruguier Date: Mon, 8 Jan 2018 15:22:20 -0800 Subject: [PATCH 030/710] Clarified documentation for Position functions --- src/vs/vscode.d.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 515a5e62cfc..44d842b4537 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -261,7 +261,7 @@ declare module 'vscode' { constructor(line: number, character: number); /** - * Check if `other` is before this position. + * Check if this position is before `other`. * * @param other A position. * @return `true` if position is on a smaller line @@ -270,7 +270,7 @@ declare module 'vscode' { isBefore(other: Position): boolean; /** - * Check if `other` is before or equal to this position. + * Check if this position is before or equal to `other`. * * @param other A position. * @return `true` if position is on a smaller line @@ -279,7 +279,7 @@ declare module 'vscode' { isBeforeOrEqual(other: Position): boolean; /** - * Check if `other` is after this position. + * Check if this position is after `other`. * * @param other A position. * @return `true` if position is on a greater line @@ -288,7 +288,7 @@ declare module 'vscode' { isAfter(other: Position): boolean; /** - * Check if `other` is after or equal to this position. + * Check if this position is after or equal to `other`. * * @param other A position. * @return `true` if position is on a greater line @@ -297,7 +297,7 @@ declare module 'vscode' { isAfterOrEqual(other: Position): boolean; /** - * Check if `other` equals this position. + * Check if this is position is equal to `other`. * * @param other A position. * @return `true` if the line and character of the given position are equal to From ec6416339e83387e234fea75f768855cb4593a0d Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 8 Jan 2018 16:56:03 -0800 Subject: [PATCH 031/710] benchmarks --- .../common/model/benchmark/edits.benchmark.ts | 28 ++++++++ .../model/benchmark/modelbuilder.benchmark.ts | 32 +++++++++ .../common/model/benchmark/read.benchmark.ts | 43 ++++++++++++ .../test/common/model/benchmark/util.ts | 66 +++++++++++++++++++ .../linesTextBufferBuilderAuto.test.ts | 6 +- 5 files changed, 172 insertions(+), 3 deletions(-) create mode 100644 src/vs/editor/test/common/model/benchmark/edits.benchmark.ts create mode 100644 src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts create mode 100644 src/vs/editor/test/common/model/benchmark/read.benchmark.ts create mode 100644 src/vs/editor/test/common/model/benchmark/util.ts diff --git a/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts b/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts new file mode 100644 index 00000000000..5a2fb86ec2b --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; +import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model'; +import { randomEdits, createMockText, createMockBuffer } from 'vs/editor/test/common/model/benchmark/util'; + +let modelBuildBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { + console.time(id); + for (let i = 0, len = edits.length; i < len; i++) { + buffer.applyEdits([edits[i]], false); + } + console.timeEnd(id); +}; + +let text = createMockText(1000, 0, 10); + +for (let i of [10, 100, 1000]) { + let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); + let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + let edits = randomEdits(text, i); + modelBuildBenchmark(`line text model builder ${i}\t`, linesTextBuffer, edits); + modelBuildBenchmark(`piece table model builder ${i}\t`, pieceTableTextBuffer, edits); +} diff --git a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts new file mode 100644 index 00000000000..4573b520379 --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -0,0 +1,32 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; +import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { ITextBufferBuilder } from 'vs/editor/common/model'; +import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/benchmark/util'; + +let linesTextBufferBuilder = new LinesTextBufferBuilder(); +let pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); +let chunks = []; + +for (let i = 0; i < 1000; i++) { + chunks.push(generateRandomChunkWithLF(16 * 1000, 64 * 1000)); +} + +let modelBuildBenchmark = function (id: string, builder: ITextBufferBuilder, chunkCnt: number) { + console.time(id); + for (let i = 0, len = Math.min(chunkCnt, chunks.length); i < len; i++) { + builder.acceptChunk(chunks[i]); + } + builder.finish(); + console.timeEnd(id); +}; + +for (let i of [10, 100, 1000]) { + modelBuildBenchmark(`line text model builder ${i}`, linesTextBufferBuilder, i); + modelBuildBenchmark(`piece table model builder ${i}`, pieceTableTextBufferBuilder, i); +} diff --git a/src/vs/editor/test/common/model/benchmark/read.benchmark.ts b/src/vs/editor/test/common/model/benchmark/read.benchmark.ts new file mode 100644 index 00000000000..f87b631135d --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/read.benchmark.ts @@ -0,0 +1,43 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; +import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { ITextBuffer } from 'vs/editor/common/model'; +import { randomEdits, createMockBuffer, createMockText } from 'vs/editor/test/common/model/benchmark/util'; + +let readLines = function (id: string, buffer: ITextBuffer) { + console.time(id); + for (let i = 0, len = buffer.getLineCount(); i < len; i++) { + var str = buffer.getLineContent(i + 1); + let firstChar = str.charCodeAt(0); + let lastChar = str.charCodeAt(str.length - 1); + firstChar = firstChar - lastChar; + lastChar = firstChar + lastChar; + firstChar = lastChar - firstChar; + } + console.timeEnd(id); +}; + +let text = createMockText(1000, 0, 50); +let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); +let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + +readLines('line text buffer', linesTextBuffer); +readLines('piece table text buffer', pieceTableTextBuffer); + +for (let i of [10, 100, 1000]) { + let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); + let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + let edits = randomEdits(text, i); + + for (let i = 0, len = edits.length; i < len; i++) { + linesTextBuffer.applyEdits([edits[i]], false); + pieceTableTextBuffer.applyEdits([edits[i]], false); + } + readLines(`line text buffer after ${i} edits`, linesTextBuffer); + readLines(`piece table text buffer after ${i} edits`, pieceTableTextBuffer); +} diff --git a/src/vs/editor/test/common/model/benchmark/util.ts b/src/vs/editor/test/common/model/benchmark/util.ts new file mode 100644 index 00000000000..2fe3911201f --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/util.ts @@ -0,0 +1,66 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { IIdentifiedSingleEditOperation, ITextBufferBuilder, DefaultEndOfLine, ITextBuffer } from 'vs/editor/common/model'; +import { Range } from 'vs/editor/common/core/range'; +import { getRandomString, getRandomInt, getRandomEOLSequence } from 'vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test'; +import { CharCode } from 'vs/base/common/charCode'; + +export function randomEdits(str: string, editCnt: number): IIdentifiedSingleEditOperation[] { + let lines = str.split(/\r\n|\r|\n/); + let ops: IIdentifiedSingleEditOperation[] = []; + + for (let i = 0; i < editCnt; i++) { + let line = getRandomInt(1, lines.length); + let startColumn = getRandomInt(1, lines[line - 1].length + 1); + let endColumn = getRandomInt(startColumn, lines[line - 1].length + 1); + let text: string = ''; + if (Math.random() < .5) { + text = getRandomString(5, 10); + } + + ops.push({ + text: text, + range: new Range(line, startColumn, line, endColumn) + }); + lines[line - 1] = lines[line - 1].substring(0, startColumn - 1) + text + lines[line - 1].substring(endColumn - 1); + } + + return ops; +} + +export function createMockText(lineCount: number, minColumn: number, maxColumn: number) { + let fixedEOL = getRandomEOLSequence(); + let lines: string[] = []; + for (let i = 0; i < lineCount; i++) { + if (i !== 0) { + lines.push(fixedEOL); + } + lines.push(getRandomString(minColumn, maxColumn)); + } + return lines.join(''); +} + +export function createMockBuffer(str: string, bufferBuilder: ITextBufferBuilder): ITextBuffer { + bufferBuilder.acceptChunk(str); + let bufferFactory = bufferBuilder.finish(); + let buffer = bufferFactory.create(DefaultEndOfLine.LF); + return buffer; +} + +export function generateRandomChunkWithLF(minLength: number, maxLength: number): string { + let length = getRandomInt(minLength, maxLength); + let r = ''; + for (let i = 0; i < length; i++) { + let randomI = getRandomInt(0, CharCode.z - CharCode.a + 1); + if (randomI === 0) { + r += '\n'; + } else { + r += String.fromCharCode(randomI + CharCode.a - 1); + } + } + return r; +} \ No newline at end of file diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts index 9b1c70f96b1..63218d9c7e5 100644 --- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts +++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts @@ -21,11 +21,11 @@ suite('ModelBuilder Auto Tests', () => { }); -function getRandomInt(min: number, max: number): number { +export function getRandomInt(min: number, max: number): number { return Math.floor(Math.random() * (max - min + 1)) + min; } -function getRandomEOLSequence(): string { +export function getRandomEOLSequence(): string { let rnd = getRandomInt(1, 3); if (rnd === 1) { return '\n'; @@ -36,7 +36,7 @@ function getRandomEOLSequence(): string { return '\r\n'; } -function getRandomString(minLength: number, maxLength: number): string { +export function getRandomString(minLength: number, maxLength: number): string { let length = getRandomInt(minLength, maxLength); let r = ''; for (let i = 0; i < length; i++) { From 2d12f2e1422ce3ce1d45e06b0da6bd9453172c5e Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 8 Jan 2018 17:00:47 -0800 Subject: [PATCH 032/710] Revert "disable failing CR test cases temporarily for custom build. will revert later." This reverts commit 96e79f729e1e63e5a09102793aabbc1963ddbe71. --- .../multicursor/test/multicursor.test.ts | 60 +++--- src/vs/editor/test/common/model/model.test.ts | 124 +++++------ .../test/common/model/textModel.test.ts | 4 +- .../test/common/model/textModelSearch.test.ts | 192 +++++++++--------- 4 files changed, 190 insertions(+), 190 deletions(-) diff --git a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts index f57b5dfd740..56a43c01f36 100644 --- a/src/vs/editor/contrib/multicursor/test/multicursor.test.ts +++ b/src/vs/editor/contrib/multicursor/test/multicursor.test.ts @@ -10,8 +10,8 @@ import { Selection } from 'vs/editor/common/core/selection'; import { Range } from 'vs/editor/common/core/range'; import { InsertCursorAbove, InsertCursorBelow, MultiCursorSelectionController, SelectHighlightsAction, AddSelectionToNextFindMatchAction } from 'vs/editor/contrib/multicursor/multicursor'; import { Handler } from 'vs/editor/common/editorCommon'; -/* import { EndOfLineSequence } from 'vs/editor/common/model'; - */import { IStorageService } from 'vs/platform/storage/common/storage'; +import { EndOfLineSequence } from 'vs/editor/common/model'; +import { IStorageService } from 'vs/platform/storage/common/storage'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { CommonFindController } from 'vs/editor/contrib/find/findController'; @@ -209,41 +209,41 @@ suite('Multicursor selection', () => { }); }); - /* test('issue #23541: Multiline Ctrl+D does not work in CRLF files', () => { - withTestCodeEditor([ - '', - 'qwe', - 'rty', - '', - 'qwe', - '', - 'rty', - 'qwe', - 'rty' - ], { serviceCollection: serviceCollection }, (editor, cursor) => { + test('issue #23541: Multiline Ctrl+D does not work in CRLF files', () => { + withTestCodeEditor([ + '', + 'qwe', + 'rty', + '', + 'qwe', + '', + 'rty', + 'qwe', + 'rty' + ], { serviceCollection: serviceCollection }, (editor, cursor) => { - editor.getModel().setEOL(EndOfLineSequence.CRLF); + editor.getModel().setEOL(EndOfLineSequence.CRLF); - let findController = editor.registerAndInstantiateContribution(CommonFindController); - let multiCursorSelectController = editor.registerAndInstantiateContribution(MultiCursorSelectionController); - let addSelectionToNextFindMatch = new AddSelectionToNextFindMatchAction(); + let findController = editor.registerAndInstantiateContribution(CommonFindController); + let multiCursorSelectController = editor.registerAndInstantiateContribution(MultiCursorSelectionController); + let addSelectionToNextFindMatch = new AddSelectionToNextFindMatchAction(); - editor.setSelection(new Selection(2, 1, 3, 4)); + editor.setSelection(new Selection(2, 1, 3, 4)); - addSelectionToNextFindMatch.run(null, editor); - assert.deepEqual(editor.getSelections().map(fromRange), [ - [2, 1, 3, 4], - [8, 1, 9, 4] - ]); + addSelectionToNextFindMatch.run(null, editor); + assert.deepEqual(editor.getSelections().map(fromRange), [ + [2, 1, 3, 4], + [8, 1, 9, 4] + ]); - editor.trigger('test', 'removeSecondaryCursors', null); + editor.trigger('test', 'removeSecondaryCursors', null); - assert.deepEqual(fromRange(editor.getSelection()), [2, 1, 3, 4]); + assert.deepEqual(fromRange(editor.getSelection()), [2, 1, 3, 4]); - multiCursorSelectController.dispose(); - findController.dispose(); - }); - }); */ + multiCursorSelectController.dispose(); + findController.dispose(); + }); + }); function testMulticursor(text: string[], callback: (editor: TestCodeEditor, findController: CommonFindController) => void): void { withTestCodeEditor(text, { serviceCollection: serviceCollection }, (editor, cursor) => { diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index 6402457ca3d..92b7e5b714a 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -10,7 +10,7 @@ import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { ModelRawContentChangedEvent, ModelRawFlush, ModelRawLineChanged, - /* ModelRawLinesDeleted, ModelRawLinesInserted */ + ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { TextModel } from 'vs/editor/common/model/textModel'; @@ -118,7 +118,7 @@ suite('Editor Model - Model', () => { )); }); - /* test('model insert text with one newline eventing', () => { + test('model insert text with one newline eventing', () => { let e: ModelRawContentChangedEvent = null; thisModel.onDidChangeRawContent((_e) => { if (e !== null) { @@ -137,7 +137,7 @@ suite('Editor Model - Model', () => { false, false )); - }); */ + }); // --------- delete text @@ -196,24 +196,24 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 1))]); }); - /* test('model delete text from one line eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; - }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'y First Line'), - ], - 2, - false, - false - )); - }); */ + test('model delete text from one line eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; + }); + thisModel.applyEdits([EditOperation.delete(new Range(1, 1, 1, 2))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'y First Line'), + ], + 2, + false, + false + )); + }); test('model delete all text from a line eventing', () => { let e: ModelRawContentChangedEvent = null; @@ -234,48 +234,48 @@ suite('Editor Model - Model', () => { )); }); - /* test('model delete text from two lines eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; - }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'My '), - new ModelRawLineChanged(1, 'My Second Line'), - new ModelRawLinesDeleted(2, 2), - ], - 2, - false, - false - )); + test('model delete text from two lines eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; }); + thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'My '), + new ModelRawLineChanged(1, 'My Second Line'), + new ModelRawLinesDeleted(2, 2), + ], + 2, + false, + false + )); + }); - test('model delete text from many lines eventing', () => { - let e: ModelRawContentChangedEvent = null; - thisModel.onDidChangeRawContent((_e) => { - if (e !== null) { - assert.fail(); - } - e = _e; - }); - thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); - assert.deepEqual(e, new ModelRawContentChangedEvent( - [ - new ModelRawLineChanged(1, 'My '), - new ModelRawLineChanged(1, 'My Third Line'), - new ModelRawLinesDeleted(2, 3), - ], - 2, - false, - false - )); + test('model delete text from many lines eventing', () => { + let e: ModelRawContentChangedEvent = null; + thisModel.onDidChangeRawContent((_e) => { + if (e !== null) { + assert.fail(); + } + e = _e; }); - */ + thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); + assert.deepEqual(e, new ModelRawContentChangedEvent( + [ + new ModelRawLineChanged(1, 'My '), + new ModelRawLineChanged(1, 'My Third Line'), + new ModelRawLinesDeleted(2, 3), + ], + 2, + false, + false + )); + }); + // --------- getValueInRange test('getValueInRange', () => { @@ -293,7 +293,7 @@ suite('Editor Model - Model', () => { // --------- getValueLengthInRange - /* test('getValueLengthInRange', () => { + test('getValueLengthInRange', () => { assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 1, 2)), 'M'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 2, 1, 3)), 'y'.length); @@ -304,7 +304,7 @@ suite('Editor Model - Model', () => { assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 2, 17)), 'My First Line\n\t\tMy Second Line'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 3, 1)), 'My First Line\n\t\tMy Second Line\n'.length); assert.equal(thisModel.getValueLengthInRange(new Range(1, 1, 4, 1)), 'My First Line\n\t\tMy Second Line\n Third Line\n'.length); - }); */ + }); // --------- setValue test('setValue eventing', () => { diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts index fc5ebf404da..323ca9886b3 100644 --- a/src/vs/editor/test/common/model/textModel.test.ts +++ b/src/vs/editor/test/common/model/textModel.test.ts @@ -150,7 +150,7 @@ suite('TextModelData.fromString', () => { suite('Editor Model - TextModel', () => { - /* test('getValueLengthInRange', () => { + test('getValueLengthInRange', () => { var m = TextModel.createFromString('My First Line\r\nMy Second Line\r\nMy Third Line'); assert.equal(m.getValueLengthInRange(new Range(1, 1, 1, 1)), ''.length); @@ -177,7 +177,7 @@ suite('Editor Model - TextModel', () => { assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1)), 'y First Line\nMy Second Line\n'.length); assert.equal(m.getValueLengthInRange(new Range(1, 2, 3, 1000)), 'y First Line\nMy Second Line\nMy Third Line'.length); assert.equal(m.getValueLengthInRange(new Range(1, 1, 1000, 1000)), 'My First Line\nMy Second Line\nMy Third Line'.length); - }); */ + }); test('guess indentation 1', () => { diff --git a/src/vs/editor/test/common/model/textModelSearch.test.ts b/src/vs/editor/test/common/model/textModelSearch.test.ts index 1d5327b5215..175c90aac7f 100644 --- a/src/vs/editor/test/common/model/textModelSearch.test.ts +++ b/src/vs/editor/test/common/model/textModelSearch.test.ts @@ -168,103 +168,103 @@ suite('TextModelSearch', () => { ); }); - /* test('multiline find 1', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - 'text\\n', true, false, null, - [ - [1, 16, 2, 1], - [2, 16, 3, 1], - ] - ); - }); + test('multiline find 1', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + 'text\\n', true, false, null, + [ + [1, 16, 2, 1], + [2, 16, 3, 1], + ] + ); + }); - test('multiline find 2', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - 'text\\nJust', true, false, null, - [ - [1, 16, 2, 5] - ] - ); - }); + test('multiline find 2', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + 'text\\nJust', true, false, null, + [ + [1, 16, 2, 5] + ] + ); + }); - test('multiline find 3', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - '\\nagain', true, false, null, - [ - [3, 16, 4, 6] - ] - ); - }); + test('multiline find 3', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + '\\nagain', true, false, null, + [ + [3, 16, 4, 6] + ] + ); + }); - test('multiline find 4', () => { - assertFindMatches( - [ - 'Just some text text', - 'Just some text text', - 'some text again', - 'again some text' - ].join('\n'), - '.*\\nJust.*\\n', true, false, null, - [ - [1, 1, 3, 1] - ] - ); - }); + test('multiline find 4', () => { + assertFindMatches( + [ + 'Just some text text', + 'Just some text text', + 'some text again', + 'again some text' + ].join('\n'), + '.*\\nJust.*\\n', true, false, null, + [ + [1, 1, 3, 1] + ] + ); + }); - test('multiline find with line beginning regex', () => { - assertFindMatches( - [ - 'if', - 'else', - '', - 'if', - 'else' - ].join('\n'), - '^if\\nelse', true, false, null, - [ - [1, 1, 2, 5], - [4, 1, 5, 5] - ] - ); - }); + test('multiline find with line beginning regex', () => { + assertFindMatches( + [ + 'if', + 'else', + '', + 'if', + 'else' + ].join('\n'), + '^if\\nelse', true, false, null, + [ + [1, 1, 2, 5], + [4, 1, 5, 5] + ] + ); + }); - test('matching empty lines using boundary expression', () => { - assertFindMatches( - [ - 'if', - '', - 'else', - ' ', - 'if', - ' ', - 'else' - ].join('\n'), - '^\\s*$\\n', true, false, null, - [ - [2, 1, 3, 1], - [4, 1, 5, 1], - [6, 1, 7, 1] - ] - ); - }); */ + test('matching empty lines using boundary expression', () => { + assertFindMatches( + [ + 'if', + '', + 'else', + ' ', + 'if', + ' ', + 'else' + ].join('\n'), + '^\\s*$\\n', true, false, null, + [ + [2, 1, 3, 1], + [4, 1, 5, 1], + [6, 1, 7, 1] + ] + ); + }); test('matching lines starting with A and ending with B', () => { assertFindMatches( @@ -282,7 +282,7 @@ suite('TextModelSearch', () => { ); }); - /* test('multiline find with line ending regex', () => { + test('multiline find with line ending regex', () => { assertFindMatches( [ 'if', @@ -298,7 +298,7 @@ suite('TextModelSearch', () => { [5, 5, 6, 5] ] ); - }); */ + }); test('issue #4836 - ^.*$', () => { assertFindMatches( @@ -320,7 +320,7 @@ suite('TextModelSearch', () => { ); }); - /* test('multiline find for non-regex string', () => { + test('multiline find for non-regex string', () => { assertFindMatches( [ 'Just some text text', @@ -335,7 +335,7 @@ suite('TextModelSearch', () => { [2, 11, 3, 5], ] ); - }); */ + }); test('issue #3623: Match whole word does not work for not latin characters', () => { assertFindMatches( From b03e50cfb8b4b59567bfeb88acbcfc38ba3e68cf Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 8 Jan 2018 17:32:24 -0800 Subject: [PATCH 033/710] rename benchmark getLineContent --- .../model/benchmark/{read.benchmark.ts => getLineContent.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/vs/editor/test/common/model/benchmark/{read.benchmark.ts => getLineContent.ts} (100%) diff --git a/src/vs/editor/test/common/model/benchmark/read.benchmark.ts b/src/vs/editor/test/common/model/benchmark/getLineContent.ts similarity index 100% rename from src/vs/editor/test/common/model/benchmark/read.benchmark.ts rename to src/vs/editor/test/common/model/benchmark/getLineContent.ts From 6016252dc335d7f5d5d8357b2f0c6066b8877e09 Mon Sep 17 00:00:00 2001 From: Yuichi Nukiyama Date: Tue, 9 Jan 2018 02:34:35 +0000 Subject: [PATCH 034/710] Fix typo Fix typo. --- .../parts/snippets/electron-browser/snippetsService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index b4ec60a65ad..b81bf27a2db 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -48,7 +48,7 @@ namespace schema { } else if (isFalsyOrWhitespace(snippet.language) && !endsWith(snippet.path, '.code-snippets')) { extension.collector.error(localize( 'invalid.language.0', - "When omitting the language, the value of `contribtes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}", + "When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}", extension.description.name, String(snippet.path) )); return false; From 64f9e8a98b406d3d04f3934791b98b04d7845719 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 07:05:02 +0100 Subject: [PATCH 035/710] fix broken "open to side" with mouse --- 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 ba4406017a6..565ef8fc5eb 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -662,7 +662,7 @@ export class ReferenceWidget extends PeekViewWidget { this._disposables.push(this._tree.onDidChangeSelection(event => onEvent(event.selection[0], event && event.payload && event.payload.origin === 'keyboard' ? 'goto' : 'show'))); this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show'))); this._disposables.push(controller.onDidSelect(event => onEvent(event.focus, 'goto'))); - this._disposables.push(controller.onDidOpenToSide(event => onEvent(event.focus, 'side'))); + this._disposables.push(controller.onDidOpenToSide(element => onEvent(element, 'side'))); this._treeContainer = div.hide(); }); From 6ebd589d9ad21982cc64ffaaa888f300eb4b8e98 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 07:27:07 +0100 Subject: [PATCH 036/710] fix more issues --- .../contrib/referenceSearch/referencesWidget.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index eb97f56d1be..d0b9b18ac3f 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -659,10 +659,18 @@ export class ReferenceWidget extends PeekViewWidget { this._onDidSelectReference.fire({ element, kind, source: 'tree' }); } }; - this._disposables.push(this._tree.onDidChangeFocus(event => onEvent(event.focus, 'show'))); - this._disposables.push(this._tree.onDidChangeSelection(event => onEvent(event.selection[0], event && event.payload && event.payload.origin === 'keyboard' ? 'goto' : 'show'))); + this._disposables.push(this._tree.onDidChangeFocus(event => { + if (event && event.payload && event.payload.origin === 'keyboard') { + onEvent(event.focus, 'show'); // only handle events from keyboard, mouse/touch is handled by other listeners below + } + })); + this._disposables.push(this._tree.onDidChangeSelection(event => { + if (event && event.payload && event.payload.origin === 'keyboard') { + onEvent(event.selection[0], 'goto'); // only handle events from keyboard, mouse/touch is handled by other listeners below + } + })); this._disposables.push(controller.onDidFocus(element => onEvent(element, 'show'))); - this._disposables.push(controller.onDidSelect(event => onEvent(event.focus, 'goto'))); + this._disposables.push(controller.onDidSelect(element => onEvent(element, 'goto'))); this._disposables.push(controller.onDidOpenToSide(element => onEvent(element, 'side'))); this._treeContainer = div.hide(); From 1ab3f8caa53f42a1404391db9089aa895d4b47f5 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 10:42:20 +0100 Subject: [PATCH 037/710] fix #41196 --- src/vs/workbench/browser/actions/toggleEditorLayout.ts | 2 +- .../workbench/browser/parts/editor/editor.contribution.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/actions/toggleEditorLayout.ts b/src/vs/workbench/browser/actions/toggleEditorLayout.ts index 9a63e35e101..ad5306eeaad 100644 --- a/src/vs/workbench/browser/actions/toggleEditorLayout.ts +++ b/src/vs/workbench/browser/actions/toggleEditorLayout.ts @@ -81,4 +81,4 @@ CommandsRegistry.registerCommand('_workbench.editor.setGroupOrientation', functi const registry = Registry.as(Extensions.WorkbenchActions); const group = nls.localize('view', "View"); -registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_1, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_1 } }), 'View: Toggle Editor Group Vertical/Horizontal Layout', group); \ No newline at end of file +registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleEditorLayoutAction, ToggleEditorLayoutAction.ID, ToggleEditorLayoutAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_0 } }), 'View: Toggle Editor Group Vertical/Horizontal Layout', group); \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 6142078b9c2..0601bf43044 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -358,9 +358,9 @@ registry.registerWorkbenchAction(new SyncActionDescriptor(MoveGroupLeftAction, M registry.registerWorkbenchAction(new SyncActionDescriptor(MoveGroupRightAction, MoveGroupRightAction.ID, MoveGroupRightAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.RightArrow) }), 'View: Move Editor Group Right', category); registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToPreviousGroupAction, MoveEditorToPreviousGroupAction.ID, MoveEditorToPreviousGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.LeftArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.LeftArrow } }), 'View: Move Editor into Previous Group', category); registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToNextGroupAction, MoveEditorToNextGroupAction.ID, MoveEditorToNextGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.RightArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.RightArrow } }), 'View: Move Editor into Next Group', category); -registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToFirstGroupAction, MoveEditorToFirstGroupAction.ID, MoveEditorToFirstGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_1, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_1 } }), 'View: Move Editor into First Group', category); -registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToSecondGroupAction, MoveEditorToSecondGroupAction.ID, MoveEditorToSecondGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_2, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_2 } }), 'View: Move Editor into Second Group', category); -registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToThirdGroupAction, MoveEditorToThirdGroupAction.ID, MoveEditorToThirdGroupAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_3, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_3 } }), 'View: Move Editor into Third Group', category); +registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToFirstGroupAction, MoveEditorToFirstGroupAction.ID, MoveEditorToFirstGroupAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_1, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_1 } }), 'View: Move Editor into First Group', category); +registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToSecondGroupAction, MoveEditorToSecondGroupAction.ID, MoveEditorToSecondGroupAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_2, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_2 } }), 'View: Move Editor into Second Group', category); +registry.registerWorkbenchAction(new SyncActionDescriptor(MoveEditorToThirdGroupAction, MoveEditorToThirdGroupAction.ID, MoveEditorToThirdGroupAction.LABEL, { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_3, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyCode.KEY_3 } }), 'View: Move Editor into Third Group', category); registry.registerWorkbenchAction(new SyncActionDescriptor(FocusPreviousGroup, FocusPreviousGroup.ID, FocusPreviousGroup.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.LeftArrow) }), 'View: Focus Previous Group', category); registry.registerWorkbenchAction(new SyncActionDescriptor(FocusNextGroup, FocusNextGroup.ID, FocusNextGroup.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.RightArrow) }), 'View: Focus Next Group', category); registry.registerWorkbenchAction(new SyncActionDescriptor(NavigateForwardAction, NavigateForwardAction.ID, NavigateForwardAction.LABEL, { primary: null, win: { primary: KeyMod.Alt | KeyCode.RightArrow }, mac: { primary: KeyMod.WinCtrl | KeyMod.Shift | KeyCode.US_MINUS }, linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_MINUS } }), 'Go Forward'); From 50bc1270ff38f44191215d089d7839428442b81d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 10:59:41 +0100 Subject: [PATCH 038/710] list.select should not register on CtrlCmd | Enter --- src/vs/workbench/electron-browser/commands.ts | 3 +-- src/vs/workbench/parts/files/electron-browser/fileCommands.ts | 2 +- .../parts/markers/browser/markersWorkbenchContributions.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts index ca2c37e005e..e26ffd3117d 100644 --- a/src/vs/workbench/electron-browser/commands.ts +++ b/src/vs/workbench/electron-browser/commands.ts @@ -274,10 +274,9 @@ export function registerCommands(): void { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: WorkbenchListFocusContextKey, primary: KeyCode.Enter, - secondary: [KeyMod.CtrlCmd | KeyCode.Enter], mac: { primary: KeyCode.Enter, - secondary: [KeyMod.CtrlCmd | KeyCode.Enter, KeyMod.CtrlCmd | KeyCode.DownArrow] + secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow] }, handler: (accessor) => { const focused = accessor.get(IListService).lastFocusedList; diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index f622eb909b6..39335a9921a 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -260,7 +260,7 @@ CommandsRegistry.registerCommand({ }); KeybindingsRegistry.registerCommandAndKeybindingRule({ - weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50), + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: ExplorerFocusCondition, primary: KeyMod.CtrlCmd | KeyCode.Enter, mac: { diff --git a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts index 4e2eb9b5dcc..1ab41b88d24 100644 --- a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts +++ b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts @@ -21,7 +21,7 @@ export function registerContributions(): void { KeybindingsRegistry.registerCommandAndKeybindingRule({ id: Constants.MARKER_OPEN_SIDE_ACTION_ID, - weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50), + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: ContextKeyExpr.and(Constants.MarkerFocusContextKey), primary: KeyMod.CtrlCmd | KeyCode.Enter, mac: { From 23c3596ef8ab2e5ea37a4e0110746c6c2786210f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 11:04:22 +0100 Subject: [PATCH 039/710] fix weight for "open to side" --- src/vs/editor/contrib/referenceSearch/referenceSearch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts index 6123655623b..a745f12aae3 100644 --- a/src/vs/editor/contrib/referenceSearch/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/referenceSearch.ts @@ -214,7 +214,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'openReferenceToSide', - weight: KeybindingsRegistry.WEIGHT.workbenchContrib(50), + weight: KeybindingsRegistry.WEIGHT.editorContrib(), primary: KeyMod.CtrlCmd | KeyCode.Enter, mac: { primary: KeyMod.WinCtrl | KeyCode.Enter From 94efa7871d2a4318027c2f859a75dc95a45a226d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 9 Jan 2018 11:22:17 +0100 Subject: [PATCH 040/710] fix #40114 --- .../browser/parts/editor/textEditor.ts | 46 +++++++++++++------ .../parts/editor/textResourceEditor.ts | 10 ++-- .../files/browser/editors/textFileEditor.ts | 6 +-- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 37ba1e22e4c..179956d9c07 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -23,7 +23,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Scope } from 'vs/workbench/common/memento'; -import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; +import { getCodeEditor, getCodeOrDiffEditor } from 'vs/editor/browser/services/codeEditorService'; import { ITextFileService, SaveReason, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; @@ -230,48 +230,66 @@ export abstract class BaseTextEditor extends BaseEditor { } /** - * Saves the text editor view state under the given key. + * Saves the text editor view state for the given resource. */ - protected saveTextEditorViewState(key: string): void { + 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 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; } - const editorViewState = this.getControl().saveViewState(); - - let lastKnownViewState = textEditorViewStateMemento[key]; + let lastKnownViewState = textEditorViewStateMemento[resource.toString()]; if (!lastKnownViewState) { lastKnownViewState = Object.create(null); - textEditorViewStateMemento[key] = lastKnownViewState; + textEditorViewStateMemento[resource.toString()] = lastKnownViewState; } if (typeof this.position === 'number') { - lastKnownViewState[this.position] = editorViewState; + lastKnownViewState[this.position] = editor.saveViewState(); } } /** - * Clears the text editor view state under the given key. + * Clears the text editor view state for the given resources. */ - protected clearTextEditorViewState(keys: string[]): void { + 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) { - keys.forEach(key => delete textEditorViewStateMemento[key]); + resources.forEach(resource => delete textEditorViewStateMemento[resource.toString()]); } } /** - * Loads the text editor view state for the given key and returns it. + * Loads the text editor view state for the given resource and returns it. */ - protected loadTextEditorViewState(key: string): IEditorViewState { + 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[key]; + const viewState = textEditorViewStateMemento[resource.toString()]; if (viewState) { return viewState[this.position]; } diff --git a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts index ac8a9d85d3d..e1dc80aef83 100644 --- a/src/vs/workbench/browser/parts/editor/textResourceEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textResourceEditor.ts @@ -107,7 +107,7 @@ export class AbstractTextResourceEditor extends BaseTextEditor { protected restoreViewState(input: EditorInput) { if (input instanceof UntitledEditorInput || input instanceof ResourceEditorInput) { - const viewState = this.loadTextEditorViewState(input.getResource().toString()); + const viewState = this.loadTextEditorViewState(input.getResource()); if (viewState) { this.getControl().restoreViewState(viewState); } @@ -177,20 +177,20 @@ export class AbstractTextResourceEditor extends BaseTextEditor { return; // only enabled for untitled and resource inputs } - const key = input.getResource().toString(); + const resource = input.getResource(); // Clear view state if input is disposed if (input.isDisposed()) { - super.clearTextEditorViewState([key]); + super.clearTextEditorViewState([resource]); } // Otherwise save it else { - super.saveTextEditorViewState(key); + super.saveTextEditorViewState(resource); // Make sure to clean up when the input gets disposed once(input.onDispose)(() => { - super.clearTextEditorViewState([key]); + super.clearTextEditorViewState([resource]); }); } } diff --git a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts index 8f360701955..8550ae70748 100644 --- a/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts +++ b/src/vs/workbench/parts/files/browser/editors/textFileEditor.ts @@ -62,7 +62,7 @@ export class TextFileEditor extends BaseTextEditor { private onFilesChanged(e: FileChangesEvent): void { const deleted = e.getDeleted(); if (deleted && deleted.length) { - this.clearTextEditorViewState(deleted.map(d => d.resource.toString())); + this.clearTextEditorViewState(deleted.map(d => d.resource)); } } @@ -127,7 +127,7 @@ export class TextFileEditor extends BaseTextEditor { textEditor.setModel(textFileModel.textEditorModel); // Always restore View State if any associated - const editorViewState = this.loadTextEditorViewState(this.input.getResource().toString()); + const editorViewState = this.loadTextEditorViewState(this.input.getResource()); if (editorViewState) { textEditor.restoreViewState(editorViewState); } @@ -235,7 +235,7 @@ export class TextFileEditor extends BaseTextEditor { private doSaveTextEditorViewState(input: FileEditorInput): void { if (input && !input.isDisposed()) { - this.saveTextEditorViewState(input.getResource().toString()); + this.saveTextEditorViewState(input.getResource()); } } } \ No newline at end of file From dbcae0f796f32923160d237b5cdecf4cc6806f45 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 11:38:23 +0100 Subject: [PATCH 041/710] Commands resource proper computation Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding To cover all these cases we need to properly compute the resource on which the command is being executed fixes #41263 fixes #41314 --- .../execution.contribution.ts | 13 +- .../files/electron-browser/fileCommands.ts | 124 ++++++++---------- .../electron-browser/search.contribution.ts | 32 +++-- 3 files changed, 72 insertions(+), 97 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 f4738daceee..97871707c4e 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -15,7 +15,6 @@ import uri from 'vs/base/common/uri'; import { ITerminalService } from 'vs/workbench/parts/execution/common/execution'; import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { toResource } from 'vs/workbench/common/editor'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { ITerminalService as IIntegratedTerminalService, KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED } from 'vs/workbench/parts/terminal/common/terminal'; @@ -25,6 +24,8 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { ResourceContextKey } from 'vs/workbench/common/resources'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { IFileService } from 'vs/platform/files/common/files'; +import { IListService } from 'vs/platform/list/browser/listService'; +import { getResourceForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; if (env.isWindows) { registerSingleton(ITerminalService, WinTerminalService); @@ -88,21 +89,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ const fileService = accessor.get(IFileService); const integratedTerminalService = accessor.get(IIntegratedTerminalService); const terminalService = accessor.get(ITerminalService); + resource = getResourceForCommand(resource, accessor.get(IListService), editorService); // Try workspace path first const root = historyService.getLastActiveWorkspaceRoot('file'); return !uri.isUri(resource) ? TPromise.as(root && root.fsPath) : fileService.resolveFile(resource).then(stat => { return stat.isDirectory ? stat.resource.fsPath : paths.dirname(stat.resource.fsPath); }).then(directoryToOpen => { - - // Otherwise check if we have an active file open - if (!directoryToOpen) { - const file = toResource(editorService.getActiveEditorInput(), { supportSideBySide: true, filter: 'file' }); - if (file) { - directoryToOpen = paths.dirname(file.fsPath); // take parent folder of file - } - } - if (configurationService.getValue().terminal.explorerKind === 'integrated') { const instance = integratedTerminalService.createInstance({ cwd: directoryToOpen }, true); if (instance) { diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 39335a9921a..7badd984b24 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -29,7 +29,7 @@ import { IListService } from 'vs/platform/list/browser/listService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { IResourceInput, Position, IEditorInput } from 'vs/platform/editor/common/editor'; +import { IResourceInput, Position } from 'vs/platform/editor/common/editor'; import { IFileService } from 'vs/platform/files/common/files'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorViewState } from 'vs/editor/common/editorCommon'; @@ -73,25 +73,38 @@ export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], f windowsService.openWindow(paths, { forceNewWindow }); }; +// Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding +// To cover all these cases we need to properly compute the resource on which the command is being executed +export function getResourceForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI { + if (URI.isUri(resource)) { + return resource; + } + + const list = listService.lastFocusedList; + if (list && list.isDOMFocused()) { + const focus = list.getFocus(); + if (focus instanceof FileStat) { + return focus.resource; + } else if (focus instanceof OpenEditor) { + return focus.editorInput.getResource(); + } + } + + return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); +} + function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, textFileService: ITextFileService, editorGroupService: IEditorGroupService): TPromise { - let source: URI; - if (resource instanceof URI) { - source = resource; - } else { - source = toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); - } - - if (source && (fileService.canHandleResource(source) || source.scheme === 'untitled')) { + if (resource && (fileService.canHandleResource(resource) || resource.scheme === 'untitled')) { // Save As (or Save untitled with associated path) - if (isSaveAs || source.scheme === 'untitled') { + if (isSaveAs || resource.scheme === 'untitled') { let encodingOfSource: string; - if (source.scheme === 'untitled') { - encodingOfSource = untitledEditorService.getEncoding(source); - } else if (source.scheme === 'file') { - const textModel = textFileService.models.get(source); + if (resource.scheme === 'untitled') { + encodingOfSource = untitledEditorService.getEncoding(resource); + } else if (resource.scheme === 'file') { + const textModel = textFileService.models.get(resource); encodingOfSource = textModel && textModel.getEncoding(); // text model can be null e.g. if this is a binary file! } @@ -100,17 +113,17 @@ function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorS const editor = getCodeEditor(activeEditor); if (editor) { const activeResource = toResource(activeEditor.input, { supportSideBySide: true }); - if (activeResource && (fileService.canHandleResource(activeResource) || source.scheme === 'untitled') && activeResource.toString() === source.toString()) { + if (activeResource && (fileService.canHandleResource(activeResource) || resource.scheme === 'untitled') && activeResource.toString() === resource.toString()) { viewStateOfSource = editor.saveViewState(); } } // Special case: an untitled file with associated path gets saved directly unless "saveAs" is true let savePromise: TPromise; - if (!isSaveAs && source.scheme === 'untitled' && untitledEditorService.hasAssociatedFilePath(source)) { - savePromise = textFileService.save(source).then((result) => { + if (!isSaveAs && resource.scheme === 'untitled' && untitledEditorService.hasAssociatedFilePath(resource)) { + savePromise = textFileService.save(resource).then((result) => { if (result) { - return URI.file(source.fsPath); + return URI.file(resource.fsPath); } return null; @@ -119,11 +132,11 @@ function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorS // Otherwise, really "Save As..." else { - savePromise = textFileService.saveAs(source); + savePromise = textFileService.saveAs(resource); } return savePromise.then((target) => { - if (!target || target.toString() === source.toString()) { + if (!target || target.toString() === resource.toString()) { return void 0; // save canceled or same resource used } @@ -137,22 +150,20 @@ function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorS }; return editorService.replaceEditors([{ - toReplace: { resource: source }, + toReplace: { resource: resource }, replaceWith }]).then(() => true); }); } // Pin the active editor if we are saving it - if (!resource) { - const editor = editorService.getActiveEditor(); - if (editor) { - editorGroupService.pinEditor(editor.position, editor.input); - } + const editor = editorService.getActiveEditor(); + if (editor && editor.input && editor.input.getResource().toString() === resource.toString()) { + editorGroupService.pinEditor(editor.position, editor.input); } // Just save - return textFileService.save(source, { force: true /* force a change to the file to trigger external watchers if any */ }); + return textFileService.save(resource, { force: true /* force a change to the file to trigger external watchers if any */ }); } return TPromise.as(false); @@ -244,10 +255,7 @@ CommandsRegistry.registerCommand({ const editorService = accessor.get(IWorkbenchEditorService); const textFileService = accessor.get(ITextFileService); const messageService = accessor.get(IMessageService); - - if (!URI.isUri(resource)) { - resource = toResource(editorService.getActiveEditorInput(), { supportSideBySide: true, filter: 'file' }); - } + resource = getResourceForCommand(resource, accessor.get(IListService), editorService); if (resource && resource.scheme !== 'untitled') { return textFileService.revert(resource, { force: true }).then(null, error => { @@ -270,18 +278,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ const editorService = accessor.get(IWorkbenchEditorService); const listService = accessor.get(IListService); const tree = listService.lastFocusedList; - - let resourceOrEditor: URI | IEditorInput; - if (URI.isUri(resource)) { - resourceOrEditor = resource; - } else { - const focus = tree.getFocus(); - if (focus instanceof FileStat && !focus.isDirectory) { - resourceOrEditor = focus.resource; - } else if (focus instanceof OpenEditor) { - resourceOrEditor = focus.editorInput; - } - } + resource = getResourceForCommand(resource, listService, editorService); // Remove highlight if (tree instanceof Tree) { @@ -289,10 +286,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } // Set side input - if (URI.isUri(resourceOrEditor)) { - return editorService.openEditor({ resource: resourceOrEditor, options: { preserveFocus: false } }, true); - } else if (resourceOrEditor) { - return editorService.openEditor(resourceOrEditor, { preserveFocus: false }, true); + if (URI.isUri(resource)) { + return editorService.openEditor({ resource, options: { preserveFocus: false } }, true); } return TPromise.as(true); @@ -315,9 +310,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } const editorService = accessor.get(IWorkbenchEditorService); - if (!URI.isUri(resource)) { - resource = toResource(editorService.getActiveEditorInput(), { supportSideBySide: true, filter: 'file' }); - } + resource = getResourceForCommand(resource, accessor.get(IListService), editorService); if (resource && resource.scheme === 'file') { const name = paths.basename(resource.fsPath); @@ -343,7 +336,7 @@ CommandsRegistry.registerCommand({ tree.DOMFocus(); } - globalResourceToCompare = resource; + globalResourceToCompare = getResourceForCommand(resource, listService, accessor.get(IWorkbenchEditorService)); if (!resourceSelectedForCompareContext) { resourceSelectedForCompareContext = ResourceSelectedForCompareContext.bindTo(accessor.get(IContextKeyService)); } @@ -364,17 +357,14 @@ CommandsRegistry.registerCommand({ return editorService.openEditor({ leftResource: globalResourceToCompare, - rightResource: resource + rightResource: getResourceForCommand(resource, listService, editorService) }); } }); const revealInOSHandler = (accessor: ServicesAccessor, resource: URI) => { // Without resource, try to look at the active editor - if (!URI.isUri(resource)) { - const editorService = accessor.get(IWorkbenchEditorService); - resource = toResource(editorService.getActiveEditorInput(), { supportSideBySide: true, filter: 'file' }); - } + resource = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); if (resource) { const windowsService = accessor.get(IWindowsService); @@ -410,18 +400,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }, id: COPY_PATH_COMMAND_ID, handler: (accessor, resource: URI) => { - // Without resource, try to look at the active editor - if (!URI.isUri(resource)) { - const editorGroupService = accessor.get(IEditorGroupService); - const editorService = accessor.get(IWorkbenchEditorService); - const activeEditor = editorService.getActiveEditor(); - - resource = activeEditor ? toResource(activeEditor.input, { supportSideBySide: true }) : void 0; - if (activeEditor) { - editorGroupService.focusGroup(activeEditor.position); // focus back to active editor group - } - } - + resource = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); if (resource) { const clipboardService = accessor.get(IClipboardService); clipboardService.writeText(resource.scheme === 'file' ? labels.getPathLabel(resource) : resource.toString()); @@ -437,6 +416,7 @@ CommandsRegistry.registerCommand({ handler: (accessor, resource: URI) => { const viewletService = accessor.get(IViewletService); const contextService = accessor.get(IWorkspaceContextService); + resource = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); viewletService.openViewlet(VIEWLET_ID, false).then((viewlet: ExplorerViewlet) => { const isInsideWorkspace = contextService.isInsideWorkspace(resource); @@ -462,7 +442,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ when: undefined, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_S, handler: (accessor, resource: URI) => { - return save(resource, true, accessor.get(IWorkbenchEditorService), accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); + const editorService = accessor.get(IWorkbenchEditorService); + resource = getResourceForCommand(resource, accessor.get(IListService), editorService); + return save(resource, true, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); } }); @@ -472,7 +454,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyMod.CtrlCmd | KeyCode.KEY_S, id: SAVE_FILE_COMMAND_ID, handler: (accessor, resource: URI) => { - return save(resource, false, accessor.get(IWorkbenchEditorService), accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); + const editorService = accessor.get(IWorkbenchEditorService); + resource = getResourceForCommand(resource, accessor.get(IListService), editorService); + return save(resource, false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); } }); 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 2ef1341b5c3..9bf399b29d5 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -14,7 +14,7 @@ import nls = require('vs/nls'); import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import * as objects from 'vs/base/common/objects'; -import { explorerItemToFileResource, ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/files/common/files'; +import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/files/common/files'; import { SyncActionDescriptor, MenuRegistry, MenuId } 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'; @@ -41,12 +41,15 @@ import { OpenSymbolHandler } from 'vs/workbench/parts/search/browser/openSymbolH import { OpenAnythingHandler } from 'vs/workbench/parts/search/browser/openAnythingHandler'; import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions'; import { getWorkspaceSymbols } from 'vs/workbench/parts/search/common/search'; -import { illegalArgument, onUnexpectedError } from 'vs/base/common/errors'; +import { illegalArgument } from 'vs/base/common/errors'; import { WorkbenchListFocusContextKey, IListService } from 'vs/platform/list/browser/listService'; import URI from 'vs/base/common/uri'; import { relative } from 'path'; import { dirname } from 'vs/base/common/resources'; import { ResourceContextKey } from 'vs/workbench/common/resources'; +import { getResourceForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IFileService } from 'vs/platform/files/common/files'; registerSingleton(ISearchWorkbenchService, SearchWorkbenchService); replaceContributions(); @@ -188,30 +191,25 @@ CommandsRegistry.registerCommand({ handler: (accessor, resource?: URI) => { const listService = accessor.get(IListService); const viewletService = accessor.get(IViewletService); + const fileService = accessor.get(IFileService); + resource = getResourceForCommand(resource, listService, accessor.get(IWorkbenchEditorService)); - if (!URI.isUri(resource)) { - const lastFocusedList = listService.lastFocusedList; - const focus = lastFocusedList ? lastFocusedList.getFocus() : void 0; - if (focus) { - const file = explorerItemToFileResource(focus); - if (file) { - resource = file.isDirectory ? file.resource : dirname(file.resource); - } - } - } - - viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { + return viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { if (resource) { - (viewlet as SearchViewlet).searchInFolder(resource, (from, to) => relative(from, to)); + fileService.resolveFile(resource).then(stat => { + return stat.isDirectory ? stat.resource : dirname(stat.resource); + }).then(resource => + (viewlet as SearchViewlet).searchInFolder(resource, (from, to) => relative(from, to)) + ); } - }).done(null, onUnexpectedError); + }); } }); const FIND_IN_WORKSPACE_ID = 'filesExplorer.findInWorkspace'; CommandsRegistry.registerCommand({ id: FIND_IN_WORKSPACE_ID, - handler: (accessor, ) => { + handler: (accessor) => { const viewletService = accessor.get(IViewletService); return viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { (viewlet as SearchViewlet).searchInFolder(null, (from, to) => relative(from, to)); From 105d2d824176dfb14bad61e02fb741e8c671e45f Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Tue, 9 Jan 2018 11:47:27 +0100 Subject: [PATCH 042/710] Fixing compile error --- extensions/gulp/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/gulp/src/main.ts b/extensions/gulp/src/main.ts index 0314dc44fde..51a64054021 100644 --- a/extensions/gulp/src/main.ts +++ b/extensions/gulp/src/main.ts @@ -68,7 +68,7 @@ interface GulpTaskDefinition extends vscode.TaskDefinition { class FolderDetector { - private fileWatcher: vscode.FileSystemWatcher; + private fileWatcher: vscode.FileSystemWatcher | undefined; private promise: Thenable | undefined; constructor(private _workspaceFolder: vscode.WorkspaceFolder) { From 627d4fd04d69abbffb46efeac027d1e282cc135f Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 12:08:39 +0100 Subject: [PATCH 043/710] commands in explorer now support alt commands, no need for the warning #41157 --- .../platform/actions/electron-browser/menusExtensionPoint.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts index ca45e187101..2295ddd7b90 100644 --- a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts +++ b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts @@ -355,10 +355,6 @@ ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyM collector.info(localize('dupe.command', "Menu item references the same command as default and alt-command")); } - if (item.alt && menu !== MenuId.EditorTitle && item.group !== 'navigation') { - collector.info(localize('nosupport.altCommand', "Sorry, but currently only the 'navigation' group of the 'editor/title' menu supports alt-commands")); - } - let group: string; let order: number; if (item.group) { From 64b5169c3a272f26159a4d49a337ba515f9367d9 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 12:42:28 +0100 Subject: [PATCH 044/710] fix npe --- src/vs/workbench/parts/files/electron-browser/fileCommands.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 7badd984b24..45dcc3156ad 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -158,7 +158,8 @@ function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorS // Pin the active editor if we are saving it const editor = editorService.getActiveEditor(); - if (editor && editor.input && editor.input.getResource().toString() === resource.toString()) { + const activeEditorResource = editor && editor.input && editor.input.getResource(); + if (activeEditorResource && activeEditorResource.toString() === resource.toString()) { editorGroupService.pinEditor(editor.position, editor.input); } From e5cbf755007a33030e93ccb83aeee8d5eefe495b Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 12:44:02 +0100 Subject: [PATCH 045/710] commands use precondition for enablement fixes #41103 --- .../fileActions.contribution.ts | 18 +++++++++++------- .../files/electron-browser/fileCommands.ts | 1 + .../electron-browser/views/openEditorsView.ts | 6 +++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 34126738db9..81c7b1de24d 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -11,7 +11,7 @@ import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTI import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; -import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -195,7 +195,8 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { order: 10, command: { id: SAVE_FILE_COMMAND_ID, - title: SAVE_FILE_LABEL + title: SAVE_FILE_LABEL, + precondition: DirtyEditorContext }, when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay')) }); @@ -205,7 +206,8 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { order: 20, command: { id: REVERT_FILE_COMMAND_ID, - title: nls.localize('revert', "Revert File") + title: nls.localize('revert', "Revert File"), + precondition: DirtyEditorContext }, when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay')) }); @@ -233,9 +235,10 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { order: 10, command: { id: COMPARE_WITH_SAVED_COMMAND_ID, - title: nls.localize('compareWithSaved', "Compare with Saved") + title: nls.localize('compareWithSaved', "Compare with Saved"), + precondition: DirtyEditorContext }, - when: ResourceContextKey.IsFile + when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay')) }); const compareResourceCommand = { @@ -363,9 +366,10 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { order: 20, command: { id: PASTE_FILE_ID, - title: PASTE_FILE_LABEL + title: PASTE_FILE_LABEL, + precondition: FileCopiedContext }, - when: ContextKeyExpr.and(ExplorerFolderContext, FileCopiedContext) + when: ExplorerFolderContext }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 45dcc3156ad..6f4b3a5486e 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -66,6 +66,7 @@ export const SAVE_FILES_COMMAND_ID = 'workbench.command.files.saveFiles'; export const SAVE_FILES_LABEL = nls.localize('saveFiles', "Save All Files"); export const OpenEditorsGroupContext = new RawContextKey('groupFocusedInOpenEditors', false); +export const DirtyEditorContext = new RawContextKey('dirtyEditor', false); export const ResourceSelectedForCompareContext = new RawContextKey('resourceSelectedForCompare', false); export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], forceNewWindow: boolean) => { diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 6e326f65acb..d1971cbbbb4 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -40,7 +40,7 @@ import { KeyCode } from 'vs/base/common/keyCodes'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { IMenuService, MenuId, IMenu } from 'vs/platform/actions/common/actions'; -import { OpenEditorsGroupContext } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { OpenEditorsGroupContext, DirtyEditorContext } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { ResourceContextKey } from 'vs/workbench/common/resources'; import { DataTransfers } from 'vs/base/browser/dnd'; import { getPathLabel, getBaseLabel } from 'vs/base/common/labels'; @@ -64,6 +64,7 @@ export class OpenEditorsView extends ViewsViewletPanel { private needsRefresh: boolean; private resourceContext: ResourceContextKey; private groupFocusedContext: IContextKey; + private dirtyEditorFocusedContext: IContextKey; constructor( options: IViewletViewOptions, @@ -159,13 +160,16 @@ export class OpenEditorsView extends ViewsViewletPanel { this.resourceContext = this.instantiationService.createInstance(ResourceContextKey); this.groupFocusedContext = OpenEditorsGroupContext.bindTo(this.contextKeyService); + this.dirtyEditorFocusedContext = DirtyEditorContext.bindTo(this.contextKeyService); this.disposables.push(this.list.onContextMenu(e => this.onListContextMenu(e))); this.list.onFocusChange(e => { this.resourceContext.reset(); this.groupFocusedContext.reset(); + this.dirtyEditorFocusedContext.reset(); const element = e.elements.length ? e.elements[0] : undefined; if (element instanceof OpenEditor) { + this.dirtyEditorFocusedContext.set(this.textFileService.isDirty(element.getResource())); this.resourceContext.set(element.getResource()); } else if (!!element) { this.groupFocusedContext.set(true); From 2c40789de977aa5c0fcc9c4e7d2e11e124dd8d0c Mon Sep 17 00:00:00 2001 From: Sean Poulter Date: Tue, 9 Jan 2018 08:37:05 -0500 Subject: [PATCH 046/710] Fix markdown, change wording --- src/vs/vscode.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index dabc8520277..0920acba747 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -5433,8 +5433,8 @@ declare module 'vscode' { * An event that is emitted when a [text document](#TextDocument) is disposed. * * To add an event listener when a visible text document is closed, use the [TextEditor](#TextEditor) events in the - * [window](#_window) namespace. Note that this event is not emitted when a [text document]#TextDocument is closed - * but remains open in another [visible text editor](#window.visibleTextEditors). + * [window](#_window) namespace. Note that this event is not emitted when a [TextEditor](#TextEditor) is closed + * but the document remains open in another [visible text editor](#window.visibleTextEditors). */ export const onDidCloseTextDocument: Event; From 9914a95ddfca2871e6e8a79eb1e229e46db8e252 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 9 Jan 2018 15:55:10 +0100 Subject: [PATCH 047/710] buffer spdlog calls in main until singleton fixes #41218 --- .../sharedProcess/sharedProcessMain.ts | 4 +- src/vs/code/electron-main/main.ts | 20 ++-- src/vs/code/node/cliProcessMain.ts | 4 +- src/vs/platform/log/common/bufferLog.ts | 95 +++++++++++++++++++ src/vs/platform/log/node/spdlogService.ts | 2 +- .../workbench/api/node/extHostLogService.ts | 4 +- src/vs/workbench/electron-browser/main.ts | 4 +- src/vs/workbench/node/extensionHostMain.ts | 4 +- 8 files changed, 120 insertions(+), 17 deletions(-) create mode 100644 src/vs/platform/log/common/bufferLog.ts diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 2e79206ac40..2f0521cf00e 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -37,7 +37,7 @@ import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { ipcRenderer } from 'electron'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { ILogService } from 'vs/platform/log/common/log'; export interface ISharedProcessConfiguration { @@ -81,7 +81,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I const services = new ServiceCollection(); const environmentService = new EnvironmentService(initData.args, process.execPath); - const logService = createLogService('sharedprocess', environmentService); + const logService = createSpdLogService('sharedprocess', environmentService); process.once('exit', () => logService.dispose()); logService.info('main', JSON.stringify(configuration)); diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 3c042ea5a67..4da562dfb9c 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -42,16 +42,16 @@ import { WorkspacesMainService } from 'vs/platform/workspaces/electron-main/work import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces'; import { localize } from 'vs/nls'; import { mnemonicButtonLabel } from 'vs/base/common/labels'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { printDiagnostics } from 'vs/code/electron-main/diagnostics'; +import { BufferLogService } from 'vs/platform/log/common/bufferLog'; -function createServices(args: ParsedArgs): IInstantiationService { +function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService { const services = new ServiceCollection(); const environmentService = new EnvironmentService(args, process.execPath); - const spdlogService = createLogService('main', environmentService); const consoleLogService = new ConsoleLogMainService(environmentService); - const logService = new MultiplexLogService([consoleLogService, spdlogService]); + const logService = new MultiplexLogService([consoleLogService, bufferLogService]); process.once('exit', () => logService.dispose()); @@ -284,7 +284,12 @@ function main() { return; } - const instantiationService = createServices(args); + // We need to buffer the spdlog logs until we are sure + // we are the only instance running, otherwise we'll have concurrent + // log file access on Windows + // https://github.com/Microsoft/vscode/issues/41218 + const bufferLogService = new BufferLogService(); + const instantiationService = createServices(args, bufferLogService); return instantiationService.invokeFunction(accessor => { @@ -300,7 +305,10 @@ function main() { // Startup return instantiationService.invokeFunction(a => createPaths(a.get(IEnvironmentService))) .then(() => instantiationService.invokeFunction(setupIPC)) - .then(mainIpcServer => instantiationService.createInstance(CodeApplication, mainIpcServer, instanceEnv).startup()); + .then(mainIpcServer => { + bufferLogService.logger = createSpdLogService('main', environmentService); + return instantiationService.createInstance(CodeApplication, mainIpcServer, instanceEnv).startup(); + }); }).done(null, err => instantiationService.invokeFunction(quit, err)); } diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index dfdaf922741..0d99eadec4f 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -35,7 +35,7 @@ import { ChoiceCliService } from 'vs/platform/message/node/messageCli'; import { getBaseLabel } from 'vs/base/common/labels'; import { IStateService } from 'vs/platform/state/common/state'; import { StateService } from 'vs/platform/state/node/stateService'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { ILogService } from 'vs/platform/log/common/log'; import { isPromiseCanceledError } from 'vs/base/common/errors'; @@ -196,7 +196,7 @@ export function main(argv: ParsedArgs): TPromise { const services = new ServiceCollection(); const environmentService = new EnvironmentService(argv, process.execPath); - const logService = createLogService('cli', environmentService); + const logService = createSpdLogService('cli', environmentService); process.once('exit', () => logService.dispose()); logService.info('main', argv); diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts new file mode 100644 index 00000000000..ce43f76d7fc --- /dev/null +++ b/src/vs/platform/log/common/bufferLog.ts @@ -0,0 +1,95 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { ILogService, LogLevel } from 'vs/platform/log/common/log'; + +interface ILog { + level: LogLevel; + args: IArguments; +} + +function getLogFunction(logger: ILogService, level: LogLevel): Function { + switch (level) { + case LogLevel.Trace: return logger.trace; + case LogLevel.Debug: return logger.debug; + case LogLevel.Info: return logger.info; + case LogLevel.Warning: return logger.warn; + case LogLevel.Error: return logger.error; + case LogLevel.Critical: return logger.critical; + default: throw new Error('Invalid log level'); + } +} + +export class BufferLogService implements ILogService { + + _serviceBrand: any; + private buffer: ILog[] = []; + private _logger: ILogService | undefined = undefined; + + constructor( + private level: LogLevel = LogLevel.Error + ) { + } + + set logger(logger: ILogService) { + this._logger = logger; + + for (const { level, args } of this.buffer) { + const fn = getLogFunction(logger, level); + fn.apply(logger, args); + } + + this.buffer = []; + } + + setLevel(logLevel: LogLevel): void { + this.level = logLevel; + } + + getLevel(): LogLevel { + return this.level; + } + + private _log(level: LogLevel, args: IArguments): void { + if (this._logger) { + const fn = getLogFunction(this._logger, level); + fn.apply(this._logger, args); + } else if (this.level < level) { + this.buffer.push({ level, args }); + } + } + + trace(): void { + this._log(LogLevel.Trace, arguments); + } + + debug(): void { + this._log(LogLevel.Debug, arguments); + } + + info(): void { + this._log(LogLevel.Info, arguments); + } + + warn(): void { + this._log(LogLevel.Warning, arguments); + } + + error(): void { + this._log(LogLevel.Error, arguments); + } + + critical(): void { + this._log(LogLevel.Critical, arguments); + } + + dispose(): void { + if (this._logger) { + this._logger.dispose(); + } + } +} \ No newline at end of file diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts index d39af82182d..6493d6e1c8d 100644 --- a/src/vs/platform/log/node/spdlogService.ts +++ b/src/vs/platform/log/node/spdlogService.ts @@ -10,7 +10,7 @@ import { ILogService, LogLevel, NullLogService } from 'vs/platform/log/common/lo import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { RotatingLogger, setAsyncMode } from 'spdlog'; -export function createLogService(processName: string, environmentService: IEnvironmentService, logsSubfolder?: string): ILogService { +export function createSpdLogService(processName: string, environmentService: IEnvironmentService, logsSubfolder?: string): ILogService { try { setAsyncMode(8192, 2000); const logsDirPath = logsSubfolder ? path.join(environmentService.logsPath, logsSubfolder) : environmentService.logsPath; diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts index 150bde4af3d..fff0755018d 100644 --- a/src/vs/workbench/api/node/extHostLogService.ts +++ b/src/vs/workbench/api/node/extHostLogService.ts @@ -11,7 +11,7 @@ import { mkdirp, dirExists } from 'vs/base/node/pfs'; import Event, { Emitter } from 'vs/base/common/event'; import { LogLevel } from 'vs/workbench/api/node/extHostTypes'; import { ILogService } from 'vs/platform/log/common/log'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { memoize } from 'vs/base/common/decorators'; @@ -23,7 +23,7 @@ export class ExtHostLogService { getExtLogger(extensionID: string): ExtHostLogger { if (!this._loggers.has(extensionID)) { - const logService = createLogService(extensionID, this._environmentService, extensionID); + const logService = createSpdLogService(extensionID, this._environmentService, extensionID); const logsDirPath = path.join(this._environmentService.logsPath, extensionID); this._loggers.set(extensionID, new ExtHostLogger(logService, logsDirPath)); } diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index 719c6d914d6..9e75b4e4cfa 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -40,7 +40,7 @@ import { URLChannelClient } from 'vs/platform/url/common/urlIpc'; import { IURLService } from 'vs/platform/url/common/url'; import { WorkspacesChannelClient } from 'vs/platform/workspaces/common/workspacesIpc'; import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import fs = require('fs'); import { ConsoleLogService, MultiplexLogService } from 'vs/platform/log/common/log'; @@ -73,7 +73,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise { const mainServices = createMainProcessServices(mainProcessClient, configuration); const environmentService = new EnvironmentService(configuration, configuration.execPath); - const spdlogService = createLogService(`renderer${configuration.windowId}`, environmentService); + const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, environmentService); const consoleLogService = new ConsoleLogService(environmentService); const logService = new MultiplexLogService([consoleLogService, spdlogService]); diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index 76041a685a1..7af498132c5 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -21,7 +21,7 @@ import * as watchdog from 'native-watchdog'; import * as glob from 'vs/base/common/glob'; import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; -import { createLogService } from 'vs/platform/log/node/spdlogService'; +import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ILogService } from 'vs/platform/log/common/log'; import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc'; @@ -92,7 +92,7 @@ export class ExtensionHostMain { const rpcProtocol = new RPCProtocol(protocol); const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace); const environmentService = new EnvironmentService(initData.args, initData.execPath); - this._logService = createLogService(`exthost${initData.windowId}`, environmentService); + this._logService = createSpdLogService(`exthost${initData.windowId}`, environmentService); this.disposables.push(this._logService); this._logService.info('extension host started'); From 43a9bab906f09241d02d670379f8c61e3f68988d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 9 Jan 2018 15:57:59 +0100 Subject: [PATCH 048/710] fix buffer log --- src/vs/platform/log/common/bufferLog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts index ce43f76d7fc..caa628e51da 100644 --- a/src/vs/platform/log/common/bufferLog.ts +++ b/src/vs/platform/log/common/bufferLog.ts @@ -58,7 +58,7 @@ export class BufferLogService implements ILogService { if (this._logger) { const fn = getLogFunction(this._logger, level); fn.apply(this._logger, args); - } else if (this.level < level) { + } else if (this.level <= level) { this.buffer.push({ level, args }); } } From 5bcca1c1e259b3b2983d5bb857979655398b3032 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 15:59:54 +0100 Subject: [PATCH 049/710] remove done todo --- .../parts/files/electron-browser/views/explorerViewer.ts | 1 - 1 file changed, 1 deletion(-) 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 6a9aa95b4e8..4f2133dfd9a 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -283,7 +283,6 @@ export class FileRenderer implements IRenderer { tree.clearHighlight(); if (commit && inputBox.value) { - // TODO@Isidor check the context editableData.action.run({ value: inputBox.value }); } From 534e8f46fb1a576e1f8c89b4ea1d04e319eea767 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 9 Jan 2018 16:29:16 +0100 Subject: [PATCH 050/710] fixes #41145 --- src/vs/base/common/comparers.ts | 50 ++++++++++++++++++------- src/vs/workbench/api/node/extHostSCM.ts | 4 +- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts index 70b404ca558..c2448ce4dd1 100644 --- a/src/vs/base/common/comparers.ts +++ b/src/vs/base/common/comparers.ts @@ -15,7 +15,7 @@ export function setFileNameComparer(collator: Intl.Collator): void { intlFileNameCollatorIsNumeric = collator.resolvedOptions().numeric; } -export function compareFileNames(one: string, other: string): number { +export function compareFileNames(one: string, other: string, caseSensitive = false): number { if (intlFileNameCollator) { const a = one || ''; const b = other || ''; @@ -30,14 +30,19 @@ export function compareFileNames(one: string, other: string): number { return result; } - return noIntlCompareFileNames(one, other); + return noIntlCompareFileNames(one, other, caseSensitive); } const FileNameMatch = /^(.*?)(\.([^.]*))?$/; -export function noIntlCompareFileNames(one: string, other: string): number { - const [oneName, oneExtension] = extractNameAndExtension(one, true); - const [otherName, otherExtension] = extractNameAndExtension(other, true); +export function noIntlCompareFileNames(one: string, other: string, caseSensitive = false): number { + if (!caseSensitive) { + one = one && one.toLowerCase(); + other = other && other.toLowerCase(); + } + + const [oneName, oneExtension] = extractNameAndExtension(one); + const [otherName, otherExtension] = extractNameAndExtension(other); if (oneName !== otherName) { return oneName < otherName ? -1 : 1; @@ -79,8 +84,8 @@ export function compareFileExtensions(one: string, other: string): number { } function noIntlCompareFileExtensions(one: string, other: string): number { - const [oneName, oneExtension] = extractNameAndExtension(one, true); - const [otherName, otherExtension] = extractNameAndExtension(other, true); + const [oneName, oneExtension] = extractNameAndExtension(one && one.toLowerCase()); + const [otherName, otherExtension] = extractNameAndExtension(other && other.toLowerCase()); if (oneExtension !== otherExtension) { return oneExtension < otherExtension ? -1 : 1; @@ -93,32 +98,49 @@ function noIntlCompareFileExtensions(one: string, other: string): number { return oneName < otherName ? -1 : 1; } -function extractNameAndExtension(str?: string, lowercase?: boolean): [string, string] { - const match = str ? FileNameMatch.exec(lowercase ? str.toLowerCase() : str) : [] as RegExpExecArray; +function extractNameAndExtension(str?: string): [string, string] { + const match = str ? FileNameMatch.exec(str) : [] as RegExpExecArray; return [(match && match[1]) || '', (match && match[3]) || '']; } -export function comparePaths(one: string, other: string): number { +function comparePathComponents(one: string, other: string, caseSensitive = false): number { + if (!caseSensitive) { + one = one && one.toLowerCase(); + other = other && other.toLowerCase(); + } + + if (one === other) { + return 0; + } + + return one < other ? -1 : 1; +} + +export function comparePaths(one: string, other: string, caseSensitive = false): number { const oneParts = one.split(paths.nativeSep); const otherParts = other.split(paths.nativeSep); const lastOne = oneParts.length - 1; const lastOther = otherParts.length - 1; - let endOne: boolean, endOther: boolean, onePart: string, otherPart: string; + let endOne: boolean, endOther: boolean; for (let i = 0; ; i++) { endOne = lastOne === i; endOther = lastOther === i; if (endOne && endOther) { - return compareFileNames(oneParts[i], otherParts[i]); + return compareFileNames(oneParts[i], otherParts[i], caseSensitive); } else if (endOne) { return -1; } else if (endOther) { return 1; - } else if ((onePart = oneParts[i].toLowerCase()) !== (otherPart = otherParts[i].toLowerCase())) { - return onePart < otherPart ? -1 : 1; + } + + const result = comparePathComponents(oneParts[i], otherParts[i], caseSensitive); + + if (result !== 0) { + return result; } } } diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts index bcd3a92b97c..f2c06ca6270 100644 --- a/src/vs/workbench/api/node/extHostSCM.ts +++ b/src/vs/workbench/api/node/extHostSCM.ts @@ -93,7 +93,7 @@ function compareResourceStatesDecorations(a: vscode.SourceControlResourceDecorat } function compareResourceStates(a: vscode.SourceControlResourceState, b: vscode.SourceControlResourceState): number { - let result = comparePaths(a.resourceUri.fsPath, b.resourceUri.fsPath); + let result = comparePaths(a.resourceUri.fsPath, b.resourceUri.fsPath, true); if (result !== 0) { return result; @@ -234,6 +234,8 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG const snapshot = [...this._resourceStates].sort(compareResourceStates); const diffs = sortedDiff(this._resourceSnapshot, snapshot, compareResourceStates); + console.log(diffs); + const splices = diffs.map>(diff => { const toInsert = diff.toInsert.map(r => { const handle = this._resourceHandlePool++; From c3ed46fa72028a34c765990421b10c7b52236c86 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 9 Jan 2018 16:33:46 +0100 Subject: [PATCH 051/710] remove console.log --- src/vs/workbench/api/node/extHostSCM.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts index f2c06ca6270..0487a50e966 100644 --- a/src/vs/workbench/api/node/extHostSCM.ts +++ b/src/vs/workbench/api/node/extHostSCM.ts @@ -234,8 +234,6 @@ class ExtHostSourceControlResourceGroup implements vscode.SourceControlResourceG const snapshot = [...this._resourceStates].sort(compareResourceStates); const diffs = sortedDiff(this._resourceSnapshot, snapshot, compareResourceStates); - console.log(diffs); - const splices = diffs.map>(diff => { const toInsert = diff.toInsert.map(r => { const handle = this._resourceHandlePool++; From 327c692f61f2037525d1cac1a689978dd7e0986b Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 9 Jan 2018 07:51:32 -0800 Subject: [PATCH 052/710] Check url fix --- src/vs/platform/url/electron-main/urlService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts index 5469274fb20..595d3b38c97 100644 --- a/src/vs/platform/url/electron-main/urlService.ts +++ b/src/vs/platform/url/electron-main/urlService.ts @@ -25,7 +25,7 @@ export class URLService implements IURLService { ...globalBuffer ]; - app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url']); + app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url', '--']); const rawOnOpenUrl = fromNodeEventEmitter(app, 'open-url', (event: Electron.Event, url: string) => ({ event, url })); From f5954714713e55b8f46e76b492ccce35da77fbe9 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 17:26:24 +0100 Subject: [PATCH 053/710] fixes #41347 --- .../files/electron-browser/fileActions.contribution.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 81c7b1de24d..81a173321f7 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -50,7 +50,7 @@ const RENAME_ID = 'renameFile'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: RENAME_ID, weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus), - when: FilesExplorerFocusCondition, + when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()), primary: KeyCode.F2, mac: { primary: KeyCode.Enter @@ -62,7 +62,7 @@ const MOVE_FILE_TO_TRASH_ID = 'moveFileToTrash'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: MOVE_FILE_TO_TRASH_ID, weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus), - when: FilesExplorerFocusCondition, + when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()), primary: KeyCode.Delete, mac: { primary: KeyMod.CtrlCmd | KeyCode.Backspace @@ -74,7 +74,7 @@ const DELETE_FILE_ID = 'deleteFile'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: DELETE_FILE_ID, weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus), - when: FilesExplorerFocusCondition, + when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()), primary: KeyMod.Shift | KeyCode.Delete, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Backspace @@ -86,7 +86,7 @@ const COPY_FILE_ID = 'filesExplorer.copy'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: COPY_FILE_ID, weight: KeybindingsRegistry.WEIGHT.workbenchContrib(explorerCommandsWeightBonus), - when: FilesExplorerFocusCondition, + when: ContextKeyExpr.and(FilesExplorerFocusCondition, ExplorerRootContext.toNegated()), primary: KeyMod.CtrlCmd | KeyCode.KEY_C, handler: copyFileHandler, }); From 1f4a001f8c91cc85519457de339ccd1bb27d5baf Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Tue, 9 Jan 2018 17:46:36 +0100 Subject: [PATCH 054/710] always quote args for PowerShell; fixes #39530 --- .../workbench/parts/debug/electron-browser/terminalSupport.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts index 25ca3cf7a4b..34ad85f35c5 100644 --- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts +++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts @@ -94,7 +94,8 @@ export class TerminalSupport { quote = (s: string) => { s = s.replace(/\'/g, '\'\''); - return s.indexOf(' ') >= 0 || s.indexOf('\'') >= 0 || s.indexOf('"') >= 0 ? `'${s}'` : s; + return `'${s}'`; + //return s.indexOf(' ') >= 0 || s.indexOf('\'') >= 0 || s.indexOf('"') >= 0 ? `'${s}'` : s; }; if (args.cwd) { From 2795711518401f80b30dec719622bb0c911944f9 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 9 Jan 2018 08:56:10 -0800 Subject: [PATCH 055/710] test --- src/vs/platform/url/electron-main/urlService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts index 595d3b38c97..e31fc2036e9 100644 --- a/src/vs/platform/url/electron-main/urlService.ts +++ b/src/vs/platform/url/electron-main/urlService.ts @@ -25,7 +25,7 @@ export class URLService implements IURLService { ...globalBuffer ]; - app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url', '--']); + app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--protocol-launcher', '--']); const rawOnOpenUrl = fromNodeEventEmitter(app, 'open-url', (event: Electron.Event, url: string) => ({ event, url })); From b10ef64bc9beb0d959f8e879c8dd706a6e3d4e77 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Jan 2018 09:41:50 -0800 Subject: [PATCH 056/710] fix #41207 --- .../snippets/electron-browser/snippetsFile.ts | 8 ++-- .../electron-browser/snippetsService.ts | 44 +++++++++++-------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts index 3ae6bdea3a6..88dee69e79a 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.ts @@ -141,7 +141,7 @@ export class SnippetFile { constructor( readonly filepath: string, - private readonly _defaultScope: string, + readonly defaultScopes: string[], private readonly _extension: IExtensionDescription ) { this.isGlobalSnippets = extname(filepath) === '.code-snippets'; @@ -149,7 +149,7 @@ export class SnippetFile { } select(selector: string, bucket: Snippet[]): void { - if (this.isGlobalSnippets) { + if (this.isGlobalSnippets || !this.isUserSnippets) { this._scopeSelect(selector, bucket); } else { this._filepathSelect(selector, bucket); @@ -229,8 +229,8 @@ export class SnippetFile { } let scopes: string[]; - if (this._defaultScope) { - scopes = [this._defaultScope]; + if (this.defaultScopes) { + scopes = this.defaultScopes; } else if (typeof snippet.scope === 'string') { scopes = snippet.scope.split(',').filter(s => !isFalsyOrWhitespace(s)); } else { diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index b4ec60a65ad..d86d0eccb2c 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -163,27 +163,33 @@ class SnippetsService implements ISnippetsService { continue; } - const file = new SnippetFile(contribution.path, contribution.language, extension.description); - this._files.set(file.filepath, file); + if (this._files.has(contribution.path)) { + this._files.get(contribution.path).defaultScopes.push(contribution.language); - if (this._environmentService.isExtensionDevelopment) { - file.load().then(file => { - // warn about bad tabstop/variable usage - if (file.data.some(snippet => snippet.isBogous)) { + } else { + const file = new SnippetFile(contribution.path, [contribution.language], extension.description); + this._files.set(file.filepath, file); + + if (this._environmentService.isExtensionDevelopment) { + file.load().then(file => { + // warn about bad tabstop/variable usage + if (file.data.some(snippet => snippet.isBogous)) { + extension.collector.warn(localize( + 'badVariableUse', + "One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)", + extension.description.name + )); + } + }, err => { + // generic error extension.collector.warn(localize( - 'badVariableUse', - "One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)", - extension.description.name + 'badFile', + "The snippet file \"{0}\" could not be read.", + file.filepath )); - } - }, err => { - // generic error - extension.collector.warn(localize( - 'badFile', - "The snippet file \"{0}\" could not be read.", - file.filepath - )); - }); + }); + } + } } } @@ -195,7 +201,7 @@ class SnippetsService implements ISnippetsService { const ext = extname(filepath); if (ext === '.json') { const langName = basename(filepath, '.json'); - this._files.set(filepath, new SnippetFile(filepath, langName, undefined)); + this._files.set(filepath, new SnippetFile(filepath, [langName], undefined)); } else if (ext === '.code-snippets') { this._files.set(filepath, new SnippetFile(filepath, undefined, undefined)); From e3367714e5fb766427d951f5efba9007ec8cd5f0 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 9 Jan 2018 18:47:11 +0100 Subject: [PATCH 057/710] Fix #40018 --- src/vs/workbench/api/node/extHostTreeViews.ts | 169 ++++++++---------- .../api/extHostTreeViews.test.ts | 20 +-- 2 files changed, 82 insertions(+), 107 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index ad9610e5fb2..5ebf180db38 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -14,6 +14,7 @@ import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.proto import { ITreeItem, TreeViewItemHandleArg } from 'vs/workbench/common/views'; import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands'; import { asWinJsPromise } from 'vs/base/common/async'; +import { coalesce } from 'vs/base/common/arrays'; type TreeItemHandle = string; @@ -51,7 +52,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape { if (!treeView) { return TPromise.wrapError(new Error(localize('treeView.notRegistered', 'No tree view with id \'{0}\' registered.', treeViewId))); } - return treeView.getTreeItems(); + return treeView.getChildren(); } $getChildren(treeViewId: string, treeItemHandle?: string): TPromise { @@ -69,10 +70,9 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape { } interface TreeNode { - index: number; handle: TreeItemHandle; - parent: TreeItemHandle; - children: TreeItemHandle[]; + parentHandle: TreeItemHandle; + childrenHandles: TreeItemHandle[]; } class ExtHostTreeView extends Disposable { @@ -89,25 +89,37 @@ class ExtHostTreeView extends Disposable { } } - getTreeItems(): TPromise { - this.clearAll(); - return asWinJsPromise(() => this.dataProvider.getChildren()) - .then(elements => this.resolveElements(elements)); - } - - getChildren(treeItemHandle: TreeItemHandle): TPromise { - let extElement = this.getExtensionElement(treeItemHandle); - if (extElement) { - this.clearChildren(extElement); - } else { - return TPromise.wrapError(new Error(localize('treeItem.notFound', 'No tree item with id \'{0}\' found.', treeItemHandle))); + getChildren(parentHandle?: TreeItemHandle): TPromise { + let parentElement; + if (parentHandle) { + parentElement = this.getExtensionElement(parentHandle); + if (!parentElement) { + return TPromise.wrapError(new Error(localize('treeItem.notFound', 'No tree item with id \'{0}\' found.', parentHandle))); + } } - return asWinJsPromise(() => this.dataProvider.getChildren(extElement)) - .then(childrenElements => this.resolveElements(childrenElements, treeItemHandle)) - .then(childrenItems => { - this.nodes.get(extElement).children = childrenItems.map(c => c.handle); - return childrenItems; + return asWinJsPromise(() => this.dataProvider.getChildren(parentElement)) + .then(elements => { + elements = coalesce(elements || []); + return TPromise.join(elements.map((element, index) => { + const node = this.nodes.get(element); + const currentHandle = node && node.parentHandle === parentHandle ? node.handle : void 0; + return this.resolveElement(element, currentHandle ? currentHandle : index, parentHandle) + .then(treeItem => { + if (treeItem) { + if (!currentHandle) { + // update the caches if current handle is not used + this.nodes.set(element, { + handle: treeItem.handle, + parentHandle, + childrenHandles: void 0 + }); + this.elements.set(treeItem.handle, element); + } + } + return treeItem; + }); + })).then(treeItems => this.updateChildren(coalesce(treeItems), parentElement)); }); } @@ -120,52 +132,29 @@ class ExtHostTreeView extends Disposable { if (hasRoot) { this.proxy.$refresh(this.viewId); } else { - const handlesToUpdate = this.getHandlesToUpdate(elements); - if (handlesToUpdate.length) { - this._refreshHandles(handlesToUpdate); + const handlesToRefresh = this.getHandlesToRefresh(elements); + if (handlesToRefresh.length) { + this.refreshHandles(handlesToRefresh); } } } - private resolveElements(elements: T[], parentHandle?: TreeItemHandle): TPromise { - if (elements && elements.length) { - return TPromise.join( - elements.filter(element => !!element) - .map((element, index) => { - return this.resolveElement(element, index, parentHandle) - .then(treeItem => { - if (treeItem) { - this.nodes.set(element, { - index, - handle: treeItem.handle, - parent: parentHandle, - children: void 0 - }); - if (this.elements.has(treeItem.handle)) { - return TPromise.wrapError(new Error(localize('treeView.duplicateElement', 'Element {0} is already registered', element))); - } - this.elements.set(treeItem.handle, element); - } - return treeItem; - }); - })) - .then(treeItems => treeItems.filter(treeItem => !!treeItem)); - } - return TPromise.as([]); - } - - private resolveElement(element: T, index: number, parentHandle?: TreeItemHandle): TPromise { + private resolveElement(element: T, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): TPromise { return asWinJsPromise(() => this.dataProvider.getTreeItem(element)) - .then(extTreeItem => this.massageTreeItem(element, extTreeItem, index, parentHandle)); + .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handleOrIndex, parentHandle)); } - private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, index: number, parentHandle: TreeItemHandle): ITreeItem { + private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): ITreeItem { if (!extensionTreeItem) { return null; } + const icon = this.getLightIconPath(extensionTreeItem); const label = extensionTreeItem.label; - const handle = typeof element === 'string' ? element : this.generateHandle(label, index, parentHandle); + const handle = typeof handleOrIndex === 'number' ? + this.generateHandle(label, handleOrIndex, parentHandle) // create the handle + : handleOrIndex; // reuse the passed handle + return { handle, parentHandle, @@ -208,18 +197,18 @@ class ExtHostTreeView extends Disposable { return URI.file(iconPath).toString(); } - private getHandlesToUpdate(elements: T[]): TreeItemHandle[] { + private getHandlesToRefresh(elements: T[]): TreeItemHandle[] { const elementsToUpdate = new Set(); for (const element of elements) { let elementNode = this.nodes.get(element); if (elementNode && !elementsToUpdate.has(elementNode.handle)) { // check if an ancestor of extElement is already in the elements to update list let currentNode = elementNode; - while (currentNode && currentNode.parent && !elementsToUpdate.has(currentNode.parent)) { - const parentElement = this.elements.get(currentNode.parent); + while (currentNode && currentNode.parentHandle && !elementsToUpdate.has(currentNode.parentHandle)) { + const parentElement = this.elements.get(currentNode.parentHandle); currentNode = this.nodes.get(parentElement); } - if (!currentNode.parent) { + if (!currentNode.parentHandle) { elementsToUpdate.add(elementNode.handle); } } @@ -230,7 +219,7 @@ class ExtHostTreeView extends Disposable { elementsToUpdate.forEach((handle) => { const element = this.elements.get(handle); let node = this.nodes.get(element); - if (node && !elementsToUpdate.has(node.parent)) { + if (node && !elementsToUpdate.has(node.parentHandle)) { handlesToUpdate.push(handle); } }); @@ -238,21 +227,16 @@ class ExtHostTreeView extends Disposable { return handlesToUpdate; } - private _refreshHandles(itemHandles: TreeItemHandle[]): TPromise { + private refreshHandles(itemHandles: TreeItemHandle[]): TPromise { const itemsToRefresh: { [handle: string]: ITreeItem } = {}; const promises: TPromise[] = []; itemHandles.forEach(treeItemHandle => { const extElement = this.getExtensionElement(treeItemHandle); const node = this.nodes.get(extElement); - const promise = this.resolveElement(extElement, node.index, node.parent) + promises.push(this.resolveElement(extElement, treeItemHandle, node.parentHandle) .then(treeItem => { - if (treeItemHandle !== treeItem.handle) { - // Update caches if handle changes - this.updateCaches(node, treeItem, extElement); - } itemsToRefresh[treeItemHandle] = treeItem; - }); - promises.push(promise); + })); }); return TPromise.join(promises) .then(treeItems => { @@ -260,39 +244,34 @@ class ExtHostTreeView extends Disposable { }); } - private updateCaches(node: TreeNode, treeItem: ITreeItem, element: T): void { - if (node.parent) { - // Update parent's children handles - const parentElement = this.getExtensionElement(node.parent); + private updateChildren(newChildren: ITreeItem[], parentElement?: T): ITreeItem[] { + let existingChildrenHandles: TreeItemHandle[] = []; + if (parentElement) { const parentNode = this.nodes.get(parentElement); - parentNode.children[node.index] = treeItem.handle; + existingChildrenHandles = parentNode.childrenHandles || []; + parentNode.childrenHandles = newChildren.map(c => c.handle); + } else { + this.nodes.forEach(node => { + if (!node.parentHandle) { + existingChildrenHandles.push(node.handle); + } + }); } - // Update elements map - this.elements.delete(node.handle); - this.elements.set(treeItem.handle, element); - - // Update node - node.handle = treeItem.handle; - } - - private clearChildren(element: T): void { - let node = this.nodes.get(element); - if (node.children) { - for (const childHandle of node.children) { - const childEleement = this.elements.get(childHandle); - if (childEleement) { - this.clear(childEleement); - } + for (const existingChildHandle of existingChildrenHandles) { + const existingChildElement = this.elements.get(existingChildHandle); + if (existingChildElement && newChildren.every(c => c.handle !== existingChildHandle)) { + this.clear(existingChildElement); } } - node.children = void 0; + + return newChildren; } private clear(element: T): void { let node = this.nodes.get(element); - if (node.children) { - for (const childHandle of node.children) { + if (node.childrenHandles) { + for (const childHandle of node.childrenHandles) { const childEleement = this.elements.get(childHandle); if (childEleement) { this.clear(childEleement); @@ -303,12 +282,8 @@ class ExtHostTreeView extends Disposable { this.elements.delete(node.handle); } - private clearAll(): void { + dispose() { this.elements.clear(); this.nodes.clear(); } - - dispose() { - this.clearAll(); - } } \ No newline at end of file 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 b62cac7b7e0..1a692f0c257 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -111,24 +111,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testStringTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['a', 'b']); + assert.deepEqual(actuals, ['0/0:a', '0/1:b']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', 'a') + testObject.$getChildren('testStringTreeProvider', '0/0:a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['aa', 'ab']); + assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', 'aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', 'ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', 'b') + testObject.$getChildren('testStringTreeProvider', '0/1:b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['ba', 'bb']); + assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', 'ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', 'bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -213,7 +213,7 @@ suite('ExtHostTreeView', function () { target.onRefresh.event(actuals => { assert.deepEqual(['0/0:a'], Object.keys(actuals)); assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), { - handle: '0/0:aa', + handle: '0/0:a', label: 'aa', }); done(); From 7a52e53e5cdb0a2d34b372e6e29aec2e99ac4522 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Jan 2018 09:55:23 -0800 Subject: [PATCH 058/710] some more todos --- src/vs/vscode.proposed.d.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 9683e1171a1..ab8f16d446a 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -84,6 +84,7 @@ declare module 'vscode' { } // todo@joh discover files etc + // todo@joh CancellationToken everywhere export interface FileSystemProvider { readonly onDidChange?: Event; @@ -98,6 +99,7 @@ declare module 'vscode' { read(resource: Uri, offset: number, length: number, progress: Progress): Thenable; + // todo@joh - have an option to create iff not exist // todo@remote // offset - byte offset to start // count - number of bytes to write From 876b47a9bd4b6e92e21699af429a96e54c464fe5 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Jan 2018 10:04:03 -0800 Subject: [PATCH 059/710] wait for calling restore, not for finishing restore, workaround for #41322 --- src/vs/workbench/electron-browser/workbench.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 2301bbcf844..758bdb709ea 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -97,6 +97,7 @@ import URI from 'vs/base/common/uri'; import { IListService, ListService } from 'vs/platform/list/browser/listService'; import { domEvent } from 'vs/base/browser/event'; import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys'; +import { onUnexpectedError } from 'vs/base/common/errors'; export const MessagesVisibleContext = new RawContextKey('globalMessageVisible', false); export const EditorsVisibleContext = new RawContextKey('editorIsOpen', false); @@ -331,7 +332,7 @@ export class Workbench implements IPartService { // update lifecycle *after* triggering the editor restore this.lifecycleService.phase = LifecyclePhase.Restoring; - return editorOpenPromise.then(editors => { + editorOpenPromise.then(editors => { this.handleEditorBackground(); // make sure we show the proper background in the editor area perf.mark('didRestoreEditors'); @@ -345,7 +346,7 @@ export class Workbench implements IPartService { } } } - }); + }).done(undefined, onUnexpectedError); })); // Restore Sidebar From c43426c2373e31df38615fe5c48a397d34e2b6a0 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 9 Jan 2018 10:12:00 -0800 Subject: [PATCH 060/710] move auto test helpers out --- .../common/model/benchmark/edits.benchmark.ts | 2 +- .../common/model/benchmark/getLineContent.ts | 2 +- .../model/benchmark/modelbuilder.benchmark.ts | 2 +- .../linesTextBufferBuilderAuto.test.ts | 26 +---------------- .../textBufferAutoTestUtils.ts} | 29 +++++++++++++++++-- 5 files changed, 30 insertions(+), 31 deletions(-) rename src/vs/editor/test/common/model/{benchmark/util.ts => linesTextBuffer/textBufferAutoTestUtils.ts} (75%) diff --git a/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts b/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts index 5a2fb86ec2b..dcbe7d11a24 100644 --- a/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts @@ -7,7 +7,7 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model'; -import { randomEdits, createMockText, createMockBuffer } from 'vs/editor/test/common/model/benchmark/util'; +import { randomEdits, createMockText, createMockBuffer } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; let modelBuildBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { console.time(id); diff --git a/src/vs/editor/test/common/model/benchmark/getLineContent.ts b/src/vs/editor/test/common/model/benchmark/getLineContent.ts index f87b631135d..7a793efee69 100644 --- a/src/vs/editor/test/common/model/benchmark/getLineContent.ts +++ b/src/vs/editor/test/common/model/benchmark/getLineContent.ts @@ -7,7 +7,7 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { ITextBuffer } from 'vs/editor/common/model'; -import { randomEdits, createMockBuffer, createMockText } from 'vs/editor/test/common/model/benchmark/util'; +import { randomEdits, createMockBuffer, createMockText } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; let readLines = function (id: string, buffer: ITextBuffer) { console.time(id); 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 4573b520379..90163a0fd29 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -7,7 +7,7 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { ITextBufferBuilder } from 'vs/editor/common/model'; -import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/benchmark/util'; +import { generateRandomChunkWithLF } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; let linesTextBufferBuilder = new LinesTextBufferBuilder(); let pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); diff --git a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts index 63218d9c7e5..8d7119d2077 100644 --- a/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts +++ b/src/vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { testModelBuilder } from './linesTextBufferBuilder.test'; -import { CharCode } from 'vs/base/common/charCode'; +import { getRandomInt, getRandomEOLSequence, getRandomString } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; const GENERATE_TESTS = false; @@ -21,30 +21,6 @@ suite('ModelBuilder Auto Tests', () => { }); -export function getRandomInt(min: number, max: number): number { - return Math.floor(Math.random() * (max - min + 1)) + min; -} - -export function getRandomEOLSequence(): string { - let rnd = getRandomInt(1, 3); - if (rnd === 1) { - return '\n'; - } - if (rnd === 2) { - return '\r'; - } - return '\r\n'; -} - -export function getRandomString(minLength: number, maxLength: number): string { - let length = getRandomInt(minLength, maxLength); - let r = ''; - for (let i = 0; i < length; i++) { - r += String.fromCharCode(getRandomInt(CharCode.a, CharCode.z)); - } - return r; -} - function generateRandomFile(): string { let lineCount = getRandomInt(1, 10); let mixedEOLSequence = getRandomInt(1, 2) === 1 ? true : false; diff --git a/src/vs/editor/test/common/model/benchmark/util.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts similarity index 75% rename from src/vs/editor/test/common/model/benchmark/util.ts rename to src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts index 2fe3911201f..2a6e2751737 100644 --- a/src/vs/editor/test/common/model/benchmark/util.ts +++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts @@ -4,10 +4,33 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IIdentifiedSingleEditOperation, ITextBufferBuilder, DefaultEndOfLine, ITextBuffer } from 'vs/editor/common/model'; -import { Range } from 'vs/editor/common/core/range'; -import { getRandomString, getRandomInt, getRandomEOLSequence } from 'vs/editor/test/common/model/linesTextBuffer/linesTextBufferBuilderAuto.test'; import { CharCode } from 'vs/base/common/charCode'; +import { IIdentifiedSingleEditOperation, DefaultEndOfLine, ITextBufferBuilder, ITextBuffer } from 'vs/editor/common/model'; +import { Range } from 'vs/editor/common/core/range'; + +export function getRandomInt(min: number, max: number): number { + return Math.floor(Math.random() * (max - min + 1)) + min; +} + +export function getRandomEOLSequence(): string { + let rnd = getRandomInt(1, 3); + if (rnd === 1) { + return '\n'; + } + if (rnd === 2) { + return '\r'; + } + return '\r\n'; +} + +export function getRandomString(minLength: number, maxLength: number): string { + let length = getRandomInt(minLength, maxLength); + let r = ''; + for (let i = 0; i < length; i++) { + r += String.fromCharCode(getRandomInt(CharCode.a, CharCode.z)); + } + return r; +} export function randomEdits(str: string, editCnt: number): IIdentifiedSingleEditOperation[] { let lines = str.split(/\r\n|\r|\n/); From 7945915d4dde56140ec9eb444aa59701884f3ac2 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Jan 2018 10:16:11 -0800 Subject: [PATCH 061/710] remote - better reads --- .../electron-browser/mainThreadFileSystem.ts | 29 ++++++++++++++----- src/vs/workbench/api/node/extHost.protocol.ts | 6 ++-- .../workbench/api/node/extHostFileSystem.ts | 6 ++-- 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index acc5872827c..52d0da37382 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -53,8 +53,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { this._provider.get(handle).$onFileSystemChange(changes); } - $reportFileChunk(handle: number, data: UriComponents, chunk: number[]): void { - this._provider.get(handle).reportFileChunk(URI.revive(data), chunk); + $reportFileChunk(handle: number, session: number, chunk: number[]): void { + this._provider.get(handle).reportFileChunk(session, chunk); } // --- search @@ -64,10 +64,22 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { } } +class FileReadOperation { + + private static _idPool = 0; + + constructor( + readonly progress: IProgress, + readonly id: number = ++FileReadOperation._idPool + ) { + // + } +} + class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProvider { private readonly _onDidChange = new Emitter(); - private readonly _reads = new Map>(); + private readonly _reads = new Map(); private readonly _registrations: IDisposable[]; readonly onDidChange: Event = this._onDidChange.event; @@ -104,11 +116,12 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv return this._proxy.$stat(this._handle, resource); } read(resource: URI, offset: number, count: number, progress: IProgress): TPromise { - this._reads.set(resource.toString(), progress); - return this._proxy.$read(this._handle, offset, count, resource); + const read = new FileReadOperation(progress); + this._reads.set(read.id, read); + return this._proxy.$read(this._handle, read.id, offset, count, resource); } - reportFileChunk(resource: URI, chunk: number[]): void { - this._reads.get(resource.toString()).report(Buffer.from(chunk)); + reportFileChunk(session: number, chunk: number[]): void { + this._reads.get(session).progress.report(Buffer.from(chunk)); } write(resource: URI, content: Uint8Array): TPromise { return this._proxy.$write(this._handle, resource, [].slice.call(content)); @@ -143,7 +156,7 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv const id = ++this._searchesIdPool; const matches: IFileMatch[] = []; return new PPromise((resolve, reject, report) => { - this._proxy.$fileFiles(this._handle, id, query.filePattern).then(() => { + this._proxy.$findFiles(this._handle, id, query.filePattern).then(() => { this._searches.delete(id); resolve({ results: matches, diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 9ec2422972f..d189f463f6b 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -371,7 +371,7 @@ export interface MainThreadFileSystemShape extends IDisposable { $onDidAddFileSystemRoot(root: UriComponents): void; $onFileSystemChange(handle: number, resource: IFileChange[]): void; - $reportFileChunk(handle: number, resource: UriComponents, chunk: number[] | null): void; + $reportFileChunk(handle: number, session: number, chunk: number[] | null): void; $handleSearchProgress(handle: number, session: number, resource: UriComponents): void; } @@ -535,14 +535,14 @@ export interface ExtHostWorkspaceShape { export interface ExtHostFileSystemShape { $utimes(handle: number, resource: UriComponents, mtime: number, atime: number): TPromise; $stat(handle: number, resource: UriComponents): TPromise; - $read(handle: number, offset: number, count: number, resource: UriComponents): TPromise; + $read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise; $write(handle: number, resource: UriComponents, content: number[]): TPromise; $unlink(handle: number, resource: UriComponents): TPromise; $move(handle: number, resource: UriComponents, target: UriComponents): TPromise; $mkdir(handle: number, resource: UriComponents): TPromise; $readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][]>; $rmdir(handle: number, resource: UriComponents): TPromise; - $fileFiles(handle: number, session: number, query: string): TPromise; + $findFiles(handle: number, session: number, query: string): TPromise; } export interface ExtHostExtensionServiceShape { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index 3cdd834d7a7..c2ad87af990 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -48,10 +48,10 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { $stat(handle: number, resource: UriComponents): TPromise { return asWinJsPromise(token => this._provider.get(handle).stat(URI.revive(resource))); } - $read(handle: number, offset: number, count: number, resource: UriComponents): TPromise { + $read(handle: number, session: number, offset: number, count: number, resource: UriComponents): TPromise { const progress = { report: chunk => { - this._proxy.$reportFileChunk(handle, resource, [].slice.call(chunk)); + this._proxy.$reportFileChunk(handle, session, [].slice.call(chunk)); } }; return asWinJsPromise(token => this._provider.get(handle).read(URI.revive(resource), offset, count, progress)); @@ -74,7 +74,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { $rmdir(handle: number, resource: UriComponents): TPromise { return asWinJsPromise(token => this._provider.get(handle).rmdir(URI.revive(resource))); } - $fileFiles(handle: number, session: number, query: string): TPromise { + $findFiles(handle: number, session: number, query: string): TPromise { const provider = this._provider.get(handle); if (!provider.findFiles) { return TPromise.as(undefined); From 9e57f6f0b7f26e69367771036adb1b6550cc72d0 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 9 Jan 2018 09:39:05 -0800 Subject: [PATCH 062/710] More --- src/vs/code/electron-main/launch.ts | 10 +++++++--- src/vs/platform/environment/common/environment.ts | 2 +- src/vs/platform/url/electron-main/urlService.ts | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index 86324ae6c63..6df3339f4a8 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -117,9 +117,13 @@ export class LaunchService implements ILaunchService { private startOpenUrl(args: ParsedArgs): TPromise { const openUrlArg = args['open-url'] || []; - const openUrl = typeof openUrlArg === 'string' ? [openUrlArg] : openUrlArg; - if (openUrl.length > 0) { - openUrl.forEach(url => this.urlService.open(url)); + if (openUrlArg) { + // --open-url must contain -- followed by the url(s) + // process.argv is used over args._ as args._ are resolved to file paths on disk at this point + const dashDashIndex = process.argv.indexOf('--'); + for (let i = dashDashIndex + 1; i < process.argv.length; i++) { + this.urlService.open(process.argv[i]); + } return TPromise.as(null); } diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index 7c6ed230677..a4373df8616 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -42,7 +42,7 @@ export interface ParsedArgs { 'install-extension'?: string | string[]; 'uninstall-extension'?: string | string[]; 'enable-proposed-api'?: string | string[]; - 'open-url'?: string | string[]; + 'open-url'?: boolean; 'skip-getting-started'?: boolean; 'skip-release-notes'?: boolean; 'sticky-quickopen'?: boolean; diff --git a/src/vs/platform/url/electron-main/urlService.ts b/src/vs/platform/url/electron-main/urlService.ts index e31fc2036e9..595d3b38c97 100644 --- a/src/vs/platform/url/electron-main/urlService.ts +++ b/src/vs/platform/url/electron-main/urlService.ts @@ -25,7 +25,7 @@ export class URLService implements IURLService { ...globalBuffer ]; - app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--protocol-launcher', '--']); + app.setAsDefaultProtocolClient(product.urlProtocol, process.execPath, ['--open-url', '--']); const rawOnOpenUrl = fromNodeEventEmitter(app, 'open-url', (event: Electron.Event, url: string) => ({ event, url })); From 4fd1a5c3e68e663d19276bd49c7c83192208d6ff Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 9 Jan 2018 13:03:58 -0800 Subject: [PATCH 063/710] progress --- src/vs/code/electron-main/launch.ts | 9 +++------ src/vs/code/node/paths.ts | 4 ++++ src/vs/platform/environment/common/environment.ts | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index 6df3339f4a8..265a0dffc4a 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -117,13 +117,10 @@ export class LaunchService implements ILaunchService { private startOpenUrl(args: ParsedArgs): TPromise { const openUrlArg = args['open-url'] || []; - if (openUrlArg) { + if (openUrlArg && args._urls && args._urls.length) { // --open-url must contain -- followed by the url(s) - // process.argv is used over args._ as args._ are resolved to file paths on disk at this point - const dashDashIndex = process.argv.indexOf('--'); - for (let i = dashDashIndex + 1; i < process.argv.length; i++) { - this.urlService.open(process.argv[i]); - } + // process.argv is used over args._ as args._ are resolved to file paths at this point + args._urls.forEach(url => this.urlService.open(url)); return TPromise.as(null); } diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts index 848b77a3c87..cafef96fd3a 100644 --- a/src/vs/code/node/paths.ts +++ b/src/vs/code/node/paths.ts @@ -15,6 +15,10 @@ import { ParsedArgs } from 'vs/platform/environment/common/environment'; import { realpathSync } from 'vs/base/node/extfs'; export function validatePaths(args: ParsedArgs): ParsedArgs { + // Track URLs if they're going to be used + if (args['open-url']) { + args._urls = args._; + } // Realpath/normalize paths and watch out for goto line mode const paths = doValidatePaths(args._, args.goto); diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index a4373df8616..ce3950c1c0f 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -9,6 +9,7 @@ import { LogLevel } from 'vs/platform/log/common/log'; export interface ParsedArgs { [arg: string]: any; _: string[]; + _urls?: string[]; help?: boolean; version?: boolean; status?: boolean; From 4c4833795e7086abe926a7c09c2687f35960145f Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Tue, 9 Jan 2018 14:25:03 -0800 Subject: [PATCH 064/710] Run hygiene in a dedicated Travis job --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f28f9d55cb..e0799f34e24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,6 @@ install: - yarn script: - - node_modules/.bin/gulp hygiene - node_modules/.bin/gulp electron --silent - node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit - node_modules/.bin/gulp compile --silent --max_old_space_size=4096 @@ -62,3 +61,10 @@ script: after_success: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then node_modules/.bin/coveralls < .build/coverage/lcov.info; fi + +matrix: + include: + - os: linux + env: label=hygiene + script: node_modules/.bin/gulp hygiene + after_success: skip From 3bf13dac11a649a76d5c967fe3ec3a9e1a38f0cd Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 9 Jan 2018 14:44:04 -0800 Subject: [PATCH 065/710] Add benchmarks for Save, Replace, Random and Seqential edits. --- .../test/common/model/benchmark/bootstrap.js | 6 ++ .../test/common/model/benchmark/entry.ts | 9 +++ .../common/model/benchmark/getLineContent.ts | 43 ------------ .../model/benchmark/modelbuilder.benchmark.ts | 4 +- .../model/benchmark/operations.benchmark.ts | 70 +++++++++++++++++++ ...nchmark.ts => searchNReplace.benchmark.ts} | 17 ++--- .../textBufferAutoTestUtils.ts | 52 +++++++++++++- 7 files changed, 148 insertions(+), 53 deletions(-) create mode 100644 src/vs/editor/test/common/model/benchmark/bootstrap.js create mode 100644 src/vs/editor/test/common/model/benchmark/entry.ts delete mode 100644 src/vs/editor/test/common/model/benchmark/getLineContent.ts create mode 100644 src/vs/editor/test/common/model/benchmark/operations.benchmark.ts rename src/vs/editor/test/common/model/benchmark/{edits.benchmark.ts => searchNReplace.benchmark.ts} (61%) diff --git a/src/vs/editor/test/common/model/benchmark/bootstrap.js b/src/vs/editor/test/common/model/benchmark/bootstrap.js new file mode 100644 index 00000000000..a93aabeb980 --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/bootstrap.js @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +require('../../../../../../bootstrap-amd').bootstrap('vs/editor/test/common/model/benchmark/entry'); \ No newline at end of file diff --git a/src/vs/editor/test/common/model/benchmark/entry.ts b/src/vs/editor/test/common/model/benchmark/entry.ts new file mode 100644 index 00000000000..e1b4221dd66 --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/entry.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import 'vs/editor/test/common/model/benchmark/modelbuilder.benchmark'; +import 'vs/editor/test/common/model/benchmark/operations.benchmark'; +import 'vs/editor/test/common/model/benchmark/searchNReplace.benchmark'; \ No newline at end of file diff --git a/src/vs/editor/test/common/model/benchmark/getLineContent.ts b/src/vs/editor/test/common/model/benchmark/getLineContent.ts deleted file mode 100644 index 7a793efee69..00000000000 --- a/src/vs/editor/test/common/model/benchmark/getLineContent.ts +++ /dev/null @@ -1,43 +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 { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; -import { ITextBuffer } from 'vs/editor/common/model'; -import { randomEdits, createMockBuffer, createMockText } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; - -let readLines = function (id: string, buffer: ITextBuffer) { - console.time(id); - for (let i = 0, len = buffer.getLineCount(); i < len; i++) { - var str = buffer.getLineContent(i + 1); - let firstChar = str.charCodeAt(0); - let lastChar = str.charCodeAt(str.length - 1); - firstChar = firstChar - lastChar; - lastChar = firstChar + lastChar; - firstChar = lastChar - firstChar; - } - console.timeEnd(id); -}; - -let text = createMockText(1000, 0, 50); -let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); -let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); - -readLines('line text buffer', linesTextBuffer); -readLines('piece table text buffer', pieceTableTextBuffer); - -for (let i of [10, 100, 1000]) { - let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); - let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); - let edits = randomEdits(text, i); - - for (let i = 0, len = edits.length; i < len; i++) { - linesTextBuffer.applyEdits([edits[i]], false); - pieceTableTextBuffer.applyEdits([edits[i]], false); - } - readLines(`line text buffer after ${i} edits`, linesTextBuffer); - readLines(`piece table text buffer after ${i} edits`, pieceTableTextBuffer); -} 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 90163a0fd29..b83e78b9133 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -13,7 +13,7 @@ let linesTextBufferBuilder = new LinesTextBufferBuilder(); let pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); let chunks = []; -for (let i = 0; i < 1000; i++) { +for (let i = 0; i < 100; i++) { chunks.push(generateRandomChunkWithLF(16 * 1000, 64 * 1000)); } @@ -26,6 +26,8 @@ let modelBuildBenchmark = function (id: string, builder: ITextBufferBuilder, chu console.timeEnd(id); }; +console.log('--- model builder ---'); + for (let i of [10, 100, 1000]) { modelBuildBenchmark(`line text model builder ${i}`, linesTextBufferBuilder, i); modelBuildBenchmark(`piece table model builder ${i}`, pieceTableTextBufferBuilder, i); diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts new file mode 100644 index 00000000000..ea3d557e208 --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts @@ -0,0 +1,70 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; +import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { ITextBuffer, IIdentifiedSingleEditOperation, EndOfLinePreference } from 'vs/editor/common/model'; +import { generateRandomEdits, createMockBuffer, createMockText, generateSequentialInserts } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; +import { Range } from 'vs/editor/common/core/range'; + +let readLinesBenchmark = function (id: string, buffer: ITextBuffer) { + console.time(id); + for (let i = 0, len = buffer.getLineCount(); i < len; i++) { + var str = buffer.getLineContent(i + 1); + let firstChar = str.charCodeAt(0); + let lastChar = str.charCodeAt(str.length - 1); + firstChar = firstChar - lastChar; + lastChar = firstChar + lastChar; + firstChar = lastChar - firstChar; + } + console.timeEnd(id); +}; +let appyEditsBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { + console.time(id); + for (let i = 0, len = edits.length; i < len; i++) { + buffer.applyEdits([edits[i]], false); + } + console.timeEnd(id); +}; +let getValueBenchmark = function (id: string, buffer: ITextBuffer, eol: EndOfLinePreference = EndOfLinePreference.LF): void { + console.time(id); + const lineCount = buffer.getLineCount(); + const fullModelRange = new Range(1, 1, lineCount, buffer.getLineLength(lineCount) + 1); + buffer.getValueInRange(fullModelRange, eol); + console.timeEnd(id); +}; + +let suites = [ + { + id: 'random edits', + generateEdits: generateRandomEdits + }, + { + id: 'sequential inserts', + generateEdits: generateSequentialInserts + } +]; + +let text = createMockText(1000, 0, 50); + +for (let i = 0, len = suites.length; i < len; i++) { + console.log(`--- ${suites[i].id} ---`); + + for (let j of [10, 100, 1000]) { + let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); + let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + let edits = suites[i].generateEdits(text, j); + + appyEditsBenchmark(`line text model \t applyEdits ${j}\t`, linesTextBuffer, edits); + appyEditsBenchmark(`piece table model \t applyEdits ${j}\t`, pieceTableTextBuffer, edits); + + readLinesBenchmark(`line text model \t getLineContent after ${j} edits\t`, linesTextBuffer); + readLinesBenchmark(`piece table model \t getLineContent after ${j} edits\t`, pieceTableTextBuffer); + + getValueBenchmark(`line text model \t save after ${j} edits\t`, linesTextBuffer); + getValueBenchmark(`piece table model \t save after ${j} edits\t`, pieceTableTextBuffer); + } +} \ No newline at end of file diff --git a/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts similarity index 61% rename from src/vs/editor/test/common/model/benchmark/edits.benchmark.ts rename to src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts index dcbe7d11a24..37e740e6c68 100644 --- a/src/vs/editor/test/common/model/benchmark/edits.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts @@ -7,9 +7,9 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model'; -import { randomEdits, createMockText, createMockBuffer } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; +import { createMockText, createMockBuffer, generateRandomReplaces } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; -let modelBuildBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { +let appyEditsBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { console.time(id); for (let i = 0, len = edits.length; i < len; i++) { buffer.applyEdits([edits[i]], false); @@ -17,12 +17,13 @@ let modelBuildBenchmark = function (id: string, buffer: ITextBuffer, edits: IIde console.timeEnd(id); }; -let text = createMockText(1000, 0, 10); +let text = createMockText(1000, 50, 100); -for (let i of [10, 100, 1000]) { +console.log('--- replace all ---'); +for (let i of [10, 100, 500, 1000]) { let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); - let edits = randomEdits(text, i); - modelBuildBenchmark(`line text model builder ${i}\t`, linesTextBuffer, edits); - modelBuildBenchmark(`piece table model builder ${i}\t`, pieceTableTextBuffer, edits); -} + let edits = generateRandomReplaces(text, i, 5, 10); + appyEditsBenchmark(`line text model \t replace all ${i}\t`, linesTextBuffer, edits); + appyEditsBenchmark(`piece table model \t replace all ${i}\t`, pieceTableTextBuffer, edits); +} \ No newline at end of file diff --git a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts index 2a6e2751737..0a95c1dfcf3 100644 --- a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts +++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts @@ -32,7 +32,7 @@ export function getRandomString(minLength: number, maxLength: number): string { return r; } -export function randomEdits(str: string, editCnt: number): IIdentifiedSingleEditOperation[] { +export function generateRandomEdits(str: string, editCnt: number): IIdentifiedSingleEditOperation[] { let lines = str.split(/\r\n|\r|\n/); let ops: IIdentifiedSingleEditOperation[] = []; @@ -55,6 +55,56 @@ export function randomEdits(str: string, editCnt: number): IIdentifiedSingleEdit return ops; } +export function generateSequentialInserts(str: string, editCnt: number): IIdentifiedSingleEditOperation[] { + let lines = str.split(/\r\n|\r|\n/); + let ops: IIdentifiedSingleEditOperation[] = []; + + for (let i = 0; i < editCnt; i++) { + let line = lines.length; + let column = lines[line - 1].length + 1; + let text: string = ''; + if (Math.random() < .5) { + text = '\n'; + lines.push(''); + } else { + text = getRandomString(50, 100); + lines[line - 1] += text; + } + + ops.push({ + text: text, + range: new Range(line, column, line, column) + }); + } + + return ops; +} + +export function generateRandomReplaces(str: string, editCnt: number, searchStringLen: number, replaceStringLen: number): IIdentifiedSingleEditOperation[] { + let lines = str.split(/\r\n|\r|\n/); + let ops: IIdentifiedSingleEditOperation[] = []; + let chunkSize = Math.max(1, Math.floor(lines.length / editCnt)); + let chunkCnt = Math.floor(lines.length / chunkSize); + let replaceString = getRandomString(replaceStringLen, replaceStringLen); + + let previousChunksLength = 0; + for (let i = 0; i < chunkCnt; i++) { + let startLine = previousChunksLength + 1; + let endLine = previousChunksLength + chunkSize; + let line = getRandomInt(startLine, endLine); + let maxColumn = lines[line - 1].length + 1; + let startColumn = getRandomInt(1, maxColumn); + let endColumn = Math.min(maxColumn, startColumn + searchStringLen); + + ops.push({ + text: replaceString, + range: new Range(line, startColumn, line, endColumn) + }); + } + + return ops; +} + export function createMockText(lineCount: number, minColumn: number, maxColumn: number) { let fixedEOL = getRandomEOLSequence(); let lines: string[] = []; From c240df0873cf78fcd8b44d3c6b9ecc8b5a6f8722 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 9 Jan 2018 14:45:05 -0800 Subject: [PATCH 066/710] remote - use etag-check to prevent repeated loading --- .../services/files/electron-browser/fileService.ts | 2 +- .../services/files/electron-browser/remoteFileService.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts index bcd10448f92..3d199425abc 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/electron-browser/fileService.ts @@ -35,7 +35,7 @@ export class FileService implements IFileService { private static readonly NET_VERSION_ERROR = 'System.MissingMethodException'; private static readonly NET_VERSION_ERROR_IGNORE_KEY = 'ignoreNetVersionError'; - private raw: IFileService; + private raw: NodeFileService; private toUnbind: IDisposable[]; diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index c712f387483..ab28accf00d 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -233,6 +233,15 @@ export class RemoteFileService extends FileService { return this._withProvider(resource).then(provider => { return this.resolveFile(resource).then(fileStat => { + + if (options.etag === fileStat.etag) { + throw new FileOperationError( + localize('fileNotModifiedError', "File not modified since"), + FileOperationResult.FILE_NOT_MODIFIED_SINCE, + options + ); + } + const guessEncoding = options.autoGuessEncoding; const count = maxBufferLen(options); const chunks: Buffer[] = []; From d4c09a70ad6857925ce1004b4ee08659ca36e12c Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Tue, 9 Jan 2018 15:30:17 -0800 Subject: [PATCH 067/710] Fixes --- src/vs/code/electron-main/launch.ts | 3 +-- src/vs/code/electron-main/main.ts | 2 +- src/vs/platform/environment/node/argv.ts | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index 265a0dffc4a..ab4a458b033 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -116,8 +116,7 @@ export class LaunchService implements ILaunchService { } private startOpenUrl(args: ParsedArgs): TPromise { - const openUrlArg = args['open-url'] || []; - if (openUrlArg && args._urls && args._urls.length) { + if (args['open-url'] && args._urls && args._urls.length > 0) { // --open-url must contain -- followed by the url(s) // process.argv is used over args._ as args._ are resolved to file paths at this point args._urls.forEach(url => this.urlService.open(url)); diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 4da562dfb9c..e268912036d 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -66,7 +66,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I services.set(IStateService, new SyncDescriptor(StateService)); services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); services.set(IRequestService, new SyncDescriptor(RequestService)); - services.set(IURLService, new SyncDescriptor(URLService, args['open-url'])); + services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : '')); services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); return new InstantiationService(services, true); diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 627e7cdc920..a5fd702fd16 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -26,7 +26,6 @@ const options: minimist.Opts = { 'debugBrkPluginHost', 'debugSearch', 'debugBrkSearch', - 'open-url', 'enable-proposed-api', 'export-default-configuration', 'install-source' @@ -41,6 +40,7 @@ const options: minimist.Opts = { 'new-window', 'unity-launch', 'reuse-window', + 'open-url', 'performance', 'prof-startup', 'verbose', From 85017ba8942779cec20c91e2636cc2f092de7572 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 9 Jan 2018 16:13:10 -0800 Subject: [PATCH 068/710] format benchmark output --- .../common/model/benchmark/benchmarkUtils.ts | 16 +++++ .../model/benchmark/modelbuilder.benchmark.ts | 24 +++---- .../model/benchmark/operations.benchmark.ts | 64 +++++++++---------- .../benchmark/searchNReplace.benchmark.ts | 19 +++--- 4 files changed, 69 insertions(+), 54 deletions(-) create mode 100644 src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts new file mode 100644 index 00000000000..e6047266767 --- /dev/null +++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +export function doBenchmark(id: string, ts: T[], fn: (t: T) => void) { + let columns: string[] = [id]; + for (let i = 0; i < ts.length; i++) { + var start = process.hrtime(); + fn(ts[i]); + var diff = process.hrtime(start); + columns.push(`${(diff[0] * 1000 + diff[1] / 1000000).toFixed(3)} ms`); + } + console.log('|' + columns.join('\t|') + '|'); +} \ No newline at end of file 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 b83e78b9133..3f65a3eb387 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -8,6 +8,7 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/l import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; 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 pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); @@ -17,18 +18,17 @@ for (let i = 0; i < 100; i++) { chunks.push(generateRandomChunkWithLF(16 * 1000, 64 * 1000)); } -let modelBuildBenchmark = function (id: string, builder: ITextBufferBuilder, chunkCnt: number) { - console.time(id); - for (let i = 0, len = Math.min(chunkCnt, chunks.length); i < len; i++) { - builder.acceptChunk(chunks[i]); - } - builder.finish(); - console.timeEnd(id); +let modelBuildBenchmark = function (id: string, builders: ITextBufferBuilder[], chunkCnt: number) { + doBenchmark(id, builders, builder => { + for (let i = 0, len = Math.min(chunkCnt, chunks.length); i < len; i++) { + builder.acceptChunk(chunks[i]); + } + builder.finish(); + }); }; -console.log('--- model builder ---'); - -for (let i of [10, 100, 1000]) { - modelBuildBenchmark(`line text model builder ${i}`, linesTextBufferBuilder, i); - modelBuildBenchmark(`piece table model builder ${i}`, pieceTableTextBufferBuilder, i); +console.log(`|model builder\t|line buffer\t|piece table\t|`); +console.log('|---|---|---|'); +for (let i of [10, 100]) { + modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTableTextBufferBuilder], i); } diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts index ea3d557e208..4682098ea0c 100644 --- a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts @@ -9,32 +9,35 @@ import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTe import { ITextBuffer, IIdentifiedSingleEditOperation, EndOfLinePreference } from 'vs/editor/common/model'; import { generateRandomEdits, createMockBuffer, createMockText, generateSequentialInserts } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; import { Range } from 'vs/editor/common/core/range'; +import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils'; -let readLinesBenchmark = function (id: string, buffer: ITextBuffer) { - console.time(id); - for (let i = 0, len = buffer.getLineCount(); i < len; i++) { - var str = buffer.getLineContent(i + 1); - let firstChar = str.charCodeAt(0); - let lastChar = str.charCodeAt(str.length - 1); - firstChar = firstChar - lastChar; - lastChar = firstChar + lastChar; - firstChar = lastChar - firstChar; - } - console.timeEnd(id); +let readLinesBenchmark = function (id: string, buffers: ITextBuffer[]) { + doBenchmark(id, buffers, (buffer) => { + for (let j = 0, len = buffer.getLineCount(); j < len; j++) { + var str = buffer.getLineContent(j + 1); + let firstChar = str.charCodeAt(0); + let lastChar = str.charCodeAt(str.length - 1); + firstChar = firstChar - lastChar; + lastChar = firstChar + lastChar; + firstChar = lastChar - firstChar; + } + }); }; -let appyEditsBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { - console.time(id); - for (let i = 0, len = edits.length; i < len; i++) { - buffer.applyEdits([edits[i]], false); - } - console.timeEnd(id); + +let appyEditsBenchmark = function (id: string, buffers: ITextBuffer[], edits: IIdentifiedSingleEditOperation[]) { + doBenchmark(id, buffers, (buffer) => { + for (let j = 0; j < edits.length; j++) { + buffer.applyEdits([edits[j]], false); + } + }); }; -let getValueBenchmark = function (id: string, buffer: ITextBuffer, eol: EndOfLinePreference = EndOfLinePreference.LF): void { - console.time(id); - const lineCount = buffer.getLineCount(); - const fullModelRange = new Range(1, 1, lineCount, buffer.getLineLength(lineCount) + 1); - buffer.getValueInRange(fullModelRange, eol); - console.timeEnd(id); + +let getValueBenchmark = function (id: string, buffers: ITextBuffer[], eol: EndOfLinePreference = EndOfLinePreference.LF): void { + doBenchmark(id, buffers, (buffer) => { + const lineCount = buffer.getLineCount(); + const fullModelRange = new Range(1, 1, lineCount, buffer.getLineLength(lineCount) + 1); + buffer.getValueInRange(fullModelRange, eol); + }); }; let suites = [ @@ -51,20 +54,15 @@ let suites = [ let text = createMockText(1000, 0, 50); for (let i = 0, len = suites.length; i < len; i++) { - console.log(`--- ${suites[i].id} ---`); - + console.log(`\n|${suites[i].id}\t|line buffer\t|piece table\t|`); + console.log('|---|---|---|'); for (let j of [10, 100, 1000]) { let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); let edits = suites[i].generateEdits(text, j); - appyEditsBenchmark(`line text model \t applyEdits ${j}\t`, linesTextBuffer, edits); - appyEditsBenchmark(`piece table model \t applyEdits ${j}\t`, pieceTableTextBuffer, edits); - - readLinesBenchmark(`line text model \t getLineContent after ${j} edits\t`, linesTextBuffer); - readLinesBenchmark(`piece table model \t getLineContent after ${j} edits\t`, pieceTableTextBuffer); - - getValueBenchmark(`line text model \t save after ${j} edits\t`, linesTextBuffer); - getValueBenchmark(`piece table model \t save after ${j} edits\t`, pieceTableTextBuffer); + appyEditsBenchmark(`apply ${j} edits`, [linesTextBuffer, pieceTableTextBuffer], edits); + readLinesBenchmark(`getLineContent after ${j} edits`, [linesTextBuffer, pieceTableTextBuffer]); + getValueBenchmark(`save after ${j} edits`, [linesTextBuffer, pieceTableTextBuffer]); } } \ No newline at end of file diff --git a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts index 37e740e6c68..1360f776208 100644 --- a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts @@ -8,22 +8,23 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/l import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model'; import { createMockText, createMockBuffer, generateRandomReplaces } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; +import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils'; -let appyEditsBenchmark = function (id: string, buffer: ITextBuffer, edits: IIdentifiedSingleEditOperation[]) { - console.time(id); - for (let i = 0, len = edits.length; i < len; i++) { - buffer.applyEdits([edits[i]], false); - } - console.timeEnd(id); +let appyEditsBenchmark = function (id: string, buffers: ITextBuffer[], edits: IIdentifiedSingleEditOperation[]) { + doBenchmark(id, buffers, buffer => { + for (let i = 0, len = edits.length; i < len; i++) { + buffer.applyEdits([edits[i]], false); + } + }); }; let text = createMockText(1000, 50, 100); -console.log('--- replace all ---'); +console.log(`\n|replace all\t|line buffer\t|piece table\t|`); +console.log('|---|---|---|'); for (let i of [10, 100, 500, 1000]) { let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); let edits = generateRandomReplaces(text, i, 5, 10); - appyEditsBenchmark(`line text model \t replace all ${i}\t`, linesTextBuffer, edits); - appyEditsBenchmark(`piece table model \t replace all ${i}\t`, pieceTableTextBuffer, edits); + appyEditsBenchmark(`replace ${i} occurrences`, [linesTextBuffer, pieceTableTextBuffer], edits); } \ No newline at end of file From 2bab83a097135cf8c2a1ca1498bb8906f06d2cb3 Mon Sep 17 00:00:00 2001 From: Ramya Rao Date: Tue, 9 Jan 2018 17:26:32 -0800 Subject: [PATCH 069/710] Add option to control width of the line cursor (#41169) * Add option to control width of the line cursor #41052 * Allow lineCursorWidth greater than 10 * Avoid linecontent read when not needed --- .../viewParts/viewCursors/viewCursor.ts | 21 +++++++++++++------ .../viewParts/viewCursors/viewCursors.css | 1 + .../common/config/commonEditorConfig.ts | 5 +++++ src/vs/editor/common/config/editorOptions.ts | 9 ++++++++ src/vs/monaco.d.ts | 5 +++++ 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts index 0ea17e25233..92838c8a6d7 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts +++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts @@ -38,6 +38,7 @@ export class ViewCursor { private readonly _domNode: FastDomNode; private _cursorStyle: TextEditorCursorStyle; + private _lineCursorWidth: number; private _lineHeight: number; private _typicalHalfwidthCharacterWidth: number; @@ -55,6 +56,7 @@ export class ViewCursor { this._cursorStyle = this._context.configuration.editor.viewInfo.cursorStyle; this._lineHeight = this._context.configuration.editor.lineHeight; this._typicalHalfwidthCharacterWidth = this._context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth; + this._lineCursorWidth = Math.min(this._context.configuration.editor.viewInfo.lineCursorWidth, this._typicalHalfwidthCharacterWidth); this._isVisible = true; @@ -103,13 +105,15 @@ export class ViewCursor { if (e.lineHeight) { this._lineHeight = this._context.configuration.editor.lineHeight; } - if (e.viewInfo) { - this._cursorStyle = this._context.configuration.editor.viewInfo.cursorStyle; - } if (e.fontInfo) { Configuration.applyFontInfo(this._domNode, this._context.configuration.editor.fontInfo); this._typicalHalfwidthCharacterWidth = this._context.configuration.editor.fontInfo.typicalHalfwidthCharacterWidth; } + if (e.viewInfo) { + this._cursorStyle = this._context.configuration.editor.viewInfo.cursorStyle; + this._lineCursorWidth = Math.min(this._context.configuration.editor.viewInfo.lineCursorWidth, this._typicalHalfwidthCharacterWidth); + } + return true; } @@ -119,6 +123,8 @@ export class ViewCursor { } private _prepareRender(ctx: RenderingContext): ViewCursorRenderData { + let textContent = ''; + if (this._cursorStyle === TextEditorCursorStyle.Line || this._cursorStyle === TextEditorCursorStyle.LineThin) { const visibleRange = ctx.visibleRangeForPosition(this._position); if (!visibleRange) { @@ -127,12 +133,16 @@ export class ViewCursor { } let width: number; if (this._cursorStyle === TextEditorCursorStyle.Line) { - width = dom.computeScreenAwareSize(2); + width = dom.computeScreenAwareSize(this._lineCursorWidth > 0 ? this._lineCursorWidth : 2); + if (this._lineCursorWidth > 2) { + const lineContent = this._context.model.getLineContent(this._position.lineNumber); + textContent = lineContent.charAt(this._position.column - 1); + } } else { width = dom.computeScreenAwareSize(1); } const top = ctx.getVerticalOffsetForLineNumber(this._position.lineNumber) - ctx.bigNumbersDelta; - return new ViewCursorRenderData(top, visibleRange.left, width, this._lineHeight, ''); + return new ViewCursorRenderData(top, visibleRange.left, width, this._lineHeight, textContent); } const visibleRangeForCharacter = ctx.linesVisibleRangesForRange(new Range(this._position.lineNumber, this._position.column, this._position.lineNumber, this._position.column + 1), false); @@ -145,7 +155,6 @@ export class ViewCursor { const range = visibleRangeForCharacter[0].ranges[0]; const width = range.width < 1 ? this._typicalHalfwidthCharacterWidth : range.width; - let textContent = ''; if (this._cursorStyle === TextEditorCursorStyle.Block) { const lineContent = this._context.model.getLineContent(this._position.lineNumber); textContent = lineContent.charAt(this._position.column - 1); diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css index 4136a3d856d..4fc3fbb24c6 100644 --- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css +++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css @@ -10,6 +10,7 @@ .monaco-editor .cursors-layer > .cursor { position: absolute; cursor: text; + overflow: hidden; } .monaco-editor .cursors-layer > .cursor.secondary { opacity: 0.6; diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index a77a10bc44c..da33dd2058d 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -511,6 +511,11 @@ const editorConfiguration: IConfigurationNode = { 'default': editorOptions.cursorStyleToString(EDITOR_DEFAULTS.viewInfo.cursorStyle), 'description': nls.localize('cursorStyle', "Controls the cursor style, accepted values are 'block', 'block-outline', 'line', 'line-thin', 'underline' and 'underline-thin'") }, + 'editor.lineCursorWidth': { + 'type': 'integer', + 'default': EDITOR_DEFAULTS.viewInfo.lineCursorWidth, + 'description': nls.localize('lineCursorWidth', "Controls the width of the cursor when editor.cursorStyle is set to 'line'") + }, 'editor.fontLigatures': { 'type': 'boolean', 'default': EDITOR_DEFAULTS.viewInfo.fontLigatures, diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 0b49b501f24..c230f0088e2 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -256,6 +256,10 @@ export interface IEditorOptions { * Defaults to 'line'. */ cursorStyle?: string; + /** + * Control the width of the cursor when cursorStyle is set to 'line' + */ + lineCursorWidth?: number; /** * Enable font ligatures. * Defaults to false. @@ -786,6 +790,7 @@ export interface InternalEditorViewOptions { readonly cursorBlinking: TextEditorCursorBlinkingStyle; readonly mouseWheelZoom: boolean; readonly cursorStyle: TextEditorCursorStyle; + readonly lineCursorWidth: number; readonly hideCursorInOverviewRuler: boolean; readonly scrollBeyondLastLine: boolean; readonly smoothScrolling: boolean; @@ -1054,6 +1059,7 @@ export class InternalEditorOptions { && a.cursorBlinking === b.cursorBlinking && a.mouseWheelZoom === b.mouseWheelZoom && a.cursorStyle === b.cursorStyle + && a.lineCursorWidth === b.lineCursorWidth && a.hideCursorInOverviewRuler === b.hideCursorInOverviewRuler && a.scrollBeyondLastLine === b.scrollBeyondLastLine && a.smoothScrolling === b.smoothScrolling @@ -1647,6 +1653,7 @@ export class EditorOptionsValidator { cursorBlinking: _cursorBlinkingStyleFromString(opts.cursorBlinking, defaults.cursorBlinking), mouseWheelZoom: _boolean(opts.mouseWheelZoom, defaults.mouseWheelZoom), cursorStyle: _cursorStyleFromString(opts.cursorStyle, defaults.cursorStyle), + lineCursorWidth: _clampedInt(opts.lineCursorWidth, defaults.lineCursorWidth, 1, Number.MAX_VALUE), hideCursorInOverviewRuler: _boolean(opts.hideCursorInOverviewRuler, defaults.hideCursorInOverviewRuler), scrollBeyondLastLine: _boolean(opts.scrollBeyondLastLine, defaults.scrollBeyondLastLine), smoothScrolling: _boolean(opts.smoothScrolling, defaults.smoothScrolling), @@ -1749,6 +1756,7 @@ export class InternalEditorOptionsFactory { cursorBlinking: opts.viewInfo.cursorBlinking, mouseWheelZoom: opts.viewInfo.mouseWheelZoom, cursorStyle: opts.viewInfo.cursorStyle, + lineCursorWidth: opts.viewInfo.lineCursorWidth, hideCursorInOverviewRuler: opts.viewInfo.hideCursorInOverviewRuler, scrollBeyondLastLine: opts.viewInfo.scrollBeyondLastLine, smoothScrolling: opts.viewInfo.smoothScrolling, @@ -2172,6 +2180,7 @@ export const EDITOR_DEFAULTS: IValidatedEditorOptions = { cursorBlinking: TextEditorCursorBlinkingStyle.Blink, mouseWheelZoom: false, cursorStyle: TextEditorCursorStyle.Line, + lineCursorWidth: 2, hideCursorInOverviewRuler: false, scrollBeyondLastLine: true, smoothScrolling: false, diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index bd19903c715..81d3e99523b 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -2538,6 +2538,10 @@ declare module monaco.editor { * Defaults to 'line'. */ cursorStyle?: string; + /** + * Control the width of the cursor when cursorStyle is set to 'line' + */ + lineCursorWidth?: number; /** * Enable font ligatures. * Defaults to false. @@ -3003,6 +3007,7 @@ declare module monaco.editor { readonly cursorBlinking: TextEditorCursorBlinkingStyle; readonly mouseWheelZoom: boolean; readonly cursorStyle: TextEditorCursorStyle; + readonly lineCursorWidth: number; readonly hideCursorInOverviewRuler: boolean; readonly scrollBeyondLastLine: boolean; readonly smoothScrolling: boolean; From f759ee511ae3eefe8d7b95408cf3f9fd43308e75 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 07:34:08 +0100 Subject: [PATCH 070/710] fix #41363 --- src/vs/base/browser/ui/dropdown/dropdown.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vs/base/browser/ui/dropdown/dropdown.ts b/src/vs/base/browser/ui/dropdown/dropdown.ts index d6d67657887..599725ee6ad 100644 --- a/src/vs/base/browser/ui/dropdown/dropdown.ts +++ b/src/vs/base/browser/ui/dropdown/dropdown.ts @@ -53,12 +53,7 @@ export class BaseDropdown extends ActionRunner { this.$label.on([EventType.CLICK, EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => { EventHelper.stop(e, true); // prevent default click behaviour to trigger }).on([EventType.MOUSE_DOWN, GestureEventType.Tap], (e: Event) => { - // We want to show the context menu on dropdown so that as a user you can press and hold the - // mouse button, make a choice of action in the menu and release the mouse to trigger that - // action. - // Due to some weird bugs though, we delay showing the menu to unwind event stack - // (see https://github.com/Microsoft/vscode/issues/27648) - setTimeout(() => this.show(), 100); + this.show(); }).appendTo(this.$el); let cleanupFn = labelRenderer(this.$label.getHTMLElement()); From 1aa00f53bc4e2f5de019791be4c9d3ac7bc4e927 Mon Sep 17 00:00:00 2001 From: Miguel Carvajal Date: Wed, 10 Jan 2018 02:52:03 -0300 Subject: [PATCH 071/710] [ext/yaml] add indentation rules configuration --- extensions/yaml/language-configuration.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/yaml/language-configuration.json b/extensions/yaml/language-configuration.json index cc1aa26cde6..010d773d3f3 100644 --- a/extensions/yaml/language-configuration.json +++ b/extensions/yaml/language-configuration.json @@ -23,5 +23,9 @@ ], "folding": { "offSide": true + }, + "indentationRules": { + "increaseIndentPattern": "^\\s*.*(:|-) ?(&\\w+)?(\\{[^}\"']*|\\([^)\"']*)?$", + "decreaseIndentPattern": "^\\s+\\}$" } -} \ No newline at end of file +} From 5906dc6809d6548bd68b910491452dd203ab0ffc Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 10 Jan 2018 09:50:16 +0300 Subject: [PATCH 072/710] Fix hr in github issues (#41313) --- src/vs/workbench/electron-browser/actions.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 082e28a6a7b..f0a5ba05fad 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -909,6 +909,7 @@ export class ReportIssueAction extends Action {
  • OS Version: ${osVersion}
  • ${areExtensionsDisabled ? 'Extensions: Extensions are disabled' : this.generateExtensionTable(extensions)}
    • + --- Steps to Reproduce: From 05b667d5a2772548f03bcdce9de999b2713c56b3 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 9 Jan 2018 23:34:12 -0800 Subject: [PATCH 073/710] Don't set TS completion entry details when passed a zero length display parts --- extensions/typescript/src/features/completionItemProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts index 5e1332afb58..f58134b67bd 100644 --- a/extensions/typescript/src/features/completionItemProvider.ts +++ b/extensions/typescript/src/features/completionItemProvider.ts @@ -374,7 +374,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP return item; } const detail = details[0]; - item.detail = Previewer.plain(detail.displayParts); + item.detail = detail.displayParts.length ? Previewer.plain(detail.displayParts) : undefined; const documentation = new MarkdownString(); if (detail.source) { let importPath = `'${Previewer.plain(detail.source)}'`; From 379bf086a2e6dd983f92e694cc7ed7c3ea25cb95 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 08:25:01 +0100 Subject: [PATCH 074/710] :lipstick: --- .../markers/electron-browser/markersElectronContributions.ts | 5 ++--- .../parts/output/electron-browser/output.contribution.ts | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.ts b/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.ts index 8664daaf52b..1c2bb459302 100644 --- a/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.ts +++ b/src/vs/workbench/parts/markers/electron-browser/markersElectronContributions.ts @@ -76,7 +76,6 @@ interface IActionDescriptor { // ICommandUI title: string; category?: string; - iconClass?: string; f1?: boolean; // @@ -96,13 +95,13 @@ interface IActionDescriptor { function registerAction(desc: IActionDescriptor) { - const { id, handler, title, category, iconClass, menu, keybinding } = desc; + const { id, handler, title, category, menu, keybinding } = desc; // 1) register as command CommandsRegistry.registerCommand(id, handler); // 2) menus - let command = { id, title, iconClass, category }; + let command = { id, title, category }; if (menu) { let { menuId, when, group } = menu; MenuRegistry.appendMenuItem(menuId, { diff --git a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts index d73919d5137..e989b92d769 100644 --- a/src/vs/workbench/parts/output/electron-browser/output.contribution.ts +++ b/src/vs/workbench/parts/output/electron-browser/output.contribution.ts @@ -91,7 +91,6 @@ interface IActionDescriptor { // ICommandUI title: string; category?: string; - iconClass?: string; f1?: boolean; // menus @@ -111,13 +110,13 @@ interface IActionDescriptor { function registerAction(desc: IActionDescriptor) { - const { id, handler, title, category, iconClass, f1, menu, keybinding } = desc; + const { id, handler, title, category, f1, menu, keybinding } = desc; // 1) register as command CommandsRegistry.registerCommand(id, handler); // 2) command palette - let command = { id, title, iconClass, category }; + let command = { id, title, category }; if (f1) { MenuRegistry.addCommand(command); } From 681d38720337542b3e59774771fe7dbc8475cb84 Mon Sep 17 00:00:00 2001 From: Charles Milette Date: Mon, 8 Jan 2018 14:54:16 -0500 Subject: [PATCH 075/710] Fix some English issues in the interactive playground --- .../editor/vs_code_editor_walkthrough.md | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md index fbd56ebf869..d9f30f401f6 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md @@ -17,11 +17,11 @@ The core editor in VS Code is packed with features. This page highlights a numb ### Multi-Cursor Editing Using multiple cursors allows you to edit multiple parts of the document at once, greatly improving your productivity. Try the following actions in the code block below: -1. Box Selection - press any combination of kb(cursorColumnSelectDown), kb(cursorColumnSelectRight), kb(cursorColumnSelectUp), kb(cursorColumnSelectLeft) to select a block of text, you can also press `⇧⌥``Shift+Alt` while selecting text with the mouse. -2. Add a cursor - press kb(editor.action.insertCursorAbove) or kb(editor.action.insertCursorBelow) to add a new cursor above or below, you can also use your mouse with +Click to add a cursor anywhere. +1. Box Selection - press any combination of kb(cursorColumnSelectDown), kb(cursorColumnSelectRight), kb(cursorColumnSelectUp), kb(cursorColumnSelectLeft) to select a block of text. You can also press `⇧⌥``Shift+Alt` while selecting text with the mouse. +2. Add a cursor - press kb(editor.action.insertCursorAbove) to add a new cursor above, or kb(editor.action.insertCursorBelow) to add a new cursor below. You can also use your mouse with +Click to add a cursor anywhere. 3. Create cursors on all occurrences of a string - select one instance of a string e.g. `background-color` and press kb(editor.action.selectHighlights). Now you can replace all instances by simply typing. -That is the tip of the iceberg for multi-cursor editing have a look at the `selection menu` and our handy [keyboard reference guide](command:workbench.action.keybindingsReference) for additional actions. +That is the tip of the iceberg for multi-cursor editing. Have a look at the selection menu and our handy [keyboard reference guide](command:workbench.action.keybindingsReference) for additional actions. ```css #p1 {background-color: #ff0000;} /* red */ @@ -29,11 +29,11 @@ That is the tip of the iceberg for multi-cursor editing have a look at the `sele #p3 {background-color: #0000ff;} /* blue */ ``` -> **CSS Tip:** you may have noticed in the example above for CSS we also provide color swatches inline, additionally if you hover over an element such as `#p1` we will show how this is represented in HTML. These swatches also act as color pickers that allow you to easily change a color value. A simple example of some language specific editor features. +> **CSS Tip:** you may have noticed in the example above we also provide color swatches inline for CSS, additionally if you hover over an element such as `#p1` we will show how this is represented in HTML. These swatches also act as color pickers that allow you to easily change a color value. A simple example of some language-specific editor features. ### IntelliSense -Visual Studio Code comes with powerful IntelliSense for JavaScript and TypeScript pre-installed. In the below example, position the text cursor in front of the error underline, right after the dot and press kb(editor.action.triggerSuggest) to invoke IntelliSense. Notice how the suggestion comes from the Request API. +Visual Studio Code comes with the powerful IntelliSense for JavaScript and TypeScript pre-installed. In the below example, position the text cursor in front of the error underline, right after the dot and press kb(editor.action.triggerSuggest) to invoke IntelliSense. Notice how the suggestion comes from the Request API. ```js var express = require('express'); @@ -50,7 +50,7 @@ app.listen(3000); ### Line Actions -Since it's very common to want to work with the entire text in a line we provide a set of useful shortcuts to help with this. +Since it's very common to work with the entire text in a line we provide a set of useful shortcuts to help with this. 1. Copy a line and insert it above or below the current position with kb(editor.action.copyLinesDownAction) or kb(editor.action.copyLinesUpAction) respectively. 2. Move an entire line or selection of lines up or down with kb(editor.action.moveLinesUpAction) and kb(editor.action.moveLinesDownAction) respectively. 3. Delete the entire line with kb(editor.action.deleteLines). @@ -68,7 +68,7 @@ Since it's very common to want to work with the entire text in a line we provide ### Rename Refactoring -It's easy to rename a symbol such as a function name or variable name. Hit kb(editor.action.rename) while in the symbol `Book` to rename all instances - this will occur across all files in a project. You can also see refactoring in the right click context menu. +It's easy to rename a symbol such as a function name or variable name. Hit kb(editor.action.rename) while in the symbol `Book` to rename all instances - this will occur across all files in a project. You can also see refactoring in the right-click context menu. ```js // Reference the function @@ -84,11 +84,11 @@ function Book(title, author) { } ``` -> **JSDoc Tip:** The example above also showcased another way to get IntelliSense hints by using `JSDoc` comments. You can try this out by invoking the `Book` function and seeing the enhanced context in the IntelliSense Experience for the function as well as parameters. +> **JSDoc Tip:** The example above also showcased another way to get IntelliSense hints by using `JSDoc` comments. You can try this out by invoking the `Book` function and seeing the enhanced context in the IntelliSense menu for the function as well as parameters. ### Refactoring via Extraction -Sometimes you want factor already written code into a separate function or constant to use it later again. Select the lines you want to factor out and press kb(editor.action.quickFix) or click the little light bulb and choose one of the respective `Extract to...` options. Try it by selecting the code inside the `if`-clause on line 3 or any other common code you want to factor out. +Sometimes you want refactor already written code into a separate function or constant to use it later again. Select the lines you want to refactor out and press kb(editor.action.quickFix) or click the little light bulb and choose one of the respective `Extract to...` options. Try it by selecting the code inside the `if`-clause on line 3 or any other common code you want to refactor out. ```js function findFirstEvenNumber(arr) { @@ -103,7 +103,7 @@ function findFirstEvenNumber(arr) { ### Formatting -Keeping your code looking great is hard without a good formatter. Luckily it's easy to format content either the entire document with kb(editor.action.formatDocument) or formatting can be applied to the current selection with kb(editor.action.formatSelection). Both of these options are also available through the right click context menu. +Keeping your code looking great is hard without a good formatter. Luckily it's easy to format content either the entire document with kb(editor.action.formatDocument). Formatting can be applied to the current selection with kb(editor.action.formatSelection). Both of these options are also available through the right-click context menu. ```js var cars = ["Saab", "Volvo", "BMW"]; @@ -118,7 +118,7 @@ console.log(`This is the manufacturer [${cars[i]}])`); ### Code Folding -In a large file it can often be useful to collapse sections of code to increase readability. To do this you can simply press kb(editor.fold) to `fold` the code - press kb(editor.unfold) to `unfold`. Folding can also be done with the +/- icons in the left gutter. To fold all sections kb(editor.foldAll) or to unfold all kb(editor.unfoldAll). +In a large file it can often be useful to collapse sections of code to increase readability. To do this you can simply press kb(editor.fold) to fold the code, press kb(editor.unfold) to unfold. Folding can also be done with the +/- icons in the left gutter. To fold all sections use kb(editor.foldAll) or to unfold all use kb(editor.unfoldAll). ```html
    @@ -137,7 +137,7 @@ In a large file it can often be useful to collapse sections of code to increase >**Tip:** Folding is based on indentation and as a result can apply to all languages. Simply indent your code to create a foldable section you can fold a certain number of levels with shortcuts like kb(editor.foldLevel1) through to kb(editor.foldLevel5). ### Errors and Warnings -Errors and warnings are highlighted as you edit your code with `squiggles`. In the sample below you can see a number of syntax errors. By pressing kb(editor.action.marker.next) you can navigate across them in sequence and see the detailed error message. As you correct them the `squiggles` and `scrollbar indicators` will update. +Errors and warnings are highlighted as you edit your code with squiggles. In the sample below you can see a number of syntax errors. By pressing kb(editor.action.marker.next) you can navigate across them in sequence and see the detailed error message. As you correct them the squiggles and scrollbar indicators will update. ```js // This code has a few syntax errors @@ -157,11 +157,11 @@ You can greatly accelerate your editing through the use of snippets. Simply sta ``` ->**Tip:** the extension gallery includes snippets for almost every framework and language imaginable [extensions](command:workbench.extensions.action.showPopularExtensions). You can also create your own [user defined snippets](command:workbench.action.openSnippets). +>**Tip:** the [extension gallery](command:workbench.extensions.action.showPopularExtensions) includes snippets for almost every framework and language imaginable. You can also create your own [user-defined snippets](command:workbench.action.openSnippets). ### Emmet -Emmet takes the snippets idea to a whole new level: you can type CSS-like expressions that can be dynamically parsed, and produce output depending on what you type in the abbreviation. To use Emmet simply run the command `Emmet: Expand Abbreviation` with cursor at the end of a valid Emmet abbreviation or snippet and the expansion will occur. +Emmet takes the snippets idea to a whole new level: you can type CSS-like expressions that can be dynamically parsed, and produce output depending on what you type in the abbreviation. To use Emmet simply run the command `Emmet: Expand Abbreviation` with the cursor at the end of a valid Emmet abbreviation or snippet and the expansion will occur. ```html ul>li.item$*5 @@ -186,10 +186,10 @@ easy = 42; ## Thanks! Well if you have got this far then you will have touched on some of the editing features in Visual Studio Code. But don't stop now :) We have lots of additional [documentation](https://code.visualstudio.com/docs), [introductory videos](https://code.visualstudio.com/docs/getstarted/introvideos) and [tips and tricks](https://go.microsoft.com/fwlink/?linkid=852118) for the product that will help you learn how to use it. And while you are here, here are a few additional things you can try: -- Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal) then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal) -- Work with version control by pressing kb(workbench.view.scm) understand how to stage, commit, change branches, and view diffs and more by reviewing the [version control documentation](https://code.visualstudio.com/docs/editor/versioncontrol) -- Browse thousands of extensions in our integrated gallery by pressing with kb(workbench.view.extensions) the [documentation](https://code.visualstudio.com/docs/editor/extension-gallery) will show you how to see the most popular extensions, disable installed ones and more. +- Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal), then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal) +- Work with version control by pressing kb(workbench.view.scm). Understand how to stage, commit, change branches, and view diffs and more by reviewing the [version control documentation](https://code.visualstudio.com/docs/editor/versioncontrol) +- Browse thousands of extensions in our integrated gallery by pressing kb(workbench.view.extensions). The [documentation](https://code.visualstudio.com/docs/editor/extension-gallery) will show you how to see the most popular extensions, disable installed ones and more. -OK that's all for now, +That's all for now, Happy Coding! \ No newline at end of file From 457162532a95349e81603e27655b8f523799c087 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 10:39:37 +0100 Subject: [PATCH 076/710] copy path command for all elements that have a resource fixes #41374 --- .../parts/files/electron-browser/fileActions.contribution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 81a173321f7..255d21e72e5 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -327,7 +327,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: 'navigation', order: 10, command: openToSideCommand, - when: ContextKeyExpr.and(ResourceContextKey.Scheme.isEqualTo('file'), ExplorerFolderContext.toNegated()) + when: ExplorerFolderContext.toNegated() }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { @@ -376,7 +376,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: '5_cutcopypaste', order: 30, command: copyPathCommand, - when: ResourceContextKey.Scheme.isEqualTo('file') + when: ResourceContextKey.HasResource }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { From 7ffffa09b36eda54366989ca3ad414875295fe25 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 10 Jan 2018 11:25:13 +0100 Subject: [PATCH 077/710] Fix #40018 --- src/vs/workbench/api/node/extHostTreeViews.ts | 27 ++---- .../api/extHostTreeViews.test.ts | 97 ++++++++----------- 2 files changed, 49 insertions(+), 75 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 5ebf180db38..44f12bb39dc 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -77,7 +77,7 @@ interface TreeNode { class ExtHostTreeView extends Disposable { - private static ROOT_HANDLE = '0'; + private _itemHandlePool = 0; private elements: Map = new Map(); private nodes: Map = new Map(); @@ -103,12 +103,10 @@ class ExtHostTreeView extends Disposable { elements = coalesce(elements || []); return TPromise.join(elements.map((element, index) => { const node = this.nodes.get(element); - const currentHandle = node && node.parentHandle === parentHandle ? node.handle : void 0; - return this.resolveElement(element, currentHandle ? currentHandle : index, parentHandle) + return this.resolveElement(element, node ? node.handle : `${++this._itemHandlePool}`, parentHandle) .then(treeItem => { if (treeItem) { - if (!currentHandle) { - // update the caches if current handle is not used + if (!node) { this.nodes.set(element, { handle: treeItem.handle, parentHandle, @@ -139,26 +137,21 @@ class ExtHostTreeView extends Disposable { } } - private resolveElement(element: T, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): TPromise { + private resolveElement(element: T, handle: TreeItemHandle, parentHandle: TreeItemHandle): TPromise { return asWinJsPromise(() => this.dataProvider.getTreeItem(element)) - .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handleOrIndex, parentHandle)); + .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handle, parentHandle)); } - private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): ITreeItem { + private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handle: TreeItemHandle, parentHandle: TreeItemHandle): ITreeItem { if (!extensionTreeItem) { return null; } const icon = this.getLightIconPath(extensionTreeItem); - const label = extensionTreeItem.label; - const handle = typeof handleOrIndex === 'number' ? - this.generateHandle(label, handleOrIndex, parentHandle) // create the handle - : handleOrIndex; // reuse the passed handle - return { handle, parentHandle, - label, + label: extensionTreeItem.label, command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0, contextValue: extensionTreeItem.contextValue, icon, @@ -167,12 +160,6 @@ class ExtHostTreeView extends Disposable { }; } - private generateHandle(label: string, index: number, parentHandle: TreeItemHandle): TreeItemHandle { - parentHandle = parentHandle ? parentHandle : ExtHostTreeView.ROOT_HANDLE; - label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; - return `${parentHandle}/${index}:${label}`; - } - private getLightIconPath(extensionTreeItem: vscode.TreeItem): string { if (extensionTreeItem.iconPath) { if (typeof extensionTreeItem.iconPath === 'string' || extensionTreeItem.iconPath instanceof URI) { 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 1a692f0c257..921c654bf16 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -83,24 +83,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testNodeTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a', '0/1:b']); + assert.deepEqual(actuals, ['1', '2']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '0/0:a') + testObject.$getChildren('testNodeTreeProvider', '1') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); + assert.deepEqual(actuals, ['3', '4']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '3').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeTreeProvider', '4').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testNodeTreeProvider', '0/1:b') + testObject.$getChildren('testNodeTreeProvider', '2') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); + assert.deepEqual(actuals, ['5', '6']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '5').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeTreeProvider', '6').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -111,24 +111,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testStringTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a', '0/1:b']); + assert.deepEqual(actuals, ['1', '2']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/0:a') + testObject.$getChildren('testStringTreeProvider', '1') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); + assert.deepEqual(actuals, ['3', '4']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '3').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '4').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', '0/1:b') + testObject.$getChildren('testStringTreeProvider', '2') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); + assert.deepEqual(actuals, ['5', '6']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '5').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '6').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -146,9 +146,9 @@ suite('ExtHostTreeView', function () { test('refresh a parent node', () => { return new TPromise((c, e) => { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['2'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['2']), { + handle: '2', label: 'b', }); c(null); @@ -159,10 +159,10 @@ suite('ExtHostTreeView', function () { test('refresh a leaf node', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b/1:bb'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b/1:bb']), { - handle: '0/1:b/1:bb', - parentHandle: '0/1:b', + assert.deepEqual(['6'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['6']), { + handle: '6', + parentHandle: '2', label: 'bb' }); done(); @@ -172,14 +172,14 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 1', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b', '0/0:a/0:aa'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['2', '3'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['2']), { + handle: '2', label: 'b', }); - assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { - handle: '0/0:a/0:aa', - parentHandle: '0/0:a', + assert.deepEqual(removeUnsetKeys(actuals['3']), { + handle: '3', + parentHandle: '1', label: 'aa', }); done(); @@ -191,14 +191,14 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 2', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a/0:aa', '0/1:b'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['2', '3'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['2']), { + handle: '2', label: 'b', }); - assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { - handle: '0/0:a/0:aa', - parentHandle: '0/0:a', + assert.deepEqual(removeUnsetKeys(actuals['3']), { + handle: '3', + parentHandle: '1', label: 'aa', }); done(); @@ -211,9 +211,9 @@ suite('ExtHostTreeView', function () { test('refresh an element for label change', function (done) { labels['a'] = 'aa'; target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), { - handle: '0/0:a', + assert.deepEqual(['1'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['1']), { + handle: '1', label: 'aa', }); done(); @@ -234,7 +234,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); + assert.deepEqual(['1', '2'], Object.keys(actuals)); done(); }); @@ -246,7 +246,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on unknown elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); + assert.deepEqual(['1', '2'], Object.keys(actuals)); done(); }); @@ -280,19 +280,6 @@ suite('ExtHostTreeView', function () { onDidChangeTreeNode.fire(getNode('a')); }); - test('generate unique handles from labels by escaping them', () => { - tree = { - 'a/0:b': {} - }; - - onDidChangeTreeNode.fire(); - - return testObject.$getElements('testNodeTreeProvider') - .then(elements => { - assert.deepEqual(elements.map(e => e.handle), ['0/0:a//0:b']); - }); - }); - function removeUnsetKeys(obj: any): any { const result = {}; for (const key of Object.keys(obj)) { From cef192525fad2c7bbb214bf1dc7be4bfa9edb945 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 11:44:18 +0100 Subject: [PATCH 078/710] more fixes for #41374 --- .../files/electron-browser/fileActions.contribution.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 255d21e72e5..561a59ad5db 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -102,16 +102,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }); // Editor Title Context Menu -appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL); -appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, CopyPathAction.LABEL); -appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Side Bar")); +appendEditorTitleContextMenuItem(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, ResourceContextKey.Scheme.isEqualTo('file')); +appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, CopyPathAction.LABEL, ResourceContextKey.IsFile); +appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localize('revealInSideBar', "Reveal in Side Bar"), ResourceContextKey.IsFile); -function appendEditorTitleContextMenuItem(id: string, title: string): void { +function appendEditorTitleContextMenuItem(id: string, title: string, when: ContextKeyExpr): void { // Menu MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id, title }, - when: ContextKeyExpr.equals('resourceScheme', 'file'), + when, group: '2_files' }); } From c557fdfc0bf6164187873847d736b65a1c642abf Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 12:01:38 +0100 Subject: [PATCH 079/710] some when condition polish (#41388) * some when condition polish * better contexts --- .../files/electron-browser/fileActions.contribution.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 561a59ad5db..e9e96a48caf 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -187,7 +187,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { group: 'navigation', order: 40, command: copyPathCommand, - when: ResourceContextKey.HasResource + when: ResourceContextKey.IsFile }); MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { @@ -334,7 +334,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: 'navigation', order: 20, command: revealInOsCommand, - when: ResourceContextKey.HasResource + when: ResourceContextKey.Scheme.isEqualTo('file') }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { @@ -376,7 +376,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: '5_cutcopypaste', order: 30, command: copyPathCommand, - when: ResourceContextKey.HasResource + when: ResourceContextKey.IsFile }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { From 325c350aeb1955c53478d1dfb6622513b5bf236d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 10 Jan 2018 12:44:54 +0100 Subject: [PATCH 080/710] fix bad cast --- src/vs/code/electron-main/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index e268912036d..64f64a85241 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -66,7 +66,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I services.set(IStateService, new SyncDescriptor(StateService)); services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); services.set(IRequestService, new SyncDescriptor(RequestService)); - services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : '')); + services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : [])); services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); return new InstantiationService(services, true); From e52a60ba55332917f25b20fc3d7a46360855ed53 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 13:33:57 +0100 Subject: [PATCH 081/710] improve open url handling --- src/vs/code/electron-main/launch.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index ab4a458b033..44408229a25 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -106,25 +106,24 @@ export class LaunchService implements ILaunchService { this.logService.trace('Received data from other instance: ', args, userEnv); // Check early for open-url which is handled in URL service - const openUrl = this.startOpenUrl(args); - if (openUrl) { - return openUrl; + if (this.shouldOpenUrl(args)) { + return TPromise.as(null); } // Otherwise handle in windows service return this.startOpenWindow(args, userEnv); } - private startOpenUrl(args: ParsedArgs): TPromise { + private shouldOpenUrl(args: ParsedArgs): boolean { if (args['open-url'] && args._urls && args._urls.length > 0) { // --open-url must contain -- followed by the url(s) // process.argv is used over args._ as args._ are resolved to file paths at this point args._urls.forEach(url => this.urlService.open(url)); - return TPromise.as(null); + return true; } - return void 0; + return false; } private startOpenWindow(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise { From 1f064796b886b3c76b2e685096a00dd68bb2937e Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Wed, 10 Jan 2018 14:52:52 +0100 Subject: [PATCH 082/710] Register content provider (again) (fixes #40557) --- extensions/merge-conflict/src/contentProvider.ts | 9 +++++++++ extensions/merge-conflict/src/services.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/extensions/merge-conflict/src/contentProvider.ts b/extensions/merge-conflict/src/contentProvider.ts index 37e5923e135..f83abbfbc03 100644 --- a/extensions/merge-conflict/src/contentProvider.ts +++ b/extensions/merge-conflict/src/contentProvider.ts @@ -9,6 +9,15 @@ export default class MergeConflictContentProvider implements vscode.TextDocument static scheme = 'merge-conflict.conflict-diff'; + constructor(private context: vscode.ExtensionContext) { + } + + begin() { + this.context.subscriptions.push( + vscode.workspace.registerTextDocumentContentProvider(MergeConflictContentProvider.scheme, this) + ); + } + dispose() { } diff --git a/extensions/merge-conflict/src/services.ts b/extensions/merge-conflict/src/services.ts index f3eb0e0630e..30fb478c6f8 100644 --- a/extensions/merge-conflict/src/services.ts +++ b/extensions/merge-conflict/src/services.ts @@ -28,7 +28,7 @@ export default class ServiceWrapper implements vscode.Disposable { documentTracker, new CommandHandler(documentTracker), new CodeLensProvider(documentTracker), - new ContentProvider(), + new ContentProvider(this.context), new Decorator(this.context, documentTracker), ); From 7e23ca4a9aef5a2affdb3a3916be6a43b4e22ff1 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 10 Jan 2018 16:17:24 +0100 Subject: [PATCH 083/710] API: Add resourceUri property to TreeItem --- src/vs/vscode.d.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 0920acba747..29cf9485877 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4963,15 +4963,20 @@ declare module 'vscode' { export class TreeItem { /** - * A human-readable string describing this item + * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). */ - label: string; + label?: string; /** - * The icon path for the tree item + * The icon path for the tree item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). */ iconPath?: string | Uri | { light: string | Uri; dark: string | Uri }; + /** + * The [uri](#Uri) of the resource representing this item. + */ + resourceUri?: Uri; + /** * The [command](#Command) which should be run when the tree item is selected. */ @@ -5007,6 +5012,12 @@ declare module 'vscode' { * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None) */ constructor(label: string, collapsibleState?: TreeItemCollapsibleState); + + /** + * @param resourceUri The [uri](#Uri) of the resource representing this item. + * @param collapsibleState [TreeItemCollapsibleState](#TreeItemCollapsibleState) of the tree item. Default is [TreeItemCollapsibleState.None](#TreeItemCollapsibleState.None) + */ + constructor(resourceUri: Uri, collapsibleState?: TreeItemCollapsibleState); } /** From 57e5c7147b5aad40a2042707ae75f75b300d10dd Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 10 Jan 2018 16:38:12 +0100 Subject: [PATCH 084/710] fix opening urls as files --- src/vs/code/node/paths.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts index cafef96fd3a..d54353ff72e 100644 --- a/src/vs/code/node/paths.ts +++ b/src/vs/code/node/paths.ts @@ -18,6 +18,7 @@ export function validatePaths(args: ParsedArgs): ParsedArgs { // Track URLs if they're going to be used if (args['open-url']) { args._urls = args._; + args._ = []; } // Realpath/normalize paths and watch out for goto line mode From f9f3333b2aee95d942dd3cc0e8f4e49f642a419d Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 10 Jan 2018 18:00:46 +0100 Subject: [PATCH 085/710] Fixes #40485 --- src/vs/editor/common/commonCodeEditor.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts index 8f1ea366af2..3ebaf23011e 100644 --- a/src/vs/editor/common/commonCodeEditor.ts +++ b/src/vs/editor/common/commonCodeEditor.ts @@ -940,6 +940,9 @@ export abstract class CommonCodeEditor extends Disposable { this.listenersToRemove.push(this.model.onDidChangeDecorations((e) => this._onDidChangeModelDecorations.fire(e))); this.listenersToRemove.push(this.model.onDidChangeLanguage((e) => { + if (!this.model) { + return; + } this.domElement.setAttribute('data-mode-id', this.model.getLanguageIdentifier().language); this._onDidChangeModelLanguage.fire(e); })); From 46e07c208728595f3d63f28986816140f9dd4bd2 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 10 Jan 2018 18:24:34 +0100 Subject: [PATCH 086/710] Add optional id property to the tree item --- src/vs/vscode.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 0920acba747..f4458445d4d 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4967,6 +4967,11 @@ declare module 'vscode' { */ label: string; + /** + * Optional id for the tree item. + */ + id?: string; + /** * The icon path for the tree item */ From 5b833336a34033505aaf0ea3d9ad7f415e54a473 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 10 Jan 2018 18:24:54 +0100 Subject: [PATCH 087/710] editor service: allow to open multiple editors at once side by side --- .../workbench/browser/parts/editor/editorPart.ts | 16 +++++++++++++--- .../services/editor/common/editorService.ts | 15 ++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 7f3b63746ec..12db963e34b 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -1100,7 +1100,9 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return res; } - public openEditors(editors: { input: EditorInput, position: Position, options?: EditorOptions }[]): TPromise { + public openEditors(editors: { input: EditorInput, position?: Position, options?: EditorOptions }[]): TPromise; + public openEditors(editors: { input: EditorInput, options?: EditorOptions }[], sideBySide?: boolean): TPromise; + public openEditors(editors: { input: EditorInput, position?: Position, options?: EditorOptions }[], sideBySide?: boolean): TPromise { if (!editors.length) { return TPromise.as([]); } @@ -1112,7 +1114,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService const ratio = this.editorGroupsControl.getRatio(); - return this.doOpenEditors(editors, activePosition, ratio); + return this.doOpenEditors(editors, activePosition, ratio, sideBySide); } public hasEditorsToRestore(): boolean { @@ -1143,7 +1145,15 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return this._onEditorsChanged.throttle(this.doOpenEditors(editors, activePosition, editorState && editorState.ratio)); } - private doOpenEditors(editors: { input: EditorInput, position: Position, options?: EditorOptions }[], activePosition?: number, ratio?: number[]): TPromise { + private doOpenEditors(editors: { input: EditorInput, position?: Position, options?: EditorOptions }[], activePosition?: number, ratio?: number[], sideBySide?: boolean): TPromise { + + // Find position if not provided already from calling side + editors.forEach(editor => { + if (typeof editor.position !== 'number') { + editor.position = this.findPosition(editor.input, editor.options, sideBySide); + } + }); + const positionOneEditors = editors.filter(e => e.position === Position.ONE); const positionTwoEditors = editors.filter(e => e.position === Position.TWO); const positionThreeEditors = editors.filter(e => e.position === Position.THREE); diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index 1debca50ef7..1af2ed59488 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -68,8 +68,10 @@ export interface IWorkbenchEditorService extends IEditorService { * Similar to #openEditor() but allows to open multiple editors for different positions at the same time. If there are * more than one editor per position, only the first one will be active and the others stacked behind inactive. */ - openEditors(editors: { input: IResourceInputType, position: Position }[]): TPromise; - openEditors(editors: { input: IEditorInput, position: Position, options?: IEditorOptions | ITextEditorOptions }[]): TPromise; + openEditors(editors: { input: IResourceInputType, position?: Position }[]): TPromise; + openEditors(editors: { input: IEditorInput, position?: Position, options?: IEditorOptions | ITextEditorOptions }[]): TPromise; + openEditors(editors: { input: IResourceInputType }[], sideBySide?: boolean): TPromise; + openEditors(editors: { input: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], sideBySide?: boolean): TPromise; /** * Given a list of editors to replace, will look across all groups where this editor is open (active or hidden) @@ -104,7 +106,8 @@ export interface IWorkbenchEditorService extends IEditorService { export interface IEditorPart { openEditor(input?: IEditorInput, options?: IEditorOptions | ITextEditorOptions, sideBySide?: boolean): TPromise; openEditor(input?: IEditorInput, options?: IEditorOptions | ITextEditorOptions, position?: Position): TPromise; - openEditors(editors: { input: IEditorInput, position: Position, options?: IEditorOptions | ITextEditorOptions }[]): TPromise; + openEditors(editors: { input: IEditorInput, position?: Position, options?: IEditorOptions | ITextEditorOptions }[]): TPromise; + openEditors(editors: { input: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], sideBySide?: boolean): TPromise; replaceEditors(editors: { toReplace: IEditorInput, replaceWith: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], position?: Position): TPromise; closeEditor(position: Position, input: IEditorInput): TPromise; closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; @@ -208,7 +211,9 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { public openEditors(editors: { input: IResourceInputType, position: Position }[]): TPromise; public openEditors(editors: { input: IEditorInput, position: Position, options?: IEditorOptions }[]): TPromise; - public openEditors(editors: any[]): TPromise { + public openEditors(editors: { input: IResourceInputType }[], sideBySide?: boolean): TPromise; + public openEditors(editors: { input: IEditorInput, options?: IEditorOptions }[], sideBySide?: boolean): TPromise; + public openEditors(editors: any[], sideBySide?: boolean): TPromise { const inputs = editors.map(editor => this.createInput(editor.input)); const typedInputs: { input: IEditorInput, position: Position, options?: EditorOptions }[] = inputs.map((input, index) => { const options = editors[index].input instanceof EditorInput ? this.toOptions(editors[index].options) : TextEditorOptions.from(editors[index].input); @@ -220,7 +225,7 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { }; }); - return this.editorPart.openEditors(typedInputs); + return this.editorPart.openEditors(typedInputs, sideBySide); } public replaceEditors(editors: { toReplace: IResourceInputType, replaceWith: IResourceInputType }[], position?: Position): TPromise; From 22170c2bf665c30119c3aabd67326871c7c1e378 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 10 Jan 2018 15:10:47 -0800 Subject: [PATCH 088/710] remote - less readdir calls --- .../electron-browser/remoteFileService.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index ab28accf00d..7767525e888 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -39,27 +39,27 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse etag: stat.mtime.toString(29) + stat.size.toString(31), }; - if (stat.type === FileType.File) { - // done - return TPromise.as(fileStat); + if (stat.type === FileType.Dir) { + fileStat.isDirectory = true; + fileStat.hasChildren = true; - } else { - // dir -> resolve - return provider.readdir(resource).then(entries => { - fileStat.isDirectory = true; - fileStat.hasChildren = entries.length > 0; + if (recurse && recurse([resource, stat])) { + // dir -> resolve + return provider.readdir(resource).then(entries => { + fileStat.isDirectory = true; + fileStat.hasChildren = entries.length > 0; - if (recurse && recurse([resource, stat])) { // resolve children if requested return TPromise.join(entries.map(stat => toIFileStat(provider, stat, recurse))).then(children => { fileStat.children = children; return fileStat; }); - } else { - return fileStat; - } - }); + }); + } } + + // file or (un-resolved) dir + return TPromise.as(fileStat); } export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], to: URI[]): TPromise { From 5c8c83419efe01d174e951a40190714ac0a40f55 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 10 Jan 2018 15:12:13 -0800 Subject: [PATCH 089/710] remote - unhook providers on dispose --- src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index 52d0da37382..e030f12c05b 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -19,7 +19,6 @@ import { onUnexpectedError } from 'vs/base/common/errors'; @extHostNamedCustomer(MainContext.MainThreadFileSystem) export class MainThreadFileSystem implements MainThreadFileSystemShape { - private readonly _toDispose: IDisposable[] = []; private readonly _proxy: ExtHostFileSystemShape; private readonly _provider = new Map(); @@ -33,7 +32,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { } dispose(): void { - dispose(this._toDispose); + this._provider.forEach(value => dispose()); + this._provider.clear(); } $registerFileSystemProvider(handle: number, scheme: string): void { From 7c90d50c1456bf4b70062f0379252a74cc069092 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 10 Jan 2018 16:08:00 -0800 Subject: [PATCH 090/710] refactor, remove repeated computation. --- .../pieceTableTextBuffer/pieceTableBase.ts | 121 +++++++++--------- 1 file changed, 60 insertions(+), 61 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 74410953b67..01b4e3e7aac 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -181,6 +181,10 @@ export interface BufferCursor { * remainer in current piece. */ remainder: number; + /** + * node start offset in document. + */ + nodeStartOffset: number; } export class Piece { @@ -241,35 +245,28 @@ export class PieceTableBase { insert(value: string, offset: number): void { // todo, validate value and offset. if (this._root !== SENTINEL) { - let { node, remainder } = this.nodeAt(offset); + let { node, remainder, nodeStartOffset } = this.nodeAt(offset); let insertPos = node.piece.lineStarts.getIndexOf(remainder); - let nodeOffsetInDocument = this.offsetOfNode(node); const startOffset = this._changeBuffer.length; - if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeOffsetInDocument + node.piece.length === offset)) { + if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeStartOffset + node.piece.length === offset)) { // append content to this node, we don't want to keep adding node when users simply type in sequence - // unless we want to make the structure immutable this.appendToNode(node, value); } else { - if (nodeOffsetInDocument === offset) { + if (nodeStartOffset === offset) { // we are inserting content to the beginning of node let nodesToDel = []; - if (value.charCodeAt(value.length - 1) === 13) { - // inserted content ends with \r - if (node !== SENTINEL) { - if (this.nodeCharCodeAt(node, 0) === 10) { - // move `\n` forward - value += '\n'; - node.piece.offset++; - node.piece.length--; - node.piece.lineFeedCnt--; - node.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. - this.updateMetadata(node, -1, -1); + if (value.charCodeAt(value.length - 1) === 13 /* \r */ && node !== SENTINEL && this.nodeCharCodeAt(node, 0) === 10 /* \n */) { + // move `\n` forward + value += '\n'; + node.piece.offset++; + node.piece.length--; + node.piece.lineFeedCnt--; + node.piece.lineStarts.removeValues(0, 1); + this.updateMetadata(node, -1, -1); - if (node.piece.length === 0) { - nodesToDel.push(node); - } - } + if (node.piece.length === 0) { + nodesToDel.push(node); } } @@ -278,24 +275,19 @@ export class PieceTableBase { let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); let newNode = this.rbInsertLeft(node, newPiece); this.fixCRLFWithPrev(newNode); - - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - } else if (nodeOffsetInDocument + node.piece.length > offset) { + this.deleteNodes(nodesToDel); + } else if (nodeStartOffset + node.piece.length > offset) { let nodesToDel = []; - - // we need to split node. Create the new piece first as we are reading current node info before modifying it. let newRightPiece = new Piece( node.piece.isOriginalBuffer, - node.piece.offset + offset - nodeOffsetInDocument, - nodeOffsetInDocument + node.piece.length - offset, + node.piece.offset + remainder, + node.piece.length - remainder, node.piece.lineFeedCnt - insertPos.index, node.piece.lineStarts.values ); if (value.charCodeAt(value.length - 1) === 13 /** \r */) { - let headOfRight = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument); + let headOfRight = this.nodeCharCodeAt(node, remainder); if (headOfRight === 10 /** \n */) { newRightPiece.offset++; @@ -312,7 +304,7 @@ export class PieceTableBase { // reuse node if (value.charCodeAt(0) === 10/** \n */) { - let tailOfLeft = this.nodeCharCodeAt(node, offset - nodeOffsetInDocument - 1); + let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); if (tailOfLeft === 13 /** \r */) { let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); this.deleteNodeTail(node, previousPos); @@ -336,9 +328,7 @@ export class PieceTableBase { this.rbInsertRight(node, newRightPiece); } this.rbInsertRight(node, newPiece); - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } + this.deleteNodes(nodesToDel); } else { // we are inserting to the right of this node. if (this.adjustCarriageReturnFromNext(value, node)) { @@ -376,17 +366,14 @@ export class PieceTableBase { let endPosition = this.nodeAt(offset + cnt); let startNode = startPosition.node; let endNode = endPosition.node; - - let length = startNode.piece.length; - let startNodeOffsetInDocument = this.offsetOfNode(startNode); - let splitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument); + let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); if (startNode === endNode) { // deletion falls into one node. - let endSplitPos = startNode.piece.lineStarts.getIndexOf(offset - startNodeOffsetInDocument + cnt); + let endSplitPos = startNode.piece.lineStarts.getIndexOf(endPosition.remainder); - if (startNodeOffsetInDocument === offset) { - if (cnt === length) { // delete node + if (startPosition.nodeStartOffset === offset) { + if (cnt === startNode.piece.length) { // delete node let next = startNode.next(); this.rbDelete(startNode); this.fixCRLFWithPrev(next); @@ -399,48 +386,41 @@ export class PieceTableBase { return; } - if (startNodeOffsetInDocument + length === offset + cnt) { - this.deleteNodeTail(startNode, splitPos); + if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { + this.deleteNodeTail(startNode, startSplitPos); this.fixCRLFWithNext(startNode); this.computeLineCount(); return; } // delete content in the middle, this node will be splitted to nodes - this.shrinkNode(startNode, splitPos, endSplitPos); + this.shrinkNode(startNode, startSplitPos, endSplitPos); this.computeLineCount(); return; } - // perform read operations before any write operation. - let endNodeOffsetInDocument = this.offsetOfNode(endNode); - - // update first touched node - this.deleteNodeTail(startNode, splitPos); let nodesToDel = []; + // update first touched node + this.deleteNodeTail(startNode, startSplitPos); if (startNode.piece.length === 0) { nodesToDel.push(startNode); } // update last touched node - let endSplitPos = endNode.piece.lineStarts.getIndexOf(offset - endNodeOffsetInDocument + cnt); + let endSplitPos = endNode.piece.lineStarts.getIndexOf(endPosition.remainder); this.deleteNodeHead(endNode, endSplitPos); - if (endNode.piece.length === 0) { nodesToDel.push(endNode); } + // delete nodes in between let secondNode = startNode.next(); for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { nodesToDel.push(node); } let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; - - for (let i = 0; i < nodesToDel.length; i++) { - this.rbDelete(nodesToDel[i]); - } - + this.deleteNodes(nodesToDel); if (prev !== SENTINEL) { this.fixCRLFWithNext(prev); } @@ -448,6 +428,12 @@ export class PieceTableBase { } } + deleteNodes(nodes: TreeNode[]): void { + for (let i = 0; i < nodes.length; i++) { + this.rbDelete(nodes[i]); + } + } + getLineRawContent(lineNumber: number): string { let x = this._root; @@ -605,17 +591,21 @@ export class PieceTableBase { nodeAt(offset: number): BufferCursor { let x = this._root; + let nodeStartOffset = 0; while (x !== SENTINEL) { if (x.size_left > offset) { x = x.left; } else if (x.size_left + x.piece.length >= offset) { + nodeStartOffset += x.size_left; return { node: x, - remainder: offset - x.size_left + remainder: offset - x.size_left, + nodeStartOffset }; } else { offset -= x.size_left + x.piece.length; + nodeStartOffset += x.size_left + x.piece.length; x = x.right; } } @@ -627,6 +617,7 @@ export class PieceTableBase { let x = this._root; let lineNumber = position.lineNumber; let column = position.column; + let nodeStartOffset = 0; while (x !== SENTINEL) { if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { @@ -634,17 +625,20 @@ export class PieceTableBase { } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + nodeStartOffset += x.size_left; return { node: x, - remainder: Math.min(prevAccumualtedValue + column - 1, accumualtedValue) + remainder: Math.min(prevAccumualtedValue + column - 1, accumualtedValue), + nodeStartOffset }; } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); if (prevAccumualtedValue + column - 1 <= x.piece.length) { return { node: x, - remainder: prevAccumualtedValue + column - 1 + remainder: prevAccumualtedValue + column - 1, + nodeStartOffset }; } else { column -= x.piece.length - prevAccumualtedValue; @@ -652,6 +646,7 @@ export class PieceTableBase { } } else { lineNumber -= x.lf_left + x.piece.lineFeedCnt; + nodeStartOffset += x.size_left + x.piece.length; x = x.right; } } @@ -662,15 +657,19 @@ export class PieceTableBase { if (x.piece.lineFeedCnt > 0) { let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + let nodeStartOffset = this.offsetOfNode(x); return { node: x, - remainder: Math.min(column - 1, accumualtedValue) + remainder: Math.min(column - 1, accumualtedValue), + nodeStartOffset }; } else { if (x.piece.length >= column - 1) { + let nodeStartOffset = this.offsetOfNode(x); return { node: x, - remainder: column - 1 + remainder: column - 1, + nodeStartOffset }; } else { column -= x.piece.length; From 59d371ffa2e4cc44fc75b284d09b725bbb7de277 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 10 Jan 2018 19:03:59 -0800 Subject: [PATCH 091/710] Extract createNewPiece method. --- .../pieceTableTextBuffer/pieceTableBase.ts | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 01b4e3e7aac..21b10ef6b34 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -247,7 +247,6 @@ export class PieceTableBase { if (this._root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); let insertPos = node.piece.lineStarts.getIndexOf(remainder); - const startOffset = this._changeBuffer.length; if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeStartOffset + node.piece.length === offset)) { // append content to this node, we don't want to keep adding node when users simply type in sequence @@ -270,9 +269,7 @@ export class PieceTableBase { } } - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + let newPiece = this.createNewPiece(value); let newNode = this.rbInsertLeft(node, newPiece); this.fixCRLFWithPrev(newNode); this.deleteNodes(nodesToDel); @@ -320,10 +317,7 @@ export class PieceTableBase { this.deleteNodeTail(node, insertPos); } - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - + let newPiece = this.createNewPiece(value); if (newRightPiece.length > 0) { this.rbInsertRight(node, newRightPiece); } @@ -335,20 +329,14 @@ export class PieceTableBase { value += '\n'; } - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let newPiece: Piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); + let newPiece = this.createNewPiece(value); let newNode = this.rbInsertRight(node, newPiece); this.fixCRLFWithPrev(newNode); } } } else { // insert new node - const startOffset = this._changeBuffer.length; - this._changeBuffer += value; - const lineLengths = this.constructLineLengths(value); - let piece = new Piece(false, startOffset, value.length, lineLengths.length - 1, lineLengths); - + let piece = this.createNewPiece(value); this.rbInsertLeft(null, piece); } @@ -434,6 +422,13 @@ export class PieceTableBase { } } + createNewPiece(text: string): Piece { + const startOffset = this._changeBuffer.length; + this._changeBuffer += text; + const lineLengths = this.constructLineLengths(text); + return new Piece(false, startOffset, text.length, lineLengths.length - 1, lineLengths); + } + getLineRawContent(lineNumber: number): string { let x = this._root; @@ -795,11 +790,7 @@ export class PieceTableBase { } // create new piece which contains \r\n - let startOffset = this._changeBuffer.length; - this._changeBuffer += '\r\n'; - const lineLengths = this.constructLineLengths('\r\n'); - let lineFeedCount = lineLengths.length - 1; - let piece = new Piece(false, startOffset, 2, lineFeedCount, lineLengths); + let piece = this.createNewPiece('\r\n'); this.rbInsertRight(prev, piece); // delete empty nodes From 63986a7fe261ecc21114ed2c16e6a785cde906e1 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 10 Jan 2018 19:41:12 -0800 Subject: [PATCH 092/710] Extract CR/LF validation method. --- .../pieceTableTextBuffer/pieceTableBase.ts | 128 ++++++++++-------- 1 file changed, 68 insertions(+), 60 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 21b10ef6b34..97e5c2ba347 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -255,7 +255,7 @@ export class PieceTableBase { if (nodeStartOffset === offset) { // we are inserting content to the beginning of node let nodesToDel = []; - if (value.charCodeAt(value.length - 1) === 13 /* \r */ && node !== SENTINEL && this.nodeCharCodeAt(node, 0) === 10 /* \n */) { + if (this.endWithCR(value) && this.startWithLF(node)) { // move `\n` forward value += '\n'; node.piece.offset++; @@ -271,7 +271,7 @@ export class PieceTableBase { let newPiece = this.createNewPiece(value); let newNode = this.rbInsertLeft(node, newPiece); - this.fixCRLFWithPrev(newNode); + this.validateCRLFWithPrevNode(newNode); this.deleteNodes(nodesToDel); } else if (nodeStartOffset + node.piece.length > offset) { let nodesToDel = []; @@ -283,7 +283,7 @@ export class PieceTableBase { node.piece.lineStarts.values ); - if (value.charCodeAt(value.length - 1) === 13 /** \r */) { + if (this.endWithCR(value)) { let headOfRight = this.nodeCharCodeAt(node, remainder); if (headOfRight === 10 /** \n */) { @@ -300,7 +300,7 @@ export class PieceTableBase { } // reuse node - if (value.charCodeAt(0) === 10/** \n */) { + if (this.startWithLF(value)) { let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); if (tailOfLeft === 13 /** \r */) { let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); @@ -331,7 +331,7 @@ export class PieceTableBase { let newPiece = this.createNewPiece(value); let newNode = this.rbInsertRight(node, newPiece); - this.fixCRLFWithPrev(newNode); + this.validateCRLFWithPrevNode(newNode); } } } else { @@ -364,19 +364,19 @@ export class PieceTableBase { if (cnt === startNode.piece.length) { // delete node let next = startNode.next(); this.rbDelete(startNode); - this.fixCRLFWithPrev(next); + this.validateCRLFWithPrevNode(next); this.computeLineCount(); return; } this.deleteNodeHead(startNode, endSplitPos); - this.fixCRLFWithPrev(startNode); + this.validateCRLFWithPrevNode(startNode); this.computeLineCount(); return; } if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { this.deleteNodeTail(startNode, startSplitPos); - this.fixCRLFWithNext(startNode); + this.validateCRLFWithNextNode(startNode); this.computeLineCount(); return; } @@ -409,9 +409,7 @@ export class PieceTableBase { let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; this.deleteNodes(nodesToDel); - if (prev !== SENTINEL) { - this.fixCRLFWithNext(prev); - } + this.validateCRLFWithNextNode(prev); this.computeLineCount(); } } @@ -552,7 +550,7 @@ export class PieceTableBase { newPiece.lineStarts.changeValue(0, newPiece.lineStarts.values[0] - end.remainder); let newNode = this.rbInsertRight(node, newPiece); - this.fixCRLFWithPrev(newNode); + this.validateCRLFWithPrevNode(newNode); } appendToNode(node: TreeNode, value: string): void { @@ -560,7 +558,7 @@ export class PieceTableBase { value += '\n'; } - let hitCRLF = value.charCodeAt(0) === 10 && this.nodeCharCodeAt(node, node.piece.length - 1) === 13; + let hitCRLF = this.startWithLF(value) && this.endWithCR(node); this._changeBuffer += value; node.piece.length += value.length; const lineLengths = this.constructLineLengths(value); @@ -677,6 +675,15 @@ export class PieceTableBase { return null; } + nodeCharCodeAt(node: TreeNode, offset: number): number { + if (node.piece.lineFeedCnt < 1) { + return -1; + } + let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + + return buffer.charCodeAt(node.piece.offset + offset); + } + offsetOfNode(node: TreeNode): number { if (!node) { return 0; @@ -715,6 +722,35 @@ export class PieceTableBase { // #endregion // #region CRLF + startWithLF(val: string | TreeNode): boolean { + if (typeof val === 'string') { + return val.charCodeAt(0) === 10; + } + + if (val === SENTINEL || val.piece.lineFeedCnt === 0) { + return false; + } + + if (val.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { + return false; + } + + // charCodeAt is expensive when the buffer is large. + return this.nodeCharCodeAt(val, 0) === 10; + } + + endWithCR(val: string | TreeNode): boolean { + if (typeof val === 'string') { + return val.charCodeAt(val.length - 1) === 13; + } + + if (val === SENTINEL || val.piece.lineFeedCnt === 0) { + return false; + } + + return this.nodeCharCodeAt(val, val.piece.length - 1) === 13; + } + hitTestCRLF(node: TreeNode, offset: number, position: PrefixSumIndexOfResult) { if (node.piece.lineFeedCnt < 1) { return false; @@ -728,36 +764,19 @@ export class PieceTableBase { return false; } - fixCRLFWithPrev(nextNode: TreeNode) { - if (nextNode === SENTINEL || nextNode.piece.lineFeedCnt === 0) { - return; - } - - if (nextNode.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { - return; - } - - if (this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + validateCRLFWithPrevNode(nextNode: TreeNode) { + if (this.startWithLF(nextNode)) { let node = nextNode.prev(); - - if (node === SENTINEL || node.piece.lineFeedCnt === 0) { - return; - } - - if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13) { + if (this.endWithCR(node)) { this.fixCRLF(node, nextNode); } } } - fixCRLFWithNext(node: TreeNode) { - if (node === SENTINEL) { - return; - } - - if (this.nodeCharCodeAt(node, node.piece.length - 1) === 13 /* \r */) { + validateCRLFWithNextNode(node: TreeNode) { + if (this.endWithCR(node)) { let nextNode = node.next(); - if (nextNode !== SENTINEL && this.nodeCharCodeAt(nextNode, 0) === 10 /* \n */) { + if (this.startWithLF(nextNode)) { this.fixCRLF(node, nextNode); } } @@ -800,39 +819,28 @@ export class PieceTableBase { } adjustCarriageReturnFromNext(value: string, node: TreeNode): boolean { - if (value.charCodeAt(value.length - 1) === 13) { - // inserted content ends with \r + if (this.endWithCR(value)) { let nextNode = node.next(); - if (nextNode !== SENTINEL) { - if (this.nodeCharCodeAt(nextNode, 0) === 10) { - // move `\n` forward - value += '\n'; + if (this.startWithLF(nextNode)) { + // move `\n` forward + value += '\n'; - if (nextNode.piece.length === 1) { - this.rbDelete(nextNode); - } else { - nextNode.piece.offset += 1; - nextNode.piece.length -= 1; - nextNode.piece.lineFeedCnt -= 1; - nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. - this.updateMetadata(nextNode, -1, -1); - } - return true; + if (nextNode.piece.length === 1) { + this.rbDelete(nextNode); + } else { + nextNode.piece.offset += 1; + nextNode.piece.length -= 1; + nextNode.piece.lineFeedCnt -= 1; + nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + this.updateMetadata(nextNode, -1, -1); } + return true; } } return false; } - nodeCharCodeAt(node: TreeNode, offset: number): number { - if (node.piece.lineFeedCnt < 1) { - return -1; - } - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; - - return buffer.charCodeAt(node.piece.offset + offset); - } // #endregion // #endregion From 4fa88afd474fc3e87e97ab21cd74fb28c3e4384b Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 10 Jan 2018 19:45:31 -0800 Subject: [PATCH 093/710] update piecetable insert method signature. --- .../editor/common/model/pieceTableTextBuffer/pieceTableBase.ts | 2 +- .../common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 97e5c2ba347..be5bb2aba66 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -242,7 +242,7 @@ export class PieceTableBase { } // #region Piece Table - insert(value: string, offset: number): void { + insert(offset: number, value: string): void { // todo, validate value and offset. if (this._root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 29bc981bf76..ffb9fac9df6 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -367,7 +367,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer if (text) { // replacement this.delete(op.rangeOffset, op.rangeLength); - this.insert(text, op.rangeOffset); + this.insert(op.rangeOffset, text); } else { // deletion From 0dc61e3fd511205fb15aa3b002cca1b936872886 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 10 Jan 2018 20:36:07 -0800 Subject: [PATCH 094/710] update comments. --- .../pieceTableTextBuffer/pieceTableBase.ts | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index be5bb2aba66..73991cf4b29 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -256,7 +256,7 @@ export class PieceTableBase { // we are inserting content to the beginning of node let nodesToDel = []; if (this.endWithCR(value) && this.startWithLF(node)) { - // move `\n` forward + // move `\n` to new node. value += '\n'; node.piece.offset++; node.piece.length--; @@ -274,6 +274,7 @@ export class PieceTableBase { this.validateCRLFWithPrevNode(newNode); this.deleteNodes(nodesToDel); } else if (nodeStartOffset + node.piece.length > offset) { + // we are inserting into the middle of a node. let nodesToDel = []; let newRightPiece = new Piece( node.piece.isOriginalBuffer, @@ -299,7 +300,7 @@ export class PieceTableBase { this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); } - // reuse node + // reuse node for content before insertion point. if (this.startWithLF(value)) { let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); if (tailOfLeft === 13 /** \r */) { @@ -326,6 +327,7 @@ export class PieceTableBase { } else { // we are inserting to the right of this node. if (this.adjustCarriageReturnFromNext(value, node)) { + // move \n to the new node. value += '\n'; } @@ -345,73 +347,71 @@ export class PieceTableBase { } delete(offset: number, cnt: number): void { - if (cnt <= 0) { + if (cnt <= 0 || this._root === SENTINEL) { return; } - if (this._root !== SENTINEL) { - let startPosition = this.nodeAt(offset); - let endPosition = this.nodeAt(offset + cnt); - let startNode = startPosition.node; - let endNode = endPosition.node; - let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); + let startPosition = this.nodeAt(offset); + let endPosition = this.nodeAt(offset + cnt); + let startNode = startPosition.node; + let endNode = endPosition.node; + let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); - if (startNode === endNode) { - // deletion falls into one node. - let endSplitPos = startNode.piece.lineStarts.getIndexOf(endPosition.remainder); + if (startNode === endNode) { + // deletion falls into one node. + let endSplitPos = startNode.piece.lineStarts.getIndexOf(endPosition.remainder); - if (startPosition.nodeStartOffset === offset) { - if (cnt === startNode.piece.length) { // delete node - let next = startNode.next(); - this.rbDelete(startNode); - this.validateCRLFWithPrevNode(next); - this.computeLineCount(); - return; - } - this.deleteNodeHead(startNode, endSplitPos); - this.validateCRLFWithPrevNode(startNode); + if (startPosition.nodeStartOffset === offset) { + if (cnt === startNode.piece.length) { // delete node + let next = startNode.next(); + this.rbDelete(startNode); + this.validateCRLFWithPrevNode(next); this.computeLineCount(); return; } - - if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { - this.deleteNodeTail(startNode, startSplitPos); - this.validateCRLFWithNextNode(startNode); - this.computeLineCount(); - return; - } - - // delete content in the middle, this node will be splitted to nodes - this.shrinkNode(startNode, startSplitPos, endSplitPos); + this.deleteNodeHead(startNode, endSplitPos); + this.validateCRLFWithPrevNode(startNode); this.computeLineCount(); return; } - let nodesToDel = []; - // update first touched node - this.deleteNodeTail(startNode, startSplitPos); - if (startNode.piece.length === 0) { - nodesToDel.push(startNode); + if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { + this.deleteNodeTail(startNode, startSplitPos); + this.validateCRLFWithNextNode(startNode); + this.computeLineCount(); + return; } - // update last touched node - let endSplitPos = endNode.piece.lineStarts.getIndexOf(endPosition.remainder); - this.deleteNodeHead(endNode, endSplitPos); - if (endNode.piece.length === 0) { - nodesToDel.push(endNode); - } - - // delete nodes in between - let secondNode = startNode.next(); - for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { - nodesToDel.push(node); - } - - let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; - this.deleteNodes(nodesToDel); - this.validateCRLFWithNextNode(prev); + // delete content in the middle, this node will be splitted to nodes + this.shrinkNode(startNode, startSplitPos, endSplitPos); this.computeLineCount(); + return; } + + let nodesToDel = []; + // update first touched node + this.deleteNodeTail(startNode, startSplitPos); + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } + + // update last touched node + let endSplitPos = endNode.piece.lineStarts.getIndexOf(endPosition.remainder); + this.deleteNodeHead(endNode, endSplitPos); + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } + + // delete nodes in between + let secondNode = startNode.next(); + for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { + nodesToDel.push(node); + } + + let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; + this.deleteNodes(nodesToDel); + this.validateCRLFWithNextNode(prev); + this.computeLineCount(); } deleteNodes(nodes: TreeNode[]): void { @@ -1166,7 +1166,7 @@ export class PieceTableBase { } updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { - // node length change, we need to update the roots of all subtrees containing this node. + // node length change or line feed count change while (x !== this._root && x !== SENTINEL) { if (x.parent.left === x) { x.parent.size_left += delta; From 9a2d1d2017b49e3dc966b3139238f68f293615b1 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 10 Jan 2018 22:23:37 -0800 Subject: [PATCH 095/710] Add log uploader command line util (#41318) * Add log uploader command line option Adds a new --upload-logs command line flag that allows users to upload log files from their current session to a secure endpoint * Use TPromise * Better argv description * Fix var spell * Use request service --- src/vs/base/node/request.ts | 11 +- src/vs/code/electron-main/launch.ts | 19 ++- src/vs/code/electron-main/logUploader.ts | 134 ++++++++++++++++++ src/vs/code/electron-main/main.ts | 16 ++- .../environment/common/environment.ts | 1 + src/vs/platform/environment/node/argv.ts | 6 +- src/vs/platform/node/product.ts | 1 + 7 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 src/vs/code/electron-main/logUploader.ts diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts index 30fdfb643fb..d50506cc21a 100644 --- a/src/vs/base/node/request.ts +++ b/src/vs/base/node/request.ts @@ -28,7 +28,7 @@ export interface IRequestOptions { password?: string; headers?: any; timeout?: number; - data?: any; + data?: string | Stream; agent?: Agent; followRedirects?: number; strictSSL?: boolean; @@ -63,6 +63,7 @@ export function request(options: IRequestOptions): TPromise { : getNodeRequest(options); return rawRequestPromise.then(rawRequest => { + return new TPromise((c, e) => { const endpoint = parseUrl(options.url); @@ -83,7 +84,6 @@ export function request(options: IRequestOptions): TPromise { req = rawRequest(opts, (res: http.ClientResponse) => { const followRedirects = isNumber(options.followRedirects) ? options.followRedirects : 3; - if (res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers['location']) { request(assign({}, options, { url: res.headers['location'], @@ -107,7 +107,12 @@ export function request(options: IRequestOptions): TPromise { } if (options.data) { - req.write(options.data); + if (typeof options.data === 'string') { + req.write(options.data); + } else { + options.data.pipe(req); + return; + } } req.end(); diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index 44408229a25..22f9d83c99b 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -10,7 +10,7 @@ import { IChannel } from 'vs/base/parts/ipc/common/ipc'; import { ILogService } from 'vs/platform/log/common/log'; import { IURLService } from 'vs/platform/url/common/url'; import { IProcessEnvironment } from 'vs/base/common/platform'; -import { ParsedArgs } from 'vs/platform/environment/common/environment'; +import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { OpenContext } from 'vs/platform/windows/common/windows'; import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows'; @@ -42,12 +42,14 @@ export interface ILaunchService { start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise; getMainProcessId(): TPromise; getMainProcessInfo(): TPromise; + getLogsPath(): TPromise; } export interface ILaunchChannel extends IChannel { call(command: 'start', arg: IStartArguments): TPromise; call(command: 'get-main-process-id', arg: null): TPromise; call(command: 'get-main-process-info', arg: null): TPromise; + call(command: 'get-logs-path', arg: null): TPromise; call(command: string, arg: any): TPromise; } @@ -66,6 +68,9 @@ export class LaunchChannel implements ILaunchChannel { case 'get-main-process-info': return this.service.getMainProcessInfo(); + + case 'get-logs-path': + return this.service.getLogsPath(); } return undefined; @@ -89,6 +94,10 @@ export class LaunchChannelClient implements ILaunchService { public getMainProcessInfo(): TPromise { return this.channel.call('get-main-process-info', null); } + + public getLogsPath(): TPromise { + return this.channel.call('get-logs-path', null); + } } export class LaunchService implements ILaunchService { @@ -99,7 +108,8 @@ export class LaunchService implements ILaunchService { @ILogService private logService: ILogService, @IWindowsMainService private windowsMainService: IWindowsMainService, @IURLService private urlService: IURLService, - @IWorkspacesMainService private workspacesMainService: IWorkspacesMainService + @IWorkspacesMainService private workspacesMainService: IWorkspacesMainService, + @IEnvironmentService private readonly environmentService: IEnvironmentService ) { } public start(args: ParsedArgs, userEnv: IProcessEnvironment): TPromise { @@ -179,6 +189,11 @@ export class LaunchService implements ILaunchService { } as IMainProcessInfo); } + public getLogsPath(): TPromise { + this.logService.trace('Received request for logs path from other instance.'); + return TPromise.as(this.environmentService.logsPath); + } + private getWindowInfo(window: ICodeWindow): IWindowInfo { const folders: string[] = []; diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts new file mode 100644 index 00000000000..f4a034627d3 --- /dev/null +++ b/src/vs/code/electron-main/logUploader.ts @@ -0,0 +1,134 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import * as os from 'os'; +import * as cp from 'child_process'; +import * as fs from 'fs'; +import * as path from 'path'; +import * as readline from 'readline'; + +import { localize } from 'vs/nls'; +import { ILaunchChannel } from 'vs/code/electron-main/launch'; +import { TPromise } from 'vs/base/common/winjs.base'; +import product from 'vs/platform/node/product'; +import { IRequestService } from 'vs/platform/request/node/request'; +import { IRequestContext } from 'vs/base/node/request'; + +interface PostResult { + readonly blob_id: string; +} + +class Endpoint { + private constructor( + public readonly url: string + ) { } + + public static getFromProduct(): Endpoint | undefined { + const logUploaderUrl = product.logUploaderUrl; + return logUploaderUrl ? new Endpoint(logUploaderUrl) : undefined; + } +} + +export async function uploadLogs( + channel: ILaunchChannel, + requestService: IRequestService +): TPromise { + const endpoint = Endpoint.getFromProduct(); + if (!endpoint) { + console.error(localize('invalidEndpoint', 'Invalid log uploader endpoint')); + return; + } + + const logsPath = await channel.call('get-logs-path', null); + + if (await promptUserToConfirmLogUpload(logsPath)) { + const outZip = await zipLogs(logsPath); + const result = await postLogs(endpoint, outZip, requestService); + console.log(localize('didUploadLogs', 'Uploaded logs ID: {0}', result.blob_id)); + } else { + console.log(localize('userDeniedUpload', 'Canceled upload')); + } +} + +async function promptUserToConfirmLogUpload( + logsPath: string +): Promise { + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout + }); + + return new TPromise(resolve => + rl.question( + localize('logUploadPromptHeader', 'Upload session logs to secure endpoint?') + + '\n\n' + localize('logUploadPromptBody', 'Please review your log files: \'{0}\'', logsPath) + + '\n\n' + localize('logUploadPromptKey', 'Enter \'y\' to confirm upload...'), + (answer: string) => { + rl.close(); + resolve(answer && answer.trim()[0].toLowerCase() === 'y'); + })); +} + +async function postLogs( + endpoint: Endpoint, + outZip: string, + requestService: IRequestService +): TPromise { + let result: IRequestContext; + try { + result = await requestService.request({ + url: endpoint.url, + type: 'POST', + data: fs.createReadStream(outZip), + headers: { + 'Content-Type': 'application/zip', + 'Content-Length': fs.statSync(outZip).size + } + }); + } catch (e) { + console.log(localize('postError', 'Error posting logs: {0}', e)); + throw e; + } + + try { + return JSON.parse(result.stream.toString()); + } catch (e) { + console.log(localize('parseError', 'Error parsing response')); + throw e; + } +} + +function zipLogs( + logsPath: string +): TPromise { + const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vscode-log-upload')); + const outZip = path.join(tempDir, 'logs.zip'); + return new TPromise((resolve, reject) => { + doZip(logsPath, outZip, (err, stdout, stderr) => { + if (err) { + console.error(localize('zipError', 'Error zipping logs: {0}', err)); + reject(err); + } else { + resolve(outZip); + } + }); + }); +} + +function doZip( + logsPath: string, + outZip: string, + callback: (error: Error, stdout: string, stderr: string) => void +) { + switch (os.platform()) { + case 'win32': + return cp.execFile('powershell', ['-Command', `Compress-Archive -Path "${logsPath}" -DestinationPath ${outZip}`], { cwd: logsPath }, callback); + + default: + return cp.execFile('zip', ['-r', outZip, '.'], { cwd: logsPath }, callback); + } +} \ No newline at end of file diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 64f64a85241..ea7bf733406 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -104,6 +104,7 @@ class ExpectedError extends Error { function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); const environmentService = accessor.get(IEnvironmentService); + const requestService = accessor.get(IRequestService); function allowSetForegroundWindow(service: LaunchChannelClient): TPromise { let promise = TPromise.wrap(void 0); @@ -133,6 +134,12 @@ function setupIPC(accessor: ServicesAccessor): TPromise { throw new ExpectedError('Terminating...'); } + // Log uploader usage info + if (environmentService.args['upload-logs']) { + logService.warn('Warning: The --upload-logs argument can only be used if Code is already running. Please run it again after Code has started.'); + throw new ExpectedError('Terminating...'); + } + // dock might be hidden at this case due to a retry if (platform.isMacintosh) { app.dock.show(); @@ -170,7 +177,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise { // Skip this if we are running with --wait where it is expected that we wait for a while. // Also skip when gathering diagnostics (--status) which can take a longer time. let startupWarningDialogHandle: number; - if (!environmentService.wait && !environmentService.status) { + if (!environmentService.wait && !environmentService.status && !environmentService.args['upload-logs']) { startupWarningDialogHandle = setTimeout(() => { showStartupWarningDialog( localize('secondInstanceNoResponse', "Another instance of {0} is running but not responding", product.nameShort), @@ -189,6 +196,13 @@ function setupIPC(accessor: ServicesAccessor): TPromise { }); } + // Log uploader + if (environmentService.args['upload-logs']) { + return import('vs/code/electron-main/logUploader') + .then(logUploader => logUploader.uploadLogs(channel, requestService)) + .then(() => TPromise.wrapError(new ExpectedError())); + } + logService.trace('Sending env to running instance...'); return allowSetForegroundWindow(service) diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index ce3950c1c0f..1194e4bc818 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -55,6 +55,7 @@ export interface ParsedArgs { 'skip-add-to-recently-opened'?: boolean; 'file-write'?: boolean; 'file-chmod'?: boolean; + 'upload-logs'?: boolean; } export const IEnvironmentService = createDecorator('environmentService'); diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index a5fd702fd16..8d4ecf47870 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -58,7 +58,8 @@ const options: minimist.Opts = { 'skip-add-to-recently-opened', 'status', 'file-write', - 'file-chmod' + 'file-chmod', + 'upload-logs' ], alias: { add: 'a', @@ -162,7 +163,8 @@ const troubleshootingHelp: { [name: string]: string; } = { '--disable-extensions': localize('disableExtensions', "Disable all installed extensions."), '--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection uri."), '--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."), - '--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration.") + '--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."), + '--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint.") }; export function formatOptions(options: { [name: string]: string; }, columns: number): string { diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts index 68802e24d9b..00a76d6fc38 100644 --- a/src/vs/platform/node/product.ts +++ b/src/vs/platform/node/product.ts @@ -69,6 +69,7 @@ export interface IProductConfiguration { 'linux-x64': string; 'darwin': string; }; + logUploaderUrl: string; } export interface ISurveyData { From a08d15501f01e78da4a2ddddc54077c574b279c3 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 11 Jan 2018 07:37:38 +0100 Subject: [PATCH 096/710] fix #16852 --- .../markers/browser/markersPanelActions.ts | 13 ------------- .../browser/markersWorkbenchContributions.ts | 19 +++++++++++++------ .../parts/markers/common/constants.ts | 1 + .../parts/markers/common/messages.ts | 4 ++-- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts index 9f1412c4218..03c6c2a3c17 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts @@ -54,19 +54,6 @@ export class ShowProblemsPanelAction extends Action { } } -export class ToggleErrorsAndWarningsAction extends TogglePanelAction { - - public static ID: string = 'workbench.action.showErrorsWarnings'; - public static readonly LABEL = Messages.SHOW_ERRORS_WARNINGS_ACTION_LABEL; - - constructor(id: string, label: string, - @IPartService partService: IPartService, - @IPanelService panelService: IPanelService, - ) { - super(id, label, Constants.MARKERS_PANEL_ID, panelService, partService); - } -} - export class CollapseAllAction extends TreeCollapseAction { constructor(viewer: Tree.ITree, enabled: boolean) { diff --git a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts index 1ab41b88d24..5d31a4a46c6 100644 --- a/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts +++ b/src/vs/workbench/parts/markers/browser/markersWorkbenchContributions.ts @@ -12,7 +12,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; -import { ToggleMarkersPanelAction, ToggleErrorsAndWarningsAction, ShowProblemsPanelAction } from 'vs/workbench/parts/markers/browser/markersPanelActions'; +import { ToggleMarkersPanelAction, ShowProblemsPanelAction } from 'vs/workbench/parts/markers/browser/markersPanelActions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { MarkersPanel } from 'vs/workbench/parts/markers/browser/markersPanel'; @@ -33,6 +33,16 @@ export function registerContributions(): void { } }); + KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: Constants.MARKER_SHOW_PANEL_ID, + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), + when: undefined, + primary: undefined, + handler: (accessor, args: any) => { + accessor.get(IPanelService).openPanel(Constants.MARKERS_PANEL_ID); + } + }); + // configuration Registry.as(Extensions.Configuration).registerConfiguration({ 'id': 'problems', @@ -63,9 +73,6 @@ export function registerContributions(): void { const registry = Registry.as(ActionExtensions.WorkbenchActions); registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleMarkersPanelAction, ToggleMarkersPanelAction.ID, ToggleMarkersPanelAction.LABEL, { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_M - }), 'View: Toggle Problems', Messages.MARKERS_PANEL_VIEW_CATEGORY); - registry.registerWorkbenchAction(new SyncActionDescriptor(ShowProblemsPanelAction, ShowProblemsPanelAction.ID, ShowProblemsPanelAction.LABEL), 'View: Show Problems', Messages.MARKERS_PANEL_VIEW_CATEGORY); - - // Retaining old action to show errors and warnings, so that custom bindings to this action for existing users works. - registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleErrorsAndWarningsAction, ToggleErrorsAndWarningsAction.ID, ToggleErrorsAndWarningsAction.LABEL), 'Show Errors and Warnings'); + }), 'View: Toggle Problems (Errors, Warnings, Infos)', Messages.MARKERS_PANEL_VIEW_CATEGORY); + registry.registerWorkbenchAction(new SyncActionDescriptor(ShowProblemsPanelAction, ShowProblemsPanelAction.ID, ShowProblemsPanelAction.LABEL), 'View: Focus Problems (Errors, Warnings, Infos)', Messages.MARKERS_PANEL_VIEW_CATEGORY); } diff --git a/src/vs/workbench/parts/markers/common/constants.ts b/src/vs/workbench/parts/markers/common/constants.ts index e1edde7ad00..b69836eaca0 100644 --- a/src/vs/workbench/parts/markers/common/constants.ts +++ b/src/vs/workbench/parts/markers/common/constants.ts @@ -10,6 +10,7 @@ export default { MARKER_COPY_ACTION_ID: 'problems.action.copy', MARKER_COPY_MESSAGE_ACTION_ID: 'problems.action.copyMessage', MARKER_OPEN_SIDE_ACTION_ID: 'problems.action.openToSide', + MARKER_SHOW_PANEL_ID: 'workbench.action.showErrorsWarnings', MarkerFocusContextKey: new RawContextKey('problemFocus', true) }; diff --git a/src/vs/workbench/parts/markers/common/messages.ts b/src/vs/workbench/parts/markers/common/messages.ts index 95fb1fe5f7f..bd2ce9fc63b 100644 --- a/src/vs/workbench/parts/markers/common/messages.ts +++ b/src/vs/workbench/parts/markers/common/messages.ts @@ -11,8 +11,8 @@ import { IMarker } from 'vs/platform/markers/common/markers'; export default class Messages { public static MARKERS_PANEL_VIEW_CATEGORY: string = nls.localize('viewCategory', "View"); - public static MARKERS_PANEL_TOGGLE_LABEL: string = nls.localize('problems.view.toggle.label', "Toggle Problems"); - public static MARKERS_PANEL_SHOW_LABEL: string = nls.localize('problems.view.focus.label', "Focus Problems"); + public static MARKERS_PANEL_TOGGLE_LABEL: string = nls.localize('problems.view.toggle.label', "Toggle Problems (Errors, Warnings, Infos)"); + public static MARKERS_PANEL_SHOW_LABEL: string = nls.localize('problems.view.focus.label', "Focus Problems (Errors, Warnings, Infos)"); public static PROBLEMS_PANEL_CONFIGURATION_TITLE: string = nls.localize('problems.panel.configuration.title', "Problems View"); public static PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL: string = nls.localize('problems.panel.configuration.autoreveal', "Controls if Problems view should automatically reveal files when opening them"); From 9b8040c937dc78057f9136c97bf827fe774cef55 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 16:58:21 +0100 Subject: [PATCH 097/710] explorer: multi select with mouse --- .../electron-browser/views/explorerViewer.ts | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) 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 4f2133dfd9a..8badf58bcac 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -329,6 +329,7 @@ export class FileController extends DefaultController implements IDisposable { private contributedContextMenu: IMenu; private toDispose: IDisposable[]; + private previousSelectionRangeStop: FileStat; constructor( @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IContextMenuService private contextMenuService: IContextMenuService, @@ -377,20 +378,39 @@ export class FileController extends DefaultController implements IDisposable { // Set DOM focus tree.DOMFocus(); + if (stat instanceof NewStatPlaceholder) { + return true; + } - // Expand / Collapse - tree.toggleExpansion(stat, event.altKey); + if (event.ctrlKey || event.metaKey) { + const selection = tree.getSelection(); + this.previousSelectionRangeStop = undefined; + if (selection.indexOf(stat) >= 0) { + tree.setSelection(selection.filter(s => s !== stat)); + } else { + tree.setSelection(selection.concat(stat)); + } + tree.setFocus(stat, payload); + } // Allow to unselect - if (event.shiftKey && !(stat instanceof NewStatPlaceholder)) { - const selection = tree.getSelection(); - if (selection && selection.length > 0 && selection[0] === stat) { - tree.clearSelection(payload); + else if (event.shiftKey) { + const focus = tree.getFocus(); + if (focus) { + if (this.previousSelectionRangeStop) { + tree.deselectRange(stat, this.previousSelectionRangeStop); + } + tree.selectRange(focus, stat, payload); + this.previousSelectionRangeStop = stat; } } // Select, Focus and open files - else if (!(stat instanceof NewStatPlaceholder)) { + else { + // Expand / Collapse + tree.toggleExpansion(stat, event.altKey); + this.previousSelectionRangeStop = undefined; + const preserveFocus = !isDoubleClick; tree.setFocus(stat, payload); From af70076b4f967efc84e8b5ceba35e58f47b9f6bd Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 9 Jan 2018 17:19:07 +0100 Subject: [PATCH 098/710] explorer: multi select with keyboard --- .../electron-browser/views/explorerViewer.ts | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 8badf58bcac..46b00a8bb46 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -342,7 +342,6 @@ export class FileController extends DefaultController implements IDisposable { this.toDispose = []; this.contributedContextMenu = menuService.createMenu(MenuId.ExplorerContext, contextKeyService); this.toDispose.push(this.contributedContextMenu); - } public onLeftClick(tree: ITree, stat: FileStat | Model, event: IMouseEvent, origin: string = 'mouse'): boolean { @@ -428,6 +427,27 @@ export class FileController extends DefaultController implements IDisposable { return true; } + public onKeyDown(tree: ITree, event: IKeyboardEvent): boolean { + if (event.shiftKey && (event.keyCode === KeyCode.DownArrow || event.keyCode === KeyCode.UpArrow)) { + const previousFocus = tree.getFocus(); + if (event.keyCode === KeyCode.DownArrow) { + tree.focusNext(); + } else { + tree.focusPrevious(); + } + + const focus = tree.getFocus(); + const selection = tree.getSelection(); + if (selection && selection.indexOf(focus) >= 0) { + tree.setSelection(selection.filter(s => s !== previousFocus)); + } else { + tree.setSelection(selection.concat(focus)); + } + } + + return super.onKeyDown(tree, event); + } + public onContextMenu(tree: ITree, stat: FileStat | Model, event: ContextMenuEvent): boolean { if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') { return false; From 4a7d0a7786e300d648d9c3599b8d531f79ecacab Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 11:34:57 +0100 Subject: [PATCH 099/710] explorer: delete and move file to trash respect multiple selection --- .../files/electron-browser/fileActions.ts | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index d39e684d6c7..e5822ff868b 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -626,14 +626,13 @@ class BaseDeleteFileAction extends BaseFileAction { private static readonly CONFIRM_DELETE_SETTING_KEY = 'explorer.confirmDelete'; - private tree: ITree; - private useTrash: boolean; private skipConfirm: boolean; constructor( - tree: ITree, + private tree: ITree, element: FileStat, - useTrash: boolean, + private useTrash: boolean, + private retry: boolean, @IFileService fileService: IFileService, @IMessageService messageService: IMessageService, @ITextFileService textFileService: ITextFileService, @@ -648,7 +647,7 @@ class BaseDeleteFileAction extends BaseFileAction { this._updateEnablement(); } - public run(context?: any): TPromise { + public run(): TPromise { // Remove highlight if (this.tree) { @@ -749,15 +748,16 @@ class BaseDeleteFileAction extends BaseFileAction { this.tree.setFocus(this.element.parent); // move focus to parent } }, (error: any) => { + if (this.retry) { + // Allow to retry + let extraAction: Action; + if (this.useTrash) { + extraAction = new Action('permanentDelete', nls.localize('permDelete', "Delete Permanently"), null, true, () => { this.useTrash = false; this.skipConfirm = true; return this.run(); }); + } - // Allow to retry - let extraAction: Action; - if (this.useTrash) { - extraAction = new Action('permanentDelete', nls.localize('permDelete', "Delete Permanently"), null, true, () => { this.useTrash = false; this.skipConfirm = true; return this.run(); }); + this.onErrorWithRetry(error, () => this.run(), extraAction); } - this.onErrorWithRetry(error, () => this.run(), extraAction); - // Focus back to tree this.tree.DOMFocus(); }); @@ -1533,11 +1533,17 @@ if (!diag) { interface IExplorerContext { viewletState: IFileViewletState; stat: FileStat; + selection: FileStat[]; } -function getContext(tree: ListWidget, viewletService: IViewletService): IExplorerContext { +function getContext(listWidget: ListWidget, viewletService: IViewletService): IExplorerContext { // These commands can only be triggered when explorer viewlet is visible so get it using the active viewlet - return { stat: tree.getFocus(), viewletState: (viewletService.getActiveViewlet()).getViewletState() }; + const tree = listWidget; + const stat = tree.getFocus(); + const selection = tree.getSelection(); + + // Only respect the selection if user clicked inside it (focus belongs to it) + return { stat, selection: selection && selection.indexOf(stat) >= 0 ? selection : [], viewletState: (viewletService.getActiveViewlet()).getViewletState() }; } // TODO@isidor these commands are calling into actions due to the complex inheritance action structure. @@ -1575,25 +1581,35 @@ export const renameHandler = (accessor: ServicesAccessor) => { return renameAction.run(explorerContext); }; -export const moveFileToTrashHandler = (accessor) => { +export const moveFileToTrashHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); - const moveFileToTrashAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, true); - return moveFileToTrashAction.run(explorerContext); + if (explorerContext.selection.length > 1) { + const actions = explorerContext.selection.map(fs => instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, fs, true, false)); + return sequence(actions.map(a => () => a.run())); + } + + const moveFileToTrashAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, true, true); + return moveFileToTrashAction.run(); }; -export const deleteFileHandler = (accessor) => { +export const deleteFileHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); - const deleteFileAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, false); - return deleteFileAction.run(explorerContext); + if (explorerContext.selection.length > 1) { + const actions = explorerContext.selection.map(fs => instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, fs, false, false)); + return sequence(actions.map(a => () => a.run())); + } + + const deleteFileAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, false, true); + return deleteFileAction.run(); }; -export const copyFileHandler = (accessor) => { +export const copyFileHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); @@ -1602,7 +1618,7 @@ export const copyFileHandler = (accessor) => { return copyFileAction.run(); }; -export const pasteFileHandler = (accessor) => { +export const pasteFileHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); From 69352e4b0ea2927af2ac9da45282c16df0cc95e7 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 12:00:31 +0100 Subject: [PATCH 100/710] copy file action adopt multi select --- .../files/electron-browser/fileActions.ts | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index e5822ff868b..e130a07a5f3 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -885,7 +885,7 @@ export class ImportFileAction extends BaseFileAction { } // Copy File/Folder -let fileToCopy: FileStat; +let filesToCopy: FileStat[]; let fileCopiedContextKey: IContextKey; class CopyFileAction extends BaseFileAction { @@ -893,7 +893,7 @@ class CopyFileAction extends BaseFileAction { private tree: ITree; constructor( tree: ITree, - element: FileStat, + private elements: FileStat[], @IFileService fileService: IFileService, @IMessageService messageService: IMessageService, @ITextFileService textFileService: ITextFileService, @@ -902,7 +902,6 @@ class CopyFileAction extends BaseFileAction { super('filesExplorer.copy', COPY_FILE_LABEL, fileService, messageService, textFileService); this.tree = tree; - this.element = element; if (!fileCopiedContextKey) { fileCopiedContextKey = FileCopiedContext.bindTo(contextKeyService); } @@ -912,8 +911,8 @@ class CopyFileAction extends BaseFileAction { public run(): TPromise { // Remember as file/folder to copy - fileToCopy = this.element; - fileCopiedContextKey.set(!!this.element); + filesToCopy = this.elements; + fileCopiedContextKey.set(!!filesToCopy.length); // Remove highlight if (this.tree) { @@ -952,7 +951,7 @@ class PasteFileAction extends BaseFileAction { this._updateEnablement(); } - public run(): TPromise { + public run(fileToCopy: FileStat): TPromise { const exists = fileToCopy.root.find(fileToCopy.resource); if (!exists) { @@ -1613,8 +1612,9 @@ export const copyFileHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); + const stats = explorerContext.selection.length > 1 ? explorerContext.selection : [explorerContext.stat]; - const copyFileAction = instantationService.createInstance(CopyFileAction, listService.lastFocusedList, explorerContext.stat); + const copyFileAction = instantationService.createInstance(CopyFileAction, listService.lastFocusedList, stats); return copyFileAction.run(); }; @@ -1623,6 +1623,8 @@ export const pasteFileHandler = (accessor: ServicesAccessor) => { const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); - const pasteFileAction = instantationService.createInstance(PasteFileAction, listService.lastFocusedList, explorerContext.stat); - return pasteFileAction.run(); + return TPromise.join(filesToCopy.map(toCopy => { + const pasteFileAction = instantationService.createInstance(PasteFileAction, listService.lastFocusedList, explorerContext.stat); + return pasteFileAction.run(toCopy); + })); }; From ed4b52cde029d9c9929852329e95752c90e4221e Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 13:03:35 +0100 Subject: [PATCH 101/710] deleteFileAction handle multiple stats to only confirm once --- .../files/electron-browser/fileActions.ts | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index e130a07a5f3..b94687ba950 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -630,9 +630,8 @@ class BaseDeleteFileAction extends BaseFileAction { constructor( private tree: ITree, - element: FileStat, + private elements: FileStat[], private useTrash: boolean, - private retry: boolean, @IFileService fileService: IFileService, @IMessageService messageService: IMessageService, @ITextFileService textFileService: ITextFileService, @@ -641,8 +640,7 @@ class BaseDeleteFileAction extends BaseFileAction { super('moveFileToTrash', MOVE_FILE_TO_TRASH_LABEL, fileService, messageService, textFileService); this.tree = tree; - this.element = element; - this.useTrash = useTrash && !paths.isUNC(element.resource.fsPath); // on UNC shares there is no trash + this.useTrash = useTrash && elements.every(e => !paths.isUNC(e.resource.fsPath)); // on UNC shares there is no trash this._updateEnablement(); } @@ -663,10 +661,12 @@ class BaseDeleteFileAction extends BaseFileAction { // Handle dirty let confirmDirtyPromise: TPromise = TPromise.as(true); - const dirty = this.textFileService.getDirty().filter(d => resources.isEqualOrParent(d, this.element.resource, !isLinux /* ignorecase */)); + const dirty = this.textFileService.getDirty().filter(d => this.elements.some(e => resources.isEqualOrParent(d, e.resource, !isLinux /* ignorecase */))); if (dirty.length) { let message: string; - if (this.element.isDirectory) { + if (this.elements.length > 1) { + message = nls.localize('dirtyMessageFilesDelete', "You are deleting files with unsaved changes. Do you want to continue?"); + } else if (this.elements[0].isDirectory) { if (dirty.length === 1) { message = nls.localize('dirtyMessageFolderOneDelete', "You are deleting a folder with unsaved changes in 1 file. Do you want to continue?"); } else { @@ -706,8 +706,11 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for moving to trash else if (this.useTrash) { + const message = this.elements.length > 1 ? nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete '{0}' resources?", this.elements.length) + : this.elements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", this.elements[0].name) + : nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", this.elements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ - message: this.element.isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", this.element.name) : nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", this.element.name), + message, detail: isWindows ? nls.localize('undoBin', "You can restore from the recycle bin.") : nls.localize('undoTrash', "You can restore from the trash."), primaryButton, checkbox: { @@ -719,8 +722,11 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for deleting permanently else { + const message = this.elements.length > 1 ? nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete '{0}' resources?", this.elements.length) + : this.elements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", this.elements[0].name) + : nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", this.elements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ - message: this.element.isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", this.element.name) : nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", this.element.name), + message, detail: nls.localize('irreversible', "This action is irreversible!"), primaryButton, type: 'warning' @@ -743,12 +749,12 @@ class BaseDeleteFileAction extends BaseFileAction { } // Call function - const servicePromise = this.fileService.del(this.element.resource, this.useTrash).then(() => { - if (this.element.parent) { - this.tree.setFocus(this.element.parent); // move focus to parent + const servicePromise = TPromise.join(this.elements.map(e => this.fileService.del(e.resource, this.useTrash))).then(() => { + if (this.elements[0].parent) { + this.tree.setFocus(this.elements[0].parent); // move focus to parent } }, (error: any) => { - if (this.retry) { + if (this.elements.length === 1) { // Allow to retry let extraAction: Action; if (this.useTrash) { @@ -1584,13 +1590,9 @@ export const moveFileToTrashHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); + const stats = explorerContext.selection.length > 1 ? explorerContext.selection : [explorerContext.stat]; - if (explorerContext.selection.length > 1) { - const actions = explorerContext.selection.map(fs => instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, fs, true, false)); - return sequence(actions.map(a => () => a.run())); - } - - const moveFileToTrashAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, true, true); + const moveFileToTrashAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, stats, true); return moveFileToTrashAction.run(); }; @@ -1598,13 +1600,9 @@ export const deleteFileHandler = (accessor: ServicesAccessor) => { const instantationService = accessor.get(IInstantiationService); const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); + const stats = explorerContext.selection.length > 1 ? explorerContext.selection : [explorerContext.stat]; - if (explorerContext.selection.length > 1) { - const actions = explorerContext.selection.map(fs => instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, fs, false, false)); - return sequence(actions.map(a => () => a.run())); - } - - const deleteFileAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, explorerContext.stat, false, true); + const deleteFileAction = instantationService.createInstance(BaseDeleteFileAction, listService.lastFocusedList, stats, false); return deleteFileAction.run(); }; From 3282450eb65dffe33f9c66c78c7a58851dbed430 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 15:30:51 +0100 Subject: [PATCH 102/710] share getConfirmMessage --- src/vs/platform/message/common/message.ts | 20 ++++++++++++++ .../files/electron-browser/fileActions.ts | 6 ++--- .../electron-browser/textFileService.ts | 26 +++---------------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/vs/platform/message/common/message.ts b/src/vs/platform/message/common/message.ts index 61ed328a213..4211798a0a9 100644 --- a/src/vs/platform/message/common/message.ts +++ b/src/vs/platform/message/common/message.ts @@ -5,6 +5,8 @@ 'use strict'; import nls = require('vs/nls'); +import uri from 'vs/base/common/uri'; +import paths = require('vs/base/common/paths'); import { TPromise } from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -35,6 +37,24 @@ export const CancelAction = new Action('cancel.message', nls.localize('cancel', export const IMessageService = createDecorator('messageService'); +const MAX_CONFIRM_FILES = 10; +export function getConfirmMessage(start: string, resourcesToConfirm: uri[]): string { + const message = [start]; + message.push(''); + message.push(...resourcesToConfirm.slice(0, MAX_CONFIRM_FILES).map(r => paths.basename(r.fsPath))); + + if (resourcesToConfirm.length > MAX_CONFIRM_FILES) { + if (resourcesToConfirm.length - MAX_CONFIRM_FILES === 1) { + message.push(nls.localize('moreFile', "...1 additional file not shown")); + } else { + message.push(nls.localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - MAX_CONFIRM_FILES)); + } + } + + message.push(''); + return message.join('\n'); +} + export interface IConfirmationResult { confirmed: boolean; checkboxChecked?: boolean; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index b94687ba950..b1d23935283 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -37,7 +37,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IUntitledResourceInput } from 'vs/platform/editor/common/editor'; import { IInstantiationService, IConstructorSignature2, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; -import { IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAction, IConfirmationResult } from 'vs/platform/message/common/message'; +import { IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAction, IConfirmationResult, getConfirmMessage } from 'vs/platform/message/common/message'; import { ITextModel } from 'vs/editor/common/model'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IWindowsService } from 'vs/platform/windows/common/windows'; @@ -706,7 +706,7 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for moving to trash else if (this.useTrash) { - const message = this.elements.length > 1 ? nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete '{0}' resources?", this.elements.length) + const message = this.elements.length > 1 ? getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", this.elements.length), this.elements.map(e => e.resource)) : this.elements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", this.elements[0].name) : nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", this.elements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ @@ -722,7 +722,7 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for deleting permanently else { - const message = this.elements.length > 1 ? nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete '{0}' resources?", this.elements.length) + const message = this.elements.length > 1 ? getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", this.elements.length), this.elements.map(e => e.resource)) : this.elements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", this.elements[0].name) : nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", this.elements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts index 4e03d14d2a3..ecf4229c83b 100644 --- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts +++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts @@ -24,7 +24,7 @@ import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textMo import product from 'vs/platform/node/product'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IMessageService } from 'vs/platform/message/common/message'; +import { IMessageService, getConfirmMessage } from 'vs/platform/message/common/message'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; @@ -33,8 +33,6 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; export class TextFileService extends AbstractTextFileService { - private static readonly MAX_CONFIRM_FILES = 10; - constructor( @IWorkspaceContextService contextService: IWorkspaceContextService, @IFileService fileService: IFileService, @@ -80,24 +78,8 @@ export class TextFileService extends AbstractTextFileService { return TPromise.wrap(ConfirmResult.DONT_SAVE); } - const message = [ - resourcesToConfirm.length === 1 ? nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", paths.basename(resourcesToConfirm[0].fsPath)) : nls.localize('saveChangesMessages', "Do you want to save the changes to the following {0} files?", resourcesToConfirm.length) - ]; - - if (resourcesToConfirm.length > 1) { - message.push(''); - message.push(...resourcesToConfirm.slice(0, TextFileService.MAX_CONFIRM_FILES).map(r => paths.basename(r.fsPath))); - - if (resourcesToConfirm.length > TextFileService.MAX_CONFIRM_FILES) { - if (resourcesToConfirm.length - TextFileService.MAX_CONFIRM_FILES === 1) { - message.push(nls.localize('moreFile', "...1 additional file not shown")); - } else { - message.push(nls.localize('moreFiles', "...{0} additional files not shown", resourcesToConfirm.length - TextFileService.MAX_CONFIRM_FILES)); - } - } - - message.push(''); - } + const message = resourcesToConfirm.length === 1 ? nls.localize('saveChangesMessage', "Do you want to save the changes you made to {0}?", paths.basename(resourcesToConfirm[0].fsPath)) + : getConfirmMessage(nls.localize('saveChangesMessages', "Do you want to save the changes to the following {0} files?", resourcesToConfirm.length), resourcesToConfirm); // Button order // Windows: Save | Don't Save | Cancel @@ -119,7 +101,7 @@ export class TextFileService extends AbstractTextFileService { const opts: Electron.MessageBoxOptions = { title: product.nameLong, - message: message.join('\n'), + message, type: 'warning', detail: nls.localize('saveChangesDetail', "Your changes will be lost if you don't save them."), buttons: buttons.map(b => b.label), From d497a068795d79afaa6a86faebc7380ca6c51152 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 15:53:02 +0100 Subject: [PATCH 103/710] copy path adopt multi selection --- .../files/electron-browser/fileCommands.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 6f4b3a5486e..fe1c82cc6f9 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -94,6 +94,17 @@ export function getResourceForCommand(resource: URI, listService: IListService, return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); } +function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { + const list = listService.lastFocusedList; + if (list && list.isDOMFocused()) { + if (list instanceof Tree) { + return list.getSelection().map(fs => fs.resource); + } + } + + return [getResourceForCommand(resource, listService, editorService)]; +} + function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, textFileService: ITextFileService, editorGroupService: IEditorGroupService): TPromise { @@ -402,10 +413,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }, id: COPY_PATH_COMMAND_ID, handler: (accessor, resource: URI) => { - resource = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); - if (resource) { + const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); + if (resources.length) { const clipboardService = accessor.get(IClipboardService); - clipboardService.writeText(resource.scheme === 'file' ? labels.getPathLabel(resource) : resource.toString()); + const text = resources.map(r => r.scheme === 'file' ? labels.getPathLabel(r) : r.toString()).join('\n'); + clipboardService.writeText(text); } else { const messageService = accessor.get(IMessageService); messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path")); From 3949e29e2643997e71a7a58ddd674e3ade1f2444 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 16:04:06 +0100 Subject: [PATCH 104/710] reveal in finder adopt multi select --- .../parts/files/electron-browser/fileCommands.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index fe1c82cc6f9..1a1da50c45a 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -39,6 +39,7 @@ import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; import { isWindows, isMacintosh } from 'vs/base/common/platform'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; +import { sequence } from 'vs/base/common/async'; // Commands @@ -96,9 +97,10 @@ export function getResourceForCommand(resource: URI, listService: IListService, function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; - if (list && list.isDOMFocused()) { - if (list instanceof Tree) { - return list.getSelection().map(fs => fs.resource); + if (list && list.isDOMFocused() && list instanceof Tree) { + const selection = list.getSelection(); + if (selection && selection.length > 1) { + return selection.map(fs => fs.resource); } } @@ -377,11 +379,11 @@ CommandsRegistry.registerCommand({ const revealInOSHandler = (accessor: ServicesAccessor, resource: URI) => { // Without resource, try to look at the active editor - resource = getResourceForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); + const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); - if (resource) { + if (resources.length) { const windowsService = accessor.get(IWindowsService); - windowsService.showItemInFolder(paths.normalize(resource.fsPath, true)); + sequence(resources.map(r => () => windowsService.showItemInFolder(paths.normalize(r.fsPath, true)))); } else { const messageService = accessor.get(IMessageService); messageService.show(severity.Info, nls.localize('openFileToReveal', "Open a file first to reveal")); From 9ccfc4a483349ca1ac69488390304fc6e7701e94 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 17:22:09 +0100 Subject: [PATCH 105/710] drag and drop multi select first cut --- .../electron-browser/views/explorerViewer.ts | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) 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 46b00a8bb46..bb28488cbc6 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -39,7 +39,7 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IMessageService, IConfirmation, Severity, IConfirmationResult } from 'vs/platform/message/common/message'; +import { IMessageService, IConfirmation, Severity, IConfirmationResult, getConfirmMessage } from 'vs/platform/message/common/message'; import { IProgressService } from 'vs/platform/progress/common/progress'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { KeyCode } from 'vs/base/common/keyCodes'; @@ -717,23 +717,23 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { public onDragStart(tree: ITree, data: IDragAndDropData, originalEvent: DragMouseEvent): void { const sources: FileStat[] = data.getData(); - let source: FileStat = null; - if (sources.length > 0) { - source = sources[0]; - } + if (sources && sources.length) { + // When dragging folders, make sure to collapse them to free up some space + sources.forEach(s => { + if (s.isDirectory && tree.isExpanded(s)) { + tree.collapse(s, false); + } + }); - // When dragging folders, make sure to collapse them to free up some space - if (source && source.isDirectory && tree.isExpanded(source)) { - tree.collapse(source, false); - } + // Apply some datatransfer types to allow for dragging the element outside of the application + // TODO@Isidor check this + if (sources.length === 1) { + if (!sources[0].isDirectory) { + originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, sources[0].name, sources[0].resource.toString()].join(':')); + } - // Apply some datatransfer types to allow for dragging the element outside of the application - if (source) { - if (!source.isDirectory) { - originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, source.name, source.resource.toString()].join(':')); + originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource)); } - - originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(source.resource)); } } @@ -884,7 +884,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { } private handleExplorerDrop(tree: ITree, data: IDragAndDropData, target: FileStat, originalEvent: DragMouseEvent): TPromise { - const source: FileStat = data.getData()[0]; + const sources: FileStat[] = data.getData(); const isCopy = (originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh); let confirmPromise: TPromise; @@ -893,7 +893,8 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { const confirmDragAndDrop = !isCopy && this.configurationService.getValue(FileDragAndDrop.CONFIRM_DND_SETTING_KEY); if (confirmDragAndDrop) { confirmPromise = this.messageService.confirmWithCheckbox({ - message: nls.localize('confirmMove', "Are you sure you want to move '{0}'?", source.name), + message: sources.length > 1 ? getConfirmMessage(nls.localize('confirmMultiMove', "Are you sure you want to move the following {0} files?", sources.length), sources.map(s => s.resource)) + : nls.localize('confirmMove', "Are you sure you want to move '{0}'?", sources[0].name), checkbox: { label: nls.localize('doNotAskAgain', "Do not ask me again") }, @@ -914,7 +915,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { return updateConfirmSettingsPromise.then(() => { if (confirmation.confirmed) { - return this.doHandleExplorerDrop(tree, data, source, target, isCopy); + return TPromise.join(sources.map(source => this.doHandleExplorerDrop(tree, data, source, target, isCopy))).then(() => void 0); } return TPromise.as(void 0); From a21b833b7192b4fcfc50bb79d7f1df0167be14bd Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 10 Jan 2018 17:22:18 +0100 Subject: [PATCH 106/710] open to the side multi select first cut --- .../files/electron-browser/fileCommands.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 1a1da50c45a..ee1a7a25de3 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -104,7 +104,8 @@ function getResourcesForCommand(resource: URI, listService: IListService, editor } } - return [getResourceForCommand(resource, listService, editorService)]; + const result = getResourceForCommand(resource, listService, editorService); + return !!result ? [result] : []; } function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, @@ -293,7 +294,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ const editorService = accessor.get(IWorkbenchEditorService); const listService = accessor.get(IListService); const tree = listService.lastFocusedList; - resource = getResourceForCommand(resource, listService, editorService); + const resources = getResourcesForCommand(resource, listService, editorService); // Remove highlight if (tree instanceof Tree) { @@ -301,8 +302,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } // Set side input - if (URI.isUri(resource)) { - return editorService.openEditor({ resource, options: { preserveFocus: false } }, true); + if (resources.length) { + return editorService.openEditors(resources.map(resource => { + return { + input: { + resource, + options: { preserveFocus: false } + }, + position: Position.THREE + }; + })); } return TPromise.as(true); From fca6ee5dafc0531c7f127e00949691034b548182 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 10:33:29 +0100 Subject: [PATCH 107/710] open to the side use new openEditors sideBySide api --- .../workbench/parts/files/electron-browser/fileCommands.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index ee1a7a25de3..eb1962aa29d 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -308,10 +308,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ input: { resource, options: { preserveFocus: false } - }, - position: Position.THREE + } }; - })); + }), true); } return TPromise.as(true); From bd0a576d3bbdf4914e93ca676fa96d9bee4b0b1d Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 11 Jan 2018 10:42:52 +0100 Subject: [PATCH 108/710] Fix #41377 --- .../browser/parts/views/panelViewlet.ts | 15 ++++- .../browser/parts/views/viewsViewlet.ts | 13 +++- .../files/electron-browser/explorerViewlet.ts | 61 ------------------- .../electron-browser/views/openEditorsView.ts | 5 ++ 4 files changed, 27 insertions(+), 67 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts index 03fb2022e2c..f9717eccef2 100644 --- a/src/vs/workbench/browser/parts/views/panelViewlet.ts +++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts @@ -134,7 +134,7 @@ interface IViewletPanelItem { export class PanelViewlet extends Viewlet { - protected lastFocusedPanel: ViewletPanel | undefined; + private lastFocusedPanel: ViewletPanel | undefined; private panelItems: IViewletPanelItem[] = []; private panelview: PanelView; @@ -195,7 +195,11 @@ export class PanelViewlet extends Viewlet { if (this.lastFocusedPanel) { this.lastFocusedPanel.focus(); } else if (this.panelItems.length > 0) { - this.panelItems[0].panel.focus(); + for (const { panel } of this.panelItems) { + if (panel.isExpanded()) { + panel.focus(); + } + } } } @@ -213,8 +217,13 @@ export class PanelViewlet extends Viewlet { addPanel(panel: ViewletPanel, size: number, index = this.panelItems.length - 1): void { const disposables: IDisposable[] = []; const onDidFocus = panel.onDidFocus(() => this.lastFocusedPanel = panel, null, disposables); + const onDidChange = panel.onDidChange(() => { + if (panel === this.lastFocusedPanel && !panel.isExpanded()) { + this.lastFocusedPanel = undefined; + } + }, null, disposables); const styler = attachPanelStyler(panel, this.themeService); - const disposable = combinedDisposable([onDidFocus, styler]); + const disposable = combinedDisposable([onDidFocus, styler, onDidChange]); const panelItem: IViewletPanelItem = { panel, disposable }; this.panelItems.splice(index, 0, panelItem); diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 7bc93ba609f..a7cdde07173 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -347,16 +347,23 @@ export class ViewsViewlet extends PanelViewlet { super.shutdown(); } - toggleViewVisibility(id: string, visible?: boolean): void { + toggleViewVisibility(id: string): void { const view = this.getView(id); let viewState = this.viewsStates.get(id); - if (!viewState || (visible === true && view) || (visible === false && !view)) { + if (!viewState) { return; } viewState.isHidden = !!view; - this.updateViews(); + this.updateViews() + .then(() => { + if (!viewState.isHidden) { + this.getView(id).focus(); + } else { + this.focus(); + } + }); } private onViewsRegistered(views: IViewDescriptor[]): void { diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts index b7b9b3cd8d8..7d3b763b318 100644 --- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts +++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts @@ -226,67 +226,6 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer return super.setVisible(visible); } - public focus(): void { - const hasOpenedEditors = !!this.editorGroupService.getStacksModel().activeGroup; - - let openEditorsView = this.getOpenEditorsView(); - if (this.lastFocusedPanel && this.lastFocusedPanel.isExpanded() && this.hasSelectionOrFocus(this.lastFocusedPanel as ViewsViewletPanel)) { - if (this.lastFocusedPanel !== openEditorsView || hasOpenedEditors) { - this.lastFocusedPanel.focus(); - return; - } - } - - if (this.hasSelectionOrFocus(openEditorsView) && hasOpenedEditors) { - return openEditorsView.focus(); - } - - let explorerView = this.getExplorerView(); - if (this.hasSelectionOrFocus(explorerView)) { - return explorerView.focus(); - } - - if (openEditorsView && openEditorsView.isExpanded() && hasOpenedEditors) { - return openEditorsView.focus(); // we have entries in the opened editors view to focus on - } - - if (explorerView && explorerView.isExpanded()) { - return explorerView.focus(); - } - - let emptyView = this.getEmptyView(); - if (emptyView && emptyView.isExpanded()) { - return emptyView.focusBody(); - } - - super.focus(); - } - - private hasSelectionOrFocus(view: ViewsViewletPanel): boolean { - if (!view) { - return false; - } - - if (!view.isExpanded()) { - return false; - } - - if (view instanceof ExplorerView) { - const viewer = view.getViewer(); - if (!viewer) { - return false; - } - - return !!viewer.getFocus() || (viewer.getSelection() && viewer.getSelection().length > 0); - - } - if (view instanceof OpenEditorsView && !!view.getList()) { - return view.getList().isDOMFocused(); - } - - return false; - } - public getActionRunner(): IActionRunner { if (!this.actionRunner) { this.actionRunner = new ActionRunner(this.viewletState); diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index d1971cbbbb4..ed1edf09a3e 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -216,6 +216,11 @@ export class OpenEditorsView extends ViewsViewletPanel { }); } + public focus(): void { + this.list.domFocus(); + super.focus(); + } + public getList(): WorkbenchList { return this.list; } From 3d93316bd598fe366e1d07fdde5bf48396348e5c Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 11 Jan 2018 10:44:05 +0100 Subject: [PATCH 109/710] dont optimize for travis --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0799f34e24..d789e84c612 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,6 @@ script: - node_modules/.bin/gulp electron --silent - node_modules/.bin/tsc -p ./src/tsconfig.monaco.json --noEmit - node_modules/.bin/gulp compile --silent --max_old_space_size=4096 - - node_modules/.bin/gulp optimize-vscode --silent --max_old_space_size=4096 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/test.sh --coverage --reporter dot; else ./scripts/test.sh --reporter dot; fi - ./scripts/test-integration.sh From 7047262299d3eedae84b690852bd7c9c5c0ff34f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 11 Jan 2018 10:59:26 +0100 Subject: [PATCH 110/710] fix #41322 --- src/vs/workbench/electron-browser/shell.ts | 73 ++++++++++++------- .../workbench/electron-browser/workbench.ts | 11 +-- .../electron-browser/extensionService.ts | 8 +- 3 files changed, 55 insertions(+), 37 deletions(-) diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index ace1369afb0..0c1fc90223f 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -161,17 +161,7 @@ export class WorkbenchShell { const [instantiationService, serviceCollection] = this.initServiceCollection(parent.getHTMLElement()); // Workbench - this.workbench = instantiationService.createInstance(Workbench, parent.getHTMLElement(), workbenchContainer.getHTMLElement(), this.configuration, serviceCollection, this.lifecycleService); - try { - this.workbench.startup().done(startupInfos => this.onWorkbenchStarted(startupInfos, instantiationService)); - } catch (error) { - - // Log it - this.logService.error(toErrorMessage(error, true)); - - // Rethrow - throw error; - } + this.workbench = this.createWorkbench(instantiationService, serviceCollection, parent.getHTMLElement(), workbenchContainer.getHTMLElement()); // Window this.workbench.getInstantiationService().createInstance(ElectronWindow, this.container); @@ -188,26 +178,55 @@ export class WorkbenchShell { return workbenchContainer; } - private onWorkbenchStarted(info: IWorkbenchStartedInfo, instantiationService: IInstantiationService): void { + private createWorkbench(instantiationService: IInstantiationService, serviceCollection: ServiceCollection, parent: HTMLElement, workbenchContainer: HTMLElement): Workbench { + try { + const workbench = instantiationService.createInstance(Workbench, parent, workbenchContainer, this.configuration, serviceCollection, this.lifecycleService); - // Startup Telemetry - this.logStartupTelemetry(info); + // Delay the "Restoring" phase for a bit to give our viewlet/editor/panels a faster startup + let restorePhaseTimeoutHandle = setTimeout(() => { + restorePhaseTimeoutHandle = void 0; + this.lifecycleService.phase = LifecyclePhase.Restoring; + }, 800); - // Set lifecycle phase to `Runnning` so that other contributions can now do something - this.lifecycleService.phase = LifecyclePhase.Running; + // Startup Workbench + workbench.startup().done(startupInfos => { - // Set lifecycle phase to `Runnning For A Bit` after a short delay - let timeoutHandle = setTimeout(() => { - timeoutHandle = void 0; - this.lifecycleService.phase = LifecyclePhase.Eventually; - }, 3000); - this.toUnbind.push({ - dispose: () => { - if (timeoutHandle) { - clearTimeout(timeoutHandle); + // Set lifecycle phase to restoring if we started up fast enough and to + // make sure to trigger contributions on this phase if any + if (restorePhaseTimeoutHandle) { + clearTimeout(restorePhaseTimeoutHandle); + this.lifecycleService.phase = LifecyclePhase.Restoring; } - } - }); + + // Set lifecycle phase to `Runnning` so that other contributions can now do something + this.lifecycleService.phase = LifecyclePhase.Running; + + // Startup Telemetry + this.logStartupTelemetry(startupInfos); + + // Set lifecycle phase to `Runnning For A Bit` after a short delay + let eventuallPhaseTimeoutHandle = setTimeout(() => { + eventuallPhaseTimeoutHandle = void 0; + this.lifecycleService.phase = LifecyclePhase.Eventually; + }, 3000); + this.toUnbind.push({ + dispose: () => { + if (eventuallPhaseTimeoutHandle) { + clearTimeout(eventuallPhaseTimeoutHandle); + } + } + }); + }); + + return workbench; + } catch (error) { + + // Log it + this.logService.error(toErrorMessage(error, true)); + + // Rethrow + throw error; + } } private logStartupTelemetry(info: IWorkbenchStartedInfo): void { diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 758bdb709ea..e13edb24a93 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -76,7 +76,7 @@ import { ProgressService2 } from 'vs/workbench/services/progress/browser/progres import { TextModelResolverService } from 'vs/workbench/services/textmodelResolver/common/textModelResolverService'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { ShutdownReason, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; +import { ShutdownReason } from 'vs/platform/lifecycle/common/lifecycle'; import { LifecycleService } from 'vs/workbench/services/lifecycle/electron-browser/lifecycleService'; import { IWindowService, IWindowConfiguration as IWindowSettings, IWindowConfiguration, IPath } from 'vs/platform/windows/common/windows'; import { IMessageService } from 'vs/platform/message/common/message'; @@ -97,7 +97,6 @@ import URI from 'vs/base/common/uri'; import { IListService, ListService } from 'vs/platform/list/browser/listService'; import { domEvent } from 'vs/base/browser/event'; import { InputFocusedContext } from 'vs/platform/workbench/common/contextkeys'; -import { onUnexpectedError } from 'vs/base/common/errors'; export const MessagesVisibleContext = new RawContextKey('globalMessageVisible', false); export const EditorsVisibleContext = new RawContextKey('editorIsOpen', false); @@ -321,7 +320,6 @@ export class Workbench implements IPartService { perf.mark('willRestoreEditors'); const restoredEditors: string[] = []; restorePromises.push(this.resolveEditorsToOpen().then(inputs => { - let editorOpenPromise: TPromise; if (inputs.length) { editorOpenPromise = this.editorService.openEditors(inputs.map(input => { return { input, position: EditorPosition.ONE }; })); @@ -329,10 +327,7 @@ export class Workbench implements IPartService { editorOpenPromise = this.editorPart.restoreEditors(); } - // update lifecycle *after* triggering the editor restore - this.lifecycleService.phase = LifecyclePhase.Restoring; - - editorOpenPromise.then(editors => { + return editorOpenPromise.then(editors => { this.handleEditorBackground(); // make sure we show the proper background in the editor area perf.mark('didRestoreEditors'); @@ -346,7 +341,7 @@ export class Workbench implements IPartService { } } } - }).done(undefined, onUnexpectedError); + }); })); // Restore Sidebar diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index c01e5b32c77..dcddee17af0 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -119,9 +119,13 @@ export class ExtensionService extends Disposable implements IExtensionService { this._extensionHostProcessCustomers = []; this._extensionHostProcessProxy = null; - lifecycleService.when(LifecyclePhase.Running).then(() => { + lifecycleService.when(LifecyclePhase.Restoring).then(() => { // delay extension host creation and extension scanning - // until after workbench is running + // until the workbench is restoring. we cannot defer the + // extension host more (LifecyclePhase.Running) because + // some editors require the extension host to restore + // and this would result in a deadlock + // see https://github.com/Microsoft/vscode/issues/41322 this._startExtensionHostProcess([]); this._scanAndHandleExtensions(); }); From 5be173790ab79bfd429e3c7c8af51c2a02d86650 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 11 Jan 2018 11:10:46 +0100 Subject: [PATCH 111/710] [seti] ts icon should be blue. Fixes #40691 --- .../theme-seti/build/update-icon-theme.js | 134 +++--- .../theme-seti/icons/vs-seti-icon-theme.json | 405 ++++++++++++------ 2 files changed, 349 insertions(+), 190 deletions(-) diff --git a/extensions/theme-seti/build/update-icon-theme.js b/extensions/theme-seti/build/update-icon-theme.js index 955a9327e76..31d7bffe3a7 100644 --- a/extensions/theme-seti/build/update-icon-theme.js +++ b/extensions/theme-seti/build/update-icon-theme.js @@ -5,13 +5,13 @@ 'use strict'; -var path = require('path'); -var fs = require('fs'); -var https = require('https'); -var url = require('url'); +let path = require('path'); +let fs = require('fs'); +let https = require('https'); +let url = require('url'); function getCommitSha(repoId, repoPath) { - var commitInfo = 'https://api.github.com/repos/' + repoId + '/commits?path=' + repoPath; + let commitInfo = 'https://api.github.com/repos/' + repoId + '/commits?path=' + repoPath; return download(commitInfo).then(function (content) { try { let lastCommit = JSON.parse(content)[0]; @@ -23,7 +23,7 @@ function getCommitSha(repoId, repoPath) { return Promise.resolve(null); } }, function () { - console.err('Failed loading ' + commitInfo); + console.error('Failed loading ' + commitInfo); return Promise.resolve(null); }); } @@ -33,9 +33,9 @@ function download(source) { return readFile(source); } return new Promise((c, e) => { - var _url = url.parse(source); - var options = { host: _url.host, port: _url.port, path: _url.path, headers: { 'User-Agent': 'NodeJS' }}; - var content = ''; + let _url = url.parse(source); + let options = { host: _url.host, port: _url.port, path: _url.path, headers: { 'User-Agent': 'NodeJS' }}; + let content = ''; https.get(options, function (response) { response.on('data', function (data) { content += data.toString(); @@ -69,7 +69,7 @@ function downloadBinary(source, dest) { https.get(source, function (response) { switch(response.statusCode) { case 200: - var file = fs.createWriteStream(dest); + let file = fs.createWriteStream(dest); response.on('data', function(chunk){ file.write(chunk); }).on('end', function(){ @@ -96,16 +96,16 @@ function downloadBinary(source, dest) { function copyFile(fileName, dest) { return new Promise((c, e) => { - var cbCalled = false; + let cbCalled = false; function handleError(err) { if (!cbCalled) { e(err); cbCalled = true; } } - var rd = fs.createReadStream(fileName); + let rd = fs.createReadStream(fileName); rd.on("error", handleError); - var wr = fs.createWriteStream(dest); + let wr = fs.createWriteStream(dest); wr.on("error", handleError); wr.on("close", function() { if (!cbCalled) { @@ -118,10 +118,10 @@ function copyFile(fileName, dest) { } function darkenColor(color) { - var res = '#'; - for (var i = 1; i < 7; i+=2) { - var newVal = Math.round(parseInt('0x' + color.substr(i, 2), 16) * 0.9); - var hex = newVal.toString(16); + let res = '#'; + for (let i = 1; i < 7; i+=2) { + let newVal = Math.round(parseInt('0x' + color.substr(i, 2), 16) * 0.9); + let hex = newVal.toString(16); if (hex.length == 1) { res += '0'; } @@ -132,23 +132,23 @@ function darkenColor(color) { function getLanguageMappings() { let langMappings = {}; - var allExtensions = fs.readdirSync('..'); - for (var i= 0; i < allExtensions.length; i++) { + let allExtensions = fs.readdirSync('..'); + for (let i= 0; i < allExtensions.length; i++) { let dirPath = path.join('..', allExtensions[i], 'package.json'); if (fs.existsSync(dirPath)) { let content = fs.readFileSync(dirPath).toString(); let jsonContent = JSON.parse(content); let languages = jsonContent.contributes && jsonContent.contributes.languages; if (Array.isArray(languages)) { - for (var k = 0; k < languages.length; k++) { - var languageId = languages[k].id; + for (let k = 0; k < languages.length; k++) { + let languageId = languages[k].id; if (languageId) { - var extensions = languages[k].extensions; - var mapping = {}; + let extensions = languages[k].extensions; + let mapping = {}; if (Array.isArray(extensions)) { mapping.extensions = extensions.map(function (e) { return e.substr(1).toLowerCase(); }); } - var filenames = languages[k].filenames; + let filenames = languages[k].filenames; if (Array.isArray(filenames)) { mapping.fileNames = filenames.map(function (f) { return f.toLowerCase(); }); } @@ -161,43 +161,45 @@ function getLanguageMappings() { return langMappings; } -//var font = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/_fonts/seti/seti.woff'; -var font = '../../../seti-ui/styles/_fonts/seti/seti.woff'; +//let font = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/_fonts/seti/seti.woff'; +let font = '../../../seti-ui/styles/_fonts/seti/seti.woff'; exports.copyFont = function() { return downloadBinary(font, './icons/seti.woff'); }; -//var fontMappings = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/_fonts/seti.less'; -//var mappings = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/components/icons/mapping.less'; -//var colors = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/ui-variables.less'; +//let fontMappings = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/_fonts/seti.less'; +//let mappings = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/components/icons/mapping.less'; +//let colors = 'https://raw.githubusercontent.com/jesseweed/seti-ui/master/styles/ui-variables.less'; -var fontMappings = '../../../seti-ui/styles/_fonts/seti.less'; -var mappings = '../../../seti-ui/styles/components/icons/mapping.less'; -var colors = '../../../seti-ui/styles/ui-variables.less'; +let fontMappings = '../../../seti-ui/styles/_fonts/seti.less'; +let mappings = '../../../seti-ui/styles/components/icons/mapping.less'; +let colors = '../../../seti-ui/styles/ui-variables.less'; exports.update = function () { console.log('Reading from ' + fontMappings); - var def2Content = {}; - var ext2Def = {}; - var fileName2Def = {}; - var def2ColorId = {}; - var colorId2Value = {}; - var lang2Def = {}; + let def2Content = {}; + let ext2Def = {}; + let fileName2Def = {}; + let def2ColorId = {}; + let colorId2Value = {}; + let lang2Def = {}; function writeFileIconContent(info) { - var iconDefinitions = {}; + let iconDefinitions = {}; + let allDefs = Object.keys(def2Content).sort(); - for (var def in def2Content) { - var entry = { fontCharacter: def2Content[def] }; - var colorId = def2ColorId[def]; + for (let i = 0; i < allDefs.length; i++) { + let def = allDefs[i]; + let entry = { fontCharacter: def2Content[def] }; + let colorId = def2ColorId[def]; if (colorId) { - var colorValue = colorId2Value[colorId]; + let colorValue = colorId2Value[colorId]; if (colorValue) { entry.fontColor = colorValue; - var entryInverse = { fontCharacter: entry.fontCharacter, fontColor: darkenColor(colorValue) }; + let entryInverse = { fontCharacter: entry.fontCharacter, fontColor: darkenColor(colorValue) }; iconDefinitions[def + '_light'] = entryInverse; } } @@ -205,8 +207,8 @@ exports.update = function () { } function getInvertSet(input) { - var result = {}; - for (var assoc in input) { + let result = {}; + for (let assoc in input) { let invertDef = input[assoc] + '_light'; if (iconDefinitions[invertDef]) { result[assoc] = invertDef; @@ -215,7 +217,7 @@ exports.update = function () { return result; } - var res = { + let res = { information_for_contributors: [ 'This file has been generated from data in https://github.com/jesseweed/seti-ui', '- icon definitions: https://github.com/jesseweed/seti-ui/blob/master/styles/_fonts/seti.less', @@ -246,40 +248,52 @@ exports.update = function () { version: 'https://github.com/jesseweed/seti-ui/commit/' + info.commitSha, }; - var path = './icons/vs-seti-icon-theme.json'; + let path = './icons/vs-seti-icon-theme.json'; fs.writeFileSync(path, JSON.stringify(res, null, '\t')); console.log('written ' + path); } - var match; + let match; return download(fontMappings).then(function (content) { - var regex = /@([\w-]+):\s*'(\\E[0-9A-F]+)';/g; + let regex = /@([\w-]+):\s*'(\\E[0-9A-F]+)';/g; + let contents = {}; while ((match = regex.exec(content)) !== null) { - def2Content['_' + match[1]] = match[2]; + contents[match[1]] = match[2]; } return download(mappings).then(function (content) { - var regex2 = /\.icon-(?:set|partial)\('([\w-\.]+)',\s*'([\w-]+)',\s*(@[\w-]+)\)/g; + let regex2 = /\.icon-(?:set|partial)\('([\w-\.]+)',\s*'([\w-]+)',\s*(@[\w-]+)\)/g; while ((match = regex2.exec(content)) !== null) { let pattern = match[1]; let def = '_' + match[2]; let colorId = match[3]; + let storedColorId = def2ColorId[def]; + let i = 1; + while (storedColorId && colorId !== storedColorId) { // different colors for the same def? + def = `_${match[2]}_${i}`; + storedColorId = def2ColorId[def]; + i++; + } + if (!def2ColorId[def]) { + def2ColorId[def] = colorId; + def2Content[def] = contents[match[2]]; + } + if (pattern[0] === '.') { ext2Def[pattern.substr(1).toLowerCase()] = def; } else { fileName2Def[pattern.toLowerCase()] = def; } - def2ColorId[def] = colorId; } // replace extensions for languageId - var langMappings = getLanguageMappings(); - for (var lang in langMappings) { - var mappings = langMappings[lang]; - var exts = mappings.extensions || []; - var fileNames = mappings.fileNames || []; - var preferredDef = null; + let langMappings = getLanguageMappings(); + for (let lang in langMappings) { + let mappings = langMappings[lang]; + let exts = mappings.extensions || []; + let fileNames = mappings.fileNames || []; + let preferredDef = null; // use the first file association for the preferred definition for (let i1 = 0; i1 < exts.length && !preferredDef; i1++) { preferredDef = ext2Def[exts[i1]]; @@ -307,7 +321,7 @@ exports.update = function () { return download(colors).then(function (content) { - var regex3 = /(@[\w-]+):\s*(#[0-9a-z]+)/g; + let regex3 = /(@[\w-]+):\s*(#[0-9a-z]+)/g; while ((match = regex3.exec(content)) !== null) { colorId2Value[match[1]] = match[2]; } diff --git a/extensions/theme-seti/icons/vs-seti-icon-theme.json b/extensions/theme-seti/icons/vs-seti-icon-theme.json index 1226c0dac6a..6aeb37e95c6 100644 --- a/extensions/theme-seti/icons/vs-seti-icon-theme.json +++ b/extensions/theme-seti/icons/vs-seti-icon-theme.json @@ -22,12 +22,6 @@ } ], "iconDefinitions": { - "_R": { - "fontCharacter": "\\E001" - }, - "_apple": { - "fontCharacter": "\\E002" - }, "_asm_light": { "fontCharacter": "\\E003", "fontColor": "#b8383d" @@ -68,6 +62,14 @@ "fontCharacter": "\\E007", "fontColor": "#cc3e44" }, + "_c_light": { + "fontCharacter": "\\E009", + "fontColor": "#498ba7" + }, + "_c": { + "fontCharacter": "\\E009", + "fontColor": "#519aba" + }, "_c-sharp_light": { "fontCharacter": "\\E008", "fontColor": "#498ba7" @@ -76,11 +78,19 @@ "fontCharacter": "\\E008", "fontColor": "#519aba" }, - "_c_light": { + "_c_1_light": { + "fontCharacter": "\\E009", + "fontColor": "#9068b0" + }, + "_c_1": { + "fontCharacter": "\\E009", + "fontColor": "#a074c4" + }, + "_c_2_light": { "fontCharacter": "\\E009", "fontColor": "#b7b73b" }, - "_c": { + "_c_2": { "fontCharacter": "\\E009", "fontColor": "#cbcb41" }, @@ -100,28 +110,35 @@ "fontCharacter": "\\E00B", "fontColor": "#cc3e44" }, - "_checkbox-unchecked": { - "fontCharacter": "\\E00C" - }, - "_checkbox": { - "fontCharacter": "\\E00D" - }, - "_cjsx": { - "fontCharacter": "\\E00E" - }, "_clock_light": { + "fontCharacter": "\\E00F", + "fontColor": "#498ba7" + }, + "_clock": { + "fontCharacter": "\\E00F", + "fontColor": "#519aba" + }, + "_clock_1_light": { "fontCharacter": "\\E00F", "fontColor": "#627379" }, - "_clock": { + "_clock_1": { "fontCharacter": "\\E00F", "fontColor": "#6d8086" }, "_clojure_light": { "fontCharacter": "\\E010", - "fontColor": "#498ba7" + "fontColor": "#7fae42" }, "_clojure": { + "fontCharacter": "\\E010", + "fontColor": "#8dc149" + }, + "_clojure_1_light": { + "fontCharacter": "\\E010", + "fontColor": "#498ba7" + }, + "_clojure_1": { "fontCharacter": "\\E010", "fontColor": "#519aba" }, @@ -141,9 +158,6 @@ "fontCharacter": "\\E012", "fontColor": "#cbcb41" }, - "_coffee_erb": { - "fontCharacter": "\\E013" - }, "_coldfusion_light": { "fontCharacter": "\\E014", "fontColor": "#498ba7" @@ -162,9 +176,17 @@ }, "_cpp_light": { "fontCharacter": "\\E016", - "fontColor": "#9068b0" + "fontColor": "#498ba7" }, "_cpp": { + "fontCharacter": "\\E016", + "fontColor": "#519aba" + }, + "_cpp_1_light": { + "fontCharacter": "\\E016", + "fontColor": "#9068b0" + }, + "_cpp_1": { "fontCharacter": "\\E016", "fontColor": "#a074c4" }, @@ -224,19 +246,37 @@ "fontCharacter": "\\E01D", "fontColor": "#d4d7d6" }, - "_deprecation-cop": { - "fontCharacter": "\\E01E" - }, "_docker_light": { "fontCharacter": "\\E01F", - "fontColor": "#dd4b78" + "fontColor": "#498ba7" }, "_docker": { "fontCharacter": "\\E01F", - "fontColor": "#f55385" + "fontColor": "#519aba" }, - "_editorconfig": { - "fontCharacter": "\\E020" + "_docker_1_light": { + "fontCharacter": "\\E01F", + "fontColor": "#455155" + }, + "_docker_1": { + "fontCharacter": "\\E01F", + "fontColor": "#4d5a5e" + }, + "_docker_2_light": { + "fontCharacter": "\\E01F", + "fontColor": "#7fae42" + }, + "_docker_2": { + "fontCharacter": "\\E01F", + "fontColor": "#8dc149" + }, + "_docker_3_light": { + "fontCharacter": "\\E01F", + "fontColor": "#dd4b78" + }, + "_docker_3": { + "fontCharacter": "\\E01F", + "fontColor": "#f55385" }, "_ejs_light": { "fontCharacter": "\\E021", @@ -270,14 +310,19 @@ "fontCharacter": "\\E024", "fontColor": "#519aba" }, - "_error": { - "fontCharacter": "\\E025" - }, "_eslint_light": { + "fontCharacter": "\\E026", + "fontColor": "#9068b0" + }, + "_eslint": { + "fontCharacter": "\\E026", + "fontColor": "#a074c4" + }, + "_eslint_1_light": { "fontCharacter": "\\E026", "fontColor": "#455155" }, - "_eslint": { + "_eslint_1": { "fontCharacter": "\\E026", "fontColor": "#4d5a5e" }, @@ -321,9 +366,6 @@ "fontCharacter": "\\E02B", "fontColor": "#e37933" }, - "_folder": { - "fontCharacter": "\\E02C" - }, "_font_light": { "fontCharacter": "\\E02D", "fontColor": "#b8383d" @@ -340,15 +382,6 @@ "fontCharacter": "\\E02E", "fontColor": "#41535b" }, - "_git_folder": { - "fontCharacter": "\\E02F" - }, - "_git_ignore": { - "fontCharacter": "\\E030" - }, - "_github": { - "fontCharacter": "\\E031" - }, "_go_light": { "fontCharacter": "\\E032", "fontColor": "#498ba7" @@ -397,9 +430,6 @@ "fontCharacter": "\\E037", "fontColor": "#cc3e44" }, - "_hacklang": { - "fontCharacter": "\\E038" - }, "_haml_light": { "fontCharacter": "\\E039", "fontColor": "#b8383d" @@ -418,9 +448,33 @@ }, "_haxe_light": { "fontCharacter": "\\E03B", - "fontColor": "#9068b0" + "fontColor": "#cc6d2e" }, "_haxe": { + "fontCharacter": "\\E03B", + "fontColor": "#e37933" + }, + "_haxe_1_light": { + "fontCharacter": "\\E03B", + "fontColor": "#b7b73b" + }, + "_haxe_1": { + "fontCharacter": "\\E03B", + "fontColor": "#cbcb41" + }, + "_haxe_2_light": { + "fontCharacter": "\\E03B", + "fontColor": "#498ba7" + }, + "_haxe_2": { + "fontCharacter": "\\E03B", + "fontColor": "#519aba" + }, + "_haxe_3_light": { + "fontCharacter": "\\E03B", + "fontColor": "#9068b0" + }, + "_haxe_3": { "fontCharacter": "\\E03B", "fontColor": "#a074c4" }, @@ -514,9 +568,25 @@ }, "_javascript_light": { "fontCharacter": "\\E047", - "fontColor": "#498ba7" + "fontColor": "#b7b73b" }, "_javascript": { + "fontCharacter": "\\E047", + "fontColor": "#cbcb41" + }, + "_javascript_1_light": { + "fontCharacter": "\\E047", + "fontColor": "#cc6d2e" + }, + "_javascript_1": { + "fontCharacter": "\\E047", + "fontColor": "#e37933" + }, + "_javascript_2_light": { + "fontCharacter": "\\E047", + "fontColor": "#498ba7" + }, + "_javascript_2": { "fontCharacter": "\\E047", "fontColor": "#519aba" }, @@ -536,9 +606,6 @@ "fontCharacter": "\\E049", "fontColor": "#cc3e44" }, - "_js_erb": { - "fontCharacter": "\\E04A" - }, "_json_light": { "fontCharacter": "\\E04B", "fontColor": "#b7b73b" @@ -573,9 +640,25 @@ }, "_license_light": { "fontCharacter": "\\E04F", - "fontColor": "#b8383d" + "fontColor": "#b7b73b" }, "_license": { + "fontCharacter": "\\E04F", + "fontColor": "#cbcb41" + }, + "_license_1_light": { + "fontCharacter": "\\E04F", + "fontColor": "#cc6d2e" + }, + "_license_1": { + "fontCharacter": "\\E04F", + "fontColor": "#e37933" + }, + "_license_2_light": { + "fontCharacter": "\\E04F", + "fontColor": "#b8383d" + }, + "_license_2": { "fontCharacter": "\\E04F", "fontColor": "#cc3e44" }, @@ -613,9 +696,33 @@ }, "_makefile_light": { "fontCharacter": "\\E054", - "fontColor": "#498ba7" + "fontColor": "#cc6d2e" }, "_makefile": { + "fontCharacter": "\\E054", + "fontColor": "#e37933" + }, + "_makefile_1_light": { + "fontCharacter": "\\E054", + "fontColor": "#9068b0" + }, + "_makefile_1": { + "fontCharacter": "\\E054", + "fontColor": "#a074c4" + }, + "_makefile_2_light": { + "fontCharacter": "\\E054", + "fontColor": "#627379" + }, + "_makefile_2": { + "fontCharacter": "\\E054", + "fontColor": "#6d8086" + }, + "_makefile_3_light": { + "fontCharacter": "\\E054", + "fontColor": "#498ba7" + }, + "_makefile_3": { "fontCharacter": "\\E054", "fontColor": "#519aba" }, @@ -651,14 +758,19 @@ "fontCharacter": "\\E058", "fontColor": "#e37933" }, - "_new-file": { - "fontCharacter": "\\E059" - }, "_npm_light": { + "fontCharacter": "\\E05A", + "fontColor": "#3b4b52" + }, + "_npm": { + "fontCharacter": "\\E05A", + "fontColor": "#41535b" + }, + "_npm_1_light": { "fontCharacter": "\\E05A", "fontColor": "#b8383d" }, - "_npm": { + "_npm_1": { "fontCharacter": "\\E05A", "fontColor": "#cc3e44" }, @@ -734,9 +846,6 @@ "fontCharacter": "\\E063", "fontColor": "#519aba" }, - "_project": { - "fontCharacter": "\\E064" - }, "_pug_light": { "fontCharacter": "\\E065", "fontColor": "#b8383d" @@ -761,9 +870,6 @@ "fontCharacter": "\\E067", "fontColor": "#519aba" }, - "_rails": { - "fontCharacter": "\\E068" - }, "_react_light": { "fontCharacter": "\\E069", "fontColor": "#498ba7" @@ -828,12 +934,6 @@ "fontCharacter": "\\E070", "fontColor": "#cc3e44" }, - "_search": { - "fontCharacter": "\\E071" - }, - "_settings": { - "fontCharacter": "\\E072" - }, "_shell_light": { "fontCharacter": "\\E073", "fontColor": "#455155" @@ -908,14 +1008,35 @@ }, "_tex_light": { "fontCharacter": "\\E07C", - "fontColor": "#bfc2c1" + "fontColor": "#498ba7" }, "_tex": { "fontCharacter": "\\E07C", - "fontColor": "#d4d7d6" + "fontColor": "#519aba" }, - "_time-cop": { - "fontCharacter": "\\E07D" + "_tex_1_light": { + "fontCharacter": "\\E07C", + "fontColor": "#b7b73b" + }, + "_tex_1": { + "fontCharacter": "\\E07C", + "fontColor": "#cbcb41" + }, + "_tex_2_light": { + "fontCharacter": "\\E07C", + "fontColor": "#cc6d2e" + }, + "_tex_2": { + "fontCharacter": "\\E07C", + "fontColor": "#e37933" + }, + "_tex_3_light": { + "fontCharacter": "\\E07C", + "fontColor": "#bfc2c1" + }, + "_tex_3": { + "fontCharacter": "\\E07C", + "fontColor": "#d4d7d6" }, "_todo": { "fontCharacter": "\\E07E" @@ -930,9 +1051,17 @@ }, "_typescript_light": { "fontCharacter": "\\E080", - "fontColor": "#b7b73b" + "fontColor": "#498ba7" }, "_typescript": { + "fontCharacter": "\\E080", + "fontColor": "#519aba" + }, + "_typescript_1_light": { + "fontCharacter": "\\E080", + "fontColor": "#b7b73b" + }, + "_typescript_1": { "fontCharacter": "\\E080", "fontColor": "#cbcb41" }, @@ -1026,9 +1155,17 @@ }, "_zip_light": { "fontCharacter": "\\E08C", - "fontColor": "#627379" + "fontColor": "#b8383d" }, "_zip": { + "fontCharacter": "\\E08C", + "fontColor": "#cc3e44" + }, + "_zip_1_light": { + "fontCharacter": "\\E08C", + "fontColor": "#627379" + }, + "_zip_1": { "fontCharacter": "\\E08C", "fontColor": "#6d8086" } @@ -1039,7 +1176,11 @@ "mdo": "_mdo", "asm": "_asm", "s": "_asm", - "h": "_c", + "h": "_c_1", + "hh": "_cpp_1", + "hpp": "_cpp_1", + "hxx": "_cpp_1", + "edn": "_clojure_1", "cfc": "_coldfusion", "cfm": "_coldfusion", "config": "_config", @@ -1077,13 +1218,13 @@ "hs": "_haskell", "lhs": "_haskell", "hx": "_haxe", - "hxs": "_haxe", - "hxp": "_haxe", - "hxml": "_haxe", + "hxs": "_haxe_1", + "hxp": "_haxe_2", + "hxml": "_haxe_3", "class": "_java", "classpath": "_java", "js.map": "_javascript", - "spec.js": "_javascript", + "spec.js": "_javascript_1", "es": "_javascript", "es5": "_javascript", "es7": "_javascript", @@ -1101,8 +1242,8 @@ "njs": "_nunjucks", "nj": "_nunjucks", "npm-debug.log": "_npm", - "npmignore": "_npm", - "npmrc": "_npm", + "npmignore": "_npm_1", + "npmrc": "_npm_1", "ml": "_ocaml", "mli": "_ocaml", "cmx": "_ocaml", @@ -1128,18 +1269,18 @@ "tf.json": "_terraform", "tfvars": "_terraform", "tex": "_tex", - "sty": "_tex", - "dtx": "_tex", - "ins": "_tex", + "sty": "_tex_1", + "dtx": "_tex_2", + "ins": "_tex_3", "txt": "_default", "toml": "_config", "twig": "_twig", - "spec.ts": "_typescript", + "spec.ts": "_typescript_1", "vala": "_vala", "vapi": "_vala", "vue": "_vue", "jar": "_zip", - "zip": "_zip", + "zip": "_zip_1", "wgt": "_wgt", "ai": "_illustrator", "psd": "_photoshop", @@ -1171,23 +1312,23 @@ "wav": "_audio", "babelrc": "_babel", "bowerrc": "_bower", - "dockerignore": "_docker", + "dockerignore": "_docker_1", "codeclimate.yml": "_code-climate", "eslintrc": "_eslint", "eslintrc.js": "_eslint", "eslintrc.yaml": "_eslint", "eslintrc.yml": "_eslint", "eslintrc.json": "_eslint", - "eslintignore": "_eslint", + "eslintignore": "_eslint_1", "firebaserc": "_firebase", - "jshintrc": "_javascript", - "jscsrc": "_javascript", + "jshintrc": "_javascript_2", + "jscsrc": "_javascript_2", "direnv": "_config", "env": "_config", "static": "_config", "editorconfig": "_config", "slugignore": "_config", - "tmp": "_clock", + "tmp": "_clock_1", "htaccess": "_config", "key": "_lock", "cert": "_lock", @@ -1206,9 +1347,9 @@ "mime.types": "_config", "jenkinsfile": "_jenkins", "bower.json": "_bower", - "docker-healthcheck": "_docker", - "docker-compose.yml": "_docker", - "docker-compose.yaml": "_docker", + "docker-healthcheck": "_docker_2", + "docker-compose.yml": "_docker_3", + "docker-compose.yaml": "_docker_3", "firebase.json": "_firebase", "geckodriver": "_firefox", "gruntfile.js": "_grunt", @@ -1226,11 +1367,11 @@ "license": "_license", "licence": "_license", "copying": "_license", - "compiling": "_license", - "contributing": "_license", - "qmakefile": "_makefile", - "omakefile": "_makefile", - "cmakelists.txt": "_makefile", + "compiling": "_license_1", + "contributing": "_license_2", + "qmakefile": "_makefile_1", + "omakefile": "_makefile_2", + "cmakelists.txt": "_makefile_3", "procfile": "_heroku", "todo": "_todo", "npm-debug.log": "_npm_ignored" @@ -1258,7 +1399,7 @@ "lua": "_lua", "makefile": "_makefile", "markdown": "_markdown", - "objective-c": "_c", + "objective-c": "_c_2", "perl": "_perl", "php": "_php", "powershell": "_powershell", @@ -1282,7 +1423,11 @@ "mdo": "_mdo_light", "asm": "_asm_light", "s": "_asm_light", - "h": "_c_light", + "h": "_c_1_light", + "hh": "_cpp_1_light", + "hpp": "_cpp_1_light", + "hxx": "_cpp_1_light", + "edn": "_clojure_1_light", "cfc": "_coldfusion_light", "cfm": "_coldfusion_light", "config": "_config_light", @@ -1320,13 +1465,13 @@ "hs": "_haskell_light", "lhs": "_haskell_light", "hx": "_haxe_light", - "hxs": "_haxe_light", - "hxp": "_haxe_light", - "hxml": "_haxe_light", + "hxs": "_haxe_1_light", + "hxp": "_haxe_2_light", + "hxml": "_haxe_3_light", "class": "_java_light", "classpath": "_java_light", "js.map": "_javascript_light", - "spec.js": "_javascript_light", + "spec.js": "_javascript_1_light", "es": "_javascript_light", "es5": "_javascript_light", "es7": "_javascript_light", @@ -1344,8 +1489,8 @@ "njs": "_nunjucks_light", "nj": "_nunjucks_light", "npm-debug.log": "_npm_light", - "npmignore": "_npm_light", - "npmrc": "_npm_light", + "npmignore": "_npm_1_light", + "npmrc": "_npm_1_light", "ml": "_ocaml_light", "mli": "_ocaml_light", "cmx": "_ocaml_light", @@ -1371,18 +1516,18 @@ "tf.json": "_terraform_light", "tfvars": "_terraform_light", "tex": "_tex_light", - "sty": "_tex_light", - "dtx": "_tex_light", - "ins": "_tex_light", + "sty": "_tex_1_light", + "dtx": "_tex_2_light", + "ins": "_tex_3_light", "txt": "_default_light", "toml": "_config_light", "twig": "_twig_light", - "spec.ts": "_typescript_light", + "spec.ts": "_typescript_1_light", "vala": "_vala_light", "vapi": "_vala_light", "vue": "_vue_light", "jar": "_zip_light", - "zip": "_zip_light", + "zip": "_zip_1_light", "wgt": "_wgt_light", "ai": "_illustrator_light", "psd": "_photoshop_light", @@ -1414,23 +1559,23 @@ "wav": "_audio_light", "babelrc": "_babel_light", "bowerrc": "_bower_light", - "dockerignore": "_docker_light", + "dockerignore": "_docker_1_light", "codeclimate.yml": "_code-climate_light", "eslintrc": "_eslint_light", "eslintrc.js": "_eslint_light", "eslintrc.yaml": "_eslint_light", "eslintrc.yml": "_eslint_light", "eslintrc.json": "_eslint_light", - "eslintignore": "_eslint_light", + "eslintignore": "_eslint_1_light", "firebaserc": "_firebase_light", - "jshintrc": "_javascript_light", - "jscsrc": "_javascript_light", + "jshintrc": "_javascript_2_light", + "jscsrc": "_javascript_2_light", "direnv": "_config_light", "env": "_config_light", "static": "_config_light", "editorconfig": "_config_light", "slugignore": "_config_light", - "tmp": "_clock_light", + "tmp": "_clock_1_light", "htaccess": "_config_light", "key": "_lock_light", "cert": "_lock_light", @@ -1459,7 +1604,7 @@ "lua": "_lua_light", "makefile": "_makefile_light", "markdown": "_markdown_light", - "objective-c": "_c_light", + "objective-c": "_c_2_light", "perl": "_perl_light", "php": "_php_light", "powershell": "_powershell_light", @@ -1489,9 +1634,9 @@ "mime.types": "_config_light", "jenkinsfile": "_jenkins_light", "bower.json": "_bower_light", - "docker-healthcheck": "_docker_light", - "docker-compose.yml": "_docker_light", - "docker-compose.yaml": "_docker_light", + "docker-healthcheck": "_docker_2_light", + "docker-compose.yml": "_docker_3_light", + "docker-compose.yaml": "_docker_3_light", "firebase.json": "_firebase_light", "geckodriver": "_firefox_light", "gruntfile.js": "_grunt_light", @@ -1509,11 +1654,11 @@ "license": "_license_light", "licence": "_license_light", "copying": "_license_light", - "compiling": "_license_light", - "contributing": "_license_light", - "qmakefile": "_makefile_light", - "omakefile": "_makefile_light", - "cmakelists.txt": "_makefile_light", + "compiling": "_license_1_light", + "contributing": "_license_2_light", + "qmakefile": "_makefile_1_light", + "omakefile": "_makefile_2_light", + "cmakelists.txt": "_makefile_3_light", "procfile": "_heroku_light", "npm-debug.log": "_npm_ignored_light" } From 7086bb87481b0bcfedafd2885ddaf2a505e4fed2 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 11:14:18 +0100 Subject: [PATCH 112/710] multiple selection drag and drop inside workbench --- src/vs/base/browser/dnd.ts | 7 ++++++- src/vs/workbench/browser/editor.ts | 20 ++++++++++++------- .../electron-browser/views/explorerViewer.ts | 3 ++- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts index b95e397071f..85bc36aac42 100644 --- a/src/vs/base/browser/dnd.ts +++ b/src/vs/base/browser/dnd.ts @@ -49,6 +49,11 @@ export const DataTransfers = { */ URL: 'URL', + /** + * Application specific resource transfer type when multiple resources are being dragged. + */ + URLS: 'URLS', + /** * Browser specific transfer type to download. */ @@ -58,4 +63,4 @@ export const DataTransfers = { * Typicaly transfer type for copy/paste transfers. */ TEXT: 'text/plain' -}; \ No newline at end of file +}; diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts index 16a6140a6e4..35486960348 100644 --- a/src/vs/workbench/browser/editor.ts +++ b/src/vs/workbench/browser/editor.ts @@ -241,13 +241,19 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge // Data Transfer: URL else { - const rawURLData = e.dataTransfer.getData(DataTransfers.URL); - if (rawURLData) { - try { - resources.push({ resource: URI.parse(rawURLData), isExternal: false }); - } catch (error) { - // Invalid URI + try { + const rawURLsData = e.dataTransfer.getData(DataTransfers.URLS); + if (rawURLsData) { + const uriStrArray: string[] = JSON.parse(rawURLsData); + resources.push(...uriStrArray.map(uriStr => ({ resource: URI.parse(uriStr), isExternal: false }))); + } else { + const rawURLData = e.dataTransfer.getData(DataTransfers.URL); + if (rawURLData) { + resources.push({ resource: URI.parse(rawURLData), isExternal: false }); + } } + } catch (error) { + // Invalid URI } } } @@ -268,4 +274,4 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge } return resources; -} \ No newline at end of file +} 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 bb28488cbc6..5545d814511 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -726,13 +726,14 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { }); // Apply some datatransfer types to allow for dragging the element outside of the application - // TODO@Isidor check this if (sources.length === 1) { if (!sources[0].isDirectory) { originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, sources[0].name, sources[0].resource.toString()].join(':')); } originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource)); + } else { + originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.map(s => s.resource.toString()))); } } } From 74aa9043de0410f7708043bb5cbd361fbb779d7c Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 16:00:24 +0100 Subject: [PATCH 113/710] pass in the selection as an array of uris as the second argument in the context --- .../parts/files/electron-browser/views/explorerViewer.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 5545d814511..5d35f928b27 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -459,6 +459,7 @@ export class FileController extends DefaultController implements IDisposable { tree.setFocus(stat); const anchor = { x: event.posx, y: event.posy }; + const selection = tree.getSelection(); this.contextMenuService.showContextMenu({ getAnchor: () => anchor, getActions: () => { @@ -470,7 +471,8 @@ export class FileController extends DefaultController implements IDisposable { if (wasCancelled) { tree.DOMFocus(); } - } + }, + getActionsContext: () => selection ? selection.map((fs: FileStat) => fs.resource) : undefined }); return true; From 64ced3e40b351aa71437d41e9a298382bc8975e3 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 11 Jan 2018 14:48:27 +0100 Subject: [PATCH 114/710] [html/css/scss/less] Textual suggestions missing in 1.19.0. Fixes #40349 --- extensions/css/client/src/cssMain.ts | 2 +- extensions/html/client/src/htmlMain.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index 5e9f4d2ec7f..6c64c46a54e 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -104,7 +104,7 @@ export function activate(context: ExtensionContext) { indentationRules: indentationRules }); - const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?/; + const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/; languages.registerCompletionItemProvider(documentSelector, { provideCompletionItems(doc, pos) { let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos)); diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts index f5885b3654f..b4b84b3ee01 100644 --- a/extensions/html/client/src/htmlMain.ts +++ b/extensions/html/client/src/htmlMain.ts @@ -164,7 +164,7 @@ export function activate(context: ExtensionContext) { ], }); - const regionCompletionRegExpr = /^(\s*)(<(!(-(-\s*(#\w*)?)?)?)?)?/; + const regionCompletionRegExpr = /^(\s*)(<(!(-(-\s*(#\w*)?)?)?)?)?$/; languages.registerCompletionItemProvider(documentSelector, { provideCompletionItems(doc, pos) { let lineUntilPos = doc.getText(new Range(new Position(pos.line, 0), pos)); From 6b965b200cad4a61fed06e8616a5915388552b0d Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 16:25:50 +0100 Subject: [PATCH 115/710] introduce doubleSelectionContext --- src/vs/base/browser/ui/list/listWidget.ts | 2 +- src/vs/platform/list/browser/listService.ts | 22 ++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index d5450e24c9d..afa154bc231 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -662,7 +662,7 @@ export class List implements ISpliceable, IDisposable { private eventBufferer = new EventBufferer(); private view: ListView; private spliceable: ISpliceable; - private disposables: IDisposable[]; + protected disposables: IDisposable[]; private styleElement: HTMLStyleElement; @memoize get onFocusChange(): Event> { diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 96a170f3ac1..8287d0efd79 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -74,6 +74,7 @@ export class ListService implements IListService { const RawWorkbenchListFocusContextKey = new RawContextKey('listFocus', true); export const WorkbenchListSupportsMultiSelectContextKey = new RawContextKey('listSupportsMultiselect', true); export const WorkbenchListFocusContextKey = ContextKeyExpr.and(RawWorkbenchListFocusContextKey, ContextKeyExpr.not(InputFocusedContextKey)); +export const WorkbenchListDoubleSelection = new RawContextKey('listDoubleSelection', false); export type Widget = List | PagedList | ITree; @@ -91,7 +92,7 @@ function createScopedContextKeyService(contextKeyService: IContextKeyService, wi export class WorkbenchList extends List { readonly contextKeyService: IContextKeyService; - private disposable: IDisposable; + private listDoubleSelection: IContextKey; constructor( container: HTMLElement, @@ -103,17 +104,18 @@ export class WorkbenchList extends List { @IThemeService themeService: IThemeService ) { super(container, delegate, renderers, options); + this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(contextKeyService); this.contextKeyService = createScopedContextKeyService(contextKeyService, this); - this.disposable = combinedDisposable([ + this.disposables.push(combinedDisposable([ this.contextKeyService, (listService as ListService).register(this), attachListStyler(this, themeService) - ]); - } - - dispose(): void { - this.disposable.dispose(); + ])); + this.disposables.push(this.onSelectionChange(() => { + const selection = this.getSelection(); + this.listDoubleSelection.set(selection && selection.length === 2); + })); } } @@ -150,6 +152,7 @@ export class WorkbenchTree extends Tree { readonly contextKeyService: IContextKeyService; private disposables: IDisposable[] = []; + private listDoubleSelection: IContextKey; constructor( container: HTMLElement, @@ -161,6 +164,7 @@ export class WorkbenchTree extends Tree { ) { super(container, configuration, options); + this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(contextKeyService); this.contextKeyService = createScopedContextKeyService(contextKeyService, this); this.disposables.push( @@ -168,6 +172,10 @@ export class WorkbenchTree extends Tree { (listService as ListService).register(this), attachListStyler(this, themeService) ); + this.disposables.push(this.onDidChangeSelection(() => { + const selection = this.getSelection(); + this.listDoubleSelection.set(selection && selection.length === 2); + })); } dispose(): void { From e476d260140493278e1c1d1cb3b531b13e66975f Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 16:26:30 +0100 Subject: [PATCH 116/710] compare selected command --- .../fileActions.contribution.ts | 17 ++++++++++++++--- .../files/electron-browser/fileCommands.ts | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index e9e96a48caf..79625b075ff 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -11,7 +11,7 @@ import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTI import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; -import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -22,6 +22,7 @@ import { CLOSE_UNMODIFIED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/workbench/parts/preferences/browser/preferencesActions'; import { AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles'; import { ResourceContextKey } from 'vs/workbench/common/resources'; +import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService'; // Contribute Global Actions @@ -341,14 +342,24 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: '3_compare', order: 20, command: compareResourceCommand, - when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, ResourceSelectedForCompareContext) + when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated()) }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: '3_compare', order: 30, command: selectForCompareCommand, - when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile) + when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, WorkbenchListDoubleSelection.toNegated()) +}); + +MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { + group: '3_compare', + order: 30, + command: { + id: COMPARE_SELECTED_COMMAND_ID, + title: nls.localize('compareSelected', "Compare Selected") + }, + when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, WorkbenchListDoubleSelection) }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index eb1962aa29d..7bb8e6883dc 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -49,6 +49,8 @@ export const REVEAL_IN_EXPLORER_COMMAND_ID = 'workbench.command.files.revealInEx export const REVERT_FILE_COMMAND_ID = 'workbench.action.files.revert'; export const OPEN_TO_SIDE_COMMAND_ID = 'explorer.openToSide'; export const SELECT_FOR_COMPARE_COMMAND_ID = 'workbench.files.command.selectForCompare'; + +export const COMPARE_SELECTED_COMMAND_ID = 'compareSelected'; export const COMPARE_RESOURCE_COMMAND_ID = 'workbench.files.command.compareFiles'; export const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved'; export const COPY_PATH_COMMAND_ID = 'copyFilePath'; @@ -367,6 +369,19 @@ CommandsRegistry.registerCommand({ } }); +CommandsRegistry.registerCommand({ + id: COMPARE_SELECTED_COMMAND_ID, + handler: (accessor, resource: URI) => { + const editorService = accessor.get(IWorkbenchEditorService); + const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); + + return editorService.openEditor({ + leftResource: resources[0], + rightResource: resources[1] + }); + } +}); + CommandsRegistry.registerCommand({ id: COMPARE_RESOURCE_COMMAND_ID, handler: (accessor, resource: URI) => { From a5c572c359ab68926070a586353605082861e841 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 16:28:32 +0100 Subject: [PATCH 117/710] do not include directories in data transfer --- .../parts/files/electron-browser/views/explorerViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5d35f928b27..52f1e48c0c2 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -735,7 +735,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource)); } else { - originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.map(s => s.resource.toString()))); + originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.filter(s => !s.isDirectory).map(s => s.resource.toString()))); } } } From d5e1727c077fc57907e681b2e55d8be6031f4a40 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 11 Jan 2018 17:19:24 +0100 Subject: [PATCH 118/710] alt click to open to the side --- .../parts/files/electron-browser/views/explorerViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 52f1e48c0c2..9a0948ba373 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -420,7 +420,7 @@ export class FileController extends DefaultController implements IDisposable { tree.setSelection([stat], payload); if (!stat.isDirectory) { - this.openEditor(stat, { preserveFocus, sideBySide: event && (event.ctrlKey || event.metaKey), pinned: isDoubleClick }); + this.openEditor(stat, { preserveFocus, sideBySide: event && event.altKey, pinned: isDoubleClick }); } } From 8962e0eb6dcf43f46009989bba0376adff40373a Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 11 Jan 2018 17:26:18 +0100 Subject: [PATCH 119/710] add commands list.expandSelectionDown and list.expandSelectionUp (for #1023) --- src/vs/base/browser/ui/list/listPaging.ts | 4 + src/vs/workbench/electron-browser/commands.ts | 122 ++++++++++++++++-- .../electron-browser/views/explorerViewer.ts | 21 --- 3 files changed, 116 insertions(+), 31 deletions(-) diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts index e1c22181d06..c6ed333a2e4 100644 --- a/src/vs/base/browser/ui/list/listPaging.ts +++ b/src/vs/base/browser/ui/list/listPaging.ts @@ -166,6 +166,10 @@ export class PagedList { this.list.setSelection(indexes); } + getSelection(): number[] { + return this.list.getSelection(); + } + layout(height?: number): void { this.list.layout(height); } diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts index e26ffd3117d..bcd9b64de45 100644 --- a/src/vs/workbench/electron-browser/commands.ts +++ b/src/vs/workbench/electron-browser/commands.ts @@ -22,11 +22,33 @@ import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiS import { PagedList } from 'vs/base/browser/ui/list/listPaging'; import { range } from 'vs/base/common/arrays'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; +import { ITree } from 'vs/base/parts/tree/browser/tree'; // --- List Commands export function registerCommands(): void { + function focusDown(accessor: ServicesAccessor, arg2?: number): void { + const focused = accessor.get(IListService).lastFocusedList; + const count = typeof arg2 === 'number' ? arg2 : 1; + + // List + if (focused instanceof List || focused instanceof PagedList) { + const list = focused; + + list.focusNext(count); + list.reveal(list.getFocus()[0]); + } + + // Tree + else if (focused) { + const tree = focused; + + tree.focusNext(count, { origin: 'keyboard' }); + tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError); + } + } + KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'list.focusDown', weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), @@ -36,28 +58,93 @@ export function registerCommands(): void { primary: KeyCode.DownArrow, secondary: [KeyMod.WinCtrl | KeyCode.KEY_N] }, + handler: (accessor, arg2) => focusDown(accessor, arg2) + }); + + function expandMultiSelection(focused: List | PagedList | ITree, previousFocus: any): void { + + // List + if (focused instanceof List || focused instanceof PagedList) { + const list = focused; + + const focus = list.getFocus() ? list.getFocus()[0] : void 0; + const selection = list.getSelection(); + if (selection && selection.indexOf(focus) >= 0) { + list.setSelection(selection.filter(s => s !== previousFocus)); + } else { + list.setSelection(selection.concat(focus)); + } + } + + // Tree + else if (focused) { + const tree = focused; + + const focus = tree.getFocus(); + const selection = tree.getSelection(); + if (selection && selection.indexOf(focus) >= 0) { + tree.setSelection(selection.filter(s => s !== previousFocus)); + } else { + tree.setSelection(selection.concat(focus)); + } + } + } + + KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: 'list.expandSelectionDown', + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), + when: WorkbenchListFocusContextKey, + primary: KeyMod.Shift | KeyCode.DownArrow, handler: (accessor, arg2) => { const focused = accessor.get(IListService).lastFocusedList; - const count = typeof arg2 === 'number' ? arg2 : 1; // List if (focused instanceof List || focused instanceof PagedList) { const list = focused; - list.focusNext(count); - list.reveal(list.getFocus()[0]); + // Focus down first + const previousFocus = list.getFocus() ? list.getFocus()[0] : void 0; + focusDown(accessor, arg2); + + // Then adjust selection + expandMultiSelection(focused, previousFocus); } // Tree else if (focused) { const tree = focused; - tree.focusNext(count, { origin: 'keyboard' }); - tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError); + // Focus down first + const previousFocus = tree.getFocus(); + focusDown(accessor, arg2); + + // Then adjust selection + expandMultiSelection(focused, previousFocus); } } }); + function focusUp(accessor: ServicesAccessor, arg2?: number): void { + const focused = accessor.get(IListService).lastFocusedList; + const count = typeof arg2 === 'number' ? arg2 : 1; + + // List + if (focused instanceof List || focused instanceof PagedList) { + const list = focused; + + list.focusPrevious(count); + list.reveal(list.getFocus()[0]); + } + + // Tree + else if (focused) { + const tree = focused; + + tree.focusPrevious(count, { origin: 'keyboard' }); + tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError); + } + } + KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'list.focusUp', weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), @@ -67,24 +154,39 @@ export function registerCommands(): void { primary: KeyCode.UpArrow, secondary: [KeyMod.WinCtrl | KeyCode.KEY_P] }, + handler: (accessor, arg2) => focusUp(accessor, arg2) + }); + + KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: 'list.expandSelectionUp', + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), + when: WorkbenchListFocusContextKey, + primary: KeyMod.Shift | KeyCode.UpArrow, handler: (accessor, arg2) => { const focused = accessor.get(IListService).lastFocusedList; - const count = typeof arg2 === 'number' ? arg2 : 1; // List if (focused instanceof List || focused instanceof PagedList) { const list = focused; - list.focusPrevious(count); - list.reveal(list.getFocus()[0]); + // Focus up first + const previousFocus = list.getFocus() ? list.getFocus()[0] : void 0; + focusUp(accessor, arg2); + + // Then adjust selection + expandMultiSelection(focused, previousFocus); } // Tree else if (focused) { const tree = focused; - tree.focusPrevious(count, { origin: 'keyboard' }); - tree.reveal(tree.getFocus()).done(null, errors.onUnexpectedError); + // Focus up first + const previousFocus = tree.getFocus(); + focusUp(accessor, arg2); + + // Then adjust selection + expandMultiSelection(focused, previousFocus); } } }); 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 9a0948ba373..8fff1117bcd 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -427,27 +427,6 @@ export class FileController extends DefaultController implements IDisposable { return true; } - public onKeyDown(tree: ITree, event: IKeyboardEvent): boolean { - if (event.shiftKey && (event.keyCode === KeyCode.DownArrow || event.keyCode === KeyCode.UpArrow)) { - const previousFocus = tree.getFocus(); - if (event.keyCode === KeyCode.DownArrow) { - tree.focusNext(); - } else { - tree.focusPrevious(); - } - - const focus = tree.getFocus(); - const selection = tree.getSelection(); - if (selection && selection.indexOf(focus) >= 0) { - tree.setSelection(selection.filter(s => s !== previousFocus)); - } else { - tree.setSelection(selection.concat(focus)); - } - } - - return super.onKeyDown(tree, event); - } - public onContextMenu(tree: ITree, stat: FileStat | Model, event: ContextMenuEvent): boolean { if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') { return false; From 6476a0e0f6d8c5e910dd31f030bd1352279d667d Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Thu, 11 Jan 2018 17:26:01 +0100 Subject: [PATCH 120/710] Add information about required transparency. Fixes #41201 --- .../editor/common/view/editorColorRegistry.ts | 2 +- .../wordHighlighter/wordHighlighter.ts | 4 +-- src/vs/platform/theme/common/colorRegistry.ts | 31 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/vs/editor/common/view/editorColorRegistry.ts b/src/vs/editor/common/view/editorColorRegistry.ts index 3fae633c29b..939a99c1d13 100644 --- a/src/vs/editor/common/view/editorColorRegistry.ts +++ b/src/vs/editor/common/view/editorColorRegistry.ts @@ -13,7 +13,7 @@ import { Color, RGBA } from 'vs/base/common/color'; */ export const editorLineHighlight = registerColor('editor.lineHighlightBackground', { dark: null, light: null, hc: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.')); export const editorLineHighlightBorder = registerColor('editor.lineHighlightBorder', { dark: '#282828', light: '#eeeeee', hc: '#f38518' }, nls.localize('lineHighlightBorderBox', 'Background color for the border around the line at the cursor position.')); -export const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hc: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features.')); +export const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', { dark: '#ffffff0b', light: '#fdff0033', hc: null }, nls.localize('rangeHighlight', 'Background color of highlighted ranges, like by quick open and find features. The color must not be opaque to not hide underlying decorations.'), true); export const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hc: Color.white }, nls.localize('caret', 'Color of the editor cursor.')); export const editorCursorBackground = registerColor('editorCursor.background', null, nls.localize('editorCursorBackground', 'The background color of the editor cursor. Allows customizing the color of a character overlapped by a block cursor.')); export const editorWhitespaces = registerColor('editorWhitespace.foreground', { dark: '#e3e4e229', light: '#33333333', hc: '#e3e4e229' }, nls.localize('editorWhitespaces', 'Color of whitespace characters in the editor.')); diff --git a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts index e438ed06ee4..02875a72eab 100644 --- a/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts +++ b/src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts @@ -27,8 +27,8 @@ import { firstIndex } from 'vs/base/common/arrays'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { ITextModel, TrackedRangeStickiness, OverviewRulerLane, IModelDeltaDecoration } from 'vs/editor/common/model'; -export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); -export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable.')); +export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable. The color must not be opaque to not hide underlying decorations.'), true); +export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable. The color must not be opaque to not hide underlying decorations.'), true); export const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights.')); export const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0', light: '#C0A0C0', hc: '#C0A0C0' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights.')); diff --git a/src/vs/platform/theme/common/colorRegistry.ts b/src/vs/platform/theme/common/colorRegistry.ts index a30413c4706..0c8fb6574b6 100644 --- a/src/vs/platform/theme/common/colorRegistry.ts +++ b/src/vs/platform/theme/common/colorRegistry.ts @@ -19,6 +19,7 @@ export interface ColorContribution { readonly id: ColorIdentifier; readonly description: string; readonly defaults: ColorDefaults; + readonly needsTransparency: boolean; } @@ -85,8 +86,8 @@ class ColorRegistry implements IColorRegistry { this.colorsById = {}; } - public registerColor(id: string, defaults: ColorDefaults, description: string): ColorIdentifier { - let colorContribution = { id, description, defaults }; + public registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency = false): ColorIdentifier { + let colorContribution = { id, description, defaults, needsTransparency }; this.colorsById[id] = colorContribution; this.colorSchema.properties[id] = { type: 'string', description, format: 'color-hex', default: '#ff0000' }; this.colorReferenceSchema.enum.push(id); @@ -133,8 +134,8 @@ class ColorRegistry implements IColorRegistry { const colorRegistry = new ColorRegistry(); platform.Registry.add(Extensions.ColorContribution, colorRegistry); -export function registerColor(id: string, defaults: ColorDefaults, description: string): ColorIdentifier { - return colorRegistry.registerColor(id, defaults, description); +export function registerColor(id: string, defaults: ColorDefaults, description: string, needsTransparency?: boolean): ColorIdentifier { + return colorRegistry.registerColor(id, defaults, description, needsTransparency); } export function getColorRegistry(): IColorRegistry { @@ -239,20 +240,20 @@ export const editorWidgetBorder = registerColor('editorWidget.border', { dark: ' */ export const editorSelectionBackground = registerColor('editor.selectionBackground', { light: '#ADD6FF', dark: '#264F78', hc: '#f3f518' }, nls.localize('editorSelectionBackground', "Color of the editor selection.")); export const editorSelectionForeground = registerColor('editor.selectionForeground', { light: null, dark: null, hc: '#000000' }, nls.localize('editorSelectionForeground', "Color of the selected text for high contrast.")); -export const editorInactiveSelection = registerColor('editor.inactiveSelectionBackground', { light: transparent(editorSelectionBackground, 0.5), dark: transparent(editorSelectionBackground, 0.5), hc: transparent(editorSelectionBackground, 0.5) }, nls.localize('editorInactiveSelection', "Color of the selection in an inactive editor.")); -export const editorSelectionHighlight = registerColor('editor.selectionHighlightBackground', { light: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), dark: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), hc: null }, nls.localize('editorSelectionHighlight', 'Color for regions with the same content as the selection.')); +export const editorInactiveSelection = registerColor('editor.inactiveSelectionBackground', { light: transparent(editorSelectionBackground, 0.5), dark: transparent(editorSelectionBackground, 0.5), hc: transparent(editorSelectionBackground, 0.5) }, nls.localize('editorInactiveSelection', "Color of the selection in an inactive editor. The color must not be opaque to not hide underlying decorations."), true); +export const editorSelectionHighlight = registerColor('editor.selectionHighlightBackground', { light: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), dark: lessProminent(editorSelectionBackground, editorBackground, 0.3, 0.6), hc: null }, nls.localize('editorSelectionHighlight', 'Color for regions with the same content as the selection. The color must not be opaque to not hide underlying decorations.'), true); /** * Editor find match colors. */ export const editorFindMatch = registerColor('editor.findMatchBackground', { light: '#A8AC94', dark: '#515C6A', hc: null }, nls.localize('editorFindMatch', "Color of the current search match.")); -export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground', { light: '#EA5C0055', dark: '#EA5C0055', hc: null }, nls.localize('findMatchHighlight', "Color of the other search matches.")); -export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground', { dark: '#3a3d4166', light: '#b4b4b44d', hc: null }, nls.localize('findRangeHighlight', "Color the range limiting the search.")); +export const editorFindMatchHighlight = registerColor('editor.findMatchHighlightBackground', { light: '#EA5C0055', dark: '#EA5C0055', hc: null }, nls.localize('findMatchHighlight', "Color of the other search matches. The color must not be opaque to not hide underlying decorations."), true); +export const editorFindRangeHighlight = registerColor('editor.findRangeHighlightBackground', { dark: '#3a3d4166', light: '#b4b4b44d', hc: null }, nls.localize('findRangeHighlight', "Color the range limiting the search. The color must not be opaque to not hide underlying decorations."), true); /** * Editor hover */ -export const editorHoverHighlight = registerColor('editor.hoverHighlightBackground', { light: '#ADD6FF26', dark: '#264f7840', hc: '#ADD6FF26' }, nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown.')); +export const editorHoverHighlight = registerColor('editor.hoverHighlightBackground', { light: '#ADD6FF26', dark: '#264f7840', hc: '#ADD6FF26' }, nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown. The color must not be opaque to not hide underlying decorations.'), true); export const editorHoverBackground = registerColor('editorHoverWidget.background', { light: editorWidgetBackground, dark: editorWidgetBackground, hc: editorWidgetBackground }, nls.localize('hoverBackground', 'Background color of the editor hover.')); export const editorHoverBorder = registerColor('editorHoverWidget.border', { light: editorWidgetBorder, dark: editorWidgetBorder, hc: editorWidgetBorder }, nls.localize('hoverBorder', 'Border color of the editor hover.')); @@ -284,12 +285,12 @@ const commonBaseColor = Color.fromHex('#606060').transparent(0.4); const contentTransparency = 0.4; const rulerTransparency = 1; -export const mergeCurrentHeaderBackground = registerColor('merge.currentHeaderBackground', { dark: currentBaseColor, light: currentBaseColor, hc: null }, nls.localize('mergeCurrentHeaderBackground', 'Current header background in inline merge-conflicts.')); -export const mergeCurrentContentBackground = registerColor('merge.currentContentBackground', { dark: transparent(mergeCurrentHeaderBackground, contentTransparency), light: transparent(mergeCurrentHeaderBackground, contentTransparency), hc: transparent(mergeCurrentHeaderBackground, contentTransparency) }, nls.localize('mergeCurrentContentBackground', 'Current content background in inline merge-conflicts.')); -export const mergeIncomingHeaderBackground = registerColor('merge.incomingHeaderBackground', { dark: incomingBaseColor, light: incomingBaseColor, hc: null }, nls.localize('mergeIncomingHeaderBackground', 'Incoming header background in inline merge-conflicts.')); -export const mergeIncomingContentBackground = registerColor('merge.incomingContentBackground', { dark: transparent(mergeIncomingHeaderBackground, contentTransparency), light: transparent(mergeIncomingHeaderBackground, contentTransparency), hc: transparent(mergeIncomingHeaderBackground, contentTransparency) }, nls.localize('mergeIncomingContentBackground', 'Incoming content background in inline merge-conflicts.')); -export const mergeCommonHeaderBackground = registerColor('merge.commonHeaderBackground', { dark: commonBaseColor, light: commonBaseColor, hc: null }, nls.localize('mergeCommonHeaderBackground', 'Common ancestor header background in inline merge-conflicts.')); -export const mergeCommonContentBackground = registerColor('merge.commonContentBackground', { dark: transparent(mergeCommonHeaderBackground, contentTransparency), light: transparent(mergeCommonHeaderBackground, contentTransparency), hc: transparent(mergeCommonHeaderBackground, contentTransparency) }, nls.localize('mergeCommonContentBackground', 'Common ancester content background in inline merge-conflicts.')); +export const mergeCurrentHeaderBackground = registerColor('merge.currentHeaderBackground', { dark: currentBaseColor, light: currentBaseColor, hc: null }, nls.localize('mergeCurrentHeaderBackground', 'Current header background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); +export const mergeCurrentContentBackground = registerColor('merge.currentContentBackground', { dark: transparent(mergeCurrentHeaderBackground, contentTransparency), light: transparent(mergeCurrentHeaderBackground, contentTransparency), hc: transparent(mergeCurrentHeaderBackground, contentTransparency) }, nls.localize('mergeCurrentContentBackground', 'Current content background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); +export const mergeIncomingHeaderBackground = registerColor('merge.incomingHeaderBackground', { dark: incomingBaseColor, light: incomingBaseColor, hc: null }, nls.localize('mergeIncomingHeaderBackground', 'Incoming header background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); +export const mergeIncomingContentBackground = registerColor('merge.incomingContentBackground', { dark: transparent(mergeIncomingHeaderBackground, contentTransparency), light: transparent(mergeIncomingHeaderBackground, contentTransparency), hc: transparent(mergeIncomingHeaderBackground, contentTransparency) }, nls.localize('mergeIncomingContentBackground', 'Incoming content background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); +export const mergeCommonHeaderBackground = registerColor('merge.commonHeaderBackground', { dark: commonBaseColor, light: commonBaseColor, hc: null }, nls.localize('mergeCommonHeaderBackground', 'Common ancestor header background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); +export const mergeCommonContentBackground = registerColor('merge.commonContentBackground', { dark: transparent(mergeCommonHeaderBackground, contentTransparency), light: transparent(mergeCommonHeaderBackground, contentTransparency), hc: transparent(mergeCommonHeaderBackground, contentTransparency) }, nls.localize('mergeCommonContentBackground', 'Common ancester content background in inline merge-conflicts. The color must not be opaque to not hide underlying decorations.'), true); export const mergeBorder = registerColor('merge.border', { dark: null, light: null, hc: '#C3DF6F' }, nls.localize('mergeBorder', 'Border color on headers and the splitter in inline merge-conflicts.')); From 05dac2f413545038f19d710e7ede5feaaee80b42 Mon Sep 17 00:00:00 2001 From: Mathieu Bruguier Date: Thu, 11 Jan 2018 09:24:31 -0800 Subject: [PATCH 121/710] Removed extra 'if' --- 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 44d842b4537..186c47422b8 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -297,7 +297,7 @@ declare module 'vscode' { isAfterOrEqual(other: Position): boolean; /** - * Check if this is position is equal to `other`. + * Check if this position is equal to `other`. * * @param other A position. * @return `true` if the line and character of the given position are equal to From 8ae2f5f27c48d441cf1c415a12a26c14d30ca76e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 11 Jan 2018 10:04:33 -0800 Subject: [PATCH 122/710] remote - remove reads after reading --- .../workbench/api/electron-browser/mainThreadFileSystem.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index e030f12c05b..afe244cb77c 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -118,7 +118,10 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv read(resource: URI, offset: number, count: number, progress: IProgress): TPromise { const read = new FileReadOperation(progress); this._reads.set(read.id, read); - return this._proxy.$read(this._handle, read.id, offset, count, resource); + return this._proxy.$read(this._handle, read.id, offset, count, resource).then(value => { + this._reads.delete(read.id); + return value; + }); } reportFileChunk(session: number, chunk: number[]): void { this._reads.get(session).progress.report(Buffer.from(chunk)); From d014618fd1dc529ce1a064e84303da57a287f6f2 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 11 Jan 2018 10:21:22 -0800 Subject: [PATCH 123/710] remote - some renames, prep for more search --- .../api/electron-browser/mainThreadFileSystem.ts | 11 ++++++++--- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostFileSystem.ts | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index afe244cb77c..72759bec5a3 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -59,8 +59,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { // --- search - $handleSearchProgress(handle: number, session: number, data: UriComponents): void { - this._provider.get(handle).handleSearchProgress(session, URI.revive(data)); + $handleDidFindFile(handle: number, session: number, data: UriComponents): void { + this._provider.get(handle).hanelDidFindFile(session, URI.revive(data)); } } @@ -155,7 +155,12 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv search(query: ISearchQuery): PPromise { if (query.type === QueryType.Text) { return PPromise.as({ results: [], stats: undefined }); + } else { + return this._findFiles(query); } + } + + private _findFiles(query: ISearchQuery): PPromise { const id = ++this._searchesIdPool; const matches: IFileMatch[] = []; return new PPromise((resolve, reject, report) => { @@ -175,7 +180,7 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv }); } - handleSearchProgress(session: number, resource: URI): void { + hanelDidFindFile(session: number, resource: URI): void { this._searches.get(session)(resource); } } diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index d189f463f6b..0771ed051dd 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -373,7 +373,7 @@ export interface MainThreadFileSystemShape extends IDisposable { $onFileSystemChange(handle: number, resource: IFileChange[]): void; $reportFileChunk(handle: number, session: number, chunk: number[] | null): void; - $handleSearchProgress(handle: number, session: number, resource: UriComponents): void; + $handleDidFindFile(handle: number, session: number, resource: UriComponents): void; } export interface MainThreadTaskShape extends IDisposable { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index c2ad87af990..95b64dfa601 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -79,7 +79,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { if (!provider.findFiles) { return TPromise.as(undefined); } - const progress = { report: (uri) => this._proxy.$handleSearchProgress(handle, session, uri) }; + const progress = { report: (uri) => this._proxy.$handleDidFindFile(handle, session, uri) }; return asWinJsPromise(token => provider.findFiles(query, progress, token)); } } From 4b9217044ed6227bf4d5a6425af3dd2a8be50887 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Thu, 11 Jan 2018 14:15:55 -0800 Subject: [PATCH 124/710] Use multiple buffers. --- .../pieceTableTextBuffer/pieceTableBase.ts | 91 ++++++++++++------- .../pieceTableTextBuffer.ts | 8 +- .../pieceTableTextBufferBuilder.ts | 44 +++++---- .../model/pieceTableTextBuffer/textSource.ts | 16 ++-- 4 files changed, 97 insertions(+), 62 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 73991cf4b29..3b5ed1a4e28 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -6,6 +6,7 @@ import { Position } from 'vs/editor/common/core/position'; import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; +import { IRawPTBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; export const enum NodeColor { Black = 0, @@ -188,15 +189,15 @@ export interface BufferCursor { } export class Piece { - isOriginalBuffer: boolean; + bufferIndex: number; offset: number; length: number; // size of current piece lineFeedCnt: number; lineStarts: PrefixSumComputer; - constructor(isOriginalBuffer: boolean, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { - this.isOriginalBuffer = isOriginalBuffer; + constructor(bufferIndex: number, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { + this.bufferIndex = bufferIndex; this.offset = offset; this.length = length; this.lineFeedCnt = lineFeedCnt; @@ -211,34 +212,56 @@ export class Piece { } export class PieceTableBase { - protected _originalBuffer: string; - protected _changeBuffer: string; + protected _buffers: string[]; // 0 is change buffer, others are readonly original buffer. protected _root: TreeNode; protected _lineCnt: number; - constructor(originalBuffer: string, lineStarts?: number[]) { - this._originalBuffer = originalBuffer; - this._changeBuffer = ''; + constructor(chunks: IRawPTBuffer[]) { + this._buffers = [ + '', + ]; this._root = SENTINEL; this._lineCnt = 1; - if (this._originalBuffer.length > 0) { - let lineLengths: Uint32Array; - if (lineStarts) { - lineLengths = new Uint32Array(lineStarts.length); - for (let i = 1; i < lineStarts.length; i++) { - lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; + let lastNode: TreeNode = null; + for (let i = 0, len = chunks.length; i < len; i++) { + if (chunks[i].text.length > 0) { + let lineLengths: Uint32Array; + if (chunks[i].lineStarts) { + lineLengths = new Uint32Array(chunks[i].lineStarts.length); + for (let j = 1; j < chunks[i].lineStarts.length; j++) { + lineLengths[j - 1] = chunks[i].lineStarts[j] - chunks[i].lineStarts[j - 1]; + } + lineLengths[chunks[i].lineStarts.length - 1] = chunks[i].text.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1]; + } else { + lineLengths = this.constructLineLengths(chunks[i].text); } - lineLengths[lineStarts.length - 1] = this._originalBuffer.length - lineStarts[lineStarts.length - 1]; - } else { - lineLengths = this.constructLineLengths(this._originalBuffer); + let piece = new Piece(i + 1, 0, chunks[i].text.length, lineLengths.length - 1, lineLengths); + this._buffers.push(chunks[i].text); + lastNode = this.rbInsertRight(lastNode, piece); } - - let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); - this.rbInsertLeft(null, piece); - this._lineCnt = lineLengths.length; } + + this.computeLineCount(); + + // if (this._originalBuffer.length > 0) { + // let lineLengths: Uint32Array; + // if (lineStarts) { + // lineLengths = new Uint32Array(lineStarts.length); + // for (let i = 1; i < lineStarts.length; i++) { + // lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; + // } + + // lineLengths[lineStarts.length - 1] = this._originalBuffer.length - lineStarts[lineStarts.length - 1]; + // } else { + // lineLengths = this.constructLineLengths(this._originalBuffer); + // } + + // let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); + // this.rbInsertLeft(null, piece); + // this._lineCnt = lineLengths.length; + // } } // #region Piece Table @@ -248,7 +271,7 @@ export class PieceTableBase { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); let insertPos = node.piece.lineStarts.getIndexOf(remainder); - if (!node.piece.isOriginalBuffer && (node.piece.offset + node.piece.length === this._changeBuffer.length) && (nodeStartOffset + node.piece.length === offset)) { + if (node.piece.bufferIndex === 0 && (node.piece.offset + node.piece.length === this._buffers[0].length) && (nodeStartOffset + node.piece.length === offset)) { // append content to this node, we don't want to keep adding node when users simply type in sequence this.appendToNode(node, value); } else { @@ -277,7 +300,7 @@ export class PieceTableBase { // we are inserting into the middle of a node. let nodesToDel = []; let newRightPiece = new Piece( - node.piece.isOriginalBuffer, + node.piece.bufferIndex, node.piece.offset + remainder, node.piece.length - remainder, node.piece.lineFeedCnt - insertPos.index, @@ -421,10 +444,10 @@ export class PieceTableBase { } createNewPiece(text: string): Piece { - const startOffset = this._changeBuffer.length; - this._changeBuffer += text; + const startOffset = this._buffers[0].length; + this._buffers[0] += text; const lineLengths = this.constructLineLengths(text); - return new Piece(false, startOffset, text.length, lineLengths.length - 1, lineLengths); + return new Piece(0, startOffset, text.length, lineLengths.length - 1, lineLengths); } getLineRawContent(lineNumber: number): string { @@ -437,12 +460,12 @@ export class PieceTableBase { } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[x.piece.bufferIndex]; return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[x.piece.bufferIndex]; ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); break; @@ -455,7 +478,7 @@ export class PieceTableBase { // search in order, to find the node contains end column x = x.next(); while (x !== SENTINEL) { - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[x.piece.bufferIndex]; if (x.piece.lineFeedCnt > 0) { let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); @@ -541,7 +564,7 @@ export class PieceTableBase { } let newPiece: Piece = new Piece( - node.piece.isOriginalBuffer, + node.piece.bufferIndex, endOffset + node.piece.offset, newPieceLength, oldLineLengthsVal.length - end.index - 1, @@ -559,7 +582,7 @@ export class PieceTableBase { } let hitCRLF = this.startWithLF(value) && this.endWithCR(node); - this._changeBuffer += value; + this._buffers[0] += value; node.piece.length += value.length; const lineLengths = this.constructLineLengths(value); let lineFeedCount = lineLengths.length - 1; @@ -679,7 +702,7 @@ export class PieceTableBase { if (node.piece.lineFeedCnt < 1) { return -1; } - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[node.piece.bufferIndex]; return buffer.charCodeAt(node.piece.offset + offset); } @@ -701,7 +724,7 @@ export class PieceTableBase { } getNodeContent(node: TreeNode): string { - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[node.piece.bufferIndex]; let currentContent = buffer.substr(node.piece.offset, node.piece.length); return currentContent; @@ -1220,7 +1243,7 @@ export class PieceTableBase { return ''; } - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[node.piece.bufferIndex]; let currentContent = buffer.substr(node.piece.offset, node.piece.length); return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index ffb9fac9df6..10b8f0de082 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -20,7 +20,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer private _mightContainNonBasicASCII: boolean; constructor(textSource: ITextSource) { - super(textSource.lines.text, textSource.lines.lineStarts); + super(textSource.chunks); this._BOM = textSource.BOM; this._EOL = textSource.EOL; this._mightContainNonBasicASCII = !textSource.isBasicASCII; @@ -86,18 +86,18 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer if (startPosition.node === endPosition.node) { let node = startPosition.node; - let buffer = node.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[node.piece.bufferIndex]; return buffer.substring(node.piece.offset + startPosition.remainder, node.piece.offset + endPosition.remainder); } let x = startPosition.node; - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[x.piece.bufferIndex]; let ret = buffer.substring(x.piece.offset + startPosition.remainder, x.piece.offset + x.piece.length); x = x.next(); while (x !== SENTINEL) { - let buffer = x.piece.isOriginalBuffer ? this._originalBuffer : this._changeBuffer; + let buffer = this._buffers[x.piece.bufferIndex]; if (x === endPosition.node) { ret += buffer.substring(x.piece.offset, x.piece.offset + endPosition.remainder); diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 2e17544cc33..7e091368f05 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -6,7 +6,7 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } from 'vs/editor/common/model'; -import { TextSource, IRawTextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; +import { TextSource, IRawTextSource, IRawPTBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; export class PieceTableTextBufferFactory implements ITextBufferFactory { @@ -20,30 +20,34 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { } public getFirstLineText(lengthLimit: number): string { - return this.rawTextSource.lines.text.substr(0, 100).split(/\r\n|\r|\n/)[0]; + return this.rawTextSource.chunks[0].text.substr(0, 100).split(/\r\n|\r|\n/)[0]; } } class PTBasedBuilder { - private lineStarts: number[]; - private text: string; + private chunks: IRawPTBuffer[]; + private lineFeedCnt: number; + // private lineStarts: number[]; + // private text: string[]; private BOM: string; private chunkIndex: number; private totalCRCount: number; private _regex: RegExp; - private totalLength: number; + // private totalLength: number; constructor() { - this.text = ''; + this.chunks = []; this.BOM = ''; this.chunkIndex = 0; - this.lineStarts = [0]; + // this.lineStarts = [0]; this.totalCRCount = 0; this._regex = new RegExp(/\r\n|\r|\n/g); - this.totalLength = 0; + // this.totalLength = 0; + this.lineFeedCnt = 0; } public acceptChunk(chunk: string): void { + let lineStarts = [0]; if (this.chunkIndex === 0) { if (strings.startsWithUTF8BOM(chunk)) { this.BOM = strings.UTF8_BOM_CHARACTER; @@ -83,21 +87,29 @@ class PTBasedBuilder { prevMatchStartIndex = matchStartIndex; prevMatchLength = matchLength; - this.lineStarts.push(this.totalLength + matchStartIndex + matchLength); + lineStarts.push(matchStartIndex + matchLength); + this.lineFeedCnt++; } while (m); - this.text += chunk; - this.totalLength += chunk.length; + // this.text.push(chunk); + this.chunks.push({ + text: chunk, + lineStarts: lineStarts + }); + // this.totalLength += chunk.length; this.chunkIndex++; } public finish(containsRTL: boolean, isBasicASCII: boolean): PieceTableTextBufferFactory { + if (this.chunks.length === 0) { + this.chunks.push({ + text: '', + lineStarts: [0] + }); + } return new PieceTableTextBufferFactory({ - lines: { - text: this.text, - lineStarts: this.lineStarts, - length: this.lineStarts.length - }, + chunks: this.chunks, + lineFeedCnt: this.lineFeedCnt, BOM: this.BOM, totalCRCount: this.totalCRCount, containsRTL: containsRTL, diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts b/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts index 97e239ed550..b1f607876ba 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts @@ -12,10 +12,6 @@ import { DefaultEndOfLine } from 'vs/editor/common/model'; export interface IRawPTBuffer { text: string; lineStarts: number[]; - /** - * lines count - */ - length: number; } /** @@ -25,7 +21,8 @@ export interface IRawTextSource { /** * The text split into lines. */ - readonly lines: IRawPTBuffer; + readonly chunks: IRawPTBuffer[]; + readonly lineFeedCnt: number; /** * The BOM (leading character sequence of the file). */ @@ -51,7 +48,8 @@ export interface ITextSource { /** * The text split into lines. */ - readonly lines: IRawPTBuffer; + readonly chunks: IRawPTBuffer[]; + readonly lineFeedCnt: number; /** * The BOM (leading character sequence of the file). */ @@ -78,7 +76,8 @@ export class TextSource { * Otherwise returns '\n'. More lines end with '\n'. */ private static _getEOL(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): '\r\n' | '\n' { - const lineFeedCnt = rawTextSource.lines.length - 1; + let lineFeedCnt = rawTextSource.lineFeedCnt; + // 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'); @@ -93,7 +92,8 @@ export class TextSource { public static fromRawTextSource(rawTextSource: IRawTextSource, defaultEOL: DefaultEndOfLine): ITextSource { return { - lines: rawTextSource.lines, + chunks: rawTextSource.chunks, + lineFeedCnt: rawTextSource.lineFeedCnt, BOM: rawTextSource.BOM, EOL: this._getEOL(rawTextSource, defaultEOL), containsRTL: rawTextSource.containsRTL, From 44d1ccf8b89851703a821dbdb70660ade07550fc Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Fri, 12 Jan 2018 01:09:08 +0100 Subject: [PATCH 125/710] use multiple integrated terminal for composite launches (mac + linux) --- .../debug/electron-browser/terminalSupport.ts | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts index 34ad85f35c5..f60c53c8a1f 100644 --- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts +++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts @@ -5,6 +5,7 @@ import * as nls from 'vs/nls'; import * as platform from 'vs/base/common/platform'; +import cp = require('child_process'); import { IDisposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITerminalService, ITerminalInstance, ITerminalConfiguration } from 'vs/workbench/parts/terminal/common/terminal'; @@ -24,11 +25,6 @@ export class TerminalSupport { return nativeTerminalService.runInTerminal(args.title, args.cwd, args.args, args.env || {}); } - let delay = 0; - if (!TerminalSupport.integratedTerminalInstance) { - TerminalSupport.integratedTerminalInstance = terminalService.createInstance({ name: args.title || nls.localize('debug.terminal.title', "debuggee") }); - delay = 2000; // delay the first sendText so that the newly created terminal is ready. - } if (!TerminalSupport.terminalDisposedListener) { // React on terminal disposed and check if that is the debug terminal #12956 TerminalSupport.terminalDisposedListener = terminalService.onInstanceDisposed(terminal => { @@ -37,22 +33,27 @@ export class TerminalSupport { } }); } - terminalService.setActiveInstance(TerminalSupport.integratedTerminalInstance); + + let t = TerminalSupport.integratedTerminalInstance; + if ((t && this.isBusy(t)) || !t) { + t = terminalService.createInstance({ name: args.title || nls.localize('debug.terminal.title', "debuggee") }); + TerminalSupport.integratedTerminalInstance = t; + } + terminalService.setActiveInstance(t); terminalService.showPanel(true); - return new TPromise((c, e) => { + const command = this.prepareCommand(args, configurationService); + t.sendText(command, true); - setTimeout(() => { - if (TerminalSupport.integratedTerminalInstance) { - const command = this.prepareCommand(args, configurationService); - TerminalSupport.integratedTerminalInstance.sendText(command, true); - c(void 0); - } else { - e(new Error(nls.localize('debug.terminal.not.available.error', "Integrated terminal not available"))); - } - }, delay); + return TPromise.as(void 0); + } - }); + private static isBusy(t: ITerminalInstance): boolean { + if ((platform.isMacintosh || platform.isLinux) && t.processId) { + const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]); + return !!result.stdout; + } + return true; } private static prepareCommand(args: DebugProtocol.RunInTerminalRequestArguments, configurationService: IConfigurationService): string { From 09446f53f564c5b36c34e6794e846a1836963811 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 12 Jan 2018 03:22:56 +0300 Subject: [PATCH 126/710] Remove hard-coded zebra in running extensions --- .../electron-browser/media/runtimeExtensionsEditor.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css index 54046a8f2a1..ebd02442497 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css +++ b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd { - background-color: #f5f5f5; + background-color: rgba(130, 130, 130, 0.1); } .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row:hover:not(.odd) { @@ -88,7 +88,7 @@ .vs-dark .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd, .hc-black .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd { - background-color: #262829; + background-color: rgba(130, 130, 130, 0.1); } .runtime-extensions-editor .monaco-action-bar { From 73ee03ed51f3f7f1d34df66d94791b1665405474 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 11 Jan 2018 16:22:48 -0800 Subject: [PATCH 127/710] remote - sketch up find in files logic --- src/vs/vscode.proposed.d.ts | 7 ++ .../electron-browser/mainThreadFileSystem.ts | 79 ++++++++++++------- src/vs/workbench/api/node/extHost.protocol.ts | 4 +- .../workbench/api/node/extHostFileSystem.ts | 23 +++++- 4 files changed, 82 insertions(+), 31 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index ab8f16d446a..f2537d74fad 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -83,6 +83,12 @@ declare module 'vscode' { type: FileType; } + export interface FindMatch { + uri: Uri; + range: Range; + preview: { leading: string, matching: string, trailing: string }; + } + // todo@joh discover files etc // todo@joh CancellationToken everywhere export interface FileSystemProvider { @@ -131,6 +137,7 @@ declare module 'vscode' { // find files by names findFiles?(query: string, progress: Progress, token: CancellationToken): Thenable; + findInFiles?(query: string, isRegex: boolean, progress: Progress, token: CancellationToken): Thenable; } export namespace workspace { diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index 72759bec5a3..18e0fe731e2 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -12,9 +12,10 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import Event, { Emitter } from 'vs/base/common/event'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IProgress } from 'vs/platform/progress/common/progress'; -import { ISearchResultProvider, ISearchQuery, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchService } from 'vs/platform/search/common/search'; +import { ISearchResultProvider, ISearchQuery, ISearchComplete, ISearchProgressItem, QueryType, IFileMatch, ISearchService, ILineMatch } from 'vs/platform/search/common/search'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { values } from 'vs/base/common/map'; @extHostNamedCustomer(MainContext.MainThreadFileSystem) export class MainThreadFileSystem implements MainThreadFileSystemShape { @@ -59,8 +60,8 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { // --- search - $handleDidFindFile(handle: number, session: number, data: UriComponents): void { - this._provider.get(handle).hanelDidFindFile(session, URI.revive(data)); + $handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void { + this._provider.get(handle).handleFindMatch(session, data); } } @@ -76,11 +77,25 @@ class FileReadOperation { } } +class SearchOperation { + + private static _idPool = 0; + + constructor( + readonly progress: (match: IFileMatch) => any, + readonly id: number = ++SearchOperation._idPool, + readonly matches = new Map() + ) { + // + } +} + class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProvider { private readonly _onDidChange = new Emitter(); - private readonly _reads = new Map(); private readonly _registrations: IDisposable[]; + private readonly _reads = new Map(); + private readonly _searches = new Map(); readonly onDidChange: Event = this._onDidChange.event; @@ -149,38 +164,44 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv // --- search - private _searches = new Map void>(); - private _searchesIdPool = 0; - search(query: ISearchQuery): PPromise { - if (query.type === QueryType.Text) { - return PPromise.as({ results: [], stats: undefined }); - } else { - return this._findFiles(query); - } - } - private _findFiles(query: ISearchQuery): PPromise { - const id = ++this._searchesIdPool; - const matches: IFileMatch[] = []; return new PPromise((resolve, reject, report) => { - this._proxy.$findFiles(this._handle, id, query.filePattern).then(() => { - this._searches.delete(id); - resolve({ - results: matches, - stats: undefined - }); - }, reject); - this._searches.set(id, resource => { - const match: IFileMatch = { resource }; - matches.push(match); - report(match); + const search = new SearchOperation(report); + this._searches.set(search.id, search); + + const promise = query.type === QueryType.File + ? this._proxy.$findFiles(this._handle, search.id, query.filePattern) + : this._proxy.$findInFiles(this._handle, search.id, query.contentPattern); + + promise.then(() => { + this._searches.delete(search.id); + resolve(({ results: values(search.matches), stats: undefined })); + }, err => { + this._searches.delete(search.id); + reject(err); }); }); } - hanelDidFindFile(session: number, resource: URI): void { - this._searches.get(session)(resource); + handleFindMatch(session: number, dataOrUri: UriComponents | [UriComponents, ILineMatch]): void { + let resource: URI; + let match: ILineMatch; + + if (Array.isArray(dataOrUri)) { + resource = URI.revive(dataOrUri[0]); + match = dataOrUri[1]; + } else { + resource = URI.revive(dataOrUri); + } + + const { matches } = this._searches.get(session); + if (!matches.has(resource.toString())) { + matches.set(resource.toString(), { resource, lineMatches: [] }); + } + if (match) { + matches.get(resource.toString()).lineMatches.push(match); + } } } diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 0771ed051dd..9a369effe2e 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -53,6 +53,7 @@ import { ConfigurationScope } from 'vs/platform/configuration/common/configurati import { ParsedArgs } from 'vs/platform/environment/common/environment'; import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration'; import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model'; +import { ILineMatch, IPatternInfo } from 'vs/platform/search/common/search'; export interface IEnvironment { isExtensionDevelopmentDebug: boolean; @@ -373,7 +374,7 @@ export interface MainThreadFileSystemShape extends IDisposable { $onFileSystemChange(handle: number, resource: IFileChange[]): void; $reportFileChunk(handle: number, session: number, chunk: number[] | null): void; - $handleDidFindFile(handle: number, session: number, resource: UriComponents): void; + $handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void; } export interface MainThreadTaskShape extends IDisposable { @@ -543,6 +544,7 @@ export interface ExtHostFileSystemShape { $readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][]>; $rmdir(handle: number, resource: UriComponents): TPromise; $findFiles(handle: number, session: number, query: string): TPromise; + $findInFiles(handle: number, session: number, pattern: IPatternInfo): TPromise; } export interface ExtHostExtensionServiceShape { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index 95b64dfa601..b96b7511f94 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -11,6 +11,7 @@ import * as vscode from 'vscode'; import { IStat } from 'vs/platform/files/common/files'; import { IDisposable } from 'vs/base/common/lifecycle'; import { asWinJsPromise } from 'vs/base/common/async'; +import { IPatternInfo } from 'vs/platform/search/common/search'; export class ExtHostFileSystem implements ExtHostFileSystemShape { @@ -79,7 +80,27 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { if (!provider.findFiles) { return TPromise.as(undefined); } - const progress = { report: (uri) => this._proxy.$handleDidFindFile(handle, session, uri) }; + const progress = { + report: (uri) => { + this._proxy.$handleFindMatch(handle, session, uri); + } + }; return asWinJsPromise(token => provider.findFiles(query, progress, token)); } + $findInFiles(handle: number, session: number, pattern: IPatternInfo): TPromise { + const provider = this._provider.get(handle); + if (!provider.findInFiles) { + return TPromise.as(undefined); + } + const progress = { + report: (data: vscode.FindMatch) => { + this._proxy.$handleFindMatch(handle, session, [data.uri, { + lineNumber: 1 + data.range.start.line, + preview: data.preview.leading + data.preview.matching + data.preview.trailing, + offsetAndLengths: [[data.preview.leading.length, data.preview.matching.length]] + }]); + } + }; + return asWinJsPromise(token => provider.findInFiles(pattern.pattern, pattern.isRegExp, progress, token)); + } } From 38fbf812236ac08df9b494f24d79b1eeaff3b467 Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Thu, 11 Jan 2018 16:40:28 -0800 Subject: [PATCH 128/710] File based recommendation trumps exe based recommendations #41368 --- .../parts/extensions/electron-browser/extensionTipsService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index c2fec16cc64..1e651f87f83 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -80,9 +80,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe getAllRecommendationsWithReason(): { [id: string]: string; } { let output: { [id: string]: string; } = Object.create(null); - Object.keys(this._fileBasedRecommendations).forEach(x => output[x.toLowerCase()] = localize('fileBasedRecommendation', "This extension is recommended based on the files you recently opened.")); this._allWorkspaceRecommendedExtensions.forEach(x => output[x.toLowerCase()] = localize('workspaceRecommendation', "This extension is recommended by users of the current workspace.")); - forEach(this._exeBasedRecommendations, entry => output[entry.key.toLowerCase()] = localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", entry.value)); + Object.keys(this._fileBasedRecommendations).forEach(x => output[x.toLowerCase()] = output[x.toLowerCase()] || localize('fileBasedRecommendation', "This extension is recommended based on the files you recently opened.")); + forEach(this._exeBasedRecommendations, entry => output[entry.key.toLowerCase()] = output[entry.key.toLowerCase()] || localize('exeBasedRecommendation', "This extension is recommended because you have {0} installed.", entry.value)); return output; } From 1aaa1006aa7dc9dc43d1e4ecaf5d68a178ad911e Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 11 Jan 2018 17:44:54 -0800 Subject: [PATCH 129/710] New settings search UX - #40957 (#40958) * Basic show fuzzy results below filtered results * Renders filtered settings without a group * Display both local filter and remote results in their own groups on the same page * Remove duplicates between local and remote results * Hide empty groups more completely, port score bounds change from master, fix NPE * Remove fuzzy settings search toggle lightbulb icon * Render all filtered groups as dynamically sized groups * Remove renderer knowledge of filtered/nlp * Update setting count on each search * Fix match ranges for default settings vs the editable settings model * Add ISearchProvider to fix layer breakage. Fix hidden areas for filtered groups * Fix result count and updating on editable side changes * Simplify model rendering - render all result groups dynamically, without allocating extra space * Fix @-searches, clean up filterSettings() code in Settings Model * Update renderers for editable prefs model * Fix up metadata and telemetry * Fix clearing the results by deleting the query * Fix duplicated commonlyUsed settings, and navigation order * Fix nlp results order, and allow scoring results * Remove unused memento * Match count tweaks * Remove obsolete padTo argument to pushGroups * Move searchResultGroup state from renderer to preferencesModels * Remove old fuzzy search prompt link * Fix NPE on filterResult * nlp/filter => remote/local * Remove "render" term from preferencesModels * Simplify settings editor model rendering - All groups are wrapped in braces for consistency When search isn't active, the search groups are removed from the editor model, not hidden by the renderer * Remove unread 'arrays' * Simplify hiding duplicate settings search results * Fix blinking on slow tokenization in search reuslts --- .../preferences/browser/preferencesEditor.ts | 225 ++++++------ .../browser/preferencesRenderers.ts | 187 +++++----- .../preferences/browser/preferencesWidgets.ts | 55 +-- .../parts/preferences/common/preferences.ts | 35 +- .../preferences/common/preferencesModels.ts | 333 +++++++++++------- .../electron-browser/preferencesSearch.ts | 146 ++++---- 6 files changed, 482 insertions(+), 499 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 5525dd14aad..3f5312baea0 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as nls from 'vs/nls'; import URI from 'vs/base/common/uri'; -import { onUnexpectedError } from 'vs/base/common/errors'; +import { onUnexpectedError, isPromiseCanceledError, getErrorMessage } from 'vs/base/common/errors'; import * as DOM from 'vs/base/browser/dom'; import { Delayer, ThrottledDelayer } from 'vs/base/common/async'; import { Dimension, Builder } from 'vs/base/browser/builder'; @@ -14,7 +14,6 @@ import { ArrayNavigator, INavigator } 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 } from 'vs/workbench/common/editor'; -import { Scope } from 'vs/workbench/common/memento'; 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'; @@ -25,7 +24,7 @@ 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, IFilterMetadata, IPreferencesSearchModel + 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, IFilterMetadata, ISearchProvider, ISearchResult } from 'vs/workbench/parts/preferences/common/preferences'; import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -108,14 +107,13 @@ export class PreferencesEditor extends BaseEditor { private headerContainer: HTMLElement; private searchWidget: SearchWidget; private sideBySidePreferencesWidget: SideBySidePreferencesWidget; - private preferencesRenderers: PreferencesRenderers; + private preferencesRenderers: PreferencesRenderersController; private delayedFilterLogging: Delayer; - private filterThrottle: ThrottledDelayer; + private remoteSearchThrottle: ThrottledDelayer; private latestEmptyFilters: string[] = []; private lastFocusedWidget: SearchWidget | SideBySidePreferencesWidget = null; - private memento: any; constructor( @IPreferencesService private preferencesService: IPreferencesService, @@ -131,8 +129,7 @@ export class PreferencesEditor extends BaseEditor { this.defaultSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(this.contextKeyService); this.focusSettingsContextKey = CONTEXT_SETTINGS_SEARCH_FOCUS.bindTo(this.contextKeyService); this.delayedFilterLogging = new Delayer(1000); - this.filterThrottle = new ThrottledDelayer(200); - this.memento = this.getMemento(storageService, Scope.WORKSPACE); + this.remoteSearchThrottle = new ThrottledDelayer(200); } public createEditor(parent: Builder): void { @@ -145,12 +142,8 @@ export class PreferencesEditor extends BaseEditor { ariaLabel: nls.localize('SearchSettingsWidget.AriaLabel', "Search settings"), placeholder: nls.localize('SearchSettingsWidget.Placeholder', "Search Settings"), focusKey: this.focusSettingsContextKey, - showFuzzyToggle: true, showResultCount: true })); - this.searchWidget.setFuzzyToggleVisible(this.preferencesSearchService.remoteSearchAllowed); - this.searchWidget.fuzzyEnabled = this.memento['fuzzyEnabled']; - this._register(this.preferencesSearchService.onRemoteSearchEnablementChanged(enabled => this.searchWidget.setFuzzyToggleVisible(enabled))); this._register(this.searchWidget.onDidChange(value => this.onInputChanged())); this._register(this.searchWidget.onFocus(() => this.lastFocusedWidget = this.searchWidget)); this.lastFocusedWidget = this.searchWidget; @@ -160,12 +153,7 @@ export class PreferencesEditor extends BaseEditor { this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget)); this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target))); - this.preferencesRenderers = this._register(new PreferencesRenderers(this.preferencesSearchService)); - - this._register(this.preferencesRenderers.onTriggeredFuzzy(() => { - this.searchWidget.fuzzyEnabled = true; - this.filterPreferences(); - })); + this.preferencesRenderers = this._register(new PreferencesRenderersController(this.preferencesSearchService, this.telemetryService)); this._register(this.preferencesRenderers.onDidFilterResultsCountChange(count => this.showSearchResultsMessage(count))); } @@ -250,15 +238,17 @@ export class PreferencesEditor extends BaseEditor { } private onInputChanged(): void { - if (this.searchWidget.fuzzyEnabled) { - this.triggerThrottledFilter(); - } else { - this.filterPreferences(); - } + this.triggerThrottledSearch(); + this.localFilterPreferences(); } - private triggerThrottledFilter(): void { - this.filterThrottle.trigger(() => this.filterPreferences()); + private triggerThrottledSearch(): void { + if (this.searchWidget.getValue()) { + this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences()); + } else { + // When clearing the input, update immediately to clear it + this.remoteSearchPreferences(); + } } private switchSettings(target: SettingsTarget): void { @@ -278,17 +268,29 @@ export class PreferencesEditor extends BaseEditor { }); } - private filterPreferences(): TPromise { - this.memento['fuzzyEnabled'] = this.searchWidget.fuzzyEnabled; - const filter = this.searchWidget.getValue().trim(); - return this.preferencesRenderers.filterPreferences({ filter, fuzzy: this.searchWidget.fuzzyEnabled }).then(result => { + private remoteSearchPreferences(): TPromise { + const query = this.searchWidget.getValue().trim(); + return this.preferencesRenderers.remoteSearchPreferences(query).then(result => { + this.onSearchResult(query, result); + }, onUnexpectedError); + } + + private localFilterPreferences(): TPromise { + const query = this.searchWidget.getValue().trim(); + return this.preferencesRenderers.localFilterPreferences(query).then(result => { + this.onSearchResult(query, result); + }, onUnexpectedError); + } + + private onSearchResult(filter: string, result: { count: number, metadata: IFilterMetadata }): void { + if (result) { this.showSearchResultsMessage(result.count); if (result.count === 0) { this.latestEmptyFilters.push(filter); } - this.preferencesRenderers.focusFirst(); + this.delayedFilterLogging.trigger(() => this.reportFilteringUsed(filter, result.metadata)); - }, onUnexpectedError); + } } private showSearchResultsMessage(count: number): void { @@ -372,35 +374,32 @@ class SettingsNavigator implements INavigator { } } -interface ISearchCriteria { - filter: string; - fuzzy: boolean; +interface IFilterOrSearchResult { + count: number; + metadata: IFilterMetadata; } -class PreferencesRenderers extends Disposable { +class PreferencesRenderersController extends Disposable { private _defaultPreferencesRenderer: IPreferencesRenderer; private _defaultPreferencesRendererDisposables: IDisposable[] = []; - private _defaultPreferencesFilterResult: IFilterResult; - private _editablePreferencesFilterResult: IFilterResult; - private _editablePreferencesRenderer: IPreferencesRenderer; private _editablePreferencesRendererDisposables: IDisposable[] = []; private _settingsNavigator: SettingsNavigator; private _filtersInProgress: TPromise[]; - private _searchCriteria: ISearchCriteria; - private _currentSearchModel: IPreferencesSearchModel; - private _onTriggeredFuzzy: Emitter = this._register(new Emitter()); - public onTriggeredFuzzy: Event = this._onTriggeredFuzzy.event; + private _currentLocalSearchProvider: ISearchProvider; + private _currentRemoteSearchProvider: ISearchProvider; + private _lastQuery: string; private _onDidFilterResultsCountChange: Emitter = this._register(new Emitter()); public onDidFilterResultsCountChange: Event = this._onDidFilterResultsCountChange.event; constructor( - private preferencesSearchService: IPreferencesSearchService + private preferencesSearchService: IPreferencesSearchService, + private telemetryService: ITelemetryService ) { super(); } @@ -423,9 +422,6 @@ class PreferencesRenderers extends Disposable { this._defaultPreferencesRenderer.onUpdatePreference(({ key, value, source, index }) => this._updatePreference(key, value, source, index, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); this._defaultPreferencesRenderer.onFocusPreference(preference => this._focusPreference(preference, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); this._defaultPreferencesRenderer.onClearFocusPreference(preference => this._clearFocus(preference, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); - if (this._defaultPreferencesRenderer.onTriggeredFuzzy) { - this._register(this._defaultPreferencesRenderer.onTriggeredFuzzy(() => this._onTriggeredFuzzy.fire())); - } } } } @@ -435,44 +431,47 @@ class PreferencesRenderers extends Disposable { this._editablePreferencesRenderer = editableSettingsRenderer; this._editablePreferencesRendererDisposables = dispose(this._editablePreferencesRendererDisposables); if (this._editablePreferencesRenderer) { - (this._editablePreferencesRenderer.preferencesModel).onDidChangeGroups(() => { - if (this._currentSearchModel) { - this._filterEditablePreferences() - .then(() => { - const count = this.consolidateAndUpdate(); - this._onDidFilterResultsCountChange.fire(count); - }); - } - }, this, this._editablePreferencesRendererDisposables); + (this._editablePreferencesRenderer.preferencesModel) + .onDidChangeGroups(this._onEditableContentDidChange, this, this._editablePreferencesRendererDisposables); } } } - filterPreferences(criteria: ISearchCriteria): TPromise<{ count: number, metadata: IFilterMetadata }> { - this._searchCriteria = criteria; + async _onEditableContentDidChange(): TPromise { + await this.localFilterPreferences(this._lastQuery, true); + await this.remoteSearchPreferences(this._lastQuery, true); + } + remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise { + this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query); + return this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results")); + } + + localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise { + this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query); + return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results")); + } + + filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string): TPromise { + this._lastQuery = query; if (this._filtersInProgress) { // Resolved/rejected promises have no .cancel() this._filtersInProgress.forEach(p => p.cancel && p.cancel()); } - this._currentSearchModel = this.preferencesSearchService.startSearch(this._searchCriteria.filter, criteria.fuzzy); - this._filtersInProgress = [this._filterDefaultPreferences(), this._filterEditablePreferences()]; + this._filtersInProgress = [ + this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel), + this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel)]; - return TPromise.join(this._filtersInProgress).then(() => { - const count = this.consolidateAndUpdate(); - return { count, metadata: this._defaultPreferencesFilterResult && this._defaultPreferencesFilterResult.metadata }; + return TPromise.join(this._filtersInProgress).then(results => { + this._filtersInProgress = null; + const [defaultFilterResult, editableFilterResult] = results; + + const count = this.consolidateAndUpdate(defaultFilterResult, editableFilterResult); + return { count, metadata: defaultFilterResult && defaultFilterResult.metadata }; }); } - focusFirst(): void { - // Focus first match in both renderers - this._focusPreference(this._getFirstSettingFromTheGroups(this._defaultPreferencesFilterResult ? this._defaultPreferencesFilterResult.filteredGroups : []), this._defaultPreferencesRenderer); - this._focusPreference(this._getFirstSettingFromTheGroups(this._editablePreferencesFilterResult ? this._editablePreferencesFilterResult.filteredGroups : []), this._editablePreferencesRenderer); - - this._settingsNavigator.first(); // Move to first - } - focusNextPreference(forward: boolean = true) { if (!this._settingsNavigator) { return; @@ -483,56 +482,61 @@ class PreferencesRenderers extends Disposable { this._focusPreference(setting, this._editablePreferencesRenderer); } - private _filterDefaultPreferences(): TPromise { - if (this._searchCriteria && this._defaultPreferencesRenderer) { - return this._filterPreferences(this._searchCriteria, this._defaultPreferencesRenderer, this._currentSearchModel) - .then(filterResult => { this._defaultPreferencesFilterResult = filterResult; }); + private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string): TPromise { + if (preferencesRenderer) { + const model = preferencesRenderer.preferencesModel; + const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null); + return searchP + .then(null, err => { + if (isPromiseCanceledError(err)) { + return null; + } else { + /* __GDPR__ + "defaultSettings.searchError" : { + "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + const message = getErrorMessage(err); + this.telemetryService.publicLog('defaultSettings.searchError', { message }); + return null; + } + }) + .then(searchResult => { + const filterResult = searchResult ? + model.updateResultGroup(groupId, { + id: groupId, + label: groupLabel, + result: searchResult + }) : + model.updateResultGroup(groupId, null); + + if (filterResult) { + filterResult.query = filter; + } + + preferencesRenderer.filterPreferences(filterResult); + return filterResult; + }); } + return TPromise.wrap(null); } - private _filterEditablePreferences(): TPromise { - if (this._searchCriteria && this._editablePreferencesRenderer) { - return this._filterPreferences(this._searchCriteria, this._editablePreferencesRenderer, this._currentSearchModel) - .then(filterResult => { this._editablePreferencesFilterResult = filterResult; }); - } - return TPromise.wrap(null); - } + private consolidateAndUpdate(defaultFilterResult: IFilterResult, editableFilterResult: IFilterResult): number { + const defaultPreferencesFilteredGroups = defaultFilterResult ? defaultFilterResult.filteredGroups : this._getAllPreferences(this._defaultPreferencesRenderer); + const editablePreferencesFilteredGroups = editableFilterResult ? editableFilterResult.filteredGroups : this._getAllPreferences(this._editablePreferencesRenderer); + const consolidatedSettings = this._consolidateSettings(editablePreferencesFilteredGroups, defaultPreferencesFilteredGroups); - private _getFirstSettingFromTheGroups(allGroups: ISettingsGroup[]): ISetting { - if (allGroups.length) { - if (allGroups[0].sections.length) { - return allGroups[0].sections[0].settings[0]; - } - } - return null; + this._settingsNavigator = new SettingsNavigator(this._lastQuery ? consolidatedSettings : []); + const count = consolidatedSettings.length; + this._onDidFilterResultsCountChange.fire(count); + return count; } private _getAllPreferences(preferencesRenderer: IPreferencesRenderer): ISettingsGroup[] { return preferencesRenderer ? (preferencesRenderer.preferencesModel).settingsGroups : []; } - private _filterPreferences(searchCriteria: ISearchCriteria, preferencesRenderer: IPreferencesRenderer, searchModel: IPreferencesSearchModel): TPromise { - if (preferencesRenderer && searchCriteria) { - const prefSearchP = searchModel.filterPreferences(preferencesRenderer.preferencesModel); - - return prefSearchP.then(filterResult => { - preferencesRenderer.filterPreferences(filterResult, this.preferencesSearchService.remoteSearchAllowed); - return filterResult; - }); - } - return TPromise.as(null); - } - - private consolidateAndUpdate(): number { - const defaultPreferencesFilteredGroups = this._defaultPreferencesFilterResult ? this._defaultPreferencesFilterResult.filteredGroups : this._getAllPreferences(this._defaultPreferencesRenderer); - const editablePreferencesFilteredGroups = this._editablePreferencesFilterResult ? this._editablePreferencesFilterResult.filteredGroups : this._getAllPreferences(this._editablePreferencesRenderer); - const consolidatedSettings = this._consolidateSettings(editablePreferencesFilteredGroups, defaultPreferencesFilteredGroups); - - this._settingsNavigator = new SettingsNavigator(this._searchCriteria.filter ? consolidatedSettings : []); - return consolidatedSettings.length; - } - private _focusPreference(preference: ISetting, preferencesRenderer: IPreferencesRenderer): void { if (preference && preferencesRenderer) { preferencesRenderer.focusPreference(preference); @@ -553,7 +557,7 @@ class PreferencesRenderers extends Disposable { private _consolidateSettings(editableSettingsGroups: ISettingsGroup[], defaultSettingsGroups: ISettingsGroup[]): ISetting[] { const editableSettings = this._flatten(editableSettingsGroups); - const defaultSettings = this._flatten(defaultSettingsGroups).filter(secondarySetting => !editableSettings.some(primarySetting => primarySetting.key === secondarySetting.key)); + const defaultSettings = this._flatten(defaultSettingsGroups).filter(secondarySetting => editableSettings.every(primarySetting => primarySetting.key !== secondarySetting.key)); return [...defaultSettings, ...editableSettings]; } @@ -564,6 +568,7 @@ class PreferencesRenderers extends Disposable { settings.push(...section.settings); } } + return settings; } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 9cdec8686f6..1ae612e71fd 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -7,7 +7,6 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as nls from 'vs/nls'; import { Delayer } from 'vs/base/common/async'; import * as strings from 'vs/base/common/strings'; -import { tail } from 'vs/base/common/arrays'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IAction } from 'vs/base/common/actions'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; @@ -42,13 +41,12 @@ export interface IPreferencesRenderer extends IDisposable { onFocusPreference: Event; onClearFocusPreference: Event; onUpdatePreference?: Event<{ key: string, value: any, source: T, index: number }>; - onTriggeredFuzzy?: Event; render(): void; updatePreference(key: string, value: any, source: T, index: number): void; - filterPreferences(filterResult: IFilterResult, fuzzySearchAvailable: boolean): void; focusPreference(setting: T): void; clearFocus(setting: T): void; + filterPreferences(filterResult: IFilterResult): void; } export class UserSettingsRenderer extends Disposable implements IPreferencesRenderer { @@ -162,6 +160,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend } return null; } + return this.preferencesModel.getPreference(key); } @@ -247,6 +246,8 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR private hiddenAreasRenderer: HiddenAreasRenderer; private editSettingActionRenderer: EditSettingRenderer; private feedbackWidgetRenderer: FeedbackWidgetRenderer; + private bracesHidingRenderer: BracesHidingRenderer; + private filterResult: IFilterResult; private _onUpdatePreference: Emitter<{ key: string, value: any, source: ISetting, index: number }> = new Emitter<{ key: string, value: any, source: ISetting, index: number }>(); public readonly onUpdatePreference: Event<{ key: string, value: any, source: ISetting, index: number }> = this._onUpdatePreference.event; @@ -257,10 +258,6 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR private _onClearFocusPreference: Emitter = new Emitter(); public readonly onClearFocusPreference: Event = this._onClearFocusPreference.event; - public readonly onTriggeredFuzzy: Event; - - private filterResult: IFilterResult; - constructor(protected editor: ICodeEditor, public readonly preferencesModel: DefaultSettingsEditorModel, @IPreferencesService protected preferencesService: IPreferencesService, @IInstantiationService protected instantiationService: IInstantiationService @@ -272,14 +269,12 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR this.filteredMatchesRenderer = this._register(instantiationService.createInstance(FilteredMatchesRenderer, editor)); this.editSettingActionRenderer = this._register(instantiationService.createInstance(EditSettingRenderer, editor, preferencesModel, this.settingHighlighter)); this.feedbackWidgetRenderer = this._register(instantiationService.createInstance(FeedbackWidgetRenderer, editor)); - const parenthesisHidingRenderer = this._register(instantiationService.createInstance(StaticContentHidingRenderer, editor, preferencesModel)); - this.hiddenAreasRenderer = this._register(instantiationService.createInstance(HiddenAreasRenderer, editor, [this.settingsGroupTitleRenderer, this.filteredMatchesRenderer, parenthesisHidingRenderer])); + this.bracesHidingRenderer = this._register(instantiationService.createInstance(BracesHidingRenderer, editor, preferencesModel)); + this.hiddenAreasRenderer = this._register(instantiationService.createInstance(HiddenAreasRenderer, editor, [this.settingsGroupTitleRenderer, this.filteredMatchesRenderer, this.bracesHidingRenderer])); this._register(this.editSettingActionRenderer.onUpdateSetting(e => this._onUpdatePreference.fire(e))); this._register(this.settingsGroupTitleRenderer.onHiddenAreasChanged(() => this.hiddenAreasRenderer.render())); this._register(preferencesModel.onDidChangeGroups(() => this.render())); - - this.onTriggeredFuzzy = this.settingsHeaderRenderer.onClick; } public get associatedPreferencesModel(): IPreferencesEditorModel { @@ -296,18 +291,20 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel); this.feedbackWidgetRenderer.render(null); this.settingHighlighter.clear(true); + this.bracesHidingRenderer.render(null, this.preferencesModel.settingsGroups); this.settingsGroupTitleRenderer.showGroup(0); this.hiddenAreasRenderer.render(); } - public filterPreferences(filterResult: IFilterResult, fuzzySearchAvailable: boolean): void { + public filterPreferences(filterResult: IFilterResult): void { this.filterResult = filterResult; if (filterResult) { this.filteredMatchesRenderer.render(filterResult, this.preferencesModel.settingsGroups); this.settingsGroupTitleRenderer.render(filterResult.filteredGroups); this.feedbackWidgetRenderer.render(filterResult); - this.settingsHeaderRenderer.render(filterResult, fuzzySearchAvailable); + this.settingsHeaderRenderer.render(filterResult); this.settingHighlighter.clear(true); + this.bracesHidingRenderer.render(filterResult, this.preferencesModel.settingsGroups); this.editSettingActionRenderer.render(filterResult.filteredGroups, this._associatedPreferencesModel); } else { this.settingHighlighter.clear(true); @@ -316,6 +313,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR this.settingsHeaderRenderer.render(null); this.settingsGroupTitleRenderer.render(this.preferencesModel.settingsGroups); this.settingsGroupTitleRenderer.showGroup(0); + this.bracesHidingRenderer.render(null, this.preferencesModel.settingsGroups); this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel); } @@ -372,45 +370,64 @@ export interface HiddenAreasProvider { hiddenAreas: IRange[]; } -export class StaticContentHidingRenderer extends Disposable implements HiddenAreasProvider { +export class BracesHidingRenderer extends Disposable implements HiddenAreasProvider { + private _result: IFilterResult; + private _settingsGroups: ISettingsGroup[]; - constructor(private editor: ICodeEditor, private settingsEditorModel: ISettingsEditorModel - ) { + constructor(private editor: ICodeEditor) { super(); } - get hiddenAreas(): IRange[] { - const model = this.editor.getModel(); + render(result: IFilterResult, settingsGroups: ISettingsGroup[]): void { + this._result = result; + this._settingsGroups = settingsGroups; + } - // Hide extra chars for "search results" and "commonly used" groups - const settingsGroups = this.settingsEditorModel.settingsGroups; - const lastGroup = tail(settingsGroups); - return [ + get hiddenAreas(): IRange[] { + // Opening square brace + const hiddenAreas = [ { startLineNumber: 1, - startColumn: model.getLineMinColumn(1), + startColumn: 1, endLineNumber: 2, - endColumn: model.getLineMaxColumn(2) - }, - { - startLineNumber: settingsGroups[0].range.endLineNumber + 1, - startColumn: model.getLineMinColumn(settingsGroups[0].range.endLineNumber + 1), - endLineNumber: settingsGroups[0].range.endLineNumber + 4, - endColumn: model.getLineMaxColumn(settingsGroups[0].range.endLineNumber + 4) - }, - { - startLineNumber: lastGroup.range.endLineNumber + 1, - startColumn: model.getLineMinColumn(lastGroup.range.endLineNumber + 1), - endLineNumber: Math.min(model.getLineCount(), lastGroup.range.endLineNumber + 4), - endColumn: model.getLineMaxColumn(Math.min(model.getLineCount(), lastGroup.range.endLineNumber + 4)) - }, - { - startLineNumber: model.getLineCount() - 1, - startColumn: model.getLineMinColumn(model.getLineCount() - 1), - endLineNumber: model.getLineCount(), - endColumn: model.getLineMaxColumn(model.getLineCount()) + endColumn: 1 } ]; + + const hideBraces = group => { + // Opening curly brace + hiddenAreas.push({ + startLineNumber: group.range.startLineNumber - 3, + startColumn: 1, + endLineNumber: group.range.startLineNumber - 3, + endColumn: 1 + }); + + // Closing curly brace + hiddenAreas.push({ + startLineNumber: group.range.endLineNumber + 1, + startColumn: 1, + endLineNumber: group.range.endLineNumber + 4, + endColumn: 1 + }); + }; + + this._settingsGroups.forEach(hideBraces); + if (this._result) { + this._result.filteredGroups.forEach(hideBraces); + } + + // Closing square brace + const lineCount = this.editor.getModel().getLineCount(); + hiddenAreas.push({ + startLineNumber: lineCount, + startColumn: 1, + endLineNumber: lineCount, + endColumn: 1 + }); + + + return hiddenAreas; } } @@ -426,10 +443,9 @@ class DefaultSettingsHeaderRenderer extends Disposable { this.onClick = this.settingsHeaderWidget.onClick; } - public render(filterResult: IFilterResult, fuzzySearchAvailable = false) { + public render(filterResult: IFilterResult) { const hasSettings = !filterResult || filterResult.filteredGroups.length > 0; - const promptFuzzy = fuzzySearchAvailable && filterResult && !filterResult.metadata; - this.settingsHeaderWidget.toggleMessage(hasSettings, promptFuzzy); + this.settingsHeaderWidget.toggleMessage(hasSettings); } } @@ -728,7 +744,7 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, result.matches.map(match => this.createDecoration(match, model))); }); } else { - this.hiddenAreas = this.computeHiddenRanges(allSettingsGroups, allSettingsGroups, model); + this.hiddenAreas = this.computeHiddenRanges(null, allSettingsGroups, model); } } @@ -739,67 +755,26 @@ export class FilteredMatchesRenderer extends Disposable implements HiddenAreasPr stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'findMatch' } - }; } private computeHiddenRanges(filteredGroups: ISettingsGroup[], allSettingsGroups: ISettingsGroup[], model: ITextModel): IRange[] { + // Hide the contents of hidden groups const notMatchesRanges: IRange[] = []; - for (const group of allSettingsGroups) { - const filteredGroup = filteredGroups.filter(g => g.title === group.title)[0]; - if (!filteredGroup || filteredGroup.sections.every(sect => sect.settings.length === 0)) { + if (filteredGroups) { + allSettingsGroups.forEach((group, i) => { notMatchesRanges.push({ startLineNumber: group.range.startLineNumber - 1, - startColumn: model.getLineMinColumn(group.range.startLineNumber - 1), + startColumn: group.range.startColumn, endLineNumber: group.range.endLineNumber, - endColumn: model.getLineMaxColumn(group.range.endLineNumber), + endColumn: group.range.endColumn }); - } else { - for (const section of group.sections) { - if (section.titleRange) { - if (!this.containsLine(section.titleRange.startLineNumber, filteredGroup)) { - notMatchesRanges.push(this.createCompleteRange(section.titleRange, model)); - } - } - for (const setting of section.settings) { - if (!this.containsLine(setting.range.startLineNumber, filteredGroup)) { - notMatchesRanges.push(this.createCompleteRange(setting.range, model)); - } - } - } - } + }); } + return notMatchesRanges; } - private containsLine(lineNumber: number, settingsGroup: ISettingsGroup): boolean { - if (settingsGroup.titleRange && lineNumber >= settingsGroup.titleRange.startLineNumber && lineNumber <= settingsGroup.titleRange.endLineNumber) { - return true; - } - - for (const section of settingsGroup.sections) { - if (section.titleRange && lineNumber >= section.titleRange.startLineNumber && lineNumber <= section.titleRange.endLineNumber) { - return true; - } - - for (const setting of section.settings) { - if (lineNumber >= setting.range.startLineNumber && lineNumber <= setting.range.endLineNumber) { - return true; - } - } - } - return false; - } - - private createCompleteRange(range: IRange, model: ITextModel): IRange { - return { - startLineNumber: range.startLineNumber, - startColumn: model.getLineMinColumn(range.startLineNumber), - endLineNumber: range.endLineNumber, - endColumn: model.getLineMaxColumn(range.endLineNumber) - }; - } - public dispose() { if (this.decorationIds) { this.decorationIds = this.editor.changeDecorations(changeAccessor => { @@ -859,7 +834,7 @@ interface IIndexedSetting extends ISetting { class EditSettingRenderer extends Disposable { - private editPreferenceWidgetForCusorPosition: EditPreferenceWidget; + private editPreferenceWidgetForCursorPosition: EditPreferenceWidget; private editPreferenceWidgetForMouseMove: EditPreferenceWidget; private settingsGroups: ISettingsGroup[]; @@ -876,11 +851,11 @@ class EditSettingRenderer extends Disposable { ) { super(); - this.editPreferenceWidgetForCusorPosition = this._register(this.instantiationService.createInstance(EditPreferenceWidget, editor)); - this.editPreferenceWidgetForMouseMove = this._register(this.instantiationService.createInstance(EditPreferenceWidget, editor)); + this.editPreferenceWidgetForCursorPosition = >this._register(this.instantiationService.createInstance(EditPreferenceWidget, editor)); + this.editPreferenceWidgetForMouseMove = >this._register(this.instantiationService.createInstance(EditPreferenceWidget, editor)); this.toggleEditPreferencesForMouseMoveDelayer = new Delayer(75); - this._register(this.editPreferenceWidgetForCusorPosition.onClick(e => this.onEditSettingClicked(this.editPreferenceWidgetForCusorPosition, e))); + this._register(this.editPreferenceWidgetForCursorPosition.onClick(e => this.onEditSettingClicked(this.editPreferenceWidgetForCursorPosition, e))); this._register(this.editPreferenceWidgetForMouseMove.onClick(e => this.onEditSettingClicked(this.editPreferenceWidgetForMouseMove, e))); this._register(this.editor.onDidChangeCursorPosition(positionChangeEvent => this.onPositionChanged(positionChangeEvent))); @@ -889,14 +864,14 @@ class EditSettingRenderer extends Disposable { } public render(settingsGroups: ISettingsGroup[], associatedPreferencesModel: IPreferencesEditorModel): void { - this.editPreferenceWidgetForCusorPosition.hide(); + this.editPreferenceWidgetForCursorPosition.hide(); this.editPreferenceWidgetForMouseMove.hide(); this.settingsGroups = settingsGroups; this.associatedPreferencesModel = associatedPreferencesModel; const settings = this.getSettings(this.editor.getPosition().lineNumber); if (settings.length) { - this.showEditPreferencesWidget(this.editPreferenceWidgetForCusorPosition, settings); + this.showEditPreferencesWidget(this.editPreferenceWidgetForCursorPosition, settings); } } @@ -906,7 +881,7 @@ class EditSettingRenderer extends Disposable { private onConfigurationChanged(): void { if (!this.editor.getConfiguration().viewInfo.glyphMargin) { - this.editPreferenceWidgetForCusorPosition.hide(); + this.editPreferenceWidgetForCursorPosition.hide(); this.editPreferenceWidgetForMouseMove.hide(); } } @@ -915,9 +890,9 @@ class EditSettingRenderer extends Disposable { this.editPreferenceWidgetForMouseMove.hide(); const settings = this.getSettings(positionChangeEvent.position.lineNumber); if (settings.length) { - this.showEditPreferencesWidget(this.editPreferenceWidgetForCusorPosition, settings); + this.showEditPreferencesWidget(this.editPreferenceWidgetForCursorPosition, settings); } else { - this.editPreferenceWidgetForCusorPosition.hide(); + this.editPreferenceWidgetForCursorPosition.hide(); } } @@ -937,8 +912,8 @@ class EditSettingRenderer extends Disposable { if (this.editPreferenceWidgetForMouseMove.getLine() === line && this.editPreferenceWidgetForMouseMove.isVisible()) { return this.editPreferenceWidgetForMouseMove; } - if (this.editPreferenceWidgetForCusorPosition.getLine() === line && this.editPreferenceWidgetForCusorPosition.isVisible()) { - return this.editPreferenceWidgetForCusorPosition; + if (this.editPreferenceWidgetForCursorPosition.getLine() === line && this.editPreferenceWidgetForCursorPosition.isVisible()) { + return this.editPreferenceWidgetForCursorPosition; } } return null; @@ -957,7 +932,7 @@ class EditSettingRenderer extends Disposable { const line = settings[0].valueRange.startLineNumber; if (this.editor.getConfiguration().viewInfo.glyphMargin && this.marginFreeFromOtherDecorations(line)) { editPreferencesWidget.show(line, nls.localize('editTtile', "Edit"), settings); - const editPreferenceWidgetToHide = editPreferencesWidget === this.editPreferenceWidgetForCusorPosition ? this.editPreferenceWidgetForMouseMove : this.editPreferenceWidgetForCusorPosition; + const editPreferenceWidgetToHide = editPreferencesWidget === this.editPreferenceWidgetForCursorPosition ? this.editPreferenceWidgetForMouseMove : this.editPreferenceWidgetForCursorPosition; editPreferenceWidgetToHide.hide(); } } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts index 7b740eae6ae..78cba03e94d 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts @@ -10,7 +10,6 @@ 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'; import { Widget } from 'vs/base/browser/ui/widget'; -import { Checkbox } from 'vs/base/browser/ui/checkbox/checkbox'; import Event, { Emitter } from 'vs/base/common/event'; import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; @@ -22,7 +21,7 @@ import { ISettingsGroup } from 'vs/workbench/parts/preferences/common/preference 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'; -import { attachInputBoxStyler, attachStylerCallback, attachCheckboxStyler } from 'vs/platform/theme/common/styler'; +import { attachInputBoxStyler, attachStylerCallback } from 'vs/platform/theme/common/styler'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import { Position } from 'vs/editor/common/core/position'; import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents'; @@ -32,7 +31,6 @@ import { Separator, ActionBar, ActionsOrientation, BaseActionItem } from 'vs/bas import { MarkdownString } from 'vs/base/common/htmlContent'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { IMarginData } from 'vs/editor/browser/controller/mouseTarget'; -import { render as renderOcticons } from 'vs/base/browser/ui/octiconLabel/octiconLabel'; import { PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; import { IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model'; @@ -103,32 +101,20 @@ export class SettingsHeaderWidget extends Widget implements IViewZone { export class DefaultSettingsHeaderWidget extends SettingsHeaderWidget { - private linkElement: HTMLElement; private _onClick = this._register(new Emitter()); public onClick: Event = this._onClick.event; protected create() { super.create(); - this.linkElement = DOM.append(this.titleContainer, DOM.$('a.settings-header-natural-language-link')); - this.linkElement.textContent = localize('defaultSettingsFuzzyPrompt', "Try natural language search!"); - - this.onclick(this.linkElement, e => this._onClick.fire()); this.toggleMessage(true); } - public toggleMessage(hasSettings: boolean, promptFuzzy = false): void { + public toggleMessage(hasSettings: boolean): void { if (hasSettings) { this.setMessage(localize('defaultSettings', "Place your settings in the right hand side editor to override.")); - DOM.addClass(this.linkElement, 'hidden'); } else { this.setMessage(localize('noSettingsFound', "No Settings Found.")); - - if (promptFuzzy) { - DOM.removeClass(this.linkElement, 'hidden'); - } else { - DOM.addClass(this.linkElement, 'hidden'); - } } } } @@ -533,7 +519,6 @@ export class SettingsTargetsWidget extends Widget { export interface SearchOptions extends IInputOptions { focusKey?: IContextKey; - showFuzzyToggle?: boolean; showResultCount?: boolean; } @@ -544,7 +529,6 @@ export class SearchWidget extends Widget { private countElement: HTMLElement; private searchContainer: HTMLElement; private inputBox: InputBox; - private fuzzyToggle: Checkbox; private controlsDiv: HTMLElement; private _onDidChange: Emitter = this._register(new Emitter()); @@ -562,32 +546,10 @@ export class SearchWidget extends Widget { this.create(parent); } - public get fuzzyEnabled(): boolean { - return this.fuzzyToggle.checked && this.fuzzyToggle.enabled; - } - - public set fuzzyEnabled(value: boolean) { - this.fuzzyToggle.checked = value; - } - private create(parent: HTMLElement) { this.domNode = DOM.append(parent, DOM.$('div.settings-header-widget')); this.createSearchContainer(DOM.append(this.domNode, DOM.$('div.settings-search-container'))); this.controlsDiv = DOM.append(this.domNode, DOM.$('div.settings-search-controls')); - if (this.options.showFuzzyToggle) { - this.fuzzyToggle = this._register(new Checkbox({ - actionClassName: 'prefs-natural-language-search-toggle', - isChecked: false, - onChange: () => { - this.inputBox.focus(); - this._onDidChange.fire(); - }, - title: localize('enableFuzzySearch', 'Enable natural language search') - })); - this.fuzzyToggle.domNode.innerHTML = renderOcticons('$(light-bulb)'); - DOM.append(this.controlsDiv, this.fuzzyToggle.domNode); - this._register(attachCheckboxStyler(this.fuzzyToggle, this.themeService)); - } if (this.options.showResultCount) { this.countElement = DOM.append(this.controlsDiv, DOM.$('.settings-count-widget')); @@ -639,16 +601,6 @@ export class SearchWidget extends Widget { } } - public setFuzzyToggleVisible(visible: boolean): void { - if (visible) { - this.fuzzyToggle.domNode.classList.remove('hidden'); - this.fuzzyToggle.enable(); - } else { - this.fuzzyToggle.domNode.classList.add('hidden'); - this.fuzzyToggle.disable(); - } - } - private styleCountElementForeground() { const colorId = DOM.hasClass(this.countElement, 'no-results') ? errorForeground : badgeForeground; const color = this.themeService.getTheme().getColor(colorId); @@ -673,8 +625,7 @@ export class SearchWidget extends Widget { private getControlsWidth(): number { const countWidth = this.countElement ? DOM.getTotalWidth(this.countElement) : 0; - const fuzzyToggleWidth = this.fuzzyToggle ? DOM.getTotalWidth(this.fuzzyToggle.domNode) : 0; - return countWidth + fuzzyToggleWidth + 20; + return countWidth + 20; } public focus() { diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 77002043556..1c3024c9db1 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -56,15 +56,31 @@ export interface ISetting { overrideOf?: ISetting; } +export interface ISearchResult { + filterMatches: ISettingMatch[]; + metadata?: IFilterMetadata; +} + +export interface ISearchResultGroup { + id: string; + label: string; + result: ISearchResult; +} + export interface IFilterResult { - query: string; + query?: string; filteredGroups: ISettingsGroup[]; allGroups: ISettingsGroup[]; matches: IRange[]; - fuzzySearchAvailable?: boolean; metadata?: IFilterMetadata; } +export interface ISettingMatch { + setting: ISetting; + matches: IRange[]; + score: number; +} + export interface IScoredResults { [key: string]: number; } @@ -86,14 +102,14 @@ export interface IPreferencesEditorModel { } export type IGroupFilter = (group: ISettingsGroup) => boolean; -export type ISettingMatcher = (setting: ISetting) => IRange[]; +export type ISettingMatcher = (setting: ISetting) => { matches: IRange[], score: number }; export interface ISettingsEditorModel extends IPreferencesEditorModel { readonly onDidChangeGroups: Event; settingsGroups: ISettingsGroup[]; - groupsTerms: string[]; - filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher, mostRelevantSettings?: string[]): IFilterResult; + filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[]; findValueMatches(filter: string, setting: ISetting): IRange[]; + updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult; } export interface IKeybindingsEditorModel extends IPreferencesEditorModel { @@ -159,15 +175,14 @@ export const IPreferencesSearchService = createDecorator; - startSearch(filter: string, remote: boolean): IPreferencesSearchModel; + getLocalSearchProvider(filter: string): ISearchProvider; + getRemoteSearchProvider(filter: string): ISearchProvider; } -export interface IPreferencesSearchModel { - filterPreferences(preferencesModel: ISettingsEditorModel): TPromise; +export interface ISearchProvider { + searchModel(preferencesModel: ISettingsEditorModel): TPromise; } export const CONTEXT_SETTINGS_EDITOR = new RawContextKey('inSettingsEditor', false); diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index 0ddf3a581cb..70ef306b89c 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -5,93 +5,72 @@ import * as nls from 'vs/nls'; import { assign } from 'vs/base/common/objects'; -import { tail } from 'vs/base/common/arrays'; +import * as map from 'vs/base/common/map'; +import { tail, flatten, first } from 'vs/base/common/arrays'; import URI from 'vs/base/common/uri'; import { IReference, Disposable } from 'vs/base/common/lifecycle'; import Event, { Emitter } from 'vs/base/common/event'; import { Registry } from 'vs/platform/registry/common/platform'; import { visit, JSONVisitor } from 'vs/base/common/json'; -import { ITextModel } from 'vs/editor/common/model'; +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, ISettingsSection, IGroupFilter, ISettingMatcher } from 'vs/workbench/parts/preferences/common/preferences'; +import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup } from 'vs/workbench/parts/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'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; +import { Selection } from 'vs/editor/common/core/selection'; export abstract class AbstractSettingsModel extends EditorModel { - public get groupsTerms(): string[] { - return this.settingsGroups.map(group => '@' + group.id); + protected _currentResultGroups = new Map(); + + public updateResultGroup(id: string, resultGroup: ISearchResultGroup): IFilterResult { + if (resultGroup) { + this._currentResultGroups.set(id, resultGroup); + } else { + this._currentResultGroups.delete(id); + } + + this.removeDuplicateResults(); + return this.update(); } - protected doFilterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): IFilterResult { - const allGroups = this.settingsGroups; + /** + * Remove duplicates between result groups, preferring results in earlier groups + */ + private removeDuplicateResults(): void { + // Depends on order of map keys + const settingKeys = new Set(); + this._currentResultGroups.forEach((group, id) => { + group.result.filterMatches = group.result.filterMatches.filter(s => !settingKeys.has(s.setting.key)); + group.result.filterMatches.forEach(s => settingKeys.add(s.setting.key)); + }); + } - if (!filter) { - return { - filteredGroups: allGroups, - allGroups, - matches: [], - query: filter - }; - } + public filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[] { + const allGroups = this.filterGroups; - const group = this.filterByGroupTerm(filter); - if (group) { - return { - filteredGroups: [group], - allGroups, - matches: [], - query: filter - }; - } - - const matches: IRange[] = []; - const filteredGroups: ISettingsGroup[] = []; + const filterMatches: ISettingMatch[] = []; for (const group of allGroups) { const groupMatched = groupFilter(group); - const sections: ISettingsSection[] = []; for (const section of group.sections) { - const settings: ISetting[] = []; for (const setting of section.settings) { - const settingMatches = settingMatcher(setting); - if (groupMatched || settingMatches && settingMatches.length) { - settings.push(setting); - } + const settingMatchResult = settingMatcher(setting); - if (settingMatches) { - matches.push(...settingMatches); + if (groupMatched || settingMatchResult) { + filterMatches.push({ + setting, + matches: settingMatchResult && settingMatchResult.matches, + score: settingMatchResult ? settingMatchResult.score : 0 + }); } } - if (settings.length) { - sections.push({ - title: section.title, - settings, - titleRange: section.titleRange - }); - } - } - if (sections.length) { - filteredGroups.push({ - id: group.id, - title: group.title, - titleRange: group.titleRange, - sections, - range: group.range - }); } } - return { filteredGroups, matches, allGroups, query: filter }; - } - private filterByGroupTerm(filter: string): ISettingsGroup { - if (this.groupsTerms.indexOf(filter) !== -1) { - const id = filter.substring(1); - return this.settingsGroups.filter(group => group.id === id)[0]; - } - return null; + return filterMatches.sort((a, b) => b.score - a.score); } public getPreference(key: string): ISetting { @@ -107,9 +86,15 @@ export abstract class AbstractSettingsModel extends EditorModel { return null; } + protected get filterGroups(): ISettingsGroup[] { + return this.settingsGroups; + } + public abstract settingsGroups: ISettingsGroup[]; public abstract findValueMatches(filter: string, setting: ISetting): IRange[]; + + protected abstract update(): IFilterResult; } export class SettingsEditorModel extends AbstractSettingsModel implements ISettingsEditorModel { @@ -149,10 +134,6 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti return this.settingsModel.getValue(); } - public filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): IFilterResult { - return this.doFilterSettings(filter, groupFilter, settingMatcher); - } - public findValueMatches(filter: string, setting: ISetting): IRange[] { return this.settingsModel.findMatches(filter, setting.valueRange, false, false, null, false).map(match => match.range); } @@ -164,6 +145,43 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti protected parse(): void { this._settingsGroups = parse(this.settingsModel, (property: string, previousParents: string[]): boolean => this.isSettingsProperty(property, previousParents)); } + + protected update(): IFilterResult { + const resultGroups = map.values(this._currentResultGroups); + if (!resultGroups.length) { + return null; + } + + // Transform resultGroups into IFilterResult - ISetting ranges are already correct here + const filteredSettings: ISetting[] = []; + const matches: IRange[] = []; + resultGroups.forEach(group => { + group.result.filterMatches.forEach(filterMatch => { + filteredSettings.push(filterMatch.setting); + matches.push(...filterMatch.matches); + }); + }); + + let filteredGroup: ISettingsGroup; + const modelGroup = this.settingsGroups[0]; // Editable model has one or zero groups + if (modelGroup) { + filteredGroup = { + id: modelGroup.id, + range: modelGroup.range, + sections: [{ + settings: filteredSettings + }], + title: modelGroup.title, + titleRange: modelGroup.titleRange + }; + } + + return { + allGroups: this.settingsGroups, + filteredGroups: filteredGroup ? [filteredGroup] : [], + matches + }; + } } function parse(model: ITextModel, isSettingsProperty: (currentProperty: string, previousParents: string[]) => boolean): ISettingsGroup[] { @@ -382,6 +400,7 @@ export class DefaultSettings extends Disposable { if (!this._allSettingsGroups) { this.parse(); } + return this._allSettingsGroups; } @@ -390,7 +409,7 @@ export class DefaultSettings extends Disposable { this.initAllSettingsMap(settingsGroups); const mostCommonlyUsed = this.getMostCommonlyUsedSettings(settingsGroups); this._allSettingsGroups = [mostCommonlyUsed, ...settingsGroups]; - this._content = this.toContent(true, [mostCommonlyUsed], settingsGroups); + this._content = this.toContent(true, this._allSettingsGroups); return this._content; } @@ -538,17 +557,14 @@ export class DefaultSettings extends Disposable { return c1.order - c2.order; } - private toContent(asArray: boolean, ...settingsGroups: ISettingsGroup[][]): string { + private toContent(asArray: boolean, settingsGroups: ISettingsGroup[]): string { const builder = new SettingsContentBuilder(); if (asArray) { builder.pushLine('['); } settingsGroups.forEach((settingsGroup, i) => { - builder.pushGroups(settingsGroup); - - if (i !== settingsGroups.length - 1) { - builder.pushLine(','); - } + builder.pushGroup(settingsGroup); + builder.pushLine(','); }); if (asArray) { builder.pushLine(']'); @@ -586,49 +602,101 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements return this.defaultSettings.settingsGroups; } - public filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher, mostRelevantSettings?: string[]): IFilterResult { - if (mostRelevantSettings) { - const mostRelevantGroup = this.renderMostRelevantSettings(mostRelevantSettings); - - // calculate match ranges - const matches = mostRelevantGroup.sections[0].settings.reduce((prev, s) => { - return prev.concat(settingMatcher(s)); - }, []); - - return { - allGroups: [...this.settingsGroups, mostRelevantGroup], - filteredGroups: mostRelevantGroup.sections[0].settings.length ? [mostRelevantGroup] : [], - matches, - query: filter - }; - } else { - // Do local search and add empty 'most relevant' group - const mostRelevantGroup = this.renderMostRelevantSettings([]); - const result = this.doFilterSettings(filter, groupFilter, settingMatcher); - result.allGroups = [...result.allGroups, mostRelevantGroup]; - return result; - } + protected get filterGroups(): ISettingsGroup[] { + // Don't look at "commonly used" for filter + return this.settingsGroups.slice(1); } - private renderMostRelevantSettings(mostRelevantSettings: string[]): ISettingsGroup { - const mostRelevantLineOffset = tail(this.settingsGroups).range.endLineNumber + 2; - const builder = new SettingsContentBuilder(mostRelevantLineOffset - 1); + protected update(): IFilterResult { + // Grab current result groups, only render non-empty groups + const resultGroups = map.values(this._currentResultGroups); + const nonEmptyResultGroups = resultGroups.filter(group => group.result.filterMatches.length); + + const startLine = tail(this.settingsGroups).range.endLineNumber + 2; + const { settingsGroups: filteredGroups, matches } = this.writeResultGroups(nonEmptyResultGroups, startLine); + + const groupWithMetadata = first(resultGroups, group => !!group.result.metadata); + return resultGroups.length ? + { + allGroups: this.settingsGroups, + filteredGroups, + matches, + metadata: groupWithMetadata && groupWithMetadata.result.metadata + } : + null; + } + + /** + * Translate the ISearchResultGroups to text, and write it to the editor model + */ + private writeResultGroups(groups: ISearchResultGroup[], startLine: number): { matches: IRange[], settingsGroups: ISettingsGroup[] } { + const contentBuilderOffset = startLine - 1; + const builder = new SettingsContentBuilder(contentBuilderOffset); + + const settingsGroups: ISettingsGroup[] = []; + const matches: IRange[] = []; builder.pushLine(','); - const mostRelevantGroup = this.getMostRelevantSettings(mostRelevantSettings); - builder.pushGroups([mostRelevantGroup]); - builder.pushLine(''); + groups.forEach(resultGroup => { + const settingsGroup = this.getGroup(resultGroup); + settingsGroups.push(settingsGroup); + matches.push(...this.writeSettingsGroupToBuilder(builder, settingsGroup, resultGroup.result.filterMatches)); + }); // note: 1-indexed line numbers here - const mostRelevantContent = builder.getContent(); - const mostRelevantEndLine = this._model.getLineCount(); - this._model.applyEdits([ - { - text: mostRelevantContent, - range: new Range(mostRelevantLineOffset, 1, mostRelevantEndLine, 1) - } - ]); + const groupContent = builder.getContent() + '\n'; + const groupEndLine = this._model.getLineCount(); + const cursorPosition = new Selection(startLine, 1, startLine, 1); + const edit: IIdentifiedSingleEditOperation = { + text: groupContent, + forceMoveMarkers: true, + range: new Range(startLine, 1, groupEndLine, 1), + identifier: { major: 1, minor: 0 } + }; - return mostRelevantGroup; + this._model.pushEditOperations([cursorPosition], [edit], () => [cursorPosition]); + + // Force tokenization now - otherwise it may be slightly delayed, causing a flash of white text + const tokenizeTo = Math.min(startLine + 60, this._model.getLineCount()); + this._model.forceTokenization(tokenizeTo); + + return { matches, settingsGroups }; + } + + private writeSettingsGroupToBuilder(builder: SettingsContentBuilder, settingsGroup: ISettingsGroup, filterMatches: ISettingMatch[]): IRange[] { + // Fix match ranges to offset from setting start line + filterMatches = filterMatches.map(filteredMatch => { + return { + setting: filteredMatch.setting, + score: filteredMatch.score, + matches: filteredMatch.matches && filteredMatch.matches.map(match => { + return new Range( + match.startLineNumber - filteredMatch.setting.range.startLineNumber, + match.startColumn, + match.endLineNumber - filteredMatch.setting.range.startLineNumber, + match.endColumn); + }) + }; + }); + + builder.pushGroup(settingsGroup); + builder.pushLine(','); + + // builder has rewritten settings ranges, fix match ranges + const fixedMatches = flatten( + filterMatches + .map(m => m.matches || []) + .map((settingMatches, i) => { + const setting = settingsGroup.sections[0].settings[i]; + return settingMatches.map(range => { + return new Range( + range.startLineNumber + setting.range.startLineNumber, + range.startColumn, + range.endLineNumber + setting.range.startLineNumber, + range.endColumn); + }); + })); + + return fixedMatches; } public findValueMatches(filter: string, setting: ISetting): IRange[] { @@ -648,30 +716,28 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements return null; } - private getMostRelevantSettings(rankedSettingNames: string[]): ISettingsGroup { - const settings = rankedSettingNames.map(key => { - const setting = this.defaultSettings.getSettingByName(key); - if (setting) { - return { - description: setting.description, - key: setting.key, - value: setting.value, - range: null, - valueRange: null, - overrides: [] - }; - } - return null; - }).filter(setting => !!setting); + private copySettings(settings: ISetting[]): ISetting[] { + return settings.map(setting => { + return { + description: setting.description, + key: setting.key, + value: setting.value, + range: null, + valueRange: null, + overrides: [] + }; + }); + } + private getGroup(resultGroup: ISearchResultGroup): ISettingsGroup { return { - id: 'mostRelevant', + id: resultGroup.id, range: null, - title: nls.localize('mostRelevant', "Most Relevant"), + title: resultGroup.label, titleRange: null, sections: [ { - settings + settings: this.copySettings(resultGroup.result.filterMatches.map(m => m.setting)) } ] }; @@ -681,10 +747,6 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements class SettingsContentBuilder { private _contentByLines: string[]; - get lines(): string[] { - return this._contentByLines; - } - private get lineCountWithOffset(): number { return this._contentByLines.length + this._rangeOffset; } @@ -705,24 +767,23 @@ class SettingsContentBuilder { this._contentByLines.push(...lineText); } - pushGroups(settingsGroups: ISettingsGroup[]): void { - let lastSetting: ISetting = null; + pushGroup(settingsGroups: ISettingsGroup): void { this._contentByLines.push('{'); this._contentByLines.push(''); - for (const group of settingsGroups) { - this._contentByLines.push(''); - lastSetting = this.pushGroup(group); - } + this._contentByLines.push(''); + const lastSetting = this._pushGroup(settingsGroups); + if (lastSetting) { // Strip the comma from the last setting const lineIdx = this.offsetIndexToIndex(lastSetting.range.endLineNumber); const content = this._contentByLines[lineIdx - 2]; this._contentByLines[lineIdx - 2] = content.substring(0, content.length - 1); } + this._contentByLines.push('}'); } - private pushGroup(group: ISettingsGroup): ISetting { + private _pushGroup(group: ISettingsGroup): ISetting { const indent = ' '; let lastSetting: ISetting = null; let groupStart = this.lineCountWithOffset + 1; diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index f99d62999fd..fb8dac50a05 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -4,11 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { TPromise } from 'vs/base/common/winjs.base'; -import * as errors from 'vs/base/common/errors'; -import Event, { Emitter } from 'vs/base/common/event'; -import { ISettingsEditorModel, IFilterResult, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, IPreferencesSearchModel } from 'vs/workbench/parts/preferences/common/preferences'; +import { ISettingsEditorModel, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, ISearchResult, ISearchProvider, IGroupFilter, ISettingMatcher, IScoredResults } from 'vs/workbench/parts/preferences/common/preferences'; import { IRange } from 'vs/editor/common/core/range'; -import { distinct } from 'vs/base/common/arrays'; +import { distinct, top } from 'vs/base/common/arrays'; import * as strings from 'vs/base/common/strings'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -20,7 +18,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IRequestService } from 'vs/platform/request/node/request'; import { asJson } from 'vs/base/node/request'; import { Disposable } from 'vs/base/common/lifecycle'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; export interface IEndpointDetails { urlBase: string; @@ -30,19 +27,15 @@ export interface IEndpointDetails { export class PreferencesSearchService extends Disposable implements IPreferencesSearchService { _serviceBrand: any; - private _onRemoteSearchEnablementChanged = new Emitter(); - public onRemoteSearchEnablementChanged: Event = this._onRemoteSearchEnablementChanged.event; - constructor( @IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService, @IEnvironmentService private environmentService: IEnvironmentService, @IInstantiationService private instantiationService: IInstantiationService ) { super(); - this._register(configurationService.onDidChangeConfiguration(() => this._onRemoteSearchEnablementChanged.fire(this.remoteSearchAllowed))); } - get remoteSearchAllowed(): boolean { + private get remoteSearchAllowed(): boolean { if (this.environmentService.appQuality === 'stable') { return false; } @@ -69,76 +62,60 @@ export class PreferencesSearchService extends Disposable implements IPreferences } } - startSearch(filter: string, remote: boolean): PreferencesSearchModel { - return this.instantiationService.createInstance(PreferencesSearchModel, this, filter, remote); + getRemoteSearchProvider(filter: string): RemoteSearchProvider { + return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this.endpoint); + } + + getLocalSearchProvider(filter: string): LocalSearchProvider { + return this.instantiationService.createInstance(LocalSearchProvider, filter); } } -export class PreferencesSearchModel implements IPreferencesSearchModel { - private _localProvider: LocalSearchProvider; - private _remoteProvider: RemoteSearchProvider; - - constructor( - private provider: IPreferencesSearchService, private filter: string, remote: boolean, - @IInstantiationService instantiationService: IInstantiationService, - @ITelemetryService private telemetryService: ITelemetryService - ) { - this._localProvider = new LocalSearchProvider(filter); - - if (remote && filter) { - this._remoteProvider = instantiationService.createInstance(RemoteSearchProvider, filter, this.provider.endpoint); - } - } - - filterPreferences(preferencesModel: ISettingsEditorModel): TPromise { - if (!this.filter) { - return TPromise.wrap(null); - } - - if (this._remoteProvider) { - return this._remoteProvider.filterPreferences(preferencesModel).then(null, err => { - const message = errors.getErrorMessage(err); - - if (message.toLowerCase() !== 'canceled') { - /* __GDPR__ - "defaultSettings.searchError" : { - "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - } - */ - this.telemetryService.publicLog('defaultSettings.searchError', { message }); - } - - return this._localProvider.filterPreferences(preferencesModel); - }); - } else { - return this._localProvider.filterPreferences(preferencesModel); - } - } -} - -class LocalSearchProvider { +export class LocalSearchProvider implements ISearchProvider { private _filter: string; constructor(filter: string) { this._filter = filter; } - filterPreferences(preferencesModel: ISettingsEditorModel): TPromise { - const regex = strings.createRegExp(this._filter, false, { global: true }); - - const groupFilter = (group: ISettingsGroup) => { - return regex.test(group.title); - }; + searchModel(preferencesModel: ISettingsEditorModel): TPromise { + if (!this._filter) { + return TPromise.wrap(null); + } + let score = 1000; // Sort is not stable const settingMatcher = (setting: ISetting) => { - return new SettingMatches(this._filter, setting, true, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches; + const matches = new SettingMatches(this._filter, setting, true, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches; + return matches && matches.length ? + { + matches, + score: score-- + } : + null; }; - return TPromise.wrap(preferencesModel.filterSettings(this._filter, groupFilter, settingMatcher)); + const filterMatches = preferencesModel.filterSettings(this._filter, this.getGroupFilter(this._filter), settingMatcher); + return TPromise.wrap({ + filterMatches + }); + } + + private getGroupFilter(filter: string): IGroupFilter { + if (strings.startsWith(filter, '@')) { + const groupId = filter.replace(/^@/, ''); + return (group: ISettingsGroup) => { + return group.id.toLowerCase() === groupId.toLowerCase(); + }; + } else { + const regex = strings.createRegExp(this._filter, false, { global: true }); + return (group: ISettingsGroup) => { + return regex.test(group.title); + }; + } } } -class RemoteSearchProvider { +export class RemoteSearchProvider implements ISearchProvider { private _filter: string; private _remoteSearchP: TPromise; @@ -147,23 +124,26 @@ class RemoteSearchProvider { @IRequestService private requestService: IRequestService ) { this._filter = filter; - this._remoteSearchP = filter ? this.getSettingsFromBing(filter, endpoint) : TPromise.wrap(null); + + // @queries are always handled by local filter + this._remoteSearchP = filter && !strings.startsWith(filter, '@') ? + this.getSettingsFromBing(filter, endpoint) : + TPromise.wrap(null); } - filterPreferences(preferencesModel: ISettingsEditorModel): TPromise { + searchModel(preferencesModel: ISettingsEditorModel): TPromise { return this._remoteSearchP.then(remoteResult => { if (remoteResult) { - let sortedNames = Object.keys(remoteResult.scoredResults).sort((a, b) => remoteResult.scoredResults[b] - remoteResult.scoredResults[a]); - if (sortedNames.length) { - const highScore = remoteResult.scoredResults[sortedNames[0]]; - const minScore = highScore / 5; - sortedNames = sortedNames.filter(name => remoteResult.scoredResults[name] >= minScore); - } + const highScoreKey = top(Object.keys(remoteResult.scoredResults), (a, b) => remoteResult.scoredResults[b] - remoteResult.scoredResults[a], 1)[0]; + const highScore = highScoreKey ? remoteResult.scoredResults[highScoreKey] : 0; + const minScore = highScore / 5; - const settingMatcher = this.getRemoteSettingMatcher(sortedNames, preferencesModel); - const result = preferencesModel.filterSettings(this._filter, group => null, settingMatcher, sortedNames); - result.metadata = remoteResult; - return result; + const settingMatcher = this.getRemoteSettingMatcher(remoteResult.scoredResults, minScore, preferencesModel); + const filterMatches = preferencesModel.filterSettings(this._filter, group => null, settingMatcher); + return { + filterMatches, + metadata: remoteResult + }; } else { return null; } @@ -218,19 +198,15 @@ class RemoteSearchProvider { return TPromise.as(p as any); } - private getRemoteSettingMatcher(names: string[], preferencesModel: ISettingsEditorModel): any { - const resultSet = new Set(); - names.forEach(name => resultSet.add(name)); - + private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher { return (setting: ISetting) => { - if (resultSet.has(setting.key)) { + const score = scoredResults[setting.key]; + if (typeof score === 'number' && score >= minScore) { const settingMatches = new SettingMatches(this._filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches; - if (settingMatches.length) { - return settingMatches; - } + return { matches: settingMatches, score: scoredResults[setting.key] }; } - return []; + return null; }; } } From ca023a700f35212071dfe9544272719cbbf80e4c Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Thu, 11 Jan 2018 19:01:53 -0800 Subject: [PATCH 130/710] Move absolute path check to avoid dependency on path in emmet helper --- extensions/emmet/src/util.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts index 2acca80d142..41b568cdabc 100644 --- a/extensions/emmet/src/util.ts +++ b/extensions/emmet/src/util.ts @@ -31,6 +31,11 @@ export function resolveUpdateExtensionsPath() { } if (_currentExtensionsPath !== extensionsPath) { _currentExtensionsPath = extensionsPath; + if (_currentExtensionsPath && !path.isAbsolute(_currentExtensionsPath)) { + vscode.window.showErrorMessage('The path provided in emmet.extensionsPath setting should be absoulte path'); + _emmetHelper.updateExtensionsPath(); + return; + } _emmetHelper.updateExtensionsPath(_currentExtensionsPath).then(null, (err: string) => vscode.window.showErrorMessage(err)); } } From 262660203e92f1a52a063274cabbb6af628acd63 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 07:27:30 +0100 Subject: [PATCH 131/710] fix #41429 --- resources/linux/bin/code.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index ca71a94db9e..55f50b6f1c1 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -7,7 +7,7 @@ if [ "$(id -u)" = "0" ]; then for i in $@ do - if [[ $i == --user-data-dir=* || $i == --file-write ]]; then + if [[ $i == --user-data-dir || $i == --user-data-dir=* || $i == --file-write ]]; then CAN_LAUNCH_AS_ROOT=1 fi done From ec91297c1d64d8c27a0a278dc17994e34813c8e0 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 07:41:05 +0100 Subject: [PATCH 132/710] better fix for #41322 --- src/vs/workbench/electron-browser/shell.ts | 14 ++------ .../electron-browser/logs.contribution.ts | 2 +- .../electron-browser/extensionService.ts | 36 ++++++++++++++----- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 0c1fc90223f..04cd7a48b26 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -182,22 +182,12 @@ export class WorkbenchShell { try { const workbench = instantiationService.createInstance(Workbench, parent, workbenchContainer, this.configuration, serviceCollection, this.lifecycleService); - // Delay the "Restoring" phase for a bit to give our viewlet/editor/panels a faster startup - let restorePhaseTimeoutHandle = setTimeout(() => { - restorePhaseTimeoutHandle = void 0; - this.lifecycleService.phase = LifecyclePhase.Restoring; - }, 800); + // Set lifecycle phase to `Restoring` + this.lifecycleService.phase = LifecyclePhase.Restoring; // Startup Workbench workbench.startup().done(startupInfos => { - // Set lifecycle phase to restoring if we started up fast enough and to - // make sure to trigger contributions on this phase if any - if (restorePhaseTimeoutHandle) { - clearTimeout(restorePhaseTimeoutHandle); - this.lifecycleService.phase = LifecyclePhase.Restoring; - } - // Set lifecycle phase to `Runnning` so that other contributions can now do something this.lifecycleService.phase = LifecyclePhase.Running; diff --git a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts b/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts index 3ed42b36111..c17d0c7e669 100644 --- a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts +++ b/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts @@ -35,7 +35,7 @@ class LogOutputChannels extends Disposable implements IWorkbenchContribution { } } -Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Restoring); +Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Running); const workbenchActionsRegistry = Registry.as(WorkbenchActionExtensions.WorkbenchActions); const devCategory = nls.localize('developer', "Developer"); diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index dcddee17af0..8abc3ff6140 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -119,16 +119,36 @@ export class ExtensionService extends Disposable implements IExtensionService { this._extensionHostProcessCustomers = []; this._extensionHostProcessProxy = null; + this.startDelayed(lifecycleService); + } + + private startDelayed(lifecycleService: ILifecycleService): void { + let started = false; + const startOnce = () => { + if (!started) { + started = true; + + this._startExtensionHostProcess([]); + this._scanAndHandleExtensions(); + } + }; + + // delay extension host creation and extension scanning + // until the workbench is restoring. we cannot defer the + // extension host more (LifecyclePhase.Running) because + // some editors require the extension host to restore + // and this would result in a deadlock + // see https://github.com/Microsoft/vscode/issues/41322 lifecycleService.when(LifecyclePhase.Restoring).then(() => { - // delay extension host creation and extension scanning - // until the workbench is restoring. we cannot defer the - // extension host more (LifecyclePhase.Running) because - // some editors require the extension host to restore - // and this would result in a deadlock - // see https://github.com/Microsoft/vscode/issues/41322 - this._startExtensionHostProcess([]); - this._scanAndHandleExtensions(); + // we add an additional delay of 800ms because the extension host + // starting is a potential expensive operation and we do no want + // to fight with editors, viewlets and panels restoring. + setTimeout(() => startOnce(), 800); }); + + // if we are running before the 800ms delay, make sure to start + // the extension host right away though. + lifecycleService.when(LifecyclePhase.Running).then(() => startOnce()); } public dispose(): void { From cc6f165f2d1c4bb4c8c152bbf8fb9a54ec143e97 Mon Sep 17 00:00:00 2001 From: Ng Yik Phang Date: Fri, 12 Jan 2018 14:41:59 +0800 Subject: [PATCH 133/710] Use HTTPS for npm package.json auto-complete Fixes https://github.com/Microsoft/vscode/issues/41511 --- extensions/javascript/src/features/packageJSONContribution.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/javascript/src/features/packageJSONContribution.ts b/extensions/javascript/src/features/packageJSONContribution.ts index ca9222dc0a3..e4b35802ecd 100644 --- a/extensions/javascript/src/features/packageJSONContribution.ts +++ b/extensions/javascript/src/features/packageJSONContribution.ts @@ -212,7 +212,7 @@ export class PackageJSONContribution implements IJSONContribution { if ((location.matches(['dependencies', '*']) || location.matches(['devDependencies', '*']) || location.matches(['optionalDependencies', '*']) || location.matches(['peerDependencies', '*']))) { const currentKey = location.path[location.path.length - 1]; if (typeof currentKey === 'string') { - const queryUrl = 'http://registry.npmjs.org/' + encodeURIComponent(currentKey).replace('%40', '@'); + const queryUrl = 'https://registry.npmjs.org/' + encodeURIComponent(currentKey).replace('%40', '@'); return this.xhr({ url: queryUrl, agent: USER_AGENT @@ -272,7 +272,7 @@ export class PackageJSONContribution implements IJSONContribution { private getInfo(pack: string): Thenable { - const queryUrl = 'http://registry.npmjs.org/' + encodeURIComponent(pack).replace('%40', '@'); + const queryUrl = 'https://registry.npmjs.org/' + encodeURIComponent(pack).replace('%40', '@'); return this.xhr({ url: queryUrl, agent: USER_AGENT From f0b65367c1b878dc1eaf538a55524079f77e19c2 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 08:09:12 +0100 Subject: [PATCH 134/710] remove hasChildren for #41497 --- src/vs/platform/files/common/files.ts | 6 ---- .../electron-browser/extensionsActions.ts | 2 +- .../parts/files/common/explorerModel.ts | 21 +++--------- .../electron-browser/views/explorerView.ts | 3 +- .../electron-browser/views/explorerViewer.ts | 1 - .../electron-browser/explorerModel.test.ts | 14 +++----- .../electron-browser/remoteFileService.ts | 3 -- .../services/files/node/fileService.ts | 4 --- .../services/files/test/node/resolver.test.ts | 33 +++++++++---------- .../textfile/common/textFileEditorModel.ts | 3 +- .../workbench/test/workbenchTestServices.ts | 2 -- 11 files changed, 29 insertions(+), 63 deletions(-) diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index ab62f52ccbe..ef95e1af1ec 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -409,12 +409,6 @@ export interface IFileStat extends IBaseStat { */ isDirectory: boolean; - /** - * Return {{true}} when this is a directory - * that is not empty. - */ - hasChildren: boolean; - /** * The children of the file stat or undefined if none. */ diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts index f4c1b8f3578..6be04be6baa 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts @@ -38,7 +38,7 @@ export class OpenExtensionsFolderAction extends Action { return this.fileService.resolveFile(URI.file(extensionsHome)).then(file => { let itemToShow: string; - if (file.hasChildren) { + if (file.children && file.children.length > 0) { itemToShow = file.children[0].resource.fsPath; } else { itemToShow = paths.normalize(extensionsHome, true); diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts index 090251625fc..14a2a7a7489 100644 --- a/src/vs/workbench/parts/files/common/explorerModel.ts +++ b/src/vs/workbench/parts/files/common/explorerModel.ts @@ -73,17 +73,15 @@ export class FileStat implements IFileStat { public mtime: number; public etag: string; private _isDirectory: boolean; - public hasChildren: boolean; public children: FileStat[]; public parent: FileStat; public isDirectoryResolved: boolean; - constructor(resource: URI, public root: FileStat, isDirectory?: boolean, hasChildren?: boolean, name: string = getPathLabel(resource), mtime?: number, etag?: string) { + constructor(resource: URI, public root: FileStat, isDirectory?: boolean, name: string = getPathLabel(resource), mtime?: number, etag?: string) { this.resource = resource; this.name = name; this.isDirectory = !!isDirectory; - this.hasChildren = isDirectory && hasChildren; this.etag = etag; this.mtime = mtime; @@ -123,7 +121,7 @@ export class FileStat implements IFileStat { } public static create(raw: IFileStat, root: FileStat, resolveTo?: URI[]): FileStat { - const stat = new FileStat(raw.resource, root, raw.isDirectory, raw.hasChildren, raw.name, raw.mtime, raw.etag); + const stat = new FileStat(raw.resource, root, raw.isDirectory, raw.name, raw.mtime, raw.etag); // Recursively add children if present if (stat.isDirectory) { @@ -141,7 +139,6 @@ export class FileStat implements IFileStat { const child = FileStat.create(raw.children[i], root, resolveTo); child.parent = stat; stat.children.push(child); - stat.hasChildren = stat.children.length > 0; } } } @@ -169,7 +166,6 @@ export class FileStat implements IFileStat { local.resource = disk.resource; local.name = disk.name; local.isDirectory = disk.isDirectory; - local.hasChildren = disk.isDirectory && disk.hasChildren; local.mtime = disk.mtime; local.isDirectoryResolved = disk.isDirectoryResolved; @@ -217,7 +213,6 @@ export class FileStat implements IFileStat { child.updateResource(false); this.children.push(child); - this.hasChildren = this.children.length > 0; } /** @@ -230,8 +225,6 @@ export class FileStat implements IFileStat { break; } } - - this.hasChildren = this.children.length > 0; } /** @@ -256,10 +249,9 @@ export class FileStat implements IFileStat { private updateResource(recursive: boolean): void { this.resource = this.parent.resource.with({ path: paths.join(this.parent.resource.path, this.name) }); - // this.resource = URI.file(paths.join(this.parent.resource.fsPath, this.name)); if (recursive) { - if (this.isDirectory && this.hasChildren && this.children) { + if (this.isDirectory && this.children) { this.children.forEach((child: FileStat) => { child.updateResource(true); }); @@ -293,7 +285,7 @@ export class FileStat implements IFileStat { } // Return if not having any children - if (!this.hasChildren) { + if (!this.children) { return null; } @@ -322,7 +314,7 @@ export class NewStatPlaceholder extends FileStat { private directoryPlaceholder: boolean; constructor(isDirectory: boolean, root: FileStat) { - super(URI.file(''), root, false, false, ''); + super(URI.file(''), root, false, ''); this.id = NewStatPlaceholder.ID++; this.isDirectoryResolved = isDirectory; @@ -335,7 +327,6 @@ export class NewStatPlaceholder extends FileStat { this.isDirectoryResolved = void 0; this.name = void 0; this.isDirectory = void 0; - this.hasChildren = void 0; this.mtime = void 0; } @@ -374,8 +365,6 @@ export class NewStatPlaceholder extends FileStat { child.parent = parent; parent.children.push(child); - parent.hasChildren = parent.children.length > 0; - return child; } } 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 024b758d31c..b2a9b1d732f 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -787,8 +787,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView name: paths.basename(resource.fsPath), mtime: 0, etag: undefined, - isDirectory: true, - hasChildren: false + isDirectory: true }, root); if (targetsToResolve.every(t => t.root.resource.scheme === 'file')) { 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 8fff1117bcd..80e1e2a9f56 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -104,7 +104,6 @@ export class FileDataSource implements IDataSource { return stat.children; }, (e: any) => { - stat.hasChildren = false; this.messageService.show(Severity.Error, e); return []; // we could not resolve any children because of an error diff --git a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts index fd651f9af7c..9bf052609fd 100644 --- a/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts +++ b/src/vs/workbench/parts/files/test/electron-browser/explorerModel.test.ts @@ -14,7 +14,7 @@ import { validateFileName } from 'vs/workbench/parts/files/electron-browser/file import { FileStat } from 'vs/workbench/parts/files/common/explorerModel'; function createStat(path: string, name: string, isFolder: boolean, hasChildren: boolean, size: number, mtime: number): FileStat { - return new FileStat(toResource(path), undefined, isFolder, hasChildren, name, mtime); + return new FileStat(toResource(path), undefined, isFolder, name, mtime); } function toResource(path) { @@ -31,7 +31,6 @@ suite('Files - View Model', () => { assert.strictEqual(s.resource.fsPath, toResource('/path/to/stat').fsPath); assert.strictEqual(s.name, 'sName'); assert.strictEqual(s.isDirectory, true); - assert.strictEqual(s.hasChildren, true); assert.strictEqual(s.mtime, new Date(d).getTime()); assert(isArray(s.children) && s.children.length === 0); @@ -49,14 +48,12 @@ suite('Files - View Model', () => { s.addChild(child1); assert(s.children.length === 1); - assert(s.hasChildren); s.removeChild(child1); s.addChild(child1); assert(s.children.length === 1); s.removeChild(child1); - assert(!s.hasChildren); assert(s.children.length === 0); // Assert that adding a child updates its path properly @@ -79,7 +76,6 @@ suite('Files - View Model', () => { s4.move(s1); assert.strictEqual(s3.children.length, 0); - assert.strictEqual(s3.hasChildren, false); assert.strictEqual(s1.children.length, 2); @@ -239,20 +235,20 @@ suite('Files - View Model', () => { test('Merge Local with Disk', function () { const d = new Date().toUTCString(); - const merge1 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, false, 'to', Date.now(), d); - const merge2 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, false, 'to', Date.now(), new Date(0).toUTCString()); + const merge1 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, 'to', Date.now(), d); + const merge2 = new FileStat(URI.file(join('C:\\', '/path/to')), undefined, true, 'to', Date.now(), new Date(0).toUTCString()); // Merge Properties FileStat.mergeLocalWithDisk(merge2, merge1); assert.strictEqual(merge1.mtime, merge2.mtime); // Merge Child when isDirectoryResolved=false is a no-op - merge2.addChild(new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, false, 'foo.html', Date.now(), d)); + merge2.addChild(new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, 'foo.html', Date.now(), d)); FileStat.mergeLocalWithDisk(merge2, merge1); assert.strictEqual(merge1.children.length, 0); // Merge Child with isDirectoryResolved=true - const child = new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, false, 'foo.html', Date.now(), d); + const child = new FileStat(URI.file(join('C:\\', '/path/to/foo.html')), undefined, true, 'foo.html', Date.now(), d); merge2.removeChild(child); merge2.addChild(child); merge2.isDirectoryResolved = true; diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index 7767525e888..2c290fddaf0 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -31,7 +31,6 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse const [resource, stat] = tuple; const fileStat: IFileStat = { isDirectory: false, - hasChildren: false, resource: resource, name: basename(resource.path), mtime: stat.mtime, @@ -41,13 +40,11 @@ function toIFileStat(provider: IFileSystemProvider, tuple: [URI, IStat], recurse if (stat.type === FileType.Dir) { fileStat.isDirectory = true; - fileStat.hasChildren = true; if (recurse && recurse([resource, stat])) { // dir -> resolve return provider.readdir(resource).then(entries => { fileStat.isDirectory = true; - fileStat.hasChildren = entries.length > 0; // resolve children if requested return TPromise.join(entries.map(stat => toIFileStat(provider, stat, recurse))).then(children => { diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts index 81b3bf49b55..b1475b44eb9 100644 --- a/src/vs/workbench/services/files/node/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -1132,7 +1132,6 @@ export class StatResolver { const fileStat: IFileStat = { resource: this.resource, isDirectory: this.isDirectory, - hasChildren: undefined, name: this.name, etag: this.etag, size: this.size, @@ -1161,7 +1160,6 @@ export class StatResolver { // Load children this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, children => { children = arrays.coalesce(children); // we don't want those null children (could be permission denied when reading a child) - fileStat.hasChildren = children && children.length > 0; fileStat.children = children || []; c(fileStat); @@ -1215,7 +1213,6 @@ export class StatResolver { const childStat: IFileStat = { resource: fileResource, isDirectory: fileStat.isDirectory(), - hasChildren: childCount > 0, name: file, mtime: fileStat.mtime.getTime(), etag: etag(fileStat), @@ -1239,7 +1236,6 @@ export class StatResolver { if (resolveFolderChildren) { $this.resolveChildren(fileResource.fsPath, absoluteTargetPaths, resolveSingleChildDescendants, children => { children = arrays.coalesce(children); // we don't want those null children - childStat.hasChildren = children && children.length > 0; childStat.children = children || []; clb(null, childStat); diff --git a/src/vs/workbench/services/files/test/node/resolver.test.ts b/src/vs/workbench/services/files/test/node/resolver.test.ts index cc314d67d75..3acfd8c3aeb 100644 --- a/src/vs/workbench/services/files/test/node/resolver.test.ts +++ b/src/vs/workbench/services/files/test/node/resolver.test.ts @@ -54,7 +54,7 @@ suite('Stat Resolver', () => { resolver.resolve(null).then(result => { assert.ok(result); assert.ok(result.children); - assert.ok(result.hasChildren); + assert.ok(result.children.length > 0); assert.ok(result.isDirectory); assert.equal(result.children.length, testsElements.length); @@ -68,13 +68,12 @@ suite('Stat Resolver', () => { assert.ok(path.basename(value.resource.fsPath)); if (['examples', 'other'].indexOf(path.basename(value.resource.fsPath)) >= 0) { assert.ok(value.isDirectory); - assert.ok(value.hasChildren); } else if (path.basename(value.resource.fsPath) === 'index.html') { assert.ok(!value.isDirectory); - assert.ok(value.hasChildren === false); + assert.ok(!value.children); } else if (path.basename(value.resource.fsPath) === 'site.css') { assert.ok(!value.isDirectory); - assert.ok(value.hasChildren === false); + assert.ok(!value.children); } else { assert.ok(!'Unexpected value ' + path.basename(value.resource.fsPath)); } @@ -89,7 +88,7 @@ suite('Stat Resolver', () => { resolver.resolve({ resolveTo: [toResource('other/deep')] }).then(result => { assert.ok(result); assert.ok(result.children); - assert.ok(result.hasChildren); + assert.ok(result.children.length > 0); assert.ok(result.isDirectory); let children = result.children; @@ -97,11 +96,11 @@ suite('Stat Resolver', () => { let other = utils.getByName(result, 'other'); assert.ok(other); - assert.ok(other.hasChildren); + assert.ok(other.children.length > 0); let deep = utils.getByName(other, 'deep'); assert.ok(deep); - assert.ok(deep.hasChildren); + assert.ok(deep.children.length > 0); assert.equal(deep.children.length, 4); }) .done(() => done(), done); @@ -113,7 +112,7 @@ suite('Stat Resolver', () => { resolver.resolve({ resolveTo: [toResource('other/Deep')] }).then(result => { assert.ok(result); assert.ok(result.children); - assert.ok(result.hasChildren); + assert.ok(result.children.length > 0); assert.ok(result.isDirectory); let children = result.children; @@ -121,16 +120,16 @@ suite('Stat Resolver', () => { let other = utils.getByName(result, 'other'); assert.ok(other); - assert.ok(other.hasChildren); + assert.ok(other.children.length > 0); let deep = utils.getByName(other, 'deep'); if (isLinux) { // Linux has case sensitive file system assert.ok(deep); - assert.ok(deep.hasChildren); + assert.ok(deep.children.length > 0); assert.ok(!deep.children); // not resolved because we got instructed to resolve other/Deep with capital D } else { assert.ok(deep); - assert.ok(deep.hasChildren); + assert.ok(deep.children.length > 0); assert.equal(deep.children.length, 4); } }) @@ -143,7 +142,7 @@ suite('Stat Resolver', () => { resolver.resolve({ resolveTo: [toResource('other/deep'), toResource('examples')] }).then(result => { assert.ok(result); assert.ok(result.children); - assert.ok(result.hasChildren); + assert.ok(result.children.length > 0); assert.ok(result.isDirectory); let children = result.children; @@ -151,16 +150,16 @@ suite('Stat Resolver', () => { let other = utils.getByName(result, 'other'); assert.ok(other); - assert.ok(other.hasChildren); + assert.ok(other.children.length > 0); let deep = utils.getByName(other, 'deep'); assert.ok(deep); - assert.ok(deep.hasChildren); + assert.ok(deep.children.length > 0); assert.equal(deep.children.length, 4); let examples = utils.getByName(result, 'examples'); assert.ok(examples); - assert.ok(examples.hasChildren); + assert.ok(examples.children.length > 0); assert.equal(examples.children.length, 4); }) .done(() => done(), done); @@ -172,7 +171,7 @@ suite('Stat Resolver', () => { resolver.resolve({ resolveSingleChildDescendants: true }).then(result => { assert.ok(result); assert.ok(result.children); - assert.ok(result.hasChildren); + assert.ok(result.children.length > 0); assert.ok(result.isDirectory); let children = result.children; @@ -180,7 +179,7 @@ suite('Stat Resolver', () => { let deep = utils.getByName(result, 'deep'); assert.ok(deep); - assert.ok(deep.hasChildren); + assert.ok(deep.children.length > 0); assert.equal(deep.children.length, 4); }) .done(() => done(), done); diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index 62ae927ce42..e25597ad24e 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -393,8 +393,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil mtime: content.mtime, etag: content.etag, isDirectory: false, - hasChildren: false, - children: void 0, + children: void 0 }; this.updateLastResolvedDiskStat(resolvedStat); diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index cf38082c617..d09a7102f69 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -711,7 +711,6 @@ export class TestFileService implements IFileService { encoding: 'utf8', mtime: Date.now(), isDirectory: false, - hasChildren: false, name: paths.basename(resource.fsPath) }); } @@ -763,7 +762,6 @@ export class TestFileService implements IFileService { encoding: 'utf8', mtime: Date.now(), isDirectory: false, - hasChildren: false, name: paths.basename(resource.fsPath) }; }); From 3b4cdbcedc74eada2cec764c67b9cd5c13ffdc18 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 12 Jan 2018 09:07:50 +0100 Subject: [PATCH 135/710] code review comments --- src/vs/vscode.d.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 29cf9485877..fc880c2e648 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4963,19 +4963,22 @@ declare module 'vscode' { export class TreeItem { /** - * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). + * A human-readable string describing this item. When `falsy`, it is derived from [uri](#TreeItem.uri). */ label?: string; /** - * The icon path for the tree item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). + * The icon path for the tree item. When `falsy`, it is derived from [uri](#TreeItem.uri). */ iconPath?: string | Uri | { light: string | Uri; dark: string | Uri }; /** * The [uri](#Uri) of the resource representing this item. + * + * Will be used to derive the [label](#TreeItem.label), when it is not provided. + * Will be used to derive the icon from current file icon theme, when [iconPath](#TreeItem.iconPath) is not provided. */ - resourceUri?: Uri; + uri?: Uri; /** * The [command](#Command) which should be run when the tree item is selected. From f5fb85d257312fcf57aeeb44585b81a02ee39f09 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 10:24:56 +0100 Subject: [PATCH 136/710] add more labels --- .github/classifier.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/classifier.yml b/.github/classifier.yml index d66324e01fa..20f295e6875 100644 --- a/.github/classifier.yml +++ b/.github/classifier.yml @@ -29,6 +29,8 @@ error-list: [], extensions: [], file-encoding: [ bpasero ], + file-io: [ bpasero ], + file-watcher: [ bpasero ], file-explorer: [ isidorn ], format: [], git: [ joaomoreno ], @@ -44,6 +46,7 @@ languages basic: [], markdown: [ mjbvz ], merge-conflict: [ chrmarti ], + multi-root: [ bpasero ], perf-profile: [], php: [ roblourens ], proxy: [], @@ -57,13 +60,17 @@ workbench: [ bpasero ], workbench-dnd: [ bpasero ], workbench-editors: [ bpasero ], + workbench-electron: [ bpasero ], workbench-feedback: [ bpasero ], + workbench-history: [ bpasero ], workbench-layout: [ bpasero ], workbench-menu: [ bpasero ], workbench-notifications: [ bpasero ], workbench-state: [ bpasero ], workbench-status: [ bpasero ], workbench-tabs: [ bpasero ], - workbench-welcome: [ chrmarti ], + workbench-title: [ bpasero ], + workbench-touchbar: [ bpasero ], + workbench-welcome: [ chrmarti ] } } From 0c870f38ea3ff31bdb26caa008a093138cee18c7 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 10:38:21 +0100 Subject: [PATCH 137/710] bring back workbench.action.files.copyPathOfActiveFile for a milestone fixes #41502 --- .../files/electron-browser/fileCommands.ts | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 7bb8e6883dc..5861f99d024 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -429,6 +429,18 @@ CommandsRegistry.registerCommand({ handler: revealInOSHandler }); +const copyPathHandler = (accessor, resource: URI) => { + const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); + if (resources.length) { + const clipboardService = accessor.get(IClipboardService); + const text = resources.map(r => r.scheme === 'file' ? labels.getPathLabel(r) : r.toString()).join('\n'); + clipboardService.writeText(text); + } else { + const messageService = accessor.get(IMessageService); + messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path")); + } +}; + KeybindingsRegistry.registerCommandAndKeybindingRule({ weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: ExplorerFocusCondition, @@ -437,17 +449,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_C }, id: COPY_PATH_COMMAND_ID, - handler: (accessor, resource: URI) => { - const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); - if (resources.length) { - const clipboardService = accessor.get(IClipboardService); - const text = resources.map(r => r.scheme === 'file' ? labels.getPathLabel(r) : r.toString()).join('\n'); - clipboardService.writeText(text); - } else { - const messageService = accessor.get(IMessageService); - messageService.show(severity.Info, nls.localize('openFileToCopy', "Open a file first to copy its path")); - } - } + handler: copyPathHandler +}); + +// TODO@isidor deprecated remove in february +CommandsRegistry.registerCommand({ + id: 'workbench.action.files.copyPathOfActiveFile', + handler: copyPathHandler }); CommandsRegistry.registerCommand({ From 3b4fa887437525ef4594759e19c391e9eb37b1af Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 10:47:51 +0100 Subject: [PATCH 138/710] add vscode.removeFromRecentlyOpened command (fixes #41391) --- src/vs/workbench/api/node/extHostApiCommands.ts | 9 +++++++++ src/vs/workbench/electron-browser/commands.ts | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts index 62652183f85..bf16fdb2c52 100644 --- a/src/vs/workbench/api/node/extHostApiCommands.ts +++ b/src/vs/workbench/api/node/extHostApiCommands.ts @@ -239,6 +239,15 @@ export class ExtHostApiCommands { { name: 'columnOrOptions', description: '(optional) Either the column in which to open or editor options, see vscode.TextDocumentShowOptions', constraint: v => v === void 0 || typeof v === 'number' || typeof v === 'object' } ] }); + + this._register('vscode.removeFromRecentlyOpened', (path: string) => { + return this._commands.executeCommand('_workbench.removeFromRecentlyOpened', path); + }, { + description: 'Removes an entry with the given path from the recently opened list.', + args: [ + { name: 'path', description: 'Path to remove from recently opened.', constraint: value => typeof value === 'string' } + ] + }); } // --- command impl diff --git a/src/vs/workbench/electron-browser/commands.ts b/src/vs/workbench/electron-browser/commands.ts index bcd9b64de45..f222e047687 100644 --- a/src/vs/workbench/electron-browser/commands.ts +++ b/src/vs/workbench/electron-browser/commands.ts @@ -528,4 +528,12 @@ export function registerCommands(): void { return void 0; }); }); + + CommandsRegistry.registerCommand('_workbench.removeFromRecentlyOpened', function (accessor: ServicesAccessor, path: string) { + const windowsService = accessor.get(IWindowsService); + + return windowsService.removeFromRecentlyOpened([path]).then(() => { + return void 0; + }); + }); } From c010fc2428e12d2ab79753af1ece58f5946fafc6 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 11:05:52 +0100 Subject: [PATCH 139/710] update bot to not assign workbench label anymore --- .github/classifier.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/classifier.yml b/.github/classifier.yml index 20f295e6875..5cc074d1246 100644 --- a/.github/classifier.yml +++ b/.github/classifier.yml @@ -57,7 +57,10 @@ telemetry: [], themes: [], typescript: [ mjbvz ], - workbench: [ bpasero ], + workbench: { + assignees: [bpasero], + assignLabel: false + }, workbench-dnd: [ bpasero ], workbench-editors: [ bpasero ], workbench-electron: [ bpasero ], From 7b06d3b88743241706493e6d74c42a4fe40ebaed Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 11:07:39 +0100 Subject: [PATCH 140/710] workbench.action.files.saveFiles fixes #41502 --- .../parts/files/electron-browser/fileActions.ts | 16 +--------------- .../parts/files/electron-browser/fileCommands.ts | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index b1d23935283..5fcd05b354e 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -41,7 +41,7 @@ import { IMessageService, IMessageWithAction, IConfirmation, Severity, CancelAct import { ITextModel } from 'vs/editor/common/model'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IWindowsService } from 'vs/platform/windows/common/windows'; -import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_FILES_COMMAND_ID, SAVE_FILES_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { once } from 'vs/base/common/event'; @@ -1217,20 +1217,6 @@ export class SaveAllInGroupAction extends BaseSaveAllAction { } } -export class SaveFilesAction extends BaseSaveAllAction { - - public static readonly ID = 'workbench.action.files.saveFiles'; - public static readonly LABEL = SAVE_FILES_LABEL; - - protected doRun(context: any): TPromise { - return this.commandService.executeCommand(SAVE_FILES_COMMAND_ID, false); - } - - protected includeUntitled(): boolean { - return false; - } -} - export class FocusOpenEditorsView extends Action { public static readonly ID = 'workbench.files.action.focusOpenEditorsView'; diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 5861f99d024..2d0d0d74261 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -65,7 +65,7 @@ export const SAVE_ALL_LABEL = nls.localize('saveAll', "Save All"); export const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup'; -export const SAVE_FILES_COMMAND_ID = 'workbench.command.files.saveFiles'; +export const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles'; export const SAVE_FILES_LABEL = nls.localize('saveFiles', "Save All Files"); export const OpenEditorsGroupContext = new RawContextKey('groupFocusedInOpenEditors', false); From b24fe5c0e17f05e4a6ab703c2ae41990e89f2ad5 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 11:11:10 +0100 Subject: [PATCH 141/710] use modern and short ids #41502 --- .../parts/files/electron-browser/fileCommands.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 2d0d0d74261..65d3e581a14 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -45,13 +45,13 @@ import { sequence } from 'vs/base/common/async'; export const REVEAL_IN_OS_COMMAND_ID = 'revealFileInOS'; export const REVEAL_IN_OS_LABEL = isWindows ? nls.localize('revealInWindows', "Reveal in Explorer") : isMacintosh ? nls.localize('revealInMac', "Reveal in Finder") : nls.localize('openContainer', "Open Containing Folder"); -export const REVEAL_IN_EXPLORER_COMMAND_ID = 'workbench.command.files.revealInExplorer'; +export const REVEAL_IN_EXPLORER_COMMAND_ID = 'revealInExplorer'; export const REVERT_FILE_COMMAND_ID = 'workbench.action.files.revert'; export const OPEN_TO_SIDE_COMMAND_ID = 'explorer.openToSide'; -export const SELECT_FOR_COMPARE_COMMAND_ID = 'workbench.files.command.selectForCompare'; +export const SELECT_FOR_COMPARE_COMMAND_ID = 'selectForCompare'; export const COMPARE_SELECTED_COMMAND_ID = 'compareSelected'; -export const COMPARE_RESOURCE_COMMAND_ID = 'workbench.files.command.compareFiles'; +export const COMPARE_RESOURCE_COMMAND_ID = 'compareFiles'; export const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved'; export const COPY_PATH_COMMAND_ID = 'copyFilePath'; @@ -60,7 +60,7 @@ export const SAVE_FILE_AS_LABEL = nls.localize('saveAs', "Save As..."); export const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save'; export const SAVE_FILE_LABEL = nls.localize('save', "Save"); -export const SAVE_ALL_COMMAND_ID = 'workbench.command.files.saveAll'; +export const SAVE_ALL_COMMAND_ID = 'saveAll'; export const SAVE_ALL_LABEL = nls.localize('saveAll', "Save All"); export const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup'; From 97d9b0c7bd2da59456d2aa8cc45451c87c25d02e Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Fri, 12 Jan 2018 11:11:48 +0100 Subject: [PATCH 142/710] another fix for integratedTerminal & compound launches --- .../workbench/parts/debug/electron-browser/terminalSupport.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts index f60c53c8a1f..8dac21d8fc3 100644 --- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts +++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts @@ -51,7 +51,7 @@ export class TerminalSupport { private static isBusy(t: ITerminalInstance): boolean { if ((platform.isMacintosh || platform.isLinux) && t.processId) { const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]); - return !!result.stdout; + return result.stdout.toString().trim().length > 0; } return true; } From b3d34e1f24053bebd799c1a3f46ca3a41d0540d7 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 11:46:53 +0100 Subject: [PATCH 143/710] setData DataTransfers.TEXT multi selection aware --- .../parts/files/electron-browser/views/explorerViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80e1e2a9f56..2cbf601a438 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -706,12 +706,12 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { }); // Apply some datatransfer types to allow for dragging the element outside of the application + originalEvent.dataTransfer.setData(DataTransfers.TEXT, sources.map(fs => fs.resource.scheme === 'file' ? getPathLabel(fs.resource) : fs.resource.toString()).join('\n')); if (sources.length === 1) { if (!sources[0].isDirectory) { originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, sources[0].name, sources[0].resource.toString()].join(':')); } - originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource)); } else { originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.filter(s => !s.isDirectory).map(s => s.resource.toString()))); } From d450711f02b1bc2b252a3290e5e7e6a99c6fb5a2 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 11:47:42 +0100 Subject: [PATCH 144/710] explorer: polish context, always pass focused as second at least --- .../parts/files/electron-browser/views/explorerViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2cbf601a438..78017d5ca55 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -450,7 +450,7 @@ export class FileController extends DefaultController implements IDisposable { tree.DOMFocus(); } }, - getActionsContext: () => selection ? selection.map((fs: FileStat) => fs.resource) : undefined + getActionsContext: () => selection && selection.indexOf(stat) >= 0 ? selection.map((fs: FileStat) => fs.resource) : [stat] }); return true; From 0f5d3dd7fc685fbf0008b725e880a23b6391f178 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 11:48:04 +0100 Subject: [PATCH 145/710] FileResultsNavigation: open to the side with alt key as default --- src/vs/workbench/parts/files/browser/fileResultsNavigation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts b/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts index 5d7b8dd13b4..53699b0c4c1 100644 --- a/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts +++ b/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts @@ -60,7 +60,7 @@ export default class FileResultsNavigation extends Disposable { originalEvent.preventDefault(); // focus moves to editor, we need to prevent default } - const sideBySide = (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey)); + const sideBySide = (originalEvent && (originalEvent.ctrlKey || originalEvent.metaKey || originalEvent.altKey)); const preserveFocus = !((keyboard && (!payload || !payload.preserveFocus)) || pinned || (payload && payload.focusEditor)); this._openFile.fire({ editorOptions: { From 3e18c4b78b4a4e985250ab087840eaea9776984b Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 11:50:33 +0100 Subject: [PATCH 146/710] linux: fix tests --- src/vs/workbench/services/files/test/node/resolver.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vs/workbench/services/files/test/node/resolver.test.ts b/src/vs/workbench/services/files/test/node/resolver.test.ts index 3acfd8c3aeb..a6ed59a578b 100644 --- a/src/vs/workbench/services/files/test/node/resolver.test.ts +++ b/src/vs/workbench/services/files/test/node/resolver.test.ts @@ -125,7 +125,6 @@ suite('Stat Resolver', () => { let deep = utils.getByName(other, 'deep'); if (isLinux) { // Linux has case sensitive file system assert.ok(deep); - assert.ok(deep.children.length > 0); assert.ok(!deep.children); // not resolved because we got instructed to resolve other/Deep with capital D } else { assert.ok(deep); From 5d6c47b685c823de48bae84c2430e54cab7081f1 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 12:08:33 +0100 Subject: [PATCH 147/710] breakopints and open editors open to the side on alt key --- .../workbench/parts/debug/electron-browser/breakpointsView.ts | 2 +- .../parts/files/electron-browser/views/openEditorsView.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts index de6a551619b..64135e242aa 100644 --- a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts @@ -95,7 +95,7 @@ export class BreakpointsView extends ViewsViewletPanel { this.disposables.push(this.list.onKeyUp(e => { const event = new StandardKeyboardEvent(e); if (event.equals(KeyCode.Enter)) { - handleBreakpointFocus(false, event && (event.ctrlKey || event.metaKey), false); + handleBreakpointFocus(false, event && (event.ctrlKey || event.metaKey || event.altKey), false); } })); this.disposables.push(this.list.onMouseDblClick(e => { diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index ed1edf09a3e..eabe0a6e757 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -185,7 +185,7 @@ export class OpenEditorsView extends ViewsViewletPanel { const focused = this.list.getFocusedElements(); const element = focused.length ? focused[0] : undefined; if (element instanceof OpenEditor) { - this.openEditor(element, { pinned: false, sideBySide: !!event.ctrlKey, preserveFocus: false }); + this.openEditor(element, { pinned: false, sideBySide: !!event.altKey, preserveFocus: false }); } } })); @@ -270,7 +270,7 @@ export class OpenEditorsView extends ViewsViewletPanel { const position = this.model.positionOfGroup(element.editorGroup); this.editorService.closeEditor(position, element.editorInput).done(null, errors.onUnexpectedError); } else { - this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: event.browserEvent.ctrlKey || event.browserEvent.metaKey }); + this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: event.browserEvent.altKey }); } } From 7cdc59a66910cdaab2c6be0810a3b91900a5701f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 12:12:19 +0100 Subject: [PATCH 148/710] let "open to side" win over reveal options --- .../goToDeclaration/goToDeclarationCommands.ts | 2 +- src/vs/platform/editor/common/editor.ts | 8 ++++++-- src/vs/workbench/browser/parts/editor/editorPart.ts | 11 ++++++++--- .../parts/files/browser/fileResultsNavigation.ts | 2 +- .../workbench/parts/markers/browser/markersPanel.ts | 2 +- .../workbench/parts/search/browser/searchViewlet.ts | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts index 94f46987882..d27eebcc428 100644 --- a/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts +++ b/src/vs/editor/contrib/goToDeclaration/goToDeclarationCommands.ts @@ -151,7 +151,7 @@ export class DefinitionAction extends EditorAction { resource: uri, options: { selection: Range.collapseToStart(range), - revealIfVisible: !sideBySide, + revealIfVisible: true, revealInCenterIfOutsideViewport: true } }, sideBySide).then(editor => { diff --git a/src/vs/platform/editor/common/editor.ts b/src/vs/platform/editor/common/editor.ts index 98d63a1977b..5e1f5db95db 100644 --- a/src/vs/platform/editor/common/editor.ts +++ b/src/vs/platform/editor/common/editor.ts @@ -269,12 +269,16 @@ export interface IEditorOptions { forceOpen?: boolean; /** - * Will reveal the editor if it is already opened and visible in any of the opened editor groups. + * Will reveal the editor if it is already opened and visible in any of the opened editor groups. Note + * that this option is just a hint that might be ignored if the user wants to open an editor explicitly + * to the side of another one. */ revealIfVisible?: boolean; /** - * Will reveal the editor if it is already opened (even when not visible) in any of the opened editor groups. + * Will reveal the editor if it is already opened (even when not visible) in any of the opened editor groups. Note + * that this option is just a hint that might be ignored if the user wants to open an editor explicitly + * to the side of another one. */ revealIfOpened?: boolean; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 12db963e34b..7365cae4026 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -1404,8 +1404,14 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return Position.ONE; // can only be ONE } + // Ignore revealIfVisible/revealIfOpened option if we got instructed explicitly to + // * open at a specific index + // * open to the side + // * open in a specific group + const skipReveal = (options && options.index) || arg1 === true /* open to side */ || typeof arg1 === 'number' /* open specific group */; + // Respect option to reveal an editor if it is already visible - if (options && options.revealIfVisible) { + if (!skipReveal && options && options.revealIfVisible) { const group = this.stacks.findGroup(input, true); if (group) { return this.stacks.positionOfGroup(group); @@ -1413,8 +1419,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService } // Respect option to reveal an editor if it is open (not necessarily visible) - const skipRevealIfOpen = (options && options.index) || arg1 === true /* open to side */ || typeof arg1 === 'number' /* open specific group */; - if (!skipRevealIfOpen && (this.revealIfOpen || (options && options.revealIfOpened))) { + if (!skipReveal && (this.revealIfOpen || (options && options.revealIfOpened))) { const group = this.stacks.findGroup(input); if (group) { return this.stacks.positionOfGroup(group); diff --git a/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts b/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts index 53699b0c4c1..46558d347a0 100644 --- a/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts +++ b/src/vs/workbench/parts/files/browser/fileResultsNavigation.ts @@ -66,7 +66,7 @@ export default class FileResultsNavigation extends Disposable { editorOptions: { preserveFocus, pinned, - revealIfVisible: !sideBySide + revealIfVisible: true }, sideBySide, element: this.tree.getSelection()[0], diff --git a/src/vs/workbench/parts/markers/browser/markersPanel.ts b/src/vs/workbench/parts/markers/browser/markersPanel.ts index 280626d940f..bfe9d25d339 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanel.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanel.ts @@ -158,7 +158,7 @@ export class MarkersPanel extends Panel { selection: marker.range, preserveFocus, pinned, - revealIfVisible: !sideByside + revealIfVisible: true }, }, sideByside).done(editor => { if (editor && preserveFocus) { diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index 7c74f429c43..166bf65132f 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -1360,7 +1360,7 @@ export class SearchViewlet extends Viewlet { preserveFocus, pinned, selection, - revealIfVisible: !sideBySide + revealIfVisible: true } }, sideBySide).then(editor => { if (editor && element instanceof Match && preserveFocus) { From 8f361377897816c77b2c75e6514b3a6c2d42fc7e Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Fri, 12 Jan 2018 12:28:55 +0100 Subject: [PATCH 149/710] Windows fix for #37589 (compound launches in Integrated Terminal) --- .../parts/debug/electron-browser/terminalSupport.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts index 8dac21d8fc3..3cf08e18ec4 100644 --- a/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts +++ b/src/vs/workbench/parts/debug/electron-browser/terminalSupport.ts @@ -49,9 +49,16 @@ export class TerminalSupport { } private static isBusy(t: ITerminalInstance): boolean { - if ((platform.isMacintosh || platform.isLinux) && t.processId) { - const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]); - return result.stdout.toString().trim().length > 0; + if (t.processId) { + // if shell has at least one child process, assume that shell is busy + if (platform.isWindows) { + const result = cp.spawnSync('wmic', ['process', 'get', 'ParentProcessId']); + const pids = result.stdout.toString().split('\r\n'); + return pids.some(p => parseInt(p) === t.processId); + } else { + const result = cp.spawnSync('/usr/bin/pgrep', ['-P', String(t.processId)]); + return result.stdout.toString().trim().length > 0; + } } return true; } From f4e12852668cc82d328942eb64402d1135d2d7b6 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 12:46:07 +0100 Subject: [PATCH 150/710] find in folder: make ready for multi-select --- .../files/electron-browser/fileCommands.ts | 2 +- .../parts/search/browser/searchViewlet.ts | 52 +++++++++++-------- .../electron-browser/search.contribution.ts | 27 ++++++---- 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 65d3e581a14..794cc59e109 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -97,7 +97,7 @@ export function getResourceForCommand(resource: URI, listService: IListService, return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); } -function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { +export function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; if (list && list.isDOMFocused() && list instanceof Tree) { const selection = list.getSelection(); diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index 166bf65132f..b47db749deb 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -908,33 +908,41 @@ export class SearchViewlet extends Viewlet { } } - public searchInFolder(resource: URI, pathToRelative: (from: string, to: string) => string): void { - let folderPath = null; + public searchInFolders(resources: URI[], pathToRelative: (from: string, to: string) => string): void { + const folderPaths = []; const workspace = this.contextService.getWorkspace(); - if (resource) { - if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) { - // Show relative path from the root for single-root mode - folderPath = paths.normalize(pathToRelative(workspace.folders[0].uri.fsPath, resource.fsPath)); - if (folderPath && folderPath !== '.') { - folderPath = './' + folderPath; - } - } else { - const owningFolder = this.contextService.getWorkspaceFolder(resource); - if (owningFolder) { - const owningRootBasename = paths.basename(owningFolder.uri.fsPath); - // If this root is the only one with its basename, use a relative ./ path. If there is another, use an absolute path - const isUniqueFolder = workspace.folders.filter(folder => paths.basename(folder.uri.fsPath) === owningRootBasename).length === 1; - if (isUniqueFolder) { - folderPath = `./${owningRootBasename}/${paths.normalize(pathToRelative(owningFolder.uri.fsPath, resource.fsPath))}`; - } else { - folderPath = resource.fsPath; + if (resources) { + resources.forEach(resource => { + let folderPath: string; + if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) { + // Show relative path from the root for single-root mode + folderPath = paths.normalize(pathToRelative(workspace.folders[0].uri.fsPath, resource.fsPath)); + if (folderPath && folderPath !== '.') { + folderPath = './' + folderPath; + } + } else { + const owningFolder = this.contextService.getWorkspaceFolder(resource); + if (owningFolder) { + const owningRootBasename = paths.basename(owningFolder.uri.fsPath); + + // If this root is the only one with its basename, use a relative ./ path. If there is another, use an absolute path + const isUniqueFolder = workspace.folders.filter(folder => paths.basename(folder.uri.fsPath) === owningRootBasename).length === 1; + if (isUniqueFolder) { + folderPath = `./${owningRootBasename}/${paths.normalize(pathToRelative(owningFolder.uri.fsPath, resource.fsPath))}`; + } else { + folderPath = resource.fsPath; + } } } - } + + if (folderPath) { + folderPaths.push(folderPath); + } + }); } - if (!folderPath || folderPath === '.') { + if (!folderPaths.length || folderPaths.some(folderPath => folderPath === '.')) { this.inputPatternIncludes.setValue(''); this.searchWidget.focus(); return; @@ -945,7 +953,7 @@ export class SearchViewlet extends Viewlet { this.toggleQueryDetails(true, true); } - this.inputPatternIncludes.setValue(folderPath); + this.inputPatternIncludes.setValue(folderPaths.join(', ')); this.searchWidget.focus(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 9bf399b29d5..81079ade397 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -47,9 +47,10 @@ import URI from 'vs/base/common/uri'; import { relative } from 'path'; import { dirname } from 'vs/base/common/resources'; import { ResourceContextKey } from 'vs/workbench/common/resources'; -import { getResourceForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { getResourcesForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IFileService } from 'vs/platform/files/common/files'; +import { distinct } from 'vs/base/common/arrays'; registerSingleton(ISearchWorkbenchService, SearchWorkbenchService); replaceContributions(); @@ -192,16 +193,24 @@ CommandsRegistry.registerCommand({ const listService = accessor.get(IListService); const viewletService = accessor.get(IViewletService); const fileService = accessor.get(IFileService); - resource = getResourceForCommand(resource, listService, accessor.get(IWorkbenchEditorService)); + const resources = getResourcesForCommand(resource, listService, accessor.get(IWorkbenchEditorService)); return viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { - if (resource) { - fileService.resolveFile(resource).then(stat => { - return stat.isDirectory ? stat.resource : dirname(stat.resource); - }).then(resource => - (viewlet as SearchViewlet).searchInFolder(resource, (from, to) => relative(from, to)) - ); + if (resources && resources.length) { + return fileService.resolveFiles(resources.map(resource => ({ resource }))).then(results => { + const folders: URI[] = []; + + results.forEach(result => { + if (result.success) { + folders.push(result.stat.isDirectory ? result.stat.resource : dirname(result.stat.resource)); + } + }); + + (viewlet as SearchViewlet).searchInFolders(distinct(folders, folder => folder.toString()), (from, to) => relative(from, to)); + }); } + + return void 0; }); } }); @@ -212,7 +221,7 @@ CommandsRegistry.registerCommand({ handler: (accessor) => { const viewletService = accessor.get(IViewletService); return viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { - (viewlet as SearchViewlet).searchInFolder(null, (from, to) => relative(from, to)); + (viewlet as SearchViewlet).searchInFolders(null, (from, to) => relative(from, to)); }); } }); From f0ba5c8e076347f568d9c1571a32d9c358c84d55 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 12:53:31 +0100 Subject: [PATCH 151/710] quick open: alt open to the side --- src/vs/workbench/browser/parts/quickopen/quickOpenController.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index c5e59196388..a3720fad8db 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -1301,7 +1301,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { public run(mode: Mode, context: IEntryRunContext): boolean { if (mode === Mode.OPEN) { - const sideBySide = !context.quickNavigateConfiguration && context.keymods.ctrlCmd; + const sideBySide = !context.quickNavigateConfiguration && (context.keymods.alt || context.keymods.ctrlCmd); const pinned = !this.configurationService.getValue().workbench.editor.enablePreviewFromQuickOpen || context.keymods.alt; if (this.input instanceof EditorInput) { From e37de9d12be0a773786fd431a23d24cfdf312b2c Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 12:55:30 +0100 Subject: [PATCH 152/710] fix "open to side" not showing up in empty selection menu --- .../parts/files/electron-browser/fileActions.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 79625b075ff..66105e7575b 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -328,7 +328,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: 'navigation', order: 10, command: openToSideCommand, - when: ExplorerFolderContext.toNegated() + when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.HasResource) }); MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { From 68026eadf8e20ee27b1a30f42f7e888ab4d28c09 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 12:57:48 +0100 Subject: [PATCH 153/710] First cut --- .../model/chunksTextBuffer/bufferPiece.ts | 220 ++++++ .../chunksTextBuffer/chunksTextBuffer.ts | 688 ++++++++++++++++++ .../chunksTextBufferBuilder.ts | 129 ++++ src/vs/editor/common/model/textModel.ts | 5 + 4 files changed, 1042 insertions(+) create mode 100644 src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts create mode 100644 src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts create mode 100644 src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts new file mode 100644 index 00000000000..cbe35718d99 --- /dev/null +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -0,0 +1,220 @@ +/*--------------------------------------------------------------------------------------------- + * 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 = createUint32Array(createLineStarts(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 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); // TODO: does this work correctly? + + return new BufferPiece( + target._str.substring(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[]; + 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.substring(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); +} + +function createUint32Array(arr: number[]): Uint32Array { + let r = new Uint32Array(arr.length); + r.set(arr, 0); + return r; +} + +function createLineStarts(str: string): number[] { + 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 r; +} diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts new file mode 100644 index 00000000000..194031e6e8a --- /dev/null +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -0,0 +1,688 @@ +/*--------------------------------------------------------------------------------------------- + * 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 } 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'; + +export class ChunksTextBuffer implements ITextBuffer { + + private _actual: Buffer; + + constructor(pieces: BufferPiece[], _averageChunkSize: number) { + 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); + } + + equals(other: ITextBuffer): boolean { + throw new Error('TODO'); + } + mightContainRTL(): boolean { + // TODO + return true; + } + mightContainNonBasicASCII(): boolean { + // TODO + return true; + } + getBOM(): string { + // TODO + return ''; + } + getEOL(): string { + // TODO + return '\n'; + } + getOffsetAt(lineNumber: number, column: number): number { + return this._actual.getOffsetAt(lineNumber, column); + } + getPositionAt(offset: number): Position { + throw new Error('TODO'); + } + getRangeAt(offset: number, length: number): Range { + throw new Error('TODO'); + } + getValueInRange(range: Range, eol: EndOfLinePreference): string { + // TODO + + if (range.isEmpty()) { + return ''; + } + + if (range.startLineNumber === range.endLineNumber) { + return this.getLineContent(range.startLineNumber).substring(range.startColumn - 1, range.endColumn - 1); + } + + var lineEnding = '\n',//todo this._getEndOfLine(eol), + startLineIndex = range.startLineNumber - 1, + endLineIndex = range.endLineNumber - 1, + resultLines: string[] = []; + + resultLines.push(this.getLineContent(startLineIndex + 1).substring(range.startColumn - 1)); + for (var i = startLineIndex + 1; i < endLineIndex; i++) { + resultLines.push(this.getLineContent(i + 1)); + } + resultLines.push(this.getLineContent(endLineIndex + 1).substring(0, range.endColumn - 1)); + + return resultLines.join(lineEnding); + } + getValueLengthInRange(range: Range, eol: EndOfLinePreference): number { + // TODO + return this.getValueInRange(range, eol).length; + } + getLineCount(): number { + // TODO: perhaps cache? + return this._actual.getLineCount(); + } + getLinesContent(): string[] { + return this._actual.getLinesContent(); + } + getLineContent(lineNumber: number): string { + // TODO + return this._actual.getLineContent(lineNumber).replace(/\r?\n?/, ''); + } + getLineCharCode(lineNumber: number, index: number): number { + return this.getLineContent(lineNumber).charCodeAt(index); + } + getLineLength(lineNumber: number): number { + // TODO + let content = this.getLineContent(lineNumber); + return content.length; + } + getLineFirstNonWhitespaceColumn(lineNumber: number): number { + throw new Error('TODO'); + } + getLineLastNonWhitespaceColumn(lineNumber: number): number { + throw new Error('TODO'); + } + setEOL(newEOL: string): void { + throw new Error('TODO'); + } + applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { + throw new Error('TODO'); + } +} + + +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 readonly offset, + public readonly leafIndex, + public readonly leafStartOffset, + public readonly 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[] + ) { } +} + +class Buffer { + + private _minLeafLength: number; + private _maxLeafLength: number; + private _idealLeafLength: number; + + private _leafs: BufferPiece[]; + private _nodes: BufferNodes; + private _nodesCount: number; + private _leafsStart: number; + private _leafsEnd: number; + + constructor(pieces: BufferPiece[], minLeafLength: number, maxLeafLength: number) { + if (!(2 * minLeafLength >= maxLeafLength)) { + throw new Error(`assertion violation`); + } + + this._minLeafLength = minLeafLength; + this._maxLeafLength = maxLeafLength; + this._idealLeafLength = (minLeafLength + maxLeafLength) >>> 1; + + this._leafs = pieces; + this._nodes = null; + this._nodesCount = 0; + this._leafsStart = 0; + this._leafsEnd = 0; + + this._rebuildNodes(); + } + + 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; + } + + public findOffset(offset: number): BufferCursor { + if (offset > this._nodes.length[1]) { + return null; + } + + 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); + + return new BufferCursor(offset, it, leafStartOffset, leafStartNewLineCount); + } + + private _findLineStart(lineIndex: number): BufferCursor { + if (lineIndex < 0 || lineIndex > this._nodes.newLineCount[1]) { + return null; + } + + 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)); + + return new BufferCursor(leafStartOffset + innerLineStartOffset, it, leafStartOffset, leafStartNewLineCount); + } + + private _findLineEnd(start: BufferCursor, lineNumber: number): BufferCursor { + 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); + return new BufferCursor(leafStartOffset + lineEndOffset, leafIndex, leafStartOffset, leafStartNewLineCount); + } + + leafIndex++; + + if (leafIndex >= leafsCount) { + return new BufferCursor(leafStartOffset + leaf.length(), leafIndex - 1, leafStartOffset, leafStartNewLineCount); + } + + leafStartOffset += leaf.length(); + leafStartNewLineCount += leaf.newLineCount(); + innerLineIndex = 0; + } + } + + public findLine(lineNumber: number): [BufferCursor, BufferCursor] { + const innerLineIndex = lineNumber - 1; + const start = this._findLineStart(innerLineIndex); + if (!start) { + return null; + } + + const end = this._findLineEnd(start, lineNumber); + return [start, end]; + } + + public getLineCount(): number { + return this._nodes.newLineCount[1] + 1; + } + + public getLineContent(lineNumber: number): string { + const r = this.findLine(lineNumber); + if (!r) { + throw new Error(`Line not found`); + } + const [start, end] = r; + return this.extractString(start, end.offset - start.offset); + } + + public getLinesContent(): string[] { + let result: string[] = new Array(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); + let length = newLineStart - leafSubstrOffset - 1 /*-1 for EOL*/; + + if (length > 0 && leaf.charCodeAt(leafSubstrOffset + length - 1) === CharCode.CarriageReturn) { + // \r\n case + length--; + } + currentLine += leaf.substr(leafSubstrOffset, length); + 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; + } + + public getOffsetAt(lineNumber: number, column: number): number { + const start = this._findLineStart(lineNumber - 1); + if (!start) { + throw new Error(`Line not found`); + } + return start.offset + column - 1; + } + + //#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: BufferCursor; + for (let i = 0, len = edits.length; i < len; i++) { + const edit = edits[i]; + + let text = edit.text; + + tmp = this.findOffset(edit.offset); + 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; + + tmp = this.findOffset(edit.offset - 1); + startLeafIndex = tmp.leafIndex; + startInnerOffset = tmp.offset - tmp.leafStartOffset; + } + } + + tmp = this.findOffset(edit.offset + edit.length); + 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'; + + tmp = this.findOffset(edit.offset + edit.length + 1); + 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; + } + + public replaceOffsetLen(_edits: OffsetLenEdit[]): void { + 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(); + } + + //#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 new file mode 100644 index 00000000000..ddd56eab383 --- /dev/null +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -0,0 +1,129 @@ +/*--------------------------------------------------------------------------------------------- + * 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 } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece'; +import { ChunksTextBuffer } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBuffer'; + +export class TextBufferFactory implements ITextBufferFactory { + + constructor( + private readonly _pieces: BufferPiece[], + private readonly _averageChunkSize: number + ) { + } + + public create(defaultEOL: DefaultEndOfLine): ITextBuffer { + // TODO: CRLF vs LF + return new ChunksTextBuffer(this._pieces, this._averageChunkSize); + } + + public getFirstLineText(lengthLimit: number): string { + console.log(`TODO`); + return ''; + } +} + +export class ChunksTextBufferBuilder implements ITextBufferBuilder { + + private _rawPieces: BufferPiece[]; + private _hasPreviousChar: boolean; + private _previousChar: number; + private _averageChunkSize: number; + + // private totalCRCount: number; + private containsRTL: boolean; + private isBasicASCII: boolean; + + constructor() { + this._rawPieces = []; + this._hasPreviousChar = false; + this._previousChar = 0; + this._averageChunkSize = 0; + + // this.totalCRCount = 0; + 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._averageChunkSize = (this._averageChunkSize * this._rawPieces.length + chunk.length) / (this._rawPieces.length + 1); + + const lastChar = chunk.charCodeAt(chunk.length - 1); + if (lastChar === 13 || (lastChar >= 0xd800 && lastChar <= 0xdbff)) { + // last character is \r or a high surrogate => keep it back + this._acceptChunk1(chunk.substring(0, chunk.length - 1), false); + this._hasPreviousChar = true; + this._previousChar = lastChar; + } else { + this._acceptChunk1(chunk, false); + this._hasPreviousChar = false; + this._previousChar = lastChar; + } + + if (!this.containsRTL) { + this.containsRTL = strings.containsRTL(chunk); + } + if (this.isBasicASCII) { + this.isBasicASCII = strings.isBasicASCII(chunk); + } + } + + 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 { + this._rawPieces.push(new BufferPiece(chunk)); + } + + public finish(): TextBufferFactory { + this._finish(); + return new TextBufferFactory(this._rawPieces, this._averageChunkSize); + } + + 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; + } + } +} diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index dff56a1a7a8..701c7274e71 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -34,9 +34,14 @@ import { TextModelSearch, SearchParams } from 'vs/editor/common/model/textModelS import { TPromise } from 'vs/base/common/winjs.base'; import { IStringStream } from 'vs/platform/files/common/files'; import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; +import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder'; // Here is the master switch for the text buffer implementation: +const USE_CHUNKS_TEXT_BUFFER = true; function createTextBufferBuilder() { + if (USE_CHUNKS_TEXT_BUFFER) { + return new ChunksTextBufferBuilder(); + } return new LinesTextBufferBuilder(); } From 2315df4bb83a7bc2ec3e68e0f3e0e34b3b2f5016 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 11 Jan 2018 11:57:09 +0100 Subject: [PATCH 154/710] Revert "Fix #40018" This reverts commit 7ffffa09b36eda54366989ca3ad414875295fe25. --- src/vs/workbench/api/node/extHostTreeViews.ts | 27 ++++-- .../api/extHostTreeViews.test.ts | 97 +++++++++++-------- 2 files changed, 75 insertions(+), 49 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 44f12bb39dc..5ebf180db38 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -77,7 +77,7 @@ interface TreeNode { class ExtHostTreeView extends Disposable { - private _itemHandlePool = 0; + private static ROOT_HANDLE = '0'; private elements: Map = new Map(); private nodes: Map = new Map(); @@ -103,10 +103,12 @@ class ExtHostTreeView extends Disposable { elements = coalesce(elements || []); return TPromise.join(elements.map((element, index) => { const node = this.nodes.get(element); - return this.resolveElement(element, node ? node.handle : `${++this._itemHandlePool}`, parentHandle) + const currentHandle = node && node.parentHandle === parentHandle ? node.handle : void 0; + return this.resolveElement(element, currentHandle ? currentHandle : index, parentHandle) .then(treeItem => { if (treeItem) { - if (!node) { + if (!currentHandle) { + // update the caches if current handle is not used this.nodes.set(element, { handle: treeItem.handle, parentHandle, @@ -137,21 +139,26 @@ class ExtHostTreeView extends Disposable { } } - private resolveElement(element: T, handle: TreeItemHandle, parentHandle: TreeItemHandle): TPromise { + private resolveElement(element: T, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): TPromise { return asWinJsPromise(() => this.dataProvider.getTreeItem(element)) - .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handle, parentHandle)); + .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handleOrIndex, parentHandle)); } - private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handle: TreeItemHandle, parentHandle: TreeItemHandle): ITreeItem { + private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): ITreeItem { if (!extensionTreeItem) { return null; } const icon = this.getLightIconPath(extensionTreeItem); + const label = extensionTreeItem.label; + const handle = typeof handleOrIndex === 'number' ? + this.generateHandle(label, handleOrIndex, parentHandle) // create the handle + : handleOrIndex; // reuse the passed handle + return { handle, parentHandle, - label: extensionTreeItem.label, + label, command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0, contextValue: extensionTreeItem.contextValue, icon, @@ -160,6 +167,12 @@ class ExtHostTreeView extends Disposable { }; } + private generateHandle(label: string, index: number, parentHandle: TreeItemHandle): TreeItemHandle { + parentHandle = parentHandle ? parentHandle : ExtHostTreeView.ROOT_HANDLE; + label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; + return `${parentHandle}/${index}:${label}`; + } + private getLightIconPath(extensionTreeItem: vscode.TreeItem): string { if (extensionTreeItem.iconPath) { if (typeof extensionTreeItem.iconPath === 'string' || extensionTreeItem.iconPath instanceof URI) { 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 921c654bf16..1a692f0c257 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -83,24 +83,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testNodeTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['1', '2']); + assert.deepEqual(actuals, ['0/0:a', '0/1:b']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '1') + testObject.$getChildren('testNodeTreeProvider', '0/0:a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['3', '4']); + assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '3').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '4').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testNodeTreeProvider', '2') + testObject.$getChildren('testNodeTreeProvider', '0/1:b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['5', '6']); + assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '5').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '6').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -111,24 +111,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testStringTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['1', '2']); + assert.deepEqual(actuals, ['0/0:a', '0/1:b']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '1') + testObject.$getChildren('testStringTreeProvider', '0/0:a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['3', '4']); + assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '3').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '4').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', '2') + testObject.$getChildren('testStringTreeProvider', '0/1:b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['5', '6']); + assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '5').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '6').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -146,9 +146,9 @@ suite('ExtHostTreeView', function () { test('refresh a parent node', () => { return new TPromise((c, e) => { target.onRefresh.event(actuals => { - assert.deepEqual(['2'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['2']), { - handle: '2', + assert.deepEqual(['0/1:b'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { + handle: '0/1:b', label: 'b', }); c(null); @@ -159,10 +159,10 @@ suite('ExtHostTreeView', function () { test('refresh a leaf node', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['6'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['6']), { - handle: '6', - parentHandle: '2', + assert.deepEqual(['0/1:b/1:bb'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/1:b/1:bb']), { + handle: '0/1:b/1:bb', + parentHandle: '0/1:b', label: 'bb' }); done(); @@ -172,14 +172,14 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 1', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['2', '3'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['2']), { - handle: '2', + assert.deepEqual(['0/1:b', '0/0:a/0:aa'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { + handle: '0/1:b', label: 'b', }); - assert.deepEqual(removeUnsetKeys(actuals['3']), { - handle: '3', - parentHandle: '1', + assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { + handle: '0/0:a/0:aa', + parentHandle: '0/0:a', label: 'aa', }); done(); @@ -191,14 +191,14 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 2', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['2', '3'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['2']), { - handle: '2', + assert.deepEqual(['0/0:a/0:aa', '0/1:b'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { + handle: '0/1:b', label: 'b', }); - assert.deepEqual(removeUnsetKeys(actuals['3']), { - handle: '3', - parentHandle: '1', + assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { + handle: '0/0:a/0:aa', + parentHandle: '0/0:a', label: 'aa', }); done(); @@ -211,9 +211,9 @@ suite('ExtHostTreeView', function () { test('refresh an element for label change', function (done) { labels['a'] = 'aa'; target.onRefresh.event(actuals => { - assert.deepEqual(['1'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['1']), { - handle: '1', + assert.deepEqual(['0/0:a'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), { + handle: '0/0:a', label: 'aa', }); done(); @@ -234,7 +234,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['1', '2'], Object.keys(actuals)); + assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); done(); }); @@ -246,7 +246,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on unknown elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['1', '2'], Object.keys(actuals)); + assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); done(); }); @@ -280,6 +280,19 @@ suite('ExtHostTreeView', function () { onDidChangeTreeNode.fire(getNode('a')); }); + test('generate unique handles from labels by escaping them', () => { + tree = { + 'a/0:b': {} + }; + + onDidChangeTreeNode.fire(); + + return testObject.$getElements('testNodeTreeProvider') + .then(elements => { + assert.deepEqual(elements.map(e => e.handle), ['0/0:a//0:b']); + }); + }); + function removeUnsetKeys(obj: any): any { const result = {}; for (const key of Object.keys(obj)) { From f2c8145dc2ce58becf9a87f6a63fac0f7372f7c3 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 11 Jan 2018 15:53:09 +0100 Subject: [PATCH 155/710] #41377 forgot to return --- src/vs/workbench/browser/parts/views/panelViewlet.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/browser/parts/views/panelViewlet.ts b/src/vs/workbench/browser/parts/views/panelViewlet.ts index f9717eccef2..c9afb8b9ced 100644 --- a/src/vs/workbench/browser/parts/views/panelViewlet.ts +++ b/src/vs/workbench/browser/parts/views/panelViewlet.ts @@ -198,6 +198,7 @@ export class PanelViewlet extends Viewlet { for (const { panel } of this.panelItems) { if (panel.isExpanded()) { panel.focus(); + return; } } } From 71cc864c495b13663bce1e3793d7f533433f2de9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 12 Jan 2018 13:55:28 +0100 Subject: [PATCH 156/710] #40018 Revert to use label as id. Do not use index instead have a counter for duplicate labels --- src/vs/workbench/api/node/extHostTreeViews.ts | 239 +++++++++--------- .../api/extHostTreeViews.test.ts | 106 +++++--- 2 files changed, 201 insertions(+), 144 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 5ebf180db38..a96594f0e3a 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -77,7 +77,9 @@ interface TreeNode { class ExtHostTreeView extends Disposable { - private static ROOT_HANDLE = '0'; + private static LABEL_HANDLE_PREFIX = '0'; + + private rootHandles: TreeItemHandle[] = []; private elements: Map = new Map(); private nodes: Map = new Map(); @@ -85,49 +87,36 @@ class ExtHostTreeView extends Disposable { super(); this.proxy.$registerView(viewId); if (dataProvider.onDidChangeTreeData) { - this._register(debounceEvent(dataProvider.onDidChangeTreeData, (last, current) => last ? [...last, current] : [current], 200)(elements => this._refresh(elements))); + this._register(debounceEvent(dataProvider.onDidChangeTreeData, (last, current) => last ? [...last, current] : [current], 200)(elements => this.refresh(elements))); } } getChildren(parentHandle?: TreeItemHandle): TPromise { - let parentElement; - if (parentHandle) { - parentElement = this.getExtensionElement(parentHandle); - if (!parentElement) { - return TPromise.wrapError(new Error(localize('treeItem.notFound', 'No tree item with id \'{0}\' found.', parentHandle))); - } + const parentElement = parentHandle ? this.getExtensionElement(parentHandle) : void 0; + if (parentHandle && !parentElement) { + console.error(`No tree item with id \'${parentHandle}\' found.`); + return TPromise.as([]); } + this.clearChildren(parentElement); return asWinJsPromise(() => this.dataProvider.getChildren(parentElement)) - .then(elements => { - elements = coalesce(elements || []); - return TPromise.join(elements.map((element, index) => { - const node = this.nodes.get(element); - const currentHandle = node && node.parentHandle === parentHandle ? node.handle : void 0; - return this.resolveElement(element, currentHandle ? currentHandle : index, parentHandle) - .then(treeItem => { - if (treeItem) { - if (!currentHandle) { - // update the caches if current handle is not used - this.nodes.set(element, { - handle: treeItem.handle, - parentHandle, - childrenHandles: void 0 - }); - this.elements.set(treeItem.handle, element); - } + .then(elements => TPromise.join( + coalesce(elements || []).map(element => + asWinJsPromise(() => this.dataProvider.getTreeItem(element)) + .then(extTreeItem => { + if (extTreeItem) { + return { element, extTreeItem }; } - return treeItem; - }); - })).then(treeItems => this.updateChildren(coalesce(treeItems), parentElement)); - }); + return null; + }) + ))).then(extTreeItems => extTreeItems.map((({ element, extTreeItem }) => this.createTreeItem(element, extTreeItem, parentHandle)))); } getExtensionElement(treeItemHandle: TreeItemHandle): T { return this.elements.get(treeItemHandle); } - private _refresh(elements: T[]): void { + private refresh(elements: T[]): void { const hasRoot = elements.some(element => !element); if (hasRoot) { this.proxy.$refresh(this.viewId); @@ -139,64 +128,6 @@ class ExtHostTreeView extends Disposable { } } - private resolveElement(element: T, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): TPromise { - return asWinJsPromise(() => this.dataProvider.getTreeItem(element)) - .then(extTreeItem => this.massageTreeItem(element, extTreeItem, handleOrIndex, parentHandle)); - } - - private massageTreeItem(element: T, extensionTreeItem: vscode.TreeItem, handleOrIndex: TreeItemHandle | number, parentHandle: TreeItemHandle): ITreeItem { - if (!extensionTreeItem) { - return null; - } - - const icon = this.getLightIconPath(extensionTreeItem); - const label = extensionTreeItem.label; - const handle = typeof handleOrIndex === 'number' ? - this.generateHandle(label, handleOrIndex, parentHandle) // create the handle - : handleOrIndex; // reuse the passed handle - - return { - handle, - parentHandle, - label, - command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0, - contextValue: extensionTreeItem.contextValue, - icon, - iconDark: this.getDarkIconPath(extensionTreeItem) || icon, - collapsibleState: extensionTreeItem.collapsibleState - }; - } - - private generateHandle(label: string, index: number, parentHandle: TreeItemHandle): TreeItemHandle { - parentHandle = parentHandle ? parentHandle : ExtHostTreeView.ROOT_HANDLE; - label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; - return `${parentHandle}/${index}:${label}`; - } - - private getLightIconPath(extensionTreeItem: vscode.TreeItem): string { - if (extensionTreeItem.iconPath) { - if (typeof extensionTreeItem.iconPath === 'string' || extensionTreeItem.iconPath instanceof URI) { - return this.getIconPath(extensionTreeItem.iconPath); - } - return this.getIconPath(extensionTreeItem.iconPath['light']); - } - return void 0; - } - - private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string { - if (extensionTreeItem.iconPath && extensionTreeItem.iconPath['dark']) { - return this.getIconPath(extensionTreeItem.iconPath['dark']); - } - return void 0; - } - - private getIconPath(iconPath: string | URI): string { - if (iconPath instanceof URI) { - return iconPath.toString(); - } - return URI.file(iconPath).toString(); - } - private getHandlesToRefresh(elements: T[]): TreeItemHandle[] { const elementsToUpdate = new Set(); for (const element of elements) { @@ -233,39 +164,116 @@ class ExtHostTreeView extends Disposable { itemHandles.forEach(treeItemHandle => { const extElement = this.getExtensionElement(treeItemHandle); const node = this.nodes.get(extElement); - promises.push(this.resolveElement(extElement, treeItemHandle, node.parentHandle) - .then(treeItem => { - itemsToRefresh[treeItemHandle] = treeItem; + promises.push(asWinJsPromise(() => this.dataProvider.getTreeItem(extElement)) + .then(extTreeItem => { + if (extTreeItem) { + itemsToRefresh[treeItemHandle] = this.createTreeItem(extElement, extTreeItem, node.parentHandle); + } })); }); return TPromise.join(promises) - .then(treeItems => { - this.proxy.$refresh(this.viewId, itemsToRefresh); - }); + .then(treeItems => this.proxy.$refresh(this.viewId, itemsToRefresh)); } - private updateChildren(newChildren: ITreeItem[], parentElement?: T): ITreeItem[] { - let existingChildrenHandles: TreeItemHandle[] = []; - if (parentElement) { - const parentNode = this.nodes.get(parentElement); - existingChildrenHandles = parentNode.childrenHandles || []; - parentNode.childrenHandles = newChildren.map(c => c.handle); - } else { - this.nodes.forEach(node => { - if (!node.parentHandle) { - existingChildrenHandles.push(node.handle); - } - }); - } + private createTreeItem(element: T, extensionTreeItem: vscode.TreeItem, parentHandle: TreeItemHandle): ITreeItem { - for (const existingChildHandle of existingChildrenHandles) { - const existingChildElement = this.elements.get(existingChildHandle); - if (existingChildElement && newChildren.every(c => c.handle !== existingChildHandle)) { - this.clear(existingChildElement); + const handle = this.createHandle(element, extensionTreeItem, parentHandle); + const icon = this.getLightIconPath(extensionTreeItem); + this.update(element, handle, parentHandle); + + return { + handle, + parentHandle, + label: extensionTreeItem.label, + command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0, + contextValue: extensionTreeItem.contextValue, + icon, + iconDark: this.getDarkIconPath(extensionTreeItem) || icon, + collapsibleState: extensionTreeItem.collapsibleState + }; + } + + private createHandle(element: T, { label }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { + const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX; + label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; + const existingHandle = this.nodes.has(element) ? this.nodes.get(element).handle : void 0; + + for (let labelCount = 0; labelCount <= this.getChildrenHandles(parentHandle).length; labelCount++) { + const handle = `${prefix}/${labelCount}:${label}`; + if (!this.elements.has(handle) || existingHandle === handle) { + return handle; } } - return newChildren; + throw new Error('This should not be reached'); + } + + private getLightIconPath(extensionTreeItem: vscode.TreeItem): string { + if (extensionTreeItem.iconPath) { + if (typeof extensionTreeItem.iconPath === 'string' || extensionTreeItem.iconPath instanceof URI) { + return this.getIconPath(extensionTreeItem.iconPath); + } + return this.getIconPath(extensionTreeItem.iconPath['light']); + } + return void 0; + } + + private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string { + if (extensionTreeItem.iconPath && extensionTreeItem.iconPath['dark']) { + return this.getIconPath(extensionTreeItem.iconPath['dark']); + } + return void 0; + } + + private getIconPath(iconPath: string | URI): string { + if (iconPath instanceof URI) { + return iconPath.toString(); + } + return URI.file(iconPath).toString(); + } + + private getChildrenHandles(parentHandle?: TreeItemHandle): TreeItemHandle[] { + return parentHandle ? this.nodes.get(this.getExtensionElement(parentHandle)).childrenHandles : this.rootHandles; + } + + private update(element: T, handle: TreeItemHandle, parentHandle: TreeItemHandle): void { + const node = this.nodes.get(element); + const childrenHandles = this.getChildrenHandles(parentHandle); + + // Update parent node + if (node) { + if (node.handle !== handle) { + childrenHandles[childrenHandles.indexOf(node.handle)] = handle; + this.clearChildren(element); + } + } else { + childrenHandles.push(handle); + } + + // Update element maps + this.elements.set(handle, element); + this.nodes.set(element, { + handle, + parentHandle, + childrenHandles: node ? node.childrenHandles : [] + }); + } + + private clearChildren(parentElement?: T): void { + if (parentElement) { + let node = this.nodes.get(parentElement); + if (node.childrenHandles) { + for (const childHandle of node.childrenHandles) { + const childEleement = this.elements.get(childHandle); + if (childEleement) { + this.clear(childEleement); + } + } + } + node.childrenHandles = []; + } else { + this.clearAll(); + } } private clear(element: T): void { @@ -282,8 +290,13 @@ class ExtHostTreeView extends Disposable { this.elements.delete(node.handle); } - dispose() { + private clearAll(): void { + this.rootHandles = []; this.elements.clear(); this.nodes.clear(); } + + dispose() { + this.clearAll(); + } } \ No newline at end of file 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 1a692f0c257..c5a1d5824b6 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -83,24 +83,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testNodeTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a', '0/1:b']); + assert.deepEqual(actuals, ['0/0:a', '0/0:b']); return TPromise.join([ testObject.$getChildren('testNodeTreeProvider', '0/0:a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); + assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/0:ab']); return TPromise.join([ testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '0/0:a/0:ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testNodeTreeProvider', '0/1:b') + testObject.$getChildren('testNodeTreeProvider', '0/0:b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); + assert.deepEqual(actuals, ['0/0:b/0:ba', '0/0:b/0:bb']); return TPromise.join([ - testObject.$getChildren('testNodeTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testNodeTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeTreeProvider', '0/0:b/0:bb').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -111,24 +111,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testStringTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a', '0/1:b']); + assert.deepEqual(actuals, ['0/0:a', '0/0:b']); return TPromise.join([ testObject.$getChildren('testStringTreeProvider', '0/0:a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/1:ab']); + assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/0:ab']); return TPromise.join([ testObject.$getChildren('testStringTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/0:a/1:ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/0:a/0:ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', '0/1:b') + testObject.$getChildren('testStringTreeProvider', '0/0:b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/1:b/0:ba', '0/1:b/1:bb']); + assert.deepEqual(actuals, ['0/0:b/0:ba', '0/0:b/0:bb']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/1:b/0:ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/1:b/1:bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '0/0:b/0:ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '0/0:b/0:bb').then(children => assert.equal(children.length, 0)) ]); }) ]); @@ -146,9 +146,9 @@ suite('ExtHostTreeView', function () { test('refresh a parent node', () => { return new TPromise((c, e) => { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['0/0:b'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), { + handle: '0/0:b', label: 'b', }); c(null); @@ -159,10 +159,10 @@ suite('ExtHostTreeView', function () { test('refresh a leaf node', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b/1:bb'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b/1:bb']), { - handle: '0/1:b/1:bb', - parentHandle: '0/1:b', + assert.deepEqual(['0/0:b/0:bb'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/0:b/0:bb']), { + handle: '0/0:b/0:bb', + parentHandle: '0/0:b', label: 'bb' }); done(); @@ -172,9 +172,9 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 1', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/1:b', '0/0:a/0:aa'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['0/0:b', '0/0:a/0:aa'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), { + handle: '0/0:b', label: 'b', }); assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { @@ -191,9 +191,9 @@ suite('ExtHostTreeView', function () { test('refresh parent and child node trigger refresh only on parent - scenario 2', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a/0:aa', '0/1:b'], Object.keys(actuals)); - assert.deepEqual(removeUnsetKeys(actuals['0/1:b']), { - handle: '0/1:b', + assert.deepEqual(['0/0:a/0:aa', '0/0:b'], Object.keys(actuals)); + assert.deepEqual(removeUnsetKeys(actuals['0/0:b']), { + handle: '0/0:b', label: 'b', }); assert.deepEqual(removeUnsetKeys(actuals['0/0:a/0:aa']), { @@ -213,7 +213,7 @@ suite('ExtHostTreeView', function () { target.onRefresh.event(actuals => { assert.deepEqual(['0/0:a'], Object.keys(actuals)); assert.deepEqual(removeUnsetKeys(actuals['0/0:a']), { - handle: '0/0:a', + handle: '0/0:aa', label: 'aa', }); done(); @@ -234,7 +234,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); + assert.deepEqual(['0/0:a', '0/0:b'], Object.keys(actuals)); done(); }); @@ -246,7 +246,7 @@ suite('ExtHostTreeView', function () { test('refresh calls are throttled on unknown elements', function (done) { target.onRefresh.event(actuals => { - assert.deepEqual(['0/0:a', '0/1:b'], Object.keys(actuals)); + assert.deepEqual(['0/0:a', '0/0:b'], Object.keys(actuals)); done(); }); @@ -293,6 +293,50 @@ suite('ExtHostTreeView', function () { }); }); + test('tree with duplicate labels', () => { + + const dupItems = { + 'adup1': 'c', + 'adup2': 'g', + 'bdup1': 'e', + 'hdup1': 'i', + 'hdup2': 'l', + 'jdup1': 'k' + }; + + labels['c'] = 'a'; + labels['e'] = 'b'; + labels['g'] = 'a'; + labels['i'] = 'h'; + labels['l'] = 'h'; + labels['k'] = 'j'; + + tree[dupItems['adup1']] = {}; + tree['d'] = {}; + + const bdup1Tree = {}; + bdup1Tree['h'] = {}; + bdup1Tree[dupItems['hdup1']] = {}; + bdup1Tree['j'] = {}; + bdup1Tree[dupItems['jdup1']] = {}; + bdup1Tree[dupItems['hdup2']] = {}; + + tree[dupItems['bdup1']] = bdup1Tree; + tree['f'] = {}; + tree[dupItems['adup2']] = {}; + + return testObject.$getElements('testNodeTreeProvider') + .then(elements => { + const actuals = elements.map(e => e.handle); + assert.deepEqual(actuals, ['0/0:a', '0/0:b', '0/1:a', '0/0:d', '0/1:b', '0/0:f', '0/2:a']); + return testObject.$getChildren('testNodeTreeProvider', '0/1:b') + .then(elements => { + const actuals = elements.map(e => e.handle); + assert.deepEqual(actuals, ['0/1:b/0:h', '0/1:b/1:h', '0/1:b/0:j', '0/1:b/1:j', '0/1:b/2:h']); + }); + }); + }); + function removeUnsetKeys(obj: any): any { const result = {}; for (const key of Object.keys(obj)) { @@ -369,4 +413,4 @@ suite('ExtHostTreeView', function () { return nodes[key]; } -}); +}); \ No newline at end of file From d13a91aa096c56ac867f24222b5fdab9d2cbce0f Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 14:49:39 +0100 Subject: [PATCH 157/710] Reduce GC --- .../chunksTextBuffer/chunksTextBuffer.ts | 142 +++++++++++++----- 1 file changed, 107 insertions(+), 35 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 194031e6e8a..90ee5d8e8b1 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -93,9 +93,7 @@ export class ChunksTextBuffer implements ITextBuffer { return this.getLineContent(lineNumber).charCodeAt(index); } getLineLength(lineNumber: number): number { - // TODO - let content = this.getLineContent(lineNumber); - return content.length; + return this._actual.getLineLength(lineNumber); } getLineFirstNonWhitespaceColumn(lineNumber: number): number { throw new Error('TODO'); @@ -126,11 +124,18 @@ class BufferNodes { class BufferCursor { constructor( - public readonly offset, - public readonly leafIndex, - public readonly leafStartOffset, - public readonly leafStartNewLineCount + 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 { @@ -160,6 +165,39 @@ class LeafReplacement { ) { } } +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 Buffer { private _minLeafLength: number; @@ -232,9 +270,9 @@ class Buffer { this._nodes.newLineCount[nodeIndex] = newLineCount; } - public findOffset(offset: number): BufferCursor { + private _findOffset(offset: number, result: BufferCursor): boolean { if (offset > this._nodes.length[1]) { - return null; + return false; } let it = 1; @@ -276,12 +314,15 @@ class Buffer { } it = this.NODE_TO_LEAF_INDEX(it); - return new BufferCursor(offset, it, leafStartOffset, leafStartNewLineCount); + result.set(offset, it, leafStartOffset, leafStartNewLineCount); + return true; } - private _findLineStart(lineIndex: number): BufferCursor { + private _findLineStart(lineNumber: number, result: BufferCursor): boolean { + let lineIndex = lineNumber - 1; if (lineIndex < 0 || lineIndex > this._nodes.newLineCount[1]) { - return null; + result.set(0, 0, 0, 0); + return false; } let it = 1; @@ -318,10 +359,11 @@ class Buffer { const innerLineStartOffset = (lineIndex === 0 ? 0 : this._leafs[it].lineStartFor(lineIndex - 1)); - return new BufferCursor(leafStartOffset + innerLineStartOffset, it, leafStartOffset, leafStartNewLineCount); + result.set(leafStartOffset + innerLineStartOffset, it, leafStartOffset, leafStartNewLineCount); + return true; } - private _findLineEnd(start: BufferCursor, lineNumber: number): BufferCursor { + private _findLineEnd(start: BufferCursor, lineNumber: number, result: BufferCursor): void { let innerLineIndex = lineNumber - 1 - start.leafStartNewLineCount; const leafsCount = this._leafs.length; @@ -333,13 +375,15 @@ class Buffer { if (innerLineIndex < leaf.newLineCount()) { const lineEndOffset = this._leafs[leafIndex].lineStartFor(innerLineIndex); - return new BufferCursor(leafStartOffset + lineEndOffset, leafIndex, leafStartOffset, leafStartNewLineCount); + result.set(leafStartOffset + lineEndOffset, leafIndex, leafStartOffset, leafStartNewLineCount); + return; } leafIndex++; if (leafIndex >= leafsCount) { - return new BufferCursor(leafStartOffset + leaf.length(), leafIndex - 1, leafStartOffset, leafStartNewLineCount); + result.set(leafStartOffset + leaf.length(), leafIndex - 1, leafStartOffset, leafStartNewLineCount); + return; } leafStartOffset += leaf.length(); @@ -348,15 +392,13 @@ class Buffer { } } - public findLine(lineNumber: number): [BufferCursor, BufferCursor] { - const innerLineIndex = lineNumber - 1; - const start = this._findLineStart(innerLineIndex); - if (!start) { - return null; + private _findLine(lineNumber: number, start: BufferCursor, end: BufferCursor): boolean { + if (!this._findLineStart(lineNumber, start)) { + return false; } - const end = this._findLineEnd(start, lineNumber); - return [start, end]; + this._findLineEnd(start, lineNumber, end); + return true; } public getLineCount(): number { @@ -364,12 +406,37 @@ class Buffer { } public getLineContent(lineNumber: number): string { - const r = this.findLine(lineNumber); - if (!r) { + 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`); } - const [start, end] = r; - return this.extractString(start, end.offset - start.offset); + + const result = this.extractString(start, end.offset - start.offset); + + BufferCursorPool.put(start); + BufferCursorPool.put(end); + 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`); + } + + const result = end.offset - start.offset; + + BufferCursorPool.put(start); + BufferCursorPool.put(end); + return result; } public getLinesContent(): string[] { @@ -435,11 +502,16 @@ class Buffer { } public getOffsetAt(lineNumber: number, column: number): number { - const start = this._findLineStart(lineNumber - 1); - if (!start) { + const start = BufferCursorPool.take(); + + if (!this._findLineStart(lineNumber, start)) { + BufferCursorPool.put(start); throw new Error(`Line not found`); } - return start.offset + column - 1; + const result = start.offset + column - 1; + + BufferCursorPool.put(start); + return result; } //#region Editing @@ -468,13 +540,13 @@ class Buffer { edits = this._mergeAdjacentEdits(edits); let result: InternalOffsetLenEdit[] = []; - let tmp: BufferCursor; + let tmp = new BufferCursor(0, 0, 0, 0); for (let i = 0, len = edits.length; i < len; i++) { const edit = edits[i]; let text = edit.text; - tmp = this.findOffset(edit.offset); + this._findOffset(edit.offset, tmp); let startLeafIndex = tmp.leafIndex; let startInnerOffset = tmp.offset - tmp.leafStartOffset; if (startInnerOffset > 0) { @@ -484,13 +556,13 @@ class Buffer { // include the replacement of \r in the edit text = '\r' + text; - tmp = this.findOffset(edit.offset - 1); + this._findOffset(edit.offset - 1, tmp); startLeafIndex = tmp.leafIndex; startInnerOffset = tmp.offset - tmp.leafStartOffset; } } - tmp = this.findOffset(edit.offset + edit.length); + this._findOffset(edit.offset + edit.length, tmp); let endLeafIndex = tmp.leafIndex; let endInnerOffset = tmp.offset - tmp.leafStartOffset; const endLeaf = this._leafs[endLeafIndex]; @@ -500,7 +572,7 @@ class Buffer { // include the replacement of \n in the edit text = text + '\n'; - tmp = this.findOffset(edit.offset + edit.length + 1); + this._findOffset(edit.offset + edit.length + 1, tmp); endLeafIndex = tmp.leafIndex; endInnerOffset = tmp.offset - tmp.leafStartOffset; } From 88d0451e0679a64a13fdb6138a3742a5a4764b2d Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 15:05:40 +0100 Subject: [PATCH 158/710] Better EOL handling --- .../model/chunksTextBuffer/bufferPiece.ts | 17 ++++-- .../chunksTextBuffer/chunksTextBuffer.ts | 24 +++++---- .../chunksTextBufferBuilder.ts | 53 +++++++++++++++---- 3 files changed, 71 insertions(+), 23 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index cbe35718d99..d682c373eab 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -23,7 +23,7 @@ export class BufferPiece { constructor(str: string, lineStarts: Uint32Array = null) { this._str = str; if (lineStarts === null) { - this._lineStarts = createUint32Array(createLineStarts(str)); + this._lineStarts = createUint32Array(createLineStarts(str).lineStarts); } else { this._lineStarts = lineStarts; } @@ -192,18 +192,27 @@ function min(a: number, b: number): number { return (a < b ? a : b); } -function createUint32Array(arr: number[]): Uint32Array { +export function createUint32Array(arr: number[]): Uint32Array { let r = new Uint32Array(arr.length); r.set(arr, 0); return r; } -function createLineStarts(str: string): number[] { +export class LineStarts { + constructor( + public readonly lineStarts: number[], + public readonly carriageReturnCnt: number + ) { } +} + +export function createLineStarts(str: string): LineStarts { let r: number[] = [], rLength = 0; + let carriageReturnCnt = 0; for (let i = 0, len = str.length; i < len; i++) { const chr = str.charCodeAt(i); if (chr === CharCode.CarriageReturn) { + carriageReturnCnt++; if (i + 1 < len && str.charCodeAt(i + 1) === CharCode.LineFeed) { // \r\n... case r[rLength++] = i + 2; @@ -216,5 +225,5 @@ function createLineStarts(str: string): number[] { r[rLength++] = i + 1; } } - return r; + return new LineStarts(r, carriageReturnCnt); } diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 90ee5d8e8b1..12f494dd734 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -14,12 +14,12 @@ export class ChunksTextBuffer implements ITextBuffer { private _actual: Buffer; - constructor(pieces: BufferPiece[], _averageChunkSize: number) { + constructor(pieces: BufferPiece[], _averageChunkSize: number, eol: '\r\n' | '\n') { 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); + this._actual = new Buffer(pieces, min, max, eol); } equals(other: ITextBuffer): boolean { @@ -204,13 +204,16 @@ class Buffer { 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) { + constructor(pieces: BufferPiece[], minLeafLength: number, maxLeafLength: number, eol: '\r\n' | '\n') { if (!(2 * minLeafLength >= maxLeafLength)) { throw new Error(`assertion violation`); } @@ -219,6 +222,9 @@ class Buffer { 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; @@ -228,6 +234,10 @@ class Buffer { this._rebuildNodes(); } + public getEOL(): string { + return this._eol; + } + private _rebuildNodes() { const leafsCount = this._leafs.length; @@ -457,13 +467,7 @@ class Buffer { let leafSubstrOffset = 0; for (let newLineIndex = 0; newLineIndex < leafNewLineCount; newLineIndex++) { const newLineStart = leaf.lineStartFor(newLineIndex); - let length = newLineStart - leafSubstrOffset - 1 /*-1 for EOL*/; - - if (length > 0 && leaf.charCodeAt(leafSubstrOffset + length - 1) === CharCode.CarriageReturn) { - // \r\n case - length--; - } - currentLine += leaf.substr(leafSubstrOffset, length); + currentLine += leaf.substr(leafSubstrOffset, newLineStart - leafSubstrOffset - this._eolLength); result[resultIndex++] = currentLine; currentLine = ''; diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index ddd56eab383..fd3d525e368 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -6,20 +6,44 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model'; -import { BufferPiece } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece'; +import { BufferPiece, createLineStarts, createUint32Array } 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 _averageChunkSize: number, + private readonly _totalCRCount: number, + private readonly _totalEOLCount: number ) { } + /** + * 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' { + if (this._totalEOLCount === 0) { + // This is an empty file or a file with precisely one line + return (defaultEOL === DefaultEndOfLine.LF ? '\n' : '\r\n'); + } + if (this._totalCRCount > this._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 { - // TODO: CRLF vs LF - return new ChunksTextBuffer(this._pieces, this._averageChunkSize); + if (this._totalCRCount > 0 && this._totalCRCount !== this._totalEOLCount) { + // TODO + console.warn(`mixed line endings not handled correctly at this time!`); + } + return new ChunksTextBuffer(this._pieces, this._averageChunkSize, this._getEOL(defaultEOL)); } public getFirstLineText(lengthLimit: number): string { @@ -35,7 +59,8 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { private _previousChar: number; private _averageChunkSize: number; - // private totalCRCount: number; + private totalCRCount: number; + private totalEOLCount: number; private containsRTL: boolean; private isBasicASCII: boolean; @@ -45,7 +70,8 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._previousChar = 0; this._averageChunkSize = 0; - // this.totalCRCount = 0; + this.totalCRCount = 0; + this.totalEOLCount = 0; this.containsRTL = false; this.isBasicASCII = true; } @@ -68,7 +94,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._averageChunkSize = (this._averageChunkSize * this._rawPieces.length + chunk.length) / (this._rawPieces.length + 1); const lastChar = chunk.charCodeAt(chunk.length - 1); - if (lastChar === 13 || (lastChar >= 0xd800 && lastChar <= 0xdbff)) { + if (lastChar === CharCode.CarriageReturn || (lastChar >= 0xd800 && lastChar <= 0xdbff)) { // last character is \r or a high surrogate => keep it back this._acceptChunk1(chunk.substring(0, chunk.length - 1), false); this._hasPreviousChar = true; @@ -101,12 +127,17 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { } private _acceptChunk2(chunk: string): void { - this._rawPieces.push(new BufferPiece(chunk)); + const lineStarts = createLineStarts(chunk); + + this._rawPieces.push(new BufferPiece(chunk, createUint32Array(lineStarts.lineStarts))); + this.totalCRCount += lineStarts.carriageReturnCnt; + this.totalEOLCount += lineStarts.lineStarts.length; } public finish(): TextBufferFactory { this._finish(); - return new TextBufferFactory(this._rawPieces, this._averageChunkSize); + console.log(`${this.totalCRCount}, ${this.totalEOLCount}`); + return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.totalCRCount, this.totalEOLCount); } private _finish(): void { @@ -124,6 +155,10 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { 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.totalCRCount++; + this.totalEOLCount++; + } } } } From 3d43ef7c462c75787e0e94a27fc2e3e04be293ff Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 12 Jan 2018 15:07:17 +0100 Subject: [PATCH 159/710] Use handle for id if it is of type string --- src/vs/workbench/api/node/extHostTreeViews.ts | 8 ++++++++ .../api/extHostTreeViews.test.ts | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index a96594f0e3a..0f7194fcc70 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -78,6 +78,7 @@ interface TreeNode { class ExtHostTreeView extends Disposable { private static LABEL_HANDLE_PREFIX = '0'; + private static ID_HANDLE_PREFIX = '1'; private rootHandles: TreeItemHandle[] = []; private elements: Map = new Map(); @@ -105,6 +106,9 @@ class ExtHostTreeView extends Disposable { asWinJsPromise(() => this.dataProvider.getTreeItem(element)) .then(extTreeItem => { if (extTreeItem) { + if (typeof element === 'string' && this.elements.has(this.createHandle(element, extTreeItem))) { + throw new Error(localize('treeView.duplicateElement', 'Element {0} is already registered', element)); + } return { element, extTreeItem }; } return null; @@ -194,6 +198,10 @@ class ExtHostTreeView extends Disposable { } private createHandle(element: T, { label }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { + if (typeof element === 'string') { + return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${element}`; + } + const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX; label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; const existingHandle = this.nodes.has(element) ? this.nodes.get(element).handle : void 0; 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 c5a1d5824b6..8cf64585e53 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -111,24 +111,24 @@ suite('ExtHostTreeView', function () { return testObject.$getElements('testStringTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a', '0/0:b']); + assert.deepEqual(actuals, ['1/a', '1/b']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/0:a') + testObject.$getChildren('testStringTreeProvider', '1/a') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:a/0:aa', '0/0:a/0:ab']); + assert.deepEqual(actuals, ['1/aa', '1/ab']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/0:a/0:aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/0:a/0:ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '1/aa').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '1/ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', '0/0:b') + testObject.$getChildren('testStringTreeProvider', '1/b') .then(children => { const actuals = children.map(e => e.handle); - assert.deepEqual(actuals, ['0/0:b/0:ba', '0/0:b/0:bb']); + assert.deepEqual(actuals, ['1/ba', '1/bb']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '0/0:b/0:ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '0/0:b/0:bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testStringTreeProvider', '1/ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testStringTreeProvider', '1/bb').then(children => assert.equal(children.length, 0)) ]); }) ]); From d85071de705b92322ea443ffae0608abc95ebecc Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 15:20:31 +0100 Subject: [PATCH 160/710] hey bot do not assign labels to my issues, thanks bro --- .github/classifier.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/classifier.yml b/.github/classifier.yml index 5cc074d1246..f1f512feb40 100644 --- a/.github/classifier.yml +++ b/.github/classifier.yml @@ -6,7 +6,10 @@ api: [], color-picker: [], css-less-sass: [], - debug: [ isidorn ], + debug: { + assignees: [ isidorn ], + assignLabel: false + }, diff-editor: [], editor: [], editor-1000-limit: [], @@ -31,7 +34,10 @@ file-encoding: [ bpasero ], file-io: [ bpasero ], file-watcher: [ bpasero ], - file-explorer: [ isidorn ], + file-explorer: { + assignees: [ isidorn ], + assignLabel: false + }, format: [], git: [ joaomoreno ], hot-exit: [ Tyriar ], From c19a86f9d12c06cd78c3c8c3ebee8aafbd88a413 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 15:24:11 +0100 Subject: [PATCH 161/710] remove root folders multi select aware and move helpr commandArgument methods to files.ts --- .../browser/actions/workspaceCommands.ts | 11 ---- .../execution.contribution.ts | 2 +- src/vs/workbench/parts/files/browser/files.ts | 46 ++++++++++++++++ .../fileActions.contribution.ts | 4 +- .../files/electron-browser/fileCommands.ts | 54 +++++++------------ .../electron-browser/search.contribution.ts | 2 +- 6 files changed, 70 insertions(+), 49 deletions(-) create mode 100644 src/vs/workbench/parts/files/browser/files.ts diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts index 2ef4aa69ab4..9c827b689d8 100644 --- a/src/vs/workbench/browser/actions/workspaceCommands.ts +++ b/src/vs/workbench/browser/actions/workspaceCommands.ts @@ -27,9 +27,6 @@ import { isLinux } from 'vs/base/common/platform'; export const ADD_ROOT_FOLDER_COMMAND_ID = 'workbench.command.addRootFolder'; export const ADD_ROOT_FOLDER_LABEL = nls.localize('addFolderToWorkspace', "Add Folder to Workspace..."); -export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'workbench.command.removeRootFolder'; -export const REMOVE_ROOT_FOLDER_LABEL = nls.localize('removeFolderFromWorkspace', "Remove Folder from Workspace"); - export const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder'; function pickFolders(buttonLabel: string, title: string, windowService: IWindowService, contextService: IWorkspaceContextService, historyService: IHistoryService): TPromise { @@ -158,14 +155,6 @@ CommandsRegistry.registerCommand({ } }); -CommandsRegistry.registerCommand({ - id: REMOVE_ROOT_FOLDER_COMMAND_ID, - handler: (accessor, resource: URI) => { - const workspaceEditingService = accessor.get(IWorkspaceEditingService); - return workspaceEditingService.removeFolders([resource]); - } -}); - CommandsRegistry.registerCommand(PICK_WORKSPACE_FOLDER_COMMAND_ID, function (accessor, args?: [IPickOptions, CancellationToken]) { const contextService = accessor.get(IWorkspaceContextService); const quickOpenService = accessor.get(IQuickOpenService); 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 97871707c4e..8da6d80138b 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -25,7 +25,7 @@ import { ResourceContextKey } from 'vs/workbench/common/resources'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { IFileService } from 'vs/platform/files/common/files'; import { IListService } from 'vs/platform/list/browser/listService'; -import { getResourceForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { getResourceForCommand } from 'vs/workbench/parts/files/browser/files'; if (env.isWindows) { registerSingleton(ITerminalService, WinTerminalService); diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts new file mode 100644 index 00000000000..3cdee5cb9d9 --- /dev/null +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -0,0 +1,46 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import URI from 'vs/base/common/uri'; +import { IListService } from 'vs/platform/list/browser/listService'; +import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; +import { toResource } from 'vs/workbench/common/editor'; +import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; + +// Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding +// To cover all these cases we need to properly compute the resource on which the command is being executed +export function getResourceForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI { + if (URI.isUri(resource)) { + return resource; + } + + const list = listService.lastFocusedList; + if (list && list.isDOMFocused()) { + const focus = list.getFocus(); + if (focus instanceof FileStat) { + return focus.resource; + } else if (focus instanceof OpenEditor) { + return focus.editorInput.getResource(); + } + } + + return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); +} + +export function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { + const list = listService.lastFocusedList; + if (list && list.isDOMFocused() && list instanceof Tree) { + const selection = list.getSelection(); + if (selection && selection.length > 1) { + return selection.map(fs => fs.resource); + } + } + + const result = getResourceForCommand(resource, listService, editorService); + return !!result ? [result] : []; +} diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 66105e7575b..4494b32fe9d 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -11,13 +11,13 @@ import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTI import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; -import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { isWindows, isMacintosh } from 'vs/base/common/platform'; import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext } from 'vs/workbench/parts/files/common/files'; -import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands'; +import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands'; import { CLOSE_UNMODIFIED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands'; import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/workbench/parts/preferences/browser/preferencesActions'; import { AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles'; diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 794cc59e109..89624e33007 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -38,8 +38,9 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; import { isWindows, isMacintosh } from 'vs/base/common/platform'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; import { sequence } from 'vs/base/common/async'; +import { getResourceForCommand, getResourcesForCommand } from 'vs/workbench/parts/files/browser/files'; +import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; // Commands @@ -72,44 +73,14 @@ export const OpenEditorsGroupContext = new RawContextKey('groupFocusedI export const DirtyEditorContext = new RawContextKey('dirtyEditor', false); export const ResourceSelectedForCompareContext = new RawContextKey('resourceSelectedForCompare', false); +export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'workbench.command.removeRootFolder'; +export const REMOVE_ROOT_FOLDER_LABEL = nls.localize('removeFolderFromWorkspace', "Remove Folder from Workspace"); + export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], forceNewWindow: boolean) => { const windowsService = accessor.get(IWindowsService); windowsService.openWindow(paths, { forceNewWindow }); }; -// Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding -// To cover all these cases we need to properly compute the resource on which the command is being executed -export function getResourceForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI { - if (URI.isUri(resource)) { - return resource; - } - - const list = listService.lastFocusedList; - if (list && list.isDOMFocused()) { - const focus = list.getFocus(); - if (focus instanceof FileStat) { - return focus.resource; - } else if (focus instanceof OpenEditor) { - return focus.editorInput.getResource(); - } - } - - return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); -} - -export function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { - const list = listService.lastFocusedList; - if (list && list.isDOMFocused() && list instanceof Tree) { - const selection = list.getSelection(); - if (selection && selection.length > 1) { - return selection.map(fs => fs.resource); - } - } - - const result = getResourceForCommand(resource, listService, editorService); - return !!result ? [result] : []; -} - function save(resource: URI, isSaveAs: boolean, editorService: IWorkbenchEditorService, fileService: IFileService, untitledEditorService: IUntitledEditorService, textFileService: ITextFileService, editorGroupService: IEditorGroupService): TPromise { @@ -542,3 +513,18 @@ CommandsRegistry.registerCommand({ return saveAll(false, accessor.get(IWorkbenchEditorService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); } }); + +CommandsRegistry.registerCommand({ + id: REMOVE_ROOT_FOLDER_COMMAND_ID, + handler: (accessor, resource: URI) => { + const workspaceEditingService = accessor.get(IWorkspaceEditingService); + const contextService = accessor.get(IWorkspaceContextService); + const workspace = contextService.getWorkspace(); + const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)).filter(r => + // Need to verify resources are workspaces since multi selection can trigger this command on some non workspace resources + workspace.folders.some(f => f.uri.toString() === r.toString()) + ); + + return workspaceEditingService.removeFolders(resources); + } +}); 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 81079ade397..c6cf0de7e59 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -47,10 +47,10 @@ import URI from 'vs/base/common/uri'; import { relative } from 'path'; import { dirname } from 'vs/base/common/resources'; import { ResourceContextKey } from 'vs/workbench/common/resources'; -import { getResourcesForCommand } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IFileService } from 'vs/platform/files/common/files'; import { distinct } from 'vs/base/common/arrays'; +import { getResourcesForCommand } from 'vs/workbench/parts/files/browser/files'; registerSingleton(ISearchWorkbenchService, SearchWorkbenchService); replaceContributions(); From 675929e543313240fd09fc4097e24a9ca9779c10 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 15:45:23 +0100 Subject: [PATCH 162/710] Improve getValueInRange --- .../chunksTextBuffer/chunksTextBuffer.ts | 143 ++++++++++++++---- 1 file changed, 112 insertions(+), 31 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 12f494dd734..f49a5ff3efa 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -51,30 +51,32 @@ export class ChunksTextBuffer implements ITextBuffer { throw new Error('TODO'); } getValueInRange(range: Range, eol: EndOfLinePreference): string { - // TODO - if (range.isEmpty()) { return ''; } - if (range.startLineNumber === range.endLineNumber) { - return this.getLineContent(range.startLineNumber).substring(range.startColumn - 1, range.endColumn - 1); + 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'); + } } - - var lineEnding = '\n',//todo this._getEndOfLine(eol), - startLineIndex = range.startLineNumber - 1, - endLineIndex = range.endLineNumber - 1, - resultLines: string[] = []; - - resultLines.push(this.getLineContent(startLineIndex + 1).substring(range.startColumn - 1)); - for (var i = startLineIndex + 1; i < endLineIndex; i++) { - resultLines.push(this.getLineContent(i + 1)); - } - resultLines.push(this.getLineContent(endLineIndex + 1).substring(0, range.endColumn - 1)); - - return resultLines.join(lineEnding); + return null; } + getValueLengthInRange(range: Range, eol: EndOfLinePreference): number { + // TODO return this.getValueInRange(range, eol).length; } @@ -86,8 +88,7 @@ export class ChunksTextBuffer implements ITextBuffer { return this._actual.getLinesContent(); } getLineContent(lineNumber: number): string { - // TODO - return this._actual.getLineContent(lineNumber).replace(/\r?\n?/, ''); + return this._actual.getLineContent(lineNumber); } getLineCharCode(lineNumber: number, index: number): number { return this.getLineContent(lineNumber).charCodeAt(index); @@ -328,6 +329,39 @@ class Buffer { 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()) { + 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]) { @@ -425,7 +459,7 @@ class Buffer { throw new Error(`Line not found`); } - const result = this.extractString(start, end.offset - start.offset); + const result = this.extractString(start, end.offset - start.offset - this._eolLength); BufferCursorPool.put(start); BufferCursorPool.put(end); @@ -442,7 +476,7 @@ class Buffer { throw new Error(`Line not found`); } - const result = end.offset - start.offset; + const result = end.offset - start.offset - this._eolLength; BufferCursorPool.put(start); BufferCursorPool.put(end); @@ -505,16 +539,56 @@ class Buffer { return res; } - public getOffsetAt(lineNumber: number, column: number): number { - const start = BufferCursorPool.take(); + private _getOffsetAt(lineNumber: number, column: number, result: BufferCursor): boolean { + const lineStart = BufferCursorPool.take(); - if (!this._findLineStart(lineNumber, start)) { + 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 getOffsetAt(lineNumber: number, column: number): number { + const offset = BufferCursorPool.take(); + + if (!this._getOffsetAt(lineNumber, column, offset)) { + BufferCursorPool.put(offset); + throw new Error(`Position not found`); + } + + BufferCursorPool.put(offset); + return offset.offset; + } + + public getValueInRange(range: Range): string { + const start = BufferCursorPool.take(); + const end = BufferCursorPool.take(); + + if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) { BufferCursorPool.put(start); + BufferCursorPool.put(end); throw new Error(`Line not found`); } - const result = start.offset + column - 1; + + if (!this._getOffsetAt(range.endLineNumber, range.endColumn, end)) { + BufferCursorPool.put(start); + BufferCursorPool.put(end); + throw new Error(`Line not found`); + } + + const result = this.extractString(start, end.offset - start.offset); BufferCursorPool.put(start); + BufferCursorPool.put(end); return result; } @@ -545,6 +619,7 @@ class Buffer { 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]; @@ -560,9 +635,12 @@ class Buffer { // include the replacement of \r in the edit text = '\r' + text; - this._findOffset(edit.offset - 1, tmp); - startLeafIndex = tmp.leafIndex; - startInnerOffset = tmp.offset - tmp.leafStartOffset; + 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; } } @@ -576,9 +654,12 @@ class Buffer { // include the replacement of \n in the edit text = text + '\n'; - this._findOffset(edit.offset + edit.length + 1, tmp); - endLeafIndex = tmp.leafIndex; - endInnerOffset = tmp.offset - tmp.leafStartOffset; + this._findOffsetCloseAfter(edit.offset + edit.length + 1, tmp, tmp2); + startLeafIndex = tmp2.leafIndex; + startInnerOffset = tmp2.offset - tmp2.leafStartOffset; + // this._findOffset(edit.offset + edit.length + 1, tmp); + // endLeafIndex = tmp.leafIndex; + // endInnerOffset = tmp.offset - tmp.leafStartOffset; } } From d2aa176871cb6c79effc58d8e1870c1d75cbec28 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 15:54:50 +0100 Subject: [PATCH 163/710] Better implementation for getValueLengthInRange --- .../chunksTextBuffer/chunksTextBuffer.ts | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index f49a5ff3efa..b7601d6a9b9 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -76,26 +76,51 @@ export class ChunksTextBuffer implements ITextBuffer { } getValueLengthInRange(range: Range, eol: EndOfLinePreference): number { - - // TODO - return this.getValueInRange(range, eol).length; + 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; } + getLineCount(): number { - // TODO: perhaps cache? 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 { + // TODO return this.getLineContent(lineNumber).charCodeAt(index); } + getLineLength(lineNumber: number): number { return this._actual.getLineLength(lineNumber); } + getLineFirstNonWhitespaceColumn(lineNumber: number): number { throw new Error('TODO'); } @@ -592,6 +617,29 @@ class Buffer { return result; } + public getValueLengthInRange(range: Range): number { + const start = BufferCursorPool.take(); + const end = BufferCursorPool.take(); + + if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) { + BufferCursorPool.put(start); + BufferCursorPool.put(end); + throw new Error(`Line not found`); + } + + if (!this._getOffsetAt(range.endLineNumber, range.endColumn, end)) { + BufferCursorPool.put(start); + BufferCursorPool.put(end); + throw new Error(`Line not found`); + } + + const result = end.offset - start.offset; + + BufferCursorPool.put(start); + BufferCursorPool.put(end); + return result; + } + //#region Editing private _mergeAdjacentEdits(edits: OffsetLenEdit[]): OffsetLenEdit[] { From ba5c31503ad0acdef405463463db71626bd00258 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 15:54:54 +0100 Subject: [PATCH 164/710] multi select - add and use distinctParents method to avoid duplicates --- src/vs/base/common/resources.ts | 26 +++++++++-- src/vs/base/test/common/resources.test.ts | 43 +++++++++++++++++++ .../files/electron-browser/fileActions.ts | 40 +++++++++-------- 3 files changed, 87 insertions(+), 22 deletions(-) create mode 100644 src/vs/base/test/common/resources.test.ts diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts index 4b883338383..3012d4a5b15 100644 --- a/src/vs/base/common/resources.ts +++ b/src/vs/base/common/resources.ts @@ -12,9 +12,9 @@ export function basenameOrAuthority(resource: uri): string { return paths.basename(resource.fsPath) || resource.authority; } -export function isEqualOrParent(first: uri, second: uri, ignoreCase?: boolean): boolean { - if (first.scheme === second.scheme && first.authority === second.authority) { - return paths.isEqualOrParent(first.fsPath, second.fsPath, ignoreCase); +export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean { + if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) { + return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase); } return false; @@ -42,3 +42,23 @@ export function dirname(resource: uri): uri { path: paths.dirname(resource.path) }); } + +export function distinctParents(items: T[], resourceAccessor: (item: T) => uri): T[] { + const distinctParents: T[] = []; + for (let i = 0; i < items.length; i++) { + const candidateResource = resourceAccessor(items[i]); + if (items.some((otherItem, index) => { + if (index === i) { + return false; + } + + return isEqualOrParent(candidateResource, resourceAccessor(otherItem)); + })) { + continue; + } + + distinctParents.push(items[i]); + } + + return distinctParents; +} \ No newline at end of file diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts new file mode 100644 index 00000000000..f9275777a53 --- /dev/null +++ b/src/vs/base/test/common/resources.test.ts @@ -0,0 +1,43 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import * as assert from 'assert'; +import URI from 'vs/base/common/uri'; +import { distinctParents } from 'vs/base/common/resources'; + +suite('Resources', () => { + + test('distinctParents', () => { + + // Basic + let resources = [ + URI.file('/some/folderA/file.txt'), + URI.file('/some/folderB/file.txt'), + URI.file('/some/folderC/file.txt') + ]; + + let distinct = distinctParents(resources, r => r); + assert.equal(distinct.length, 3); + assert.equal(distinct[0].toString(), resources[0].toString()); + assert.equal(distinct[1].toString(), resources[1].toString()); + assert.equal(distinct[2].toString(), resources[2].toString()); + + // Parent / Child + resources = [ + URI.file('/some/folderA'), + URI.file('/some/folderA/file.txt'), + URI.file('/some/folderA/child/file.txt'), + URI.file('/some/folderA2/file.txt'), + URI.file('/some/file.txt') + ]; + + distinct = distinctParents(resources, r => r); + assert.equal(distinct.length, 3); + assert.equal(distinct[0].toString(), resources[0].toString()); + assert.equal(distinct[1].toString(), resources[3].toString()); + assert.equal(distinct[2].toString(), resources[4].toString()); + }); +}); \ No newline at end of file diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 5fcd05b354e..79e7b568601 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -51,6 +51,7 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { ICommandService, CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IListService, ListWidget } from 'vs/platform/list/browser/listService'; import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; +import { distinctParents } from 'vs/base/common/resources'; export interface IEditableData { action: IAction; @@ -659,14 +660,16 @@ class BaseDeleteFileAction extends BaseFileAction { primaryButton = nls.localize({ key: 'deleteButtonLabel', comment: ['&& denotes a mnemonic'] }, "&&Delete"); } + const distinctElements = distinctParents(this.elements, e => e.resource); + // Handle dirty let confirmDirtyPromise: TPromise = TPromise.as(true); - const dirty = this.textFileService.getDirty().filter(d => this.elements.some(e => resources.isEqualOrParent(d, e.resource, !isLinux /* ignorecase */))); + const dirty = this.textFileService.getDirty().filter(d => distinctElements.some(e => resources.isEqualOrParent(d, e.resource, !isLinux /* ignorecase */))); if (dirty.length) { let message: string; - if (this.elements.length > 1) { + if (distinctElements.length > 1) { message = nls.localize('dirtyMessageFilesDelete', "You are deleting files with unsaved changes. Do you want to continue?"); - } else if (this.elements[0].isDirectory) { + } else if (distinctElements[0].isDirectory) { if (dirty.length === 1) { message = nls.localize('dirtyMessageFolderOneDelete', "You are deleting a folder with unsaved changes in 1 file. Do you want to continue?"); } else { @@ -706,9 +709,9 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for moving to trash else if (this.useTrash) { - const message = this.elements.length > 1 ? getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", this.elements.length), this.elements.map(e => e.resource)) - : this.elements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", this.elements[0].name) - : nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", this.elements[0].name); + const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmMoveTrashMessageMultiple', "Are you sure you want to delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource)) + : distinctElements[0].isDirectory ? nls.localize('confirmMoveTrashMessageFolder', "Are you sure you want to delete '{0}' and its contents?", distinctElements[0].name) + : nls.localize('confirmMoveTrashMessageFile', "Are you sure you want to delete '{0}'?", distinctElements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ message, detail: isWindows ? nls.localize('undoBin', "You can restore from the recycle bin.") : nls.localize('undoTrash', "You can restore from the trash."), @@ -722,9 +725,9 @@ class BaseDeleteFileAction extends BaseFileAction { // Confirm for deleting permanently else { - const message = this.elements.length > 1 ? getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", this.elements.length), this.elements.map(e => e.resource)) - : this.elements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", this.elements[0].name) - : nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", this.elements[0].name); + const message = distinctElements.length > 1 ? getConfirmMessage(nls.localize('confirmDeleteMessageMultiple', "Are you sure you want to permanently delete the following {0} files?", distinctElements.length), distinctElements.map(e => e.resource)) + : distinctElements[0].isDirectory ? nls.localize('confirmDeleteMessageFolder', "Are you sure you want to permanently delete '{0}' and its contents?", distinctElements[0].name) + : nls.localize('confirmDeleteMessageFile', "Are you sure you want to permanently delete '{0}'?", distinctElements[0].name); confirmDeletePromise = this.messageService.confirmWithCheckbox({ message, detail: nls.localize('irreversible', "This action is irreversible!"), @@ -749,21 +752,20 @@ class BaseDeleteFileAction extends BaseFileAction { } // Call function - const servicePromise = TPromise.join(this.elements.map(e => this.fileService.del(e.resource, this.useTrash))).then(() => { - if (this.elements[0].parent) { - this.tree.setFocus(this.elements[0].parent); // move focus to parent + const servicePromise = TPromise.join(distinctElements.map(e => this.fileService.del(e.resource, this.useTrash))).then(() => { + if (distinctElements[0].parent) { + this.tree.setFocus(distinctElements[0].parent); // move focus to parent } }, (error: any) => { - if (this.elements.length === 1) { - // Allow to retry - let extraAction: Action; - if (this.useTrash) { - extraAction = new Action('permanentDelete', nls.localize('permDelete', "Delete Permanently"), null, true, () => { this.useTrash = false; this.skipConfirm = true; return this.run(); }); - } - this.onErrorWithRetry(error, () => this.run(), extraAction); + // Allow to retry + let extraAction: Action; + if (this.useTrash) { + extraAction = new Action('permanentDelete', nls.localize('permDelete', "Delete Permanently"), null, true, () => { this.useTrash = false; this.skipConfirm = true; return this.run(); }); } + this.onErrorWithRetry(error, () => this.run(), extraAction); + // Focus back to tree this.tree.DOMFocus(); }); From 35c5f9712172936b2478643dfaa264251d3c96b1 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 15:57:31 +0100 Subject: [PATCH 165/710] command id polish --- .../browser/actions/workspaceCommands.ts | 2 +- .../execution.contribution.ts | 2 +- .../fileActions.contribution.ts | 7 +++--- .../files/electron-browser/fileActions.ts | 24 ++----------------- .../files/electron-browser/fileCommands.ts | 4 ++-- 5 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/vs/workbench/browser/actions/workspaceCommands.ts b/src/vs/workbench/browser/actions/workspaceCommands.ts index 9c827b689d8..6849aabe033 100644 --- a/src/vs/workbench/browser/actions/workspaceCommands.ts +++ b/src/vs/workbench/browser/actions/workspaceCommands.ts @@ -24,7 +24,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { isLinux } from 'vs/base/common/platform'; -export const ADD_ROOT_FOLDER_COMMAND_ID = 'workbench.command.addRootFolder'; +export const ADD_ROOT_FOLDER_COMMAND_ID = 'addRootFolder'; export const ADD_ROOT_FOLDER_LABEL = nls.localize('addFolderToWorkspace', "Add Folder to Workspace..."); export const PICK_WORKSPACE_FOLDER_COMMAND_ID = '_workbench.pickWorkspaceFolder'; 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 8da6d80138b..0ac2c650755 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -75,7 +75,7 @@ DEFAULT_TERMINAL_LINUX_READY.then(defaultTerminalLinux => { }); }); -const OPEN_CONSOLE_COMMAND_ID = 'workbench.command.terminal.openNativeConsole'; +const OPEN_CONSOLE_COMMAND_ID = 'workbench.action.terminal.openNativeConsole'; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: OPEN_CONSOLE_COMMAND_ID, diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 4494b32fe9d..f229fcbe408 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -6,7 +6,7 @@ import nls = require('vs/nls'); import { Registry } from 'vs/platform/registry/common/platform'; -import { GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, CopyPathAction, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, GlobalNewFileAction, GlobalNewFolderAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions'; +import { GlobalNewUntitledFileAction, ShowOpenedFileInNewWindow, CopyPathAction, FocusOpenEditorsView, FocusFilesExplorer, GlobalCompareResourcesAction, SaveAllAction, ShowActiveFileInExplorer, CollapseExplorerView, RefreshExplorerView, CompareWithClipboardAction, NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, TRIGGER_RENAME_LABEL, MOVE_FILE_TO_TRASH_LABEL, COPY_FILE_LABEL, PASTE_FILE_LABEL, FileCopiedContext, renameHandler, moveFileToTrashHandler, copyFileHandler, pasteFileHandler, deleteFileHandler } from 'vs/workbench/parts/files/electron-browser/fileActions'; import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTION_CONTEXT } from 'vs/workbench/parts/files/electron-browser/saveErrorHandler'; import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; @@ -30,8 +30,6 @@ const category = nls.localize('filesCategory', "File"); const registry = Registry.as(ActionExtensions.WorkbenchActions); registry.registerWorkbenchAction(new SyncActionDescriptor(SaveAllAction, SaveAllAction.ID, SaveAllAction.LABEL, { primary: void 0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_S }, win: { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_S) } }), 'File: Save All', category); -registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalNewFileAction, GlobalNewFileAction.ID, GlobalNewFileAction.LABEL), 'File: New File', category); -registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalNewFolderAction, GlobalNewFolderAction.ID, GlobalNewFolderAction.LABEL), 'File: New Folder', category); registry.registerWorkbenchAction(new SyncActionDescriptor(GlobalCompareResourcesAction, GlobalCompareResourcesAction.ID, GlobalCompareResourcesAction.LABEL), 'File: Compare Active File With...', category); registry.registerWorkbenchAction(new SyncActionDescriptor(FocusOpenEditorsView, FocusOpenEditorsView.ID, FocusOpenEditorsView.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_E) }), 'File: Focus on Open Editors View', category); registry.registerWorkbenchAction(new SyncActionDescriptor(FocusFilesExplorer, FocusFilesExplorer.ID, FocusFilesExplorer.LABEL), 'File: Focus on Files Explorer', category); @@ -154,6 +152,9 @@ appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, nls.localize('compareActiv appendToCommandPalette(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, category); appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, category); appendToCommandPalette(CLOSE_EDITOR_COMMAND_ID, nls.localize('closeEditor', "Close Editor"), nls.localize('view', "View")); +appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category); +appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category); + // Menu registration - open editors diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 79e7b568601..e4d78169688 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -64,10 +64,10 @@ export interface IFileViewletState { clearEditable(stat: IFileStat): void; } -export const NEW_FILE_COMMAND_ID = 'workbench.command.files.newFile'; +export const NEW_FILE_COMMAND_ID = 'explorer.newFile'; export const NEW_FILE_LABEL = nls.localize('newFile', "New File"); -export const NEW_FOLDER_COMMAND_ID = 'workbench.command.files.newFolder'; +export const NEW_FOLDER_COMMAND_ID = 'explorer.newFolder'; export const NEW_FOLDER_LABEL = nls.localize('newFolder', "New Folder"); export const TRIGGER_RENAME_LABEL = nls.localize('rename', "Rename"); @@ -538,26 +538,6 @@ export class GlobalNewUntitledFileAction extends Action { } } -/* Create new file from anywhere */ -export class GlobalNewFileAction extends BaseGlobalNewAction { - public static readonly ID = 'explorer.newFile'; - public static readonly LABEL = nls.localize('newFile', "New File"); - - protected getAction(): IConstructorSignature2 { - return NewFileAction; - } -} - -/* Create new folder from anywhere */ -export class GlobalNewFolderAction extends BaseGlobalNewAction { - public static readonly ID = 'explorer.newFolder'; - public static readonly LABEL = nls.localize('newFolder', "New Folder"); - - protected getAction(): IConstructorSignature2 { - return NewFolderAction; - } -} - /* Create New File/Folder (only used internally by explorerViewer) */ export abstract class BaseCreateAction extends BaseRenameAction { diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 89624e33007..4baa25ff2c2 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -17,8 +17,8 @@ import { IWindowsService } from 'vs/platform/windows/common/windows'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; +import { ExplorerFocusCondition, FileOnDiskContentProvider, VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; import { ExplorerViewlet } from 'vs/workbench/parts/files/electron-browser/explorerViewlet'; -import { VIEWLET_ID, ExplorerFocusCondition, FileOnDiskContentProvider } from 'vs/workbench/parts/files/common/files'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; @@ -73,7 +73,7 @@ export const OpenEditorsGroupContext = new RawContextKey('groupFocusedI export const DirtyEditorContext = new RawContextKey('dirtyEditor', false); export const ResourceSelectedForCompareContext = new RawContextKey('resourceSelectedForCompare', false); -export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'workbench.command.removeRootFolder'; +export const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder'; export const REMOVE_ROOT_FOLDER_LABEL = nls.localize('removeFolderFromWorkspace', "Remove Folder from Workspace"); export const openWindowCommand = (accessor: ServicesAccessor, paths: string[], forceNewWindow: boolean) => { From 487b57454d5157455bbcedc7b4d6a65af5cf5c6c Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 12 Jan 2018 16:03:00 +0100 Subject: [PATCH 166/710] Fix #41490 --- .../markers/browser/markersTreeController.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/vs/workbench/parts/markers/browser/markersTreeController.ts b/src/vs/workbench/parts/markers/browser/markersTreeController.ts index 51f591e42cd..4bcde1d43f1 100644 --- a/src/vs/workbench/parts/markers/browser/markersTreeController.ts +++ b/src/vs/workbench/parts/markers/browser/markersTreeController.ts @@ -10,24 +10,20 @@ import tree = require('vs/base/parts/tree/browser/tree'); import treedefaults = require('vs/base/parts/tree/browser/treeDefaults'); import { MarkersModel } from 'vs/workbench/parts/markers/common/markersModel'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { IMenuService, IMenu, MenuId } from 'vs/platform/actions/common/actions'; +import { IMenuService, MenuId } from 'vs/platform/actions/common/actions'; import { IAction } from 'vs/base/common/actions'; import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; +import { WorkbenchTree } from 'vs/platform/list/browser/listService'; export class Controller extends treedefaults.DefaultController { - private contextMenu: IMenu; - constructor( @IContextMenuService private contextMenuService: IContextMenuService, - @IMenuService menuService: IMenuService, - @IContextKeyService contextKeyService: IContextKeyService, + @IMenuService private menuService: IMenuService, @IKeybindingService private _keybindingService: IKeybindingService ) { super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN, keyboardSupport: false }); - this.contextMenu = menuService.createMenu(MenuId.ProblemsPanelContext, contextKeyService); } protected onLeftClick(tree: tree.ITree, element: any, event: mouse.IMouseEvent): boolean { @@ -45,9 +41,9 @@ export class Controller extends treedefaults.DefaultController { return false; } - public onContextMenu(tree: tree.ITree, element: any, event: tree.ContextMenuEvent): boolean { + public onContextMenu(tree: WorkbenchTree, element: any, event: tree.ContextMenuEvent): boolean { tree.setFocus(element); - const actions = this._getMenuActions(); + const actions = this._getMenuActions(tree); if (!actions.length) { return true; } @@ -77,9 +73,9 @@ export class Controller extends treedefaults.DefaultController { return true; } - private _getMenuActions(): IAction[] { + private _getMenuActions(tree: WorkbenchTree): IAction[] { const result: IAction[] = []; - const groups = this.contextMenu.getActions(); + const groups = this.menuService.createMenu(MenuId.ProblemsPanelContext, tree.contextKeyService).getActions(); for (let group of groups) { const [, actions] = group; From 184f92ef0179aa7eb12ef6e309bed9cc2090890d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 16:13:29 +0100 Subject: [PATCH 167/710] paste action: make sure to use distinct parents --- src/vs/workbench/parts/files/electron-browser/fileActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index e4d78169688..e80a6804eb1 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -1589,7 +1589,7 @@ export const pasteFileHandler = (accessor: ServicesAccessor) => { const listService = accessor.get(IListService); const explorerContext = getContext(listService.lastFocusedList, accessor.get(IViewletService)); - return TPromise.join(filesToCopy.map(toCopy => { + return TPromise.join(distinctParents(filesToCopy, s => s.resource).map(toCopy => { const pasteFileAction = instantationService.createInstance(PasteFileAction, listService.lastFocusedList, explorerContext.stat); return pasteFileAction.run(toCopy); })); From a983217a4d0111275e7a8737a001607ad93b24bc Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 16:20:44 +0100 Subject: [PATCH 168/710] Implement offset -> (ln;col) conversion --- .../model/chunksTextBuffer/bufferPiece.ts | 17 ++++ .../chunksTextBuffer/chunksTextBuffer.ts | 81 ++++++++++++++++--- 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index d682c373eab..cc1a887589d 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -49,6 +49,23 @@ export class BufferPiece { return this._str.substr(from, length); } + public findLineStartBeforeOffset(offset: number): number { + if (this._lineStarts.length === 0 || offset < this._lineStarts[0]) { + return -1; + } + + // TODO: implement binary search + for (let i = this._lineStarts.length - 1; i >= 0; i--) { + let lineStart = this._lineStarts[i]; + + if (lineStart <= offset) { + return i; + } + } + + return -1; + } + public static deleteLastChar(target: BufferPiece): BufferPiece { const targetCharsLength = target.length(); const targetLineStartsLength = target.newLineCount(); diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index b7601d6a9b9..1daefc55226 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -38,14 +38,13 @@ export class ChunksTextBuffer implements ITextBuffer { return ''; } getEOL(): string { - // TODO - return '\n'; + return this._actual.getEOL(); } getOffsetAt(lineNumber: number, column: number): number { - return this._actual.getOffsetAt(lineNumber, column); + return this._actual.convertPositionToOffset(lineNumber, column); } getPositionAt(offset: number): Position { - throw new Error('TODO'); + return this._actual.convertOffsetToPosition(offset); } getRangeAt(offset: number, length: number): Range { throw new Error('TODO'); @@ -582,16 +581,78 @@ class Buffer { return true; } - public getOffsetAt(lineNumber: number, column: number): number { - const offset = BufferCursorPool.take(); + public convertPositionToOffset(lineNumber: number, column: number): number { + const r = BufferCursorPool.take(); - if (!this._getOffsetAt(lineNumber, column, offset)) { - BufferCursorPool.put(offset); + if (!this._getOffsetAt(lineNumber, column, r)) { + BufferCursorPool.put(r); throw new Error(`Position not found`); } - BufferCursorPool.put(offset); - return offset.offset; + const result = r.offset; + + 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 + 1; + } + + /** + * 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 getValueInRange(range: Range): string { From 5c8378b6664a11d8ab72eaaab144c3416d0699b5 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 16:21:08 +0100 Subject: [PATCH 169/710] explorer multi select - distinct parents for DND --- .../parts/files/electron-browser/views/explorerViewer.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 78017d5ca55..1105d96bf3f 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -55,6 +55,7 @@ import { getPathLabel } from 'vs/base/common/labels'; import { extractResources } from 'vs/workbench/browser/editor'; import { relative } from 'path'; import { DataTransfers } from 'vs/base/browser/dnd'; +import { distinctParents } from 'vs/base/common/resources'; export class FileDataSource implements IDataSource { constructor( @@ -865,7 +866,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop { } private handleExplorerDrop(tree: ITree, data: IDragAndDropData, target: FileStat, originalEvent: DragMouseEvent): TPromise { - const sources: FileStat[] = data.getData(); + const sources: FileStat[] = distinctParents(data.getData(), s => s.resource); const isCopy = (originalEvent.ctrlKey && !isMacintosh) || (originalEvent.altKey && isMacintosh); let confirmPromise: TPromise; From fdb46688ee730081041bea3bcfb00c059c14b6be Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 16:21:11 +0100 Subject: [PATCH 170/710] new file and new folder command only when explorer has focus --- .../electron-browser/fileActions.contribution.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index f229fcbe408..f9e193a5a78 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -16,7 +16,7 @@ import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/c import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { isWindows, isMacintosh } from 'vs/base/common/platform'; -import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext } from 'vs/workbench/parts/files/common/files'; +import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerFolderContext, ExplorerFocusedContext } from 'vs/workbench/parts/files/common/files'; import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vs/workbench/browser/actions/workspaceCommands'; import { CLOSE_UNMODIFIED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands'; import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/workbench/parts/preferences/browser/preferencesActions'; @@ -135,13 +135,14 @@ function appendSaveConflictEditorTitleAction(id: string, title: string, iconClas // Menu registration - command palette -function appendToCommandPalette(id: string, title: string, category: string): void { +function appendToCommandPalette(id: string, title: string, category: string, when?: ContextKeyExpr): void { MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id, title, category - } + }, + when }); } appendToCommandPalette(COPY_PATH_COMMAND_ID, nls.localize('copyPathOfActive', "Copy Path of Active File"), category); @@ -152,8 +153,8 @@ appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, nls.localize('compareActiv appendToCommandPalette(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, category); appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, category); appendToCommandPalette(CLOSE_EDITOR_COMMAND_ID, nls.localize('closeEditor', "Close Editor"), nls.localize('view', "View")); -appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category); -appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category); +appendToCommandPalette(NEW_FILE_COMMAND_ID, NEW_FILE_LABEL, category, ExplorerFocusedContext); +appendToCommandPalette(NEW_FOLDER_COMMAND_ID, NEW_FOLDER_LABEL, category, ExplorerFocusedContext); From 612db35849987c3a2f9c22ddd6b964f7f60f941c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 12 Jan 2018 16:28:39 +0100 Subject: [PATCH 171/710] Implement more methods --- .../chunksTextBuffer/chunksTextBuffer.ts | 40 ++++++++++++++++--- .../chunksTextBufferBuilder.ts | 4 +- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 1daefc55226..1bf8fb01079 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -13,25 +13,27 @@ import { Range } from 'vs/editor/common/core/range'; export class ChunksTextBuffer implements ITextBuffer { private _actual: Buffer; + private _mightContainRTL: boolean; + private _mightContainNonBasicASCII: boolean; - constructor(pieces: BufferPiece[], _averageChunkSize: number, eol: '\r\n' | '\n') { + constructor(pieces: BufferPiece[], _averageChunkSize: number, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) { 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 { throw new Error('TODO'); } mightContainRTL(): boolean { - // TODO - return true; + return this._mightContainRTL; } mightContainNonBasicASCII(): boolean { - // TODO - return true; + return this._mightContainNonBasicASCII; } getBOM(): string { // TODO @@ -47,7 +49,7 @@ export class ChunksTextBuffer implements ITextBuffer { return this._actual.convertOffsetToPosition(offset); } getRangeAt(offset: number, length: number): Range { - throw new Error('TODO'); + return this._actual.convertOffsetLenToRange(offset, length); } getValueInRange(range: Range, eol: EndOfLinePreference): string { if (range.isEmpty()) { @@ -655,6 +657,32 @@ class Buffer { 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(); const end = BufferCursorPool.take(); diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index fd3d525e368..1a16096fbbd 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -16,7 +16,9 @@ export class TextBufferFactory implements ITextBufferFactory { private readonly _pieces: BufferPiece[], private readonly _averageChunkSize: number, private readonly _totalCRCount: number, - private readonly _totalEOLCount: number + private readonly _totalEOLCount: number, + private readonly _containsRTL: boolean, + private readonly _isBasicASCII: boolean, ) { } From 18d202d79b58dc2c4d365137a83130a7af21e8ac Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 16:30:41 +0100 Subject: [PATCH 172/710] references widget: alt click open to side --- src/vs/editor/contrib/referenceSearch/referencesWidget.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts index d0b9b18ac3f..136e54c22a8 100644 --- a/src/vs/editor/contrib/referenceSearch/referencesWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/referencesWidget.ts @@ -251,7 +251,7 @@ class Controller extends DefaultController { } var result = super.onClick(tree, element, event); - if (event.ctrlKey || event.metaKey) { + if (event.ctrlKey || event.metaKey || event.altKey) { this._onDidOpenToSide.fire(element); } else if (event.detail === 2) { this._onDidSelect.fire(element); @@ -578,7 +578,7 @@ export class ReferenceWidget extends PeekViewWidget { if (this._preview && this._preview.getModel()) { this._onDidSelectReference.fire({ element: this._getFocusedReference(), - kind: e.ctrlKey || e.metaKey ? 'side' : 'open', + kind: e.ctrlKey || e.metaKey || e.altKey ? 'side' : 'open', source: 'title' }); } @@ -745,7 +745,7 @@ export class ReferenceWidget extends PeekViewWidget { if (event.detail === 2) { this._onDidSelectReference.fire({ element: { uri: this._getFocusedReference().uri, range: target.range }, - kind: (event.ctrlKey || event.metaKey) ? 'side' : 'open', + kind: (event.ctrlKey || event.metaKey || event.altKey) ? 'side' : 'open', source: 'editor' }); } From c75ebac63aa8fca228786237cfa53f1f62cbb4b6 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 07:35:24 -0800 Subject: [PATCH 173/710] update classifier --- .github/classifier.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/classifier.yml b/.github/classifier.yml index f1f512feb40..2a79b268962 100644 --- a/.github/classifier.yml +++ b/.github/classifier.yml @@ -3,7 +3,10 @@ alwaysRequireAssignee: false, labelsRequiringAssignee: [ feature-request ], autoAssignees: { - api: [], + api: { + assignees: [ jrieken ], + assignLabel: false + }, color-picker: [], css-less-sass: [], debug: { @@ -56,9 +59,16 @@ perf-profile: [], php: [ roblourens ], proxy: [], + remote: { + assignees: [ jrieken ], + assignLabel: false + }, scm: [], search: [ roblourens ], - snippets: [ jrieken ], + snippets: { + assignees: [ jrieken ], + assignLabel: false + }, tasks: [ dbaeumer ], telemetry: [], themes: [], From 0b9b33600992ae9a2ea9057468e0dec107173c6b Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 08:14:18 -0800 Subject: [PATCH 174/710] refine text search api, #41536 --- src/vs/vscode.proposed.d.ts | 12 ++++++++++-- .../api/electron-browser/mainThreadFileSystem.ts | 2 +- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostFileSystem.ts | 8 ++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index f2537d74fad..6a680130e16 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -83,7 +83,14 @@ declare module 'vscode' { type: FileType; } - export interface FindMatch { + export interface TextSearchQuery { + pattern: string; + isRegex?: boolean; + isCaseSensitive?: boolean; + isWordMatch?: boolean; + } + + export interface TextSearchResult { uri: Uri; range: Range; preview: { leading: string, matching: string, trailing: string }; @@ -137,7 +144,8 @@ declare module 'vscode' { // find files by names findFiles?(query: string, progress: Progress, token: CancellationToken): Thenable; - findInFiles?(query: string, isRegex: boolean, progress: Progress, token: CancellationToken): Thenable; + + provideTextSearchResults?(query: TextSearchQuery, include: GlobPattern, exclude: GlobPattern, progress: Progress, token: CancellationToken): Thenable; } export namespace workspace { diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index 18e0fe731e2..b98c0103c54 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -173,7 +173,7 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv const promise = query.type === QueryType.File ? this._proxy.$findFiles(this._handle, search.id, query.filePattern) - : this._proxy.$findInFiles(this._handle, search.id, query.contentPattern); + : this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, undefined, undefined); promise.then(() => { this._searches.delete(search.id); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 9a369effe2e..44ca4d7f3cd 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -544,7 +544,7 @@ export interface ExtHostFileSystemShape { $readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][]>; $rmdir(handle: number, resource: UriComponents): TPromise; $findFiles(handle: number, session: number, query: string): TPromise; - $findInFiles(handle: number, session: number, pattern: IPatternInfo): TPromise; + $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, include: string, exclude: string): TPromise; } export interface ExtHostExtensionServiceShape { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index b96b7511f94..901419f3f2a 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -87,13 +87,13 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { }; return asWinJsPromise(token => provider.findFiles(query, progress, token)); } - $findInFiles(handle: number, session: number, pattern: IPatternInfo): TPromise { + $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, include: string, exclude: string): TPromise { const provider = this._provider.get(handle); - if (!provider.findInFiles) { + if (!provider.provideTextSearchResults) { return TPromise.as(undefined); } const progress = { - report: (data: vscode.FindMatch) => { + report: (data: vscode.TextSearchResult) => { this._proxy.$handleFindMatch(handle, session, [data.uri, { lineNumber: 1 + data.range.start.line, preview: data.preview.leading + data.preview.matching + data.preview.trailing, @@ -101,6 +101,6 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { }]); } }; - return asWinJsPromise(token => provider.findInFiles(pattern.pattern, pattern.isRegExp, progress, token)); + return asWinJsPromise(token => provider.provideTextSearchResults(pattern, include, exclude, progress, token)); } } From 99fea39b3a9bc162a85a788c678f3eb4dcd6e6bd Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 12 Jan 2018 17:16:20 +0100 Subject: [PATCH 175/710] remove explorer.openEditors.dynamicHeight fixes #40638 --- src/vs/workbench/parts/files/common/files.ts | 1 - .../electron-browser/files.contribution.ts | 5 ----- .../electron-browser/views/openEditorsView.ts | 18 +++--------------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/vs/workbench/parts/files/common/files.ts b/src/vs/workbench/parts/files/common/files.ts index 9a538d836bb..3147b323330 100644 --- a/src/vs/workbench/parts/files/common/files.ts +++ b/src/vs/workbench/parts/files/common/files.ts @@ -77,7 +77,6 @@ export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEdit explorer: { openEditors: { visible: number; - dynamicHeight: boolean; }; autoReveal: boolean; enableDragAndDrop: boolean; 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 8bedc8f8563..c893a744be8 100644 --- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts @@ -306,11 +306,6 @@ configurationRegistry.registerConfiguration({ 'description': nls.localize({ key: 'openEditorsVisible', comment: ['Open is an adjective'] }, "Number of editors shown in the Open Editors pane. Set it to 0 to hide the pane."), 'default': 9 }, - 'explorer.openEditors.dynamicHeight': { - 'type': 'boolean', - 'description': nls.localize({ key: 'dynamicHeight', comment: ['Open is an adjective'] }, "Controls if the height of the open editors section should adapt dynamically to the number of elements or not."), - 'default': true - }, 'explorer.autoReveal': { 'type': 'boolean', 'description': nls.localize('autoReveal', "Controls if the explorer should automatically reveal and select files when opening them."), diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index eabe0a6e757..5c07be204af 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -51,7 +51,6 @@ const $ = dom.$; export class OpenEditorsView extends ViewsViewletPanel { private static readonly DEFAULT_VISIBLE_OPEN_EDITORS = 9; - private static readonly DEFAULT_DYNAMIC_HEIGHT = true; static readonly ID = 'workbench.explorer.openEditorsView'; static NAME = nls.localize({ key: 'openEditors', comment: ['Open is an adjective'] }, "Open Editors"); @@ -381,22 +380,11 @@ export class OpenEditorsView extends ViewsViewletPanel { visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS; } - let dynamicHeight = this.configurationService.getValue('explorer.openEditors.dynamicHeight'); - if (typeof dynamicHeight !== 'boolean') { - dynamicHeight = OpenEditorsView.DEFAULT_DYNAMIC_HEIGHT; - } - - return this.computeMinExpandedBodySize(visibleOpenEditors, dynamicHeight); + return this.computeMinExpandedBodySize(visibleOpenEditors); } - private computeMinExpandedBodySize(visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS, dynamicHeight = OpenEditorsView.DEFAULT_DYNAMIC_HEIGHT): number { - let itemsToShow: number; - if (dynamicHeight) { - itemsToShow = Math.min(Math.max(visibleOpenEditors, 1), this.elementCount); - } else { - itemsToShow = Math.max(visibleOpenEditors, 1); - } - + private computeMinExpandedBodySize(visibleOpenEditors = OpenEditorsView.DEFAULT_VISIBLE_OPEN_EDITORS): number { + const itemsToShow = Math.min(Math.max(visibleOpenEditors, 1), this.elementCount); return itemsToShow * OpenEditorsDelegate.ITEM_HEIGHT; } From 2b735020281fcac2cbc3d6bbd0330a0dfdf7c454 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 12 Jan 2018 17:32:07 +0100 Subject: [PATCH 176/710] changing back to resourceUri --- src/vs/vscode.d.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index fc880c2e648..4248b434462 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4963,12 +4963,12 @@ declare module 'vscode' { export class TreeItem { /** - * A human-readable string describing this item. When `falsy`, it is derived from [uri](#TreeItem.uri). + * A human-readable string describing this item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). */ label?: string; /** - * The icon path for the tree item. When `falsy`, it is derived from [uri](#TreeItem.uri). + * The icon path for the tree item. When `falsy`, it is derived from [resourceUri](#TreeItem.resourceUri). */ iconPath?: string | Uri | { light: string | Uri; dark: string | Uri }; @@ -4978,7 +4978,7 @@ declare module 'vscode' { * Will be used to derive the [label](#TreeItem.label), when it is not provided. * Will be used to derive the icon from current file icon theme, when [iconPath](#TreeItem.iconPath) is not provided. */ - uri?: Uri; + resourceUri?: Uri; /** * The [command](#Command) which should be run when the tree item is selected. From d4436daa61248ad0b2e3af7a83ff635fb165b462 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 17:42:43 +0100 Subject: [PATCH 177/710] more bot updates --- .github/classifier.yml | 87 +++++++++++++++++++++++++++++++++--------- 1 file changed, 69 insertions(+), 18 deletions(-) diff --git a/.github/classifier.yml b/.github/classifier.yml index 2a79b268962..645a350b6ae 100644 --- a/.github/classifier.yml +++ b/.github/classifier.yml @@ -34,9 +34,18 @@ emmet: [ ramya-rao-a ], error-list: [], extensions: [], - file-encoding: [ bpasero ], - file-io: [ bpasero ], - file-watcher: [ bpasero ], + file-encoding: { + assignees: [ bpasero ], + assignLabel: false + }, + file-io: { + assignees: [ bpasero ], + assignLabel: false + }, + file-watcher: { + assignees: [ bpasero ], + assignLabel: false + }, file-explorer: { assignees: [ isidorn ], assignLabel: false @@ -55,7 +64,10 @@ languages basic: [], markdown: [ mjbvz ], merge-conflict: [ chrmarti ], - multi-root: [ bpasero ], + multi-root: { + assignees: [ bpasero ], + assignLabel: false + }, perf-profile: [], php: [ roblourens ], proxy: [], @@ -74,22 +86,61 @@ themes: [], typescript: [ mjbvz ], workbench: { - assignees: [bpasero], + assignees: [ bpasero ], + assignLabel: false + }, + workbench-dnd: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-editors: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-electron: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-feedback: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-history: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-layout: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-menu: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-notifications: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-state: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-status: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-tabs: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-title: { + assignees: [ bpasero ], + assignLabel: false + }, + workbench-touchbar: { + assignees: [ bpasero ], assignLabel: false }, - workbench-dnd: [ bpasero ], - workbench-editors: [ bpasero ], - workbench-electron: [ bpasero ], - workbench-feedback: [ bpasero ], - workbench-history: [ bpasero ], - workbench-layout: [ bpasero ], - workbench-menu: [ bpasero ], - workbench-notifications: [ bpasero ], - workbench-state: [ bpasero ], - workbench-status: [ bpasero ], - workbench-tabs: [ bpasero ], - workbench-title: [ bpasero ], - workbench-touchbar: [ bpasero ], workbench-welcome: [ chrmarti ] } } From 3705413135d15c20b0dad1780d24f54ebd6ce95c Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 08:57:34 -0800 Subject: [PATCH 178/710] include scheme in path label unless file or untitled, #40662 --- src/vs/base/common/labels.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index e8f135512e7..3007f2757a0 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -30,7 +30,7 @@ export function getPathLabel(resource: URI | string, rootProvider?: IWorkspaceFo } if (resource.scheme !== 'file' && resource.scheme !== 'untitled') { - return resource.authority + resource.path; + return resource.with({ query: null, fragment: null }).toString(false); } // return early if we can resolve a relative path label from the root @@ -362,4 +362,4 @@ export function mnemonicButtonLabel(label: string): string { export function unmnemonicLabel(label: string): string { return label.replace(/&/g, '&&'); -} \ No newline at end of file +} From 7c3838d5edad0eb0686f3a252f92e11488906293 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 12 Jan 2018 18:23:54 +0100 Subject: [PATCH 179/710] editor service - add method to close specific editors of a group --- .../workbench/browser/parts/editor/editorPart.ts | 14 ++++++++++++-- .../services/editor/common/editorService.ts | 12 ++++++++++-- .../editor/test/browser/editorService.test.ts | 4 +++- src/vs/workbench/test/workbenchTestServices.ts | 4 +++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 7365cae4026..3d891c869cf 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -701,13 +701,23 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService }); } - public closeEditors(position: Position, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean } = Object.create(null)): TPromise { + public closeEditors(position: Position, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, editors: EditorInput[]): TPromise; + public closeEditors(position: Position, filterOrEditors?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean } | EditorInput[]): TPromise { const group = this.stacks.groupAt(position); if (!group) { return TPromise.wrap(null); } - let editorsToClose = group.getEditors(true /* in MRU order */); + let editorsToClose: EditorInput[]; + let filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }; + if (Array.isArray(filterOrEditors)) { + editorsToClose = filterOrEditors; + filter = Object.create(null); + } else { + editorsToClose = group.getEditors(true /* in MRU order */); + filter = filterOrEditors || Object.create(null); + } // Filter: unmodified only if (filter.unmodifiedOnly) { diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index 1af2ed59488..215b03c98ad 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -92,6 +92,11 @@ export interface IWorkbenchEditorService extends IEditorService { */ closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + /** + * Closes the provided editors of a specific group at the provided position. + */ + closeEditors(position: Position, editors: IEditorInput[]): TPromise; + /** * Closes all editors across all groups. The optional position allows to keep one group alive. */ @@ -111,6 +116,7 @@ export interface IEditorPart { replaceEditors(editors: { toReplace: IEditorInput, replaceWith: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], position?: Position): TPromise; closeEditor(position: Position, input: IEditorInput): TPromise; closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + closeEditors(position: Position, editors: IEditorInput[]): TPromise; closeAllEditors(except?: Position): TPromise; getActiveEditor(): IEditor; getVisibleEditors(): IEditor[]; @@ -254,8 +260,10 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { return this.editorPart.closeEditor(position, input); } - public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise { - return this.editorPart.closeEditors(position, filter); + public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, editors: IEditorInput[]): TPromise; + public closeEditors(position: Position, filterOrEditors?: any): TPromise { + return this.editorPart.closeEditors(position, filterOrEditors); } public closeAllEditors(except?: Position): TPromise { diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index 0e71a596420..3e467c8e195 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -51,7 +51,9 @@ class TestEditorPart implements IEditorPart { return TPromise.as([]); } - public closeEditors(position: Position, filter?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise { + public closeEditors(position: Position, filter?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, editors?: EditorInput[]): TPromise; + public closeEditors(position: Position, filterOrEditors: any): TPromise { return TPromise.as(null); } diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index d09a7102f69..636f79434ff 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -606,7 +606,9 @@ export class TestEditorService implements IWorkbenchEditorService { return TPromise.as([]); } - public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise { + public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, editors: IEditorInput[]): TPromise; + public closeEditors(position: Position, filterOrEditors?: any): TPromise { return TPromise.as(null); } From 3a7647c3f845c0d8e9e2d4e5923cd52c042bc96c Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 09:43:58 -0800 Subject: [PATCH 180/710] workaround for #41543 --- .../services/files/electron-browser/remoteFileService.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index 2c290fddaf0..08a628e8802 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -471,10 +471,9 @@ export class RemoteFileService extends FileService { : TPromise.as(null); return prepare.then(() => { - // TODO@Joh This does only work for textfiles - // because the content turns things into a string - // and all binary data will be broken - return this.resolveContent(source).then(content => { + // todo@ben, can only copy text files + // https://github.com/Microsoft/vscode/issues/41543 + return this.resolveContent(source, { acceptTextOnly: true }).then(content => { return this._withProvider(target).then(provider => { return this._doUpdateContent(provider, target, content.value, { encoding: content.encoding }).then(fileStat => { this._onAfterOperation.fire(new FileOperationEvent(source, FileOperation.COPY, fileStat)); From a81a909dfea3b24f15df7d1991270021221246d3 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 10:24:11 -0800 Subject: [PATCH 181/710] workaround for #41547 --- .../files/electron-browser/remoteFileService.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts index 08a628e8802..2bf1ba014e1 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts @@ -231,7 +231,16 @@ export class RemoteFileService extends FileService { return this.resolveFile(resource).then(fileStat => { - if (options.etag === fileStat.etag) { + if (fileStat.isDirectory) { + // todo@joh cannot copy a folder + // https://github.com/Microsoft/vscode/issues/41547 + throw new FileOperationError( + localize('fileIsDirectoryError', "File is directory"), + FileOperationResult.FILE_IS_DIRECTORY, + options + ); + } + if (fileStat.etag === options.etag) { throw new FileOperationError( localize('fileNotModifiedError', "File not modified since"), FileOperationResult.FILE_NOT_MODIFIED_SINCE, From db95108d015b3c0c9958e1a2cd50bd1ccabaf9ff Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 13:52:42 -0800 Subject: [PATCH 182/710] align goto error/warning with #16852 --- src/vs/editor/contrib/gotoError/gotoError.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/gotoError/gotoError.ts b/src/vs/editor/contrib/gotoError/gotoError.ts index f60bc6af83d..9efd2151ada 100644 --- a/src/vs/editor/contrib/gotoError/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/gotoError.ts @@ -494,7 +494,7 @@ class NextMarkerAction extends MarkerNavigationAction { constructor() { super(true, { id: 'editor.action.marker.next', - label: nls.localize('markerAction.next.label', "Go to Next Error or Warning"), + label: nls.localize('markerAction.next.label', "Go to Next Problem (Error, Warning, Info)"), alias: 'Go to Next Error or Warning', precondition: EditorContextKeys.writable, kbOpts: { @@ -509,7 +509,7 @@ class PrevMarkerAction extends MarkerNavigationAction { constructor() { super(false, { id: 'editor.action.marker.prev', - label: nls.localize('markerAction.previous.label', "Go to Previous Error or Warning"), + label: nls.localize('markerAction.previous.label', "Go to Previous Problem (Error, Warning, Info)"), alias: 'Go to Previous Error or Warning', precondition: EditorContextKeys.writable, kbOpts: { From e932b8ad9cf1c70762d89cdcbf66fcf5776a157a Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 10 Jan 2018 14:26:43 -0800 Subject: [PATCH 183/710] Add rename/create/delete file to workspaced edit Fixes #10659 Allows workspace edits to also change files in the workspace --- .../vscode-api-tests/src/workspace.test.ts | 14 ++++ src/vs/editor/browser/services/bulkEdit.ts | 71 ++++++++++++++++--- src/vs/editor/common/modes.ts | 14 ++++ .../contrib/quickFix/quickFixCommands.ts | 11 +-- src/vs/monaco.d.ts | 13 ++++ src/vs/vscode.d.ts | 38 ++++++++++ .../api/electron-browser/mainThreadEditors.ts | 17 +++-- src/vs/workbench/api/node/extHost.protocol.ts | 8 ++- .../workbench/api/node/extHostTextEditors.ts | 2 +- .../api/node/extHostTypeConverters.ts | 7 +- src/vs/workbench/api/node/extHostTypes.ts | 53 +++++++++++++- .../electron-browser/api/extHostTypes.test.ts | 13 ++++ .../api/mainThreadEditors.test.ts | 66 ++++++++++++++++- 13 files changed, 304 insertions(+), 23 deletions(-) diff --git a/extensions/vscode-api-tests/src/workspace.test.ts b/extensions/vscode-api-tests/src/workspace.test.ts index d4c4ae7013c..4fccf98385b 100644 --- a/extensions/vscode-api-tests/src/workspace.test.ts +++ b/extensions/vscode-api-tests/src/workspace.test.ts @@ -505,4 +505,18 @@ suite('workspace-namespace', () => { return vscode.workspace.applyEdit(edit); }); }); + + + test('applyEdit should fail when editing deleted resource', async () => { + const resource = await createRandomFile(); + + let edit = new vscode.WorkspaceEdit(); + edit.deleteResource(resource); + try { + edit.insert(resource, new vscode.Position(0, 0), ''); + assert.fail(false, 'Should disallow edit of deleted resource'); + } catch { + // noop + } + }); }); diff --git a/src/vs/editor/browser/services/bulkEdit.ts b/src/vs/editor/browser/services/bulkEdit.ts index bfe4d9c4df3..d5052d8c706 100644 --- a/src/vs/editor/browser/services/bulkEdit.ts +++ b/src/vs/editor/browser/services/bulkEdit.ts @@ -18,6 +18,13 @@ import { Selection, ISelection } from 'vs/editor/common/core/selection'; import { IIdentifiedSingleEditOperation, ITextModel, EndOfLineSequence } from 'vs/editor/common/model'; import { IProgressRunner } from 'vs/platform/progress/common/progress'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; +import { IResourceRename, IResourceCreate } from 'vs/editor/common/modes'; + +export interface IResourceFileEdit { + readonly renamedResources: { from: URI, to }[]; + readonly createdResources: { uri: URI, contents: string }[]; + readonly deletedResources: URI[]; +} export interface IResourceEdit { resource: URI; @@ -196,12 +203,24 @@ class BulkEditModel implements IDisposable { private _sourceSelections: Selection[]; private _sourceModelTask: SourceModelEditTask; - constructor(textModelResolverService: ITextModelService, sourceModel: URI, sourceSelections: Selection[], edits: IResourceEdit[], private progress: IProgressRunner = null) { + constructor( + textModelResolverService: ITextModelService, + sourceModel: URI, + sourceSelections: Selection[], + edits: IResourceEdit[], + private progress: IProgressRunner, + private renames: IResourceRename[], + private creates: IResourceCreate[], + private deletes: URI[], + private fileService: IFileService + ) { this._textModelResolverService = textModelResolverService; this._sourceModel = sourceModel; this._sourceSelections = sourceSelections; this._sourceModelTask = null; + this._numberOfResourcesToModify += this.renames.length + this.deletes.length + this.creates.length; + for (let edit of edits) { this._addEdit(edit); } @@ -216,7 +235,7 @@ class BulkEditModel implements IDisposable { array.push(edit); } - public prepare(): TPromise { + public async prepare(): TPromise { if (this._tasks) { throw new Error('illegal state - already prepared'); @@ -229,6 +248,15 @@ class BulkEditModel implements IDisposable { this.progress.total(this._numberOfResourcesToModify * 2); } + await TPromise.join(this.renames.map(rename => + this.fileService.moveFile(rename.from, rename.to))); + + await TPromise.join(this.creates.map(create => + this.fileService.createFile(create.uri, create.contents))); + + await TPromise.join(this.deletes.map(uri => + this.fileService.del(uri))); + forEach(this._edits, entry => { const promise = this._textModelResolverService.createModelReference(URI.parse(entry.key)).then(ref => { const model = ref.object; @@ -256,8 +284,9 @@ class BulkEditModel implements IDisposable { promises.push(promise); }); + await TPromise.join(promises); - return TPromise.join(promises).then(_ => this); + return this; } public apply(): Selection { @@ -284,20 +313,29 @@ class BulkEditModel implements IDisposable { export interface BulkEdit { progress(progress: IProgressRunner): void; add(edit: IResourceEdit[]): void; + addRename(edit: IResourceRename[]): void; + addCreate(edit: IResourceCreate[]): void; + addDelete(edit: URI[]): void; finish(): TPromise; ariaMessage(): string; } -export function bulkEdit(textModelResolverService: ITextModelService, editor: ICodeEditor, edits: IResourceEdit[], fileService?: IFileService, progress: IProgressRunner = null): TPromise { +export function bulkEdit(textModelResolverService: ITextModelService, editor: ICodeEditor, edits: IResourceEdit[], fileService: IFileService, resourceFileEdits?: IResourceFileEdit): TPromise { let bulk = createBulkEdit(textModelResolverService, editor, fileService); bulk.add(edits); - bulk.progress(progress); + bulk.addRename(resourceFileEdits.renamedResources); + bulk.addCreate(resourceFileEdits.createdResources); + bulk.addDelete(resourceFileEdits.deletedResources); + bulk.progress(null); return bulk.finish(); } export function createBulkEdit(textModelResolverService: ITextModelService, editor?: ICodeEditor, fileService?: IFileService): BulkEdit { let all: IResourceEdit[] = []; + const renames: IResourceRename[] = []; + const creates: IResourceCreate[] = []; + const deletes: URI[] = []; let recording = new ChangeRecorder(fileService).start(); let progressRunner: IProgressRunner; @@ -309,6 +347,18 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit all.push(...edits); } + function addRename(edits: IResourceRename[]): void { + renames.push(...edits); + } + + function addCreate(edits: IResourceCreate[]): void { + creates.push(...edits); + } + + function addDelete(edits: URI[]): void { + deletes.push(...edits); + } + function getConcurrentEdits() { let names: string[]; for (let edit of all) { @@ -327,7 +377,7 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit function finish(): TPromise { - if (all.length === 0) { + if (all.length === 0 && renames.length === 0 && creates.length === 0 && deletes.length === 0) { return TPromise.as(undefined); } @@ -344,9 +394,9 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit selections = editor.getSelections(); } - const model = new BulkEditModel(textModelResolverService, uri, selections, all, progressRunner); + const model = new BulkEditModel(textModelResolverService, uri, selections, all, progressRunner, renames, creates, deletes, fileService); - return model.prepare().then(_ => { + return model.prepare().then(async _ => { let concurrentEdits = getConcurrentEdits(); if (concurrentEdits) { @@ -355,7 +405,7 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit recording.stop(); - const result = model.apply(); + const result = await model.apply(); model.dispose(); return result; }); @@ -376,6 +426,9 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit return { progress, add, + addRename, + addCreate, + addDelete, finish, ariaMessage }; diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 1693993e6db..9aa2e6ae1ba 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -821,8 +821,22 @@ export interface IResourceEdit { range: IRange; newText: string; } + +export interface IResourceRename { + readonly from: URI; + readonly to: URI; +} + +export interface IResourceCreate { + readonly uri: URI; + readonly contents: string; +} + export interface WorkspaceEdit { edits: IResourceEdit[]; + renamedResources?: IResourceRename[]; + createdResources?: IResourceCreate[]; + deletedResources?: URI[]; rejectReason?: string; } export interface RenameProvider { diff --git a/src/vs/editor/contrib/quickFix/quickFixCommands.ts b/src/vs/editor/contrib/quickFix/quickFixCommands.ts index 2d067db0bf0..f012b11a4ca 100644 --- a/src/vs/editor/contrib/quickFix/quickFixCommands.ts +++ b/src/vs/editor/contrib/quickFix/quickFixCommands.ts @@ -22,9 +22,10 @@ import { LightBulbWidget } from './lightBulbWidget'; import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel'; import { TPromise } from 'vs/base/common/winjs.base'; import { CodeAction } from 'vs/editor/common/modes'; -import { createBulkEdit } from 'vs/editor/browser/services/bulkEdit'; +import { bulkEdit } from 'vs/editor/browser/services/bulkEdit'; import { IFileService } from 'vs/platform/files/common/files'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; +import URI from 'vs/base/common/uri'; export class QuickFixController implements IEditorContribution { @@ -112,9 +113,11 @@ export class QuickFixController implements IEditorContribution { private async _onApplyCodeAction(action: CodeAction): TPromise { if (action.edit) { - const edit = createBulkEdit(this._textModelService, this._editor, this._fileService); - edit.add(action.edit.edits); - await edit.finish(); + await bulkEdit(this._textModelService, this._editor, action.edit.edits, this._fileService, { + createdResources: action.edit.createdResources.map(create => ({ uri: URI.revive(create.uri), contents: create.contents })), + renamedResources: action.edit.renamedResources.map(rename => ({ from: URI.revive(rename.from), to: URI.revive(rename.to) })), + deletedResources: action.edit.deletedResources.map(URI.revive) + }); } if (action.command) { diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 81d3e99523b..58eb60dd225 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -4913,8 +4913,21 @@ declare module monaco.languages { newText: string; } + export interface IResourceRename { + readonly from: Uri; + readonly to: Uri; + } + + export interface IResourceCreate { + readonly uri: Uri; + readonly contents: string; + } + export interface WorkspaceEdit { edits: IResourceEdit[]; + renamedResources?: IResourceRename[]; + createdResources?: IResourceCreate[]; + deletedResources?: Uri[]; rejectReason?: string; } diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 0920acba747..ad5cb36dc8c 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -2430,6 +2430,29 @@ declare module 'vscode' { */ readonly size: number; + /** + * Renames a given resource in the workspace. + * + * @param from Uri of current resource. + * @param to Uri of renamed resource. + */ + renameResource(from: Uri, to: Uri): void; + + /** + * Create a new resource in the workspace. + * + * @param uri Uri of resource to create. + * @param contents New file contents. + */ + createResource(uri: Uri, contents: String): void; + + /** + * Delete a given resource in the workspace. + * + * @param uri Uri of resource to delete. + */ + deleteResource(uri: Uri): void; + /** * Replace the given range with given text for the given resource. * @@ -2485,6 +2508,21 @@ declare module 'vscode' { * @return An array of `[Uri, TextEdit[]]`-tuples. */ entries(): [Uri, TextEdit[]][]; + + /** + * Get all resource rename edits. + */ + readonly renamedResources: { from: Uri, to: Uri }[]; + + /** + * Get all resource create edits. + */ + readonly createdResources: { uri: Uri, contents: string }[]; + + /** + * Get all resource delete edits. + */ + readonly deletedResources: Uri[]; } /** diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index 0952ff3985f..1af196d2491 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -15,7 +15,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { Position as EditorPosition, ITextEditorOptions } from 'vs/platform/editor/common/editor'; import { MainThreadTextEditor } from './mainThreadEditor'; -import { ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions } from 'vs/workbench/api/node/extHost.protocol'; +import { ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions, IResourceFileEdit } from 'vs/workbench/api/node/extHost.protocol'; import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors'; import { equals as objectEquals } from 'vs/base/common/objects'; import { ExtHostContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IExtHostContext, IWorkspaceResourceEdit } from '../node/extHost.protocol'; @@ -210,7 +210,7 @@ export class MainThreadEditors implements MainThreadEditorsShape { return TPromise.as(this._documentsAndEditors.getEditor(id).applyEdits(modelVersionId, edits, opts)); } - $tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[]): TPromise { + $tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[], resourceFileEdits?: IResourceFileEdit): TPromise { // First check if loaded models were not changed in the meantime for (let i = 0, len = workspaceResourceEdits.length; i < len; i++) { @@ -253,8 +253,17 @@ export class MainThreadEditors implements MainThreadEditorsShape { } } - return bulkEdit(this._textModelResolverService, codeEditor, resourceEdits, this._fileService) - .then(() => true); + return bulkEdit( + this._textModelResolverService, + codeEditor, + resourceEdits, + this._fileService, + resourceFileEdits ? { + renamedResources: resourceFileEdits.renamedResources.map(entry => ({ from: URI.revive(entry.from), to: URI.revive(entry.to) })), + createdResources: resourceFileEdits.createdResources.map(entry => ({ uri: URI.revive(entry.uri), contents: entry.contents })), + deletedResources: resourceFileEdits.deletedResources.map(URI.revive) + } : undefined + ).then(() => true); } $tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): TPromise { diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index d189f463f6b..0d3ad1d8df1 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -210,6 +210,12 @@ export interface IWorkspaceResourceEdit { }[]; } +export interface IResourceFileEdit { + renamedResources: { from: UriComponents, to: UriComponents }[]; + createdResources: { uri: UriComponents, contents: string }[]; + deletedResources: UriComponents[]; +} + export interface MainThreadEditorsShape extends IDisposable { $tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): TPromise; $registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void; @@ -222,7 +228,7 @@ export interface MainThreadEditorsShape extends IDisposable { $tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise; $trySetSelections(id: string, selections: ISelection[]): TPromise; $tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): TPromise; - $tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[]): TPromise; + $tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[], resourceFileEdits?: IResourceFileEdit): TPromise; $tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): TPromise; $getDiffInformation(id: string): TPromise; } diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts index 35ad03c3a49..79e50c129a2 100644 --- a/src/vs/workbench/api/node/extHostTextEditors.ts +++ b/src/vs/workbench/api/node/extHostTextEditors.ts @@ -121,7 +121,7 @@ export class ExtHostEditors implements ExtHostEditorsShape { workspaceResourceEdits.push(workspaceResourceEdit); } - return this._proxy.$tryApplyWorkspaceEdit(workspaceResourceEdits); + return this._proxy.$tryApplyWorkspaceEdit(workspaceResourceEdits, edit); } // --- called from main thread diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 46b71714596..f1379708459 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -228,7 +228,12 @@ export const TextEdit = { export namespace WorkspaceEdit { export function from(value: vscode.WorkspaceEdit): modes.WorkspaceEdit { - const result: modes.WorkspaceEdit = { edits: [] }; + const result: modes.WorkspaceEdit = { + edits: [], + renamedResources: value.renamedResources, + createdResources: value.createdResources, + deletedResources: value.deletedResources + }; for (let entry of value.entries()) { let [uri, textEdits] = entry; for (let textEdit of textEdits) { diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 154012715bf..a7b250b6d69 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -494,8 +494,43 @@ export class TextEdit { export class WorkspaceEdit { private _values: [URI, TextEdit[]][] = []; + private readonly _resourcesCreated: { uri: URI, contents: string }[] = []; + private readonly _resourcesDeleted: URI[] = []; + private readonly _resourcesRenamed: { from: URI, to: URI }[] = []; private _index = new Map(); + private _validResources = new Set(); + private _invalidResources = new Set(); + + + createResource(uri: URI, contents: string): void { + if (this._invalidResources.has(uri)) { + throw illegalArgument('Cannot create already deleted resource'); + } + this._resourcesCreated.push({ uri: uri, contents: contents }); + this._validResources.add(uri); + } + + deleteResource(uri: URI): void { + if (this._validResources.has(uri)) { + throw illegalArgument('Cannot delete newly created resource'); + } + this._resourcesDeleted.push(uri); + this._invalidResources.add(uri); + } + + renameResource(uri: URI, newUri: URI): void { + if (this._validResources.has(uri)) { + throw illegalArgument('Cannot delete newly created resource'); + } + if (this._invalidResources.has(newUri)) { + throw illegalArgument('Cannot create already deleted resource'); + } + this._resourcesRenamed.push({ from: uri, to: newUri }); + this._invalidResources.add(uri); + this._validResources.add(newUri); + } + replace(uri: URI, range: Range, newText: string): void { let edit = new TextEdit(range, newText); let array = this.get(uri); @@ -519,6 +554,10 @@ export class WorkspaceEdit { } set(uri: URI, edits: TextEdit[]): void { + if (this._invalidResources.has(uri)) { + throw illegalArgument('Cannot modify already deleted resource'); + } + this._validResources.add(uri); const idx = this._index.get(uri.toString()); if (typeof idx === 'undefined') { let newLen = this._values.push([uri, edits]); @@ -537,8 +576,20 @@ export class WorkspaceEdit { return this._values; } + get createdResources(): { uri: URI, contents: string }[] { + return this._resourcesCreated; + } + + get deletedResources(): URI[] { + return this._resourcesDeleted; + } + + get renamedResources(): { from: URI, to: URI }[] { + return this._resourcesRenamed; + } + get size(): number { - return this._values.length; + return this._values.length + this._resourcesCreated.length + this._resourcesRenamed.length + this._resourcesDeleted.length; } toJSON(): any { diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts index 3cd1208f264..3e99b175fc7 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts @@ -362,6 +362,19 @@ suite('ExtHostTypes', function () { }); + test('WorkspaceEdit should fail when editing deleted resource', () => { + const resource = URI.parse('file:///a.ts'); + + const edit = new types.WorkspaceEdit(); + edit.deleteResource(resource); + try { + edit.insert(resource, new types.Position(0, 0), ''); + assert.fail(false, 'Should disallow edit of deleted resource'); + } catch { + // expected + } + }); + test('DocumentLink', function () { assert.throws(() => new types.DocumentLink(null, null)); assert.throws(() => new types.DocumentLink(new types.Range(1, 1, 1, 1), null)); diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts index 73887be8ea3..b725c6163bd 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts @@ -23,6 +23,9 @@ import { Range } from 'vs/editor/common/core/range'; import { Position } from 'vs/editor/common/core/position'; import { IModelService } from 'vs/editor/common/services/modelService'; import { EditOperation } from 'vs/editor/common/core/editOperation'; +import { TestFileService } from 'vs/workbench/test/workbenchTestServices'; +import { TPromise } from 'vs/base/common/winjs.base'; +import { IFileStat } from 'vs/platform/files/common/files'; suite('MainThreadEditors', () => { @@ -31,10 +34,35 @@ suite('MainThreadEditors', () => { let modelService: IModelService; let editors: MainThreadEditors; + const movedResources = new Map(); + const createdResources = new Map(); + const deletedResources = new Set(); + setup(() => { const configService = new TestConfigurationService(); modelService = new ModelServiceImpl(null, configService); const codeEditorService = new TestCodeEditorService(); + + movedResources.clear(); + createdResources.clear(); + deletedResources.clear(); + const fileService = new TestFileService(); + + fileService.moveFile = async (from, target): TPromise => { + assert(!movedResources.has(from)); + movedResources.set(from, target); + return createMockFileStat(target); + }; + fileService.createFile = async (uri, contents): TPromise => { + assert(!createdResources.has(uri)); + createdResources.set(uri, contents); + return createMockFileStat(uri); + }; + fileService.del = async (uri): TPromise => { + assert(!deletedResources.has(uri)); + deletedResources.add(uri); + }; + const textFileService = new class extends mock() { isDirty() { return false; } models = { @@ -69,7 +97,7 @@ suite('MainThreadEditors', () => { workbenchEditorService, codeEditorService, null, - null, + fileService, null, null, editorGroupService, @@ -82,7 +110,7 @@ suite('MainThreadEditors', () => { workbenchEditorService, editorGroupService, null, - null, + fileService, modelService ); }); @@ -107,4 +135,38 @@ suite('MainThreadEditors', () => { assert.equal(result, false); }); }); + + test(`applyWorkspaceEdit with only resource edit`, () => { + let model = modelService.createModel('something', null, resource); + + let workspaceResourceEdit: IWorkspaceResourceEdit = { + resource: resource, + modelVersionId: model.getVersionId(), + edits: [] + }; + + return editors.$tryApplyWorkspaceEdit([workspaceResourceEdit], { + renamedResources: [{ from: resource, to: resource }], + createdResources: [{ uri: resource, contents: 'foo' }], + deletedResources: [resource] + }).then((result) => { + assert.equal(result, true); + assert.equal(movedResources.get(resource), resource); + assert.equal(createdResources.get(resource), 'foo'); + assert.equal(deletedResources.has(resource), true); + }); + }); }); + + +function createMockFileStat(target: URI): IFileStat { + return { + etag: '', + hasChildren: false, + isDirectory: false, + name: target.path, + mtime: 0, + resource: target + }; +} + From 519b4723d586d364cf4b34afea3c5c759ba1ef23 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 12 Jan 2018 14:12:52 -0800 Subject: [PATCH 184/710] Fix potentiall undefined ref --- .../vscode-api-tests/src/workspace.test.ts | 29 ++++++++++++++++++- .../workbench/api/node/extHostTextEditors.ts | 6 +++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/extensions/vscode-api-tests/src/workspace.test.ts b/extensions/vscode-api-tests/src/workspace.test.ts index 4fccf98385b..d698bba1eab 100644 --- a/extensions/vscode-api-tests/src/workspace.test.ts +++ b/extensions/vscode-api-tests/src/workspace.test.ts @@ -10,6 +10,7 @@ import * as vscode from 'vscode'; import { createRandomFile, deleteFile, closeAllEditors, pathEquals } from './utils'; import { join, basename } from 'path'; import * as fs from 'fs'; +import { Uri } from 'vscode'; suite('workspace-namespace', () => { @@ -510,7 +511,7 @@ suite('workspace-namespace', () => { test('applyEdit should fail when editing deleted resource', async () => { const resource = await createRandomFile(); - let edit = new vscode.WorkspaceEdit(); + const edit = new vscode.WorkspaceEdit(); edit.deleteResource(resource); try { edit.insert(resource, new vscode.Position(0, 0), ''); @@ -519,4 +520,30 @@ suite('workspace-namespace', () => { // noop } }); + + test('applyEdit should fail when renaming deleted resource', async () => { + const resource = await createRandomFile(); + + const edit = new vscode.WorkspaceEdit(); + edit.deleteResource(resource); + try { + edit.renameResource(resource, resource); + assert.fail(false, 'Should disallow rename of deleted resource'); + } catch { + // noop + } + }); + + test('applyEdit should fail when editing renamed from resource', async () => { + const resource = await createRandomFile(); + const newResource = Uri.parse(resource.fsPath + '.1'); + const edit = new vscode.WorkspaceEdit(); + edit.renameResource(resource, newResource); + try { + edit.insert(resource, new vscode.Position(0, 0), ''); + assert.fail(false, 'Should disallow editing renamed file'); + } catch { + // noop + } + }); }); diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts index 79e50c129a2..2b3738a27f3 100644 --- a/src/vs/workbench/api/node/extHostTextEditors.ts +++ b/src/vs/workbench/api/node/extHostTextEditors.ts @@ -121,7 +121,11 @@ export class ExtHostEditors implements ExtHostEditorsShape { workspaceResourceEdits.push(workspaceResourceEdit); } - return this._proxy.$tryApplyWorkspaceEdit(workspaceResourceEdits, edit); + return this._proxy.$tryApplyWorkspaceEdit(workspaceResourceEdits, { + createdResources: edit.createdResources, + renamedResources: edit.renamedResources, + deletedResources: edit.deletedResources + }); } // --- called from main thread From 65f1bd4b25c0c927ff999c359f49a28f95351f02 Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Fri, 12 Jan 2018 16:07:09 -0800 Subject: [PATCH 185/710] Allow hex color completions from emmet --- extensions/emmet/package.json | 2 +- extensions/emmet/src/abbreviationActions.ts | 6 +- .../src/test/cssAbbreviationAction.test.ts | 93 ++++++++++++++++++- extensions/emmet/yarn.lock | 6 +- 4 files changed, 99 insertions(+), 8 deletions(-) diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json index 263bb63ed63..5085e13b2b6 100644 --- a/extensions/emmet/package.json +++ b/extensions/emmet/package.json @@ -310,7 +310,7 @@ "compile": "gulp compile-extension:emmet" }, "devDependencies": { - "@types/node": "7.0.43", + "@types/node": "8.0.33", "vscode": "1.0.1" }, "dependencies": { diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts index 09c531ed726..ee0e1b5a3be 100644 --- a/extensions/emmet/src/abbreviationActions.ts +++ b/extensions/emmet/src/abbreviationActions.ts @@ -8,6 +8,7 @@ import { Node, HtmlNode, Rule, Property } from 'EmmetNode'; import { getEmmetHelper, getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate, getEmmetConfiguration, isStyleSheet, getEmmetMode } from './util'; const trimRegex = /[\u00a0]*[\d|#|\-|\*|\u2022]+\.?/; +const hexColorRegex = /^#\d+$/; interface ExpandAbbreviationInput { syntax: string; @@ -232,17 +233,18 @@ export function isValidLocationForEmmetAbbreviation(document: vscode.TextDocumen // Fix for https://github.com/Microsoft/vscode/issues/34162 // Other than sass, stylus, we can make use of the terminator tokens to validate position if (syntax !== 'sass' && syntax !== 'stylus' && currentNode.type === 'property') { + const abbreviation = document.getText(new vscode.Range(abbreviationRange.start.line, abbreviationRange.start.character, abbreviationRange.end.line, abbreviationRange.end.character)); const propertyNode = currentNode; if (propertyNode.terminatorToken && propertyNode.separator && position.isAfterOrEqual(propertyNode.separatorToken.end) && position.isBeforeOrEqual(propertyNode.terminatorToken.start)) { - return false; + return hexColorRegex.test(abbreviation); } if (!propertyNode.terminatorToken && propertyNode.separator && position.isAfterOrEqual(propertyNode.separatorToken.end)) { - return false; + return hexColorRegex.test(abbreviation); } } diff --git a/extensions/emmet/src/test/cssAbbreviationAction.test.ts b/extensions/emmet/src/test/cssAbbreviationAction.test.ts index 00b205c682a..5ff9460dad2 100644 --- a/extensions/emmet/src/test/cssAbbreviationAction.test.ts +++ b/extensions/emmet/src/test/cssAbbreviationAction.test.ts @@ -70,7 +70,7 @@ suite('Tests for Expand Abbreviations (CSS)', () => { .foo { margin: a margin: 10px; -} +} `; return withRandomFileEditor(testContent, 'css', (editor, doc) => { @@ -87,6 +87,36 @@ suite('Tests for Expand Abbreviations (CSS)', () => { }); }); + test('Allow hex color when typing property values when there is a property in the next line (CSS)', () => { + const testContent = ` +.foo { + margin: #12 + margin: 10px; +} + `; + + return withRandomFileEditor(testContent, 'css', (editor, doc) => { + editor.selection = new Selection(2, 12, 2, 12); + 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); + if (!completionPromise) { + assert.fail('Completion promise wasnt returned'); + return Promise.resolve(); + } + completionPromise.then(result => { + if (!result || !result.items || !result.items.length) { + assert.fail('Completion promise came back empty'); + return Promise.resolve(); + } + assert.equal(result.items[0].label, '#121212'); + }); + return Promise.resolve(); + }); + }); + }); + test('Skip when typing property values when there is a property in the previous line (CSS)', () => { const testContent = ` .foo { @@ -109,11 +139,41 @@ suite('Tests for Expand Abbreviations (CSS)', () => { }); }); + test('Allow hex color when typing property values when there is a property in the previous line (CSS)', () => { + const testContent = ` +.foo { + margin: 10px; + margin: #12 +} + `; + + return withRandomFileEditor(testContent, 'css', (editor, doc) => { + editor.selection = new Selection(3, 12, 3, 12); + 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); + if (!completionPromise) { + assert.fail('Completion promise wasnt returned'); + return Promise.resolve(); + } + completionPromise.then(result => { + if (!result || !result.items || !result.items.length) { + assert.fail('Completion promise came back empty'); + return Promise.resolve(); + } + assert.equal(result.items[0].label, '#121212'); + }); + return Promise.resolve(); + }); + }); + }); + test('Skip when typing property values when it is the only property in the rule (CSS)', () => { const testContent = ` .foo { margin: a -} +} `; return withRandomFileEditor(testContent, 'css', (editor, doc) => { @@ -130,6 +190,35 @@ suite('Tests for Expand Abbreviations (CSS)', () => { }); }); + test('Allow hex colors when typing property values when it is the only property in the rule (CSS)', () => { + const testContent = ` +.foo { + margin: #12 +} + `; + + return withRandomFileEditor(testContent, 'css', (editor, doc) => { + editor.selection = new Selection(2, 12, 2, 12); + 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); + if (!completionPromise) { + assert.fail('Completion promise wasnt returned'); + return Promise.resolve(); + } + completionPromise.then(result => { + if (!result || !result.items || !result.items.length) { + assert.fail('Completion promise came back empty'); + return Promise.resolve(); + } + assert.equal(result.items[0].label, '#121212'); + }); + return Promise.resolve(); + }); + }); + }); + test('Expand abbreviation in completion list (CSS)', () => { const abbreviation = 'm10'; const expandedText = 'margin: 10px;'; diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock index 95b87244b85..5ba2df336e0 100644 --- a/extensions/emmet/yarn.lock +++ b/extensions/emmet/yarn.lock @@ -35,9 +35,9 @@ version "2.2.0" resolved "https://registry.yarnpkg.com/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz#46cffea119a0a003312a21c2d9b5628cb5fcd442" -"@types/node@7.0.43": - version "7.0.43" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" +"@types/node@8.0.33": + version "8.0.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd" ajv@^5.1.0: version "5.3.0" From 8046a0366054f554322cbad7d8a40852e421431d Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 16:20:10 -0800 Subject: [PATCH 186/710] root in fs provider is optional, #36177 --- src/vs/vscode.proposed.d.ts | 5 +++-- src/vs/workbench/api/node/extHostFileSystem.ts | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 6a680130e16..07b1295b641 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -102,7 +102,8 @@ declare module 'vscode' { readonly onDidChange?: Event; - readonly root: Uri; + // todo@joh - remove this + readonly root?: Uri; // more... // @@ -149,7 +150,7 @@ declare module 'vscode' { } export namespace workspace { - export function registerFileSystemProvider(authority: string, provider: FileSystemProvider): Disposable; + export function registerFileSystemProvider(scheme: string, provider: FileSystemProvider): Disposable; } export namespace window { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index 901419f3f2a..c89a461d1cc 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -27,7 +27,10 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { const handle = this._handlePool++; this._provider.set(handle, provider); this._proxy.$registerFileSystemProvider(handle, scheme); - this._proxy.$onDidAddFileSystemRoot(provider.root); + if (provider.root) { + // todo@remote + this._proxy.$onDidAddFileSystemRoot(provider.root); + } let reg: IDisposable; if (provider.onDidChange) { reg = provider.onDidChange(event => this._proxy.$onFileSystemChange(handle, event)); From 4df995c240cb95ab7b2353fa95f6854c136af414 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 12 Jan 2018 16:46:41 -0800 Subject: [PATCH 187/710] remote - manage some todos --- src/vs/vscode.proposed.d.ts | 3 ++- src/vs/workbench/api/node/extHost.api.impl.ts | 2 +- .../workbench/services/textfile/common/textFileEditorModel.ts | 4 ---- src/vs/workbench/services/textfile/common/textFileService.ts | 4 ---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 07b1295b641..51f8b8f5e5d 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -98,6 +98,7 @@ declare module 'vscode' { // todo@joh discover files etc // todo@joh CancellationToken everywhere + // todo@joh add open/close calls? export interface FileSystemProvider { readonly onDidChange?: Event; @@ -144,8 +145,8 @@ declare module 'vscode' { // create(resource: Uri): Thenable; // find files by names + // todo@joh, move into its own provider findFiles?(query: string, progress: Progress, token: CancellationToken): Thenable; - provideTextSearchResults?(query: TextSearchQuery, include: GlobPattern, exclude: GlobPattern, progress: Progress, token: CancellationToken): Thenable; } diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index bd4337b59a1..a1d13f701f7 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -616,7 +616,7 @@ export function createApiFactory( ConfigurationTarget: extHostTypes.ConfigurationTarget, RelativePattern: extHostTypes.RelativePattern, - // TODO@JOH,remote + // todo@remote FileChangeType: FileChangeType, FileType: FileType }; diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index e25597ad24e..fc18f6c5656 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -85,10 +85,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil @IHashService private hashService: IHashService ) { super(modelService, modeService); - - // TODO@remote - // assert.ok(resource.scheme === 'file', 'TextFileEditorModel can only handle file:// resources.'); - this.resource = resource; this.toDispose = []; this._onDidContentChange = new Emitter(); diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts index 96e31476b70..6e5bf84bf4a 100644 --- a/src/vs/workbench/services/textfile/common/textFileService.ts +++ b/src/vs/workbench/services/textfile/common/textFileService.ts @@ -413,10 +413,6 @@ export abstract class TextFileService implements ITextFileService { const filesToSave: URI[] = []; const untitledToSave: URI[] = []; toSave.forEach(s => { - // TODO@remote - // if (s.scheme === Schemas.file) { - // filesToSave.push(s); - // } else if ((Array.isArray(arg1) || arg1 === true /* includeUntitled */) && s.scheme === UNTITLED_SCHEMA) { untitledToSave.push(s); } else { From f5a5097918812d5e96c91eecd8db305ad88659e5 Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Fri, 12 Jan 2018 16:54:21 -0800 Subject: [PATCH 188/710] When trigger suggest for incomplete completions, use new kind --- src/vs/editor/common/modes.ts | 3 ++- src/vs/editor/contrib/suggest/suggestModel.ts | 20 ++++++++++++++----- src/vs/monaco.d.ts | 1 + src/vs/vscode.d.ts | 8 ++++++-- .../api/node/extHostTypeConverters.ts | 3 ++- src/vs/workbench/api/node/extHostTypes.ts | 3 ++- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 1693993e6db..c3c19319c48 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -314,7 +314,8 @@ export interface ISuggestResult { */ export enum SuggestTriggerKind { Invoke = 0, - TriggerCharacter = 1 + TriggerCharacter = 1, + TriggerForIncompleteCompletions = 2 } /** diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts index 9ae1b480474..b597301e9c8 100644 --- a/src/vs/editor/contrib/suggest/suggestModel.ts +++ b/src/vs/editor/contrib/suggest/suggestModel.ts @@ -11,7 +11,7 @@ import Event, { Emitter } from 'vs/base/common/event'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITextModel, IWordAtPosition } from 'vs/editor/common/model'; -import { ISuggestSupport, SuggestRegistry, StandardTokenType, SuggestTriggerKind } from 'vs/editor/common/modes'; +import { ISuggestSupport, SuggestRegistry, StandardTokenType, SuggestTriggerKind, SuggestContext } from 'vs/editor/common/modes'; import { Position } from 'vs/editor/common/core/position'; import { provideSuggestionItems, getSuggestionComparator, ISuggestionItem } from './suggest'; import { CompletionModel } from './completionModel'; @@ -347,13 +347,23 @@ export class SuggestModel implements IDisposable { // Capture context when request was sent this._context = ctx; + // Build context for request + let suggestCtx: SuggestContext; + if (context.triggerCharacter) { + suggestCtx = { + triggerKind: SuggestTriggerKind.TriggerCharacter, + triggerCharacter: context.triggerCharacter + }; + } else if (onlyFrom && onlyFrom.length) { + suggestCtx = { triggerKind: SuggestTriggerKind.TriggerForIncompleteCompletions }; + } else { + suggestCtx = { triggerKind: SuggestTriggerKind.Invoke }; + } + this._requestPromise = provideSuggestionItems(model, this._editor.getPosition(), this._editor.getConfiguration().contribInfo.snippetSuggestions, onlyFrom, - { - triggerCharacter: context.triggerCharacter, - triggerKind: context.triggerCharacter ? SuggestTriggerKind.TriggerCharacter : SuggestTriggerKind.Invoke - } + suggestCtx ).then(items => { this._requestPromise = null; diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 81d3e99523b..b419e7e58ba 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -4487,6 +4487,7 @@ declare module monaco.languages { export enum SuggestTriggerKind { Invoke = 0, TriggerCharacter = 1, + TriggerForIncompleteCompletions = 2, } export interface CodeAction { diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index b30eb83f8d5..2f0189a054f 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -2912,7 +2912,7 @@ declare module 'vscode' { export class CompletionList { /** - * This list it not complete. Further typing should result in recomputing + * This list is not complete. Further typing should result in recomputing * this list. */ isIncomplete?: boolean; @@ -2942,7 +2942,11 @@ declare module 'vscode' { /** * Completion was triggered by a trigger character. */ - TriggerCharacter = 1 + TriggerCharacter = 1, + /** + * Completion was re-triggered as current completion list is incomplete + */ + TriggerForIncompleteCompletions = 2 } /** diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 46b71714596..a25d0430ff9 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -347,7 +347,8 @@ export namespace CompletionTriggerKind { switch (kind) { case modes.SuggestTriggerKind.TriggerCharacter: return types.CompletionTriggerKind.TriggerCharacter; - + case modes.SuggestTriggerKind.TriggerForIncompleteCompletions: + return types.CompletionTriggerKind.TriggerForIncompleteCompletions; case modes.SuggestTriggerKind.Invoke: default: return types.CompletionTriggerKind.Invoke; diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 154012715bf..815f4039344 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -907,7 +907,8 @@ export class SignatureHelp { export enum CompletionTriggerKind { Invoke = 0, - TriggerCharacter = 1 + TriggerCharacter = 1, + TriggerForIncompleteCompletions = 2 } export interface CompletionContext { From e78b926db62adfbd2171956eb9b052c919c0d8c9 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Fri, 12 Jan 2018 21:12:38 -0800 Subject: [PATCH 189/710] Safe point for dropping off line start prefix sum. --- .../model/linesTextBuffer/textSource.ts | 2 +- .../pieceTableTextBuffer/pieceTableBase.ts | 848 ++++++++++++++---- .../pieceTableTextBuffer.ts | 23 +- .../model/benchmark/modelbuilder.benchmark.ts | 27 + 4 files changed, 691 insertions(+), 209 deletions(-) diff --git a/src/vs/editor/common/model/linesTextBuffer/textSource.ts b/src/vs/editor/common/model/linesTextBuffer/textSource.ts index 79c06f1c9f1..d2ea4389338 100644 --- a/src/vs/editor/common/model/linesTextBuffer/textSource.ts +++ b/src/vs/editor/common/model/linesTextBuffer/textSource.ts @@ -35,7 +35,7 @@ export interface IRawTextSource { export class TextSource { - /** + /**f * 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'. diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 3b5ed1a4e28..431343239db 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -102,11 +102,11 @@ export class TreeNode { color: NodeColor; // Piece - piece: Piece; + piece: IPiece; size_left: number; // size of the left subtree (not inorder) lf_left: number; // line feeds cnt in the left subtree (not in order) - constructor(piece: Piece, color: NodeColor) { + constructor(piece: IPiece, color: NodeColor) { this.piece = piece; this.color = color; this.size_left = 0; @@ -173,7 +173,7 @@ SENTINEL.left = SENTINEL; SENTINEL.right = SENTINEL; setNodeColor(SENTINEL, NodeColor.Black); -export interface BufferCursor { +export interface NodePosition { /** * Piece Index */ @@ -188,7 +188,46 @@ export interface BufferCursor { nodeStartOffset: number; } -export class Piece { +export interface BufferCursor { + /** + * Line number in current buffer + */ + line: number; + /** + * Column number in current buffer + */ + column: number; +} + +export interface IPiece { + bufferIndex: number; + length: number; + lineFeedCnt: number; + + shift(offset: number); +} + +export class OriginalPiece implements IPiece { + bufferIndex: number; + start: BufferCursor; + end: BufferCursor; + length: number; + lineFeedCnt: number; + + constructor(bufferIndex: number, start: BufferCursor, end: BufferCursor, lineFeedCnt: number, length: number) { + this.bufferIndex = bufferIndex; + this.start = start; + this.end = end; + this.lineFeedCnt = lineFeedCnt; + this.length = length; + } + + shift(offset: number) { + + } +} + +export class Piece implements IPiece { bufferIndex: number; offset: number; length: number; // size of current piece @@ -209,16 +248,32 @@ export class Piece { this.lineStarts = new PrefixSumComputer(newVal); } } + + shift(offset: number) { + this.offset += offset; + this.length -= offset; + } } +export class StringBuffer { + buffer: string; + lineStarts: number[]; + + constructor(buffer: string, lineStarts: number[]) { + this.buffer = buffer; + this.lineStarts = lineStarts; + } +} + + export class PieceTableBase { - protected _buffers: string[]; // 0 is change buffer, others are readonly original buffer. + protected _buffers: StringBuffer[]; // 0 is change buffer, others are readonly original buffer. protected _root: TreeNode; protected _lineCnt: number; constructor(chunks: IRawPTBuffer[]) { this._buffers = [ - '', + new StringBuffer('', [0]) ]; this._root = SENTINEL; this._lineCnt = 1; @@ -226,42 +281,26 @@ export class PieceTableBase { let lastNode: TreeNode = null; for (let i = 0, len = chunks.length; i < len; i++) { if (chunks[i].text.length > 0) { - let lineLengths: Uint32Array; + let lineStarts: number[]; if (chunks[i].lineStarts) { - lineLengths = new Uint32Array(chunks[i].lineStarts.length); - for (let j = 1; j < chunks[i].lineStarts.length; j++) { - lineLengths[j - 1] = chunks[i].lineStarts[j] - chunks[i].lineStarts[j - 1]; - } - lineLengths[chunks[i].lineStarts.length - 1] = chunks[i].text.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1]; + lineStarts = chunks[i].lineStarts; } else { - lineLengths = this.constructLineLengths(chunks[i].text); + lineStarts = constructLineStarts(chunks[i].text); } - let piece = new Piece(i + 1, 0, chunks[i].text.length, lineLengths.length - 1, lineLengths); - this._buffers.push(chunks[i].text); + let piece = new OriginalPiece( + i + 1, + { line: 0, column: 0 }, + { line: lineStarts.length - 1, column: chunks[i].text.length - lineStarts[lineStarts.length - 1] }, + lineStarts.length - 1, + chunks[i].text.length + ); + this._buffers.push(new StringBuffer(chunks[i].text, lineStarts)); lastNode = this.rbInsertRight(lastNode, piece); } } this.computeLineCount(); - - // if (this._originalBuffer.length > 0) { - // let lineLengths: Uint32Array; - // if (lineStarts) { - // lineLengths = new Uint32Array(lineStarts.length); - // for (let i = 1; i < lineStarts.length; i++) { - // lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; - // } - - // lineLengths[lineStarts.length - 1] = this._originalBuffer.length - lineStarts[lineStarts.length - 1]; - // } else { - // lineLengths = this.constructLineLengths(this._originalBuffer); - // } - - // let piece = new Piece(true, 0, this._originalBuffer.length, lineLengths.length - 1, lineLengths); - // this.rbInsertLeft(null, piece); - // this._lineCnt = lineLengths.length; - // } } // #region Piece Table @@ -269,95 +308,68 @@ export class PieceTableBase { // todo, validate value and offset. if (this._root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); - let insertPos = node.piece.lineStarts.getIndexOf(remainder); + if (this.isChangeBufferNode(node)) { + // changed buffer + this.insertToChangedPiece(node, remainder, nodeStartOffset, offset, value); + this.computeLineCount(); + return; + } - if (node.piece.bufferIndex === 0 && (node.piece.offset + node.piece.length === this._buffers[0].length) && (nodeStartOffset + node.piece.length === offset)) { - // append content to this node, we don't want to keep adding node when users simply type in sequence - this.appendToNode(node, value); - } else { - if (nodeStartOffset === offset) { - // we are inserting content to the beginning of node - let nodesToDel = []; - if (this.endWithCR(value) && this.startWithLF(node)) { - // move `\n` to new node. + let piece = node.piece; + let bufferIndex = piece.bufferIndex; + let insertPosInBuffer = this.positionInBuffer(node, remainder); + + if (nodeStartOffset === offset) { + this.insertContentToNodeLeft(value, node); + } else if (nodeStartOffset + node.piece.length > offset) { + // we are inserting into the middle of a node. + let nodesToDel = []; + let newRightPiece = new OriginalPiece( + piece.bufferIndex, + insertPosInBuffer, + piece.end, + this.getLineFeedCnt(piece.bufferIndex, insertPosInBuffer, piece.end), + this.offsetInBuffer(bufferIndex, piece.end) - this.offsetInBuffer(bufferIndex, insertPosInBuffer) + ); + + if (this.endWithCR(value)) { + let headOfRight = this.nodeCharCodeAt(node, remainder); + + if (headOfRight === 10 /** \n */) { + let newStart: BufferCursor = { line: newRightPiece.start.line + 1, column: 0 }; + newRightPiece.start = newStart; + newRightPiece.length -= 1; + newRightPiece.lineFeedCnt = this.getLineFeedCnt(newRightPiece.bufferIndex, newRightPiece.start, newRightPiece.end); // @todo, we can optimize value += '\n'; - node.piece.offset++; - node.piece.length--; - node.piece.lineFeedCnt--; - node.piece.lineStarts.removeValues(0, 1); - this.updateMetadata(node, -1, -1); + } + } + + // reuse node for content before insertion point. + if (this.startWithLF(value)) { + let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); + if (tailOfLeft === 13 /** \r */) { + let previousPos = this.positionInBuffer(node, remainder - 1); + this.deleteOriginalNodeTail(node, previousPos); + value = '\r' + value; if (node.piece.length === 0) { nodesToDel.push(node); } - } - - let newPiece = this.createNewPiece(value); - let newNode = this.rbInsertLeft(node, newPiece); - this.validateCRLFWithPrevNode(newNode); - this.deleteNodes(nodesToDel); - } else if (nodeStartOffset + node.piece.length > offset) { - // we are inserting into the middle of a node. - let nodesToDel = []; - let newRightPiece = new Piece( - node.piece.bufferIndex, - node.piece.offset + remainder, - node.piece.length - remainder, - node.piece.lineFeedCnt - insertPos.index, - node.piece.lineStarts.values - ); - - if (this.endWithCR(value)) { - let headOfRight = this.nodeCharCodeAt(node, remainder); - - if (headOfRight === 10 /** \n */) { - newRightPiece.offset++; - newRightPiece.length--; - newRightPiece.lineFeedCnt--; - newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); - value += '\n'; - } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); - } } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + this.deleteOriginalNodeTail(node, insertPosInBuffer); } - - // reuse node for content before insertion point. - if (this.startWithLF(value)) { - let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); - if (tailOfLeft === 13 /** \r */) { - let previousPos = node.piece.lineStarts.getIndexOf(remainder - 1); - this.deleteNodeTail(node, previousPos); - value = '\r' + value; - - if (node.piece.length === 0) { - nodesToDel.push(node); - } - } else { - this.deleteNodeTail(node, insertPos); - } - } else { - this.deleteNodeTail(node, insertPos); - } - - let newPiece = this.createNewPiece(value); - if (newRightPiece.length > 0) { - this.rbInsertRight(node, newRightPiece); - } - this.rbInsertRight(node, newPiece); - this.deleteNodes(nodesToDel); } else { - // we are inserting to the right of this node. - if (this.adjustCarriageReturnFromNext(value, node)) { - // move \n to the new node. - value += '\n'; - } - - let newPiece = this.createNewPiece(value); - let newNode = this.rbInsertRight(node, newPiece); - this.validateCRLFWithPrevNode(newNode); + this.deleteOriginalNodeTail(node, insertPosInBuffer); } + + let newPiece = this.createNewPiece(value); + if (newRightPiece.length > 0) { + this.rbInsertRight(node, newRightPiece); + } + this.rbInsertRight(node, newPiece); + this.deleteNodes(nodesToDel); + } else { + this.insertContentToNodeRight(value, node); } } else { // insert new node @@ -369,6 +381,149 @@ export class PieceTableBase { this.computeLineCount(); } + insertContentToNodeLeft(value: string, node: TreeNode) { + // we are inserting content to the beginning of node + let nodesToDel = []; + if (this.endWithCR(value) && this.startWithLF(node)) { + // move `\n` to new node. + + if (this.isChangeBufferNode(node)) { + let piece = node.piece; + piece.shift(1); + piece.lineFeedCnt--; + piece.lineStarts.removeValues(0, 1); + } else { + let piece = node.piece; + let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; + piece.start = newStart; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize + piece.length -= 1; + } + + value += '\n'; + this.updateMetadata(node, -1, -1); + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } + + let newPiece = this.createNewPiece(value); + let newNode = this.rbInsertLeft(node, newPiece); + this.validateCRLFWithPrevNode(newNode); + this.deleteNodes(nodesToDel); + } + + insertContentToNodeRight(value: string, node: TreeNode) { + // we are inserting to the right of this node. + if (this.adjustCarriageReturnFromNext(value, node)) { + // move \n to the new node. + value += '\n'; + } + + let newPiece = this.createNewPiece(value); + let newNode = this.rbInsertRight(node, newPiece); + this.validateCRLFWithPrevNode(newNode); + } + + insertToChangedPiece(node: TreeNode, remainder: number, nodeStartOffset: number, offset: number, value: string) { + let piece: Piece = node.piece; + let insertPos = piece.lineStarts.getIndexOf(remainder); + + if (piece.offset + piece.length === this._buffers[0].buffer.length && (nodeStartOffset + piece.length === offset)) { + this.appendToNode(node, value); + } else { + if (nodeStartOffset === offset) { + this.insertContentToNodeLeft(value, node); + } else if (nodeStartOffset + node.piece.length > offset) { + // we are inserting into the middle of a node. + let nodesToDel = []; + let newRightPiece = new Piece( + piece.bufferIndex, + piece.offset + remainder, + piece.length - remainder, + piece.lineFeedCnt - insertPos.index, + piece.lineStarts.values + ); + + if (this.endWithCR(value)) { + let headOfRight = this.nodeCharCodeAt(node, remainder); + + if (headOfRight === 10 /** \n */) { + newRightPiece.offset++; + newRightPiece.length--; + newRightPiece.lineFeedCnt--; + newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); + value += '\n'; + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + } else { + this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); + } + + // reuse node for content before insertion point. + if (this.startWithLF(value)) { + let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); + if (tailOfLeft === 13 /** \r */) { + let previousPos = piece.lineStarts.getIndexOf(remainder - 1); + this.deleteNodeTail(node, previousPos); + value = '\r' + value; + + if (node.piece.length === 0) { + nodesToDel.push(node); + } + } else { + this.deleteNodeTail(node, insertPos); + } + } else { + this.deleteNodeTail(node, insertPos); + } + + let newPiece = this.createNewPiece(value); + if (newRightPiece.length > 0) { + this.rbInsertRight(node, newRightPiece); + } + this.rbInsertRight(node, newPiece); + this.deleteNodes(nodesToDel); + } else { + this.insertContentToNodeRight(value, node); + } + } + } + + deletePartOfChangedNode(startNode: TreeNode, offset: number, cnt: number, startPosition, endPosition) { + let piece = startNode.piece; + let startSplitPos = piece.lineStarts.getIndexOf(startPosition.remainder); + let endSplitPos = piece.lineStarts.getIndexOf(endPosition.remainder); + + if (startPosition.nodeStartOffset === offset) { + if (cnt === piece.length) { // delete node + let next = startNode.next(); + this.rbDelete(startNode); + this.validateCRLFWithPrevNode(next); + this.computeLineCount(); + return; + } + this.deleteNodeHead(startNode, endSplitPos); + this.validateCRLFWithPrevNode(startNode); + this.computeLineCount(); + return; + } + + if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { + this.deleteNodeTail(startNode, startSplitPos); + this.validateCRLFWithNextNode(startNode); + this.computeLineCount(); + return; + } + + // delete content in the middle, this node will be splitted to nodes + this.shrinkNode(startNode, startSplitPos, endSplitPos); + this.computeLineCount(); + return; + } + delete(offset: number, cnt: number): void { if (cnt <= 0 || this._root === SENTINEL) { return; @@ -378,11 +533,15 @@ export class PieceTableBase { let endPosition = this.nodeAt(offset + cnt); let startNode = startPosition.node; let endNode = endPosition.node; - let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); + // let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); if (startNode === endNode) { - // deletion falls into one node. - let endSplitPos = startNode.piece.lineStarts.getIndexOf(endPosition.remainder); + if (this.isChangeBufferNode(startNode)) { + return this.deletePartOfChangedNode(startNode, offset, cnt, startPosition, endPosition); + } + + let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); + let endSplitPosInBuffer = this.positionInBuffer(startNode, endPosition.remainder); if (startPosition.nodeStartOffset === offset) { if (cnt === startNode.piece.length) { // delete node @@ -392,37 +551,58 @@ export class PieceTableBase { this.computeLineCount(); return; } - this.deleteNodeHead(startNode, endSplitPos); + this.deleteOriginalNodeHead(startNode, endSplitPosInBuffer); this.validateCRLFWithPrevNode(startNode); this.computeLineCount(); return; } if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { - this.deleteNodeTail(startNode, startSplitPos); + this.deleteOriginalNodeTail(startNode, startSplitPosInBuffer); this.validateCRLFWithNextNode(startNode); this.computeLineCount(); return; } // delete content in the middle, this node will be splitted to nodes - this.shrinkNode(startNode, startSplitPos, endSplitPos); + this.shrinkOriginalNode(startNode, startSplitPosInBuffer, endSplitPosInBuffer); this.computeLineCount(); return; } let nodesToDel = []; - // update first touched node - this.deleteNodeTail(startNode, startSplitPos); - if (startNode.piece.length === 0) { - nodesToDel.push(startNode); + + if (this.isChangeBufferNode(startNode)) { + // changed buffer + let piece = startNode.piece; + let startSplitPos = piece.lineStarts.getIndexOf(startPosition.remainder); + // update first touched node + this.deleteNodeTail(startNode, startSplitPos); + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } + } else { + let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); + this.deleteOriginalNodeTail(startNode, startSplitPosInBuffer); + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } } // update last touched node - let endSplitPos = endNode.piece.lineStarts.getIndexOf(endPosition.remainder); - this.deleteNodeHead(endNode, endSplitPos); - if (endNode.piece.length === 0) { - nodesToDel.push(endNode); + if (this.isChangeBufferNode(endNode)) { + let piece = endNode.piece; + let endSplitPos = piece.lineStarts.getIndexOf(endPosition.remainder); + this.deleteNodeHead(endNode, endSplitPos); + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } + } else { + let endSplitPosInBuffer = this.positionInBuffer(endNode, endPosition.remainder); + this.deleteOriginalNodeHead(endNode, endSplitPosInBuffer); + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } } // delete nodes in between @@ -437,6 +617,90 @@ export class PieceTableBase { this.computeLineCount(); } + positionInBuffer(node: TreeNode, remainder: number): BufferCursor { + let piece = node.piece; + let bufferIndex = node.piece.bufferIndex; + let lineStarts = this._buffers[bufferIndex].lineStarts; + + let startOffset = lineStarts[piece.start.line] + piece.start.column; + // let endOffset = lineStarts[piece.end.line] + piece.end.column; + + let offset = startOffset + remainder; + + // binary search offset between startOffset and endOffset + let low = piece.start.line; + let high = piece.end.line; + + let mid: number; + let midStop: number; + let midStart: number; + + while (low <= high) { + mid = low + ((high - low) / 2) | 0; + midStart = lineStarts[mid]; + + if (mid === high) { + break; + } + + midStop = lineStarts[mid + 1]; + + if (offset < midStart) { + high = mid - 1; + } else if (offset >= midStop) { + low = mid + 1; + } else { + break; + } + } + + return { + line: mid, + column: offset - midStart + }; + } + + getLineFeedCnt(bufferIndex: number, start: BufferCursor, end: BufferCursor): number { + // we don't need to worry about start + // abc\r|\n, or abc|\r, or abc|\n, or abc|\r\n doesn't change the fact that, there is one line break after start. + + // now let's take care of end + // abc\r|\n, if end is in between \r and \n, we need to add line feed count by 1 + if (end.column === 0) { + return end.line - start.line; + } + + let lineStarts = this._buffers[bufferIndex].lineStarts; + if (end.line === lineStarts.length - 1) { + // it means, there is no \n after end, otherwise, there will be one more lineStart. + return end.line - start.line; + } + + let nextLineStartOffset = lineStarts[end.line + 1]; + let endOffset = lineStarts[end.line] + end.column; + if (nextLineStartOffset > endOffset + 1) { + // there are more than 1 character after end, which means it can't be \n + return end.line - start.line; + } + // endOffset + 1 === nextLineStartOffset + // character at endOffset is \n, so we check the character before first + // if character at endOffset is \r, end.column is 0 and we can't get here. + let previousCharOffset = endOffset - 1; // end.column > 0 so it's okay. + let buffer = this._buffers[bufferIndex].buffer; + + if (buffer.charCodeAt(previousCharOffset) === 13) { + return end.line - start.line + 1; + } else { + return end.line - start.line; + } + } + + offsetInBuffer(bufferIndex: number, cursor: BufferCursor): number { + let lineStarts = this._buffers[bufferIndex].lineStarts; + + return lineStarts[cursor.line] + cursor.column; + } + deleteNodes(nodes: TreeNode[]): void { for (let i = 0; i < nodes.length; i++) { this.rbDelete(nodes[i]); @@ -444,8 +708,8 @@ export class PieceTableBase { } createNewPiece(text: string): Piece { - const startOffset = this._buffers[0].length; - this._buffers[0] += text; + const startOffset = this._buffers[0].buffer.length; + this._buffers[0].buffer += text; const lineLengths = this.constructLineLengths(text); return new Piece(0, startOffset, text.length, lineLengths.length - 1, lineLengths); } @@ -458,16 +722,17 @@ export class PieceTableBase { if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { x = x.left; } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); - let buffer = this._buffers[x.piece.bufferIndex]; - - return buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + accumualtedValue); + let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); + let accumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 1); + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); + return buffer.substring(startOffset + prevAccumualtedValue, startOffset + accumualtedValue); } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let buffer = this._buffers[x.piece.bufferIndex]; + let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); - ret = buffer.substring(x.piece.offset + prevAccumualtedValue, x.piece.offset + x.piece.length); + ret = buffer.substring(startOffset + prevAccumualtedValue, startOffset + x.piece.length); break; } else { lineNumber -= x.lf_left + x.piece.lineFeedCnt; @@ -478,15 +743,17 @@ export class PieceTableBase { // search in order, to find the node contains end column x = x.next(); while (x !== SENTINEL) { - let buffer = this._buffers[x.piece.bufferIndex]; + let buffer = this._buffers[x.piece.bufferIndex].buffer; if (x.piece.lineFeedCnt > 0) { - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + let accumualtedValue = this.getAccumulatedValue(x, 0); + let startOffset = this.getStartOffset(x); - ret += buffer.substring(x.piece.offset, x.piece.offset + accumualtedValue); + ret += buffer.substring(startOffset, startOffset + accumualtedValue); return ret; } else { - ret += buffer.substr(x.piece.offset, x.piece.length); + let startOffset = this.getStartOffset(x); + ret += buffer.substr(startOffset, x.piece.length); } x = x.next(); @@ -508,28 +775,134 @@ export class PieceTableBase { } // #region node operations + getStartOffset(node: TreeNode) { + if (this.isChangeBufferNode(node)) { + return (node.piece).offset; + } else { + return this.offsetInBuffer(node.piece.bufferIndex, (node.piece).start); + } + } + + getIndexOf(node: TreeNode, accumulatedValue: number): PrefixSumIndexOfResult { + if (this.isChangeBufferNode(node)) { + return (node.piece).lineStarts.getIndexOf(accumulatedValue); + } else { + let piece = node.piece; + let pos = this.positionInBuffer(node, accumulatedValue); + let lineCnt = pos.line - piece.start.line; + + if (this.offsetInBuffer(piece.bufferIndex, piece.end) - this.offsetInBuffer(piece.bufferIndex, piece.start) === accumulatedValue) { + // we are checking the end of this node, so a CRLF check is necessary. + let realLineCnt = this.getLineFeedCnt(node.piece.bufferIndex, piece.start, pos); + if (realLineCnt !== lineCnt) { + // aha yes, CRLF + return new PrefixSumIndexOfResult(realLineCnt, 0); + } + } + + return new PrefixSumIndexOfResult(lineCnt, pos.column); + } + } + + getAccumulatedValue(node: TreeNode, index: number) { + if (this.isChangeBufferNode(node)) { + return (node.piece).lineStarts.getAccumulatedValue(index); + } else { + if (index < 0) { + return 0; + } + let piece = node.piece; + let lineStarts = this._buffers[piece.bufferIndex].lineStarts; + let expectedLineStartIndex = piece.start.line + index + 1; + if (expectedLineStartIndex > piece.end.line) { + return lineStarts[piece.end.line] + piece.end.column - lineStarts[piece.start.line] - piece.start.column; + } else { + return lineStarts[expectedLineStartIndex] - lineStarts[piece.start.line] - piece.start.column; + } + } + } + + deleteOriginalNodeTail(node: TreeNode, pos: BufferCursor) { + let piece = node.piece; + let originalLFCnt = piece.lineFeedCnt; + let originalEndOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + piece.end = pos; + let newEndOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); + let lf_delta = piece.lineFeedCnt - originalLFCnt; + let size_delta = newEndOffset - originalEndOffset; + piece.length += size_delta; + this.updateMetadata(node, size_delta, lf_delta); + } + + deleteOriginalNodeHead(node: TreeNode, pos: BufferCursor) { + let piece = node.piece; + let originalLFCnt = piece.lineFeedCnt; + let originalStartOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + + piece.start = pos; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, maybe we can optimize this case as we just change start. + let newStartOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + let lf_delta = piece.lineFeedCnt - originalLFCnt; + let size_delta = originalStartOffset - newStartOffset; + piece.length += size_delta; + this.updateMetadata(node, size_delta, lf_delta); + } + + shrinkOriginalNode(node: TreeNode, start: BufferCursor, end: BufferCursor) { + let piece = node.piece; + let originalStartPos = piece.start; + let originalEndPos = piece.end; + + // old piece + // originalStartPos, start + let oldLength = piece.length; + let oldLFCnt = piece.lineFeedCnt; + piece.end = start; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); + let newLength = this.offsetInBuffer(piece.bufferIndex, start) - this.offsetInBuffer(piece.bufferIndex, originalStartPos); + let newLFCnt = piece.lineFeedCnt; + piece.length = newLength; + this.updateMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt); + + // new right piece + // end, originalEndPos + let newPiece = new OriginalPiece( + piece.bufferIndex, + end, + originalEndPos, + this.getLineFeedCnt(piece.bufferIndex, end, originalEndPos), + this.offsetInBuffer(piece.bufferIndex, originalEndPos) - this.offsetInBuffer(piece.bufferIndex, end) + ); + + let newNode = this.rbInsertRight(node, newPiece); + this.validateCRLFWithPrevNode(newNode); + } + deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { + let piece = node.piece; // it's okay to delete CR in CRLF. - let cnt = node.piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; - node.piece.length -= cnt; - node.piece.offset += cnt; - node.piece.lineFeedCnt -= pos.index; - this.deletePrefixSumHead(node.piece.lineStarts, pos); + let cnt = piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; + piece.length -= cnt; + piece.offset += cnt; + piece.lineFeedCnt -= pos.index; + this.deletePrefixSumHead(piece.lineStarts, pos); this.updateMetadata(node, -cnt, -pos.index); } deleteNodeTail(node: TreeNode, start: PrefixSumIndexOfResult) { - let cnt = node.piece.length - node.piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; - let hitCRLF = this.hitTestCRLF(node, node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); + let piece = node.piece; + let cnt = node.piece.length - piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; + let hitCRLF = this.hitTestCRLF(node, piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); node.piece.length -= cnt; let lf_delta = start.index - node.piece.lineFeedCnt; node.piece.lineFeedCnt = start.index; - this.deletePrefixSumTail(node.piece.lineStarts, start); + this.deletePrefixSumTail(piece.lineStarts, start); if (hitCRLF) { node.piece.lineFeedCnt += 1; lf_delta += 1; - node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + piece.lineStarts.insertValues(piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); } this.updateMetadata(node, -cnt, lf_delta); @@ -537,24 +910,25 @@ export class PieceTableBase { // remove start-end from node. shrinkNode(node: TreeNode, start: PrefixSumIndexOfResult, end?: PrefixSumIndexOfResult) { + let piece = node.piece; // read operation first - let oldLineLengthsVal = node.piece.lineStarts.values; - let offset = node.piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; - let endOffset = node.piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; + let oldLineLengthsVal = piece.lineStarts.values; + let offset = piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; + let endOffset = piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; // write. let startHitCRLF = this.hitTestCRLF(node, offset, start); - let nodeOldLength = node.piece.length; - node.piece.length = offset; - let lf_delta = start.index - node.piece.lineFeedCnt; - node.piece.lineFeedCnt = start.index; - node.piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); - node.piece.lineStarts.changeValue(start.index, start.remainder); + let nodeOldLength = piece.length; + piece.length = offset; + let lf_delta = start.index - piece.lineFeedCnt; + piece.lineFeedCnt = start.index; + piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); + piece.lineStarts.changeValue(start.index, start.remainder); if (startHitCRLF) { node.piece.lineFeedCnt += 1; lf_delta += 1; - node.piece.lineStarts.insertValues(node.piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); + piece.lineStarts.insertValues(piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); } this.updateMetadata(node, offset - nodeOldLength, lf_delta); @@ -565,7 +939,7 @@ export class PieceTableBase { let newPiece: Piece = new Piece( node.piece.bufferIndex, - endOffset + node.piece.offset, + endOffset + piece.offset, newPieceLength, oldLineLengthsVal.length - end.index - 1, oldLineLengthsVal.slice(end.index) @@ -582,22 +956,23 @@ export class PieceTableBase { } let hitCRLF = this.startWithLF(value) && this.endWithCR(node); - this._buffers[0] += value; + this._buffers[0].buffer += value; node.piece.length += value.length; const lineLengths = this.constructLineLengths(value); let lineFeedCount = lineLengths.length - 1; let lf_delta = lineFeedCount; + let piece = node.piece; if (hitCRLF) { node.piece.lineFeedCnt += lineFeedCount - 1; lf_delta--; - let lineStarts = node.piece.lineStarts; + let lineStarts = piece.lineStarts; lineStarts.removeValues(lineStarts.values.length - 1, 1); lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + 1); lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); } else { - node.piece.lineFeedCnt += lineFeedCount; - let lineStarts = node.piece.lineStarts; + piece.lineFeedCnt += lineFeedCount; + let lineStarts = piece.lineStarts; lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + lineLengths[0]); lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); } @@ -605,7 +980,7 @@ export class PieceTableBase { this.updateMetadata(node, value.length, lf_delta); } - nodeAt(offset: number): BufferCursor { + nodeAt(offset: number): NodePosition { let x = this._root; let nodeStartOffset = 0; @@ -629,7 +1004,7 @@ export class PieceTableBase { return null; } - nodeAt2(position: Position): BufferCursor { + nodeAt2(position: Position): NodePosition { let x = this._root; let lineNumber = position.lineNumber; let column = position.column; @@ -639,8 +1014,8 @@ export class PieceTableBase { if (x.left !== SENTINEL && x.lf_left >= lineNumber - 1) { x = x.left; } else if (x.lf_left + x.piece.lineFeedCnt > lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 1); + let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); + let accumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 1); nodeStartOffset += x.size_left; return { @@ -649,7 +1024,7 @@ export class PieceTableBase { nodeStartOffset }; } else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) { - let prevAccumualtedValue = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); if (prevAccumualtedValue + column - 1 <= x.piece.length) { return { node: x, @@ -672,7 +1047,7 @@ export class PieceTableBase { while (x !== SENTINEL) { if (x.piece.lineFeedCnt > 0) { - let accumualtedValue = x.piece.lineStarts.getAccumulatedValue(0); + let accumualtedValue = this.getAccumulatedValue(x, 0); let nodeStartOffset = this.offsetOfNode(x); return { node: x, @@ -704,7 +1079,18 @@ export class PieceTableBase { } let buffer = this._buffers[node.piece.bufferIndex]; - return buffer.charCodeAt(node.piece.offset + offset); + if (this.isChangeBufferNode(node)) { + let piece = node.piece; + return buffer.buffer.charCodeAt(piece.offset + offset); + } else { + let piece = node.piece; + let newOffset = this.offsetInBuffer(piece.bufferIndex, piece.start) + offset; + return buffer.buffer.charCodeAt(newOffset); + } + } + + private isChangeBufferNode(node: TreeNode) { + return node.piece.bufferIndex === 0; } offsetOfNode(node: TreeNode): number { @@ -725,9 +1111,17 @@ export class PieceTableBase { getNodeContent(node: TreeNode): string { let buffer = this._buffers[node.piece.bufferIndex]; - let currentContent = buffer.substr(node.piece.offset, node.piece.length); + if (this.isChangeBufferNode(node)) { + let piece = node.piece; + let currentContent = buffer.buffer.substr(piece.offset, node.piece.length); + return currentContent; + } else { + let piece = node.piece; + let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + return buffer.buffer.substring(startOffset, endOffset); + } - return currentContent; } deletePrefixSumTail(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { @@ -754,12 +1148,30 @@ export class PieceTableBase { return false; } - if (val.piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { - return false; - } + if (this.isChangeBufferNode(val)) { + let piece = val.piece; - // charCodeAt is expensive when the buffer is large. - return this.nodeCharCodeAt(val, 0) === 10; + if (piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { + return false; + } + + // charCodeAt is expensive when the buffer is large. + return this.nodeCharCodeAt(val, 0) === 10; + } else { + let piece = val.piece; + let lineStarts = this._buffers[piece.bufferIndex].lineStarts; + let line = piece.start.line; + let startOffset = lineStarts[line] + piece.start.column; + if (line === lineStarts.length - 1) { + // last line, so there is no line feed at the end of this line + return false; + } + let nextLineOffset = lineStarts[line + 1]; + if (nextLineOffset > startOffset + 1) { + return false; + } + return this._buffers[piece.bufferIndex].buffer.charCodeAt(startOffset) === 10; + } } endWithCR(val: string | TreeNode): boolean { @@ -779,7 +1191,8 @@ export class PieceTableBase { return false; } - let currentLineLen = node.piece.lineStarts.getAccumulatedValue(position.index); + let piece = node.piece; + let currentLineLen = piece.lineStarts.getAccumulatedValue(position.index); if (offset === currentLineLen - 1) { // charCodeAt becomes slow (single or even two digits ms) when the changed buffer is long return this.nodeCharCodeAt(node, offset - 1) === 13/* \r */ && this.nodeCharCodeAt(node, offset) === 10 /* \n */; @@ -808,24 +1221,50 @@ export class PieceTableBase { fixCRLF(prev: TreeNode, next: TreeNode) { let nodesToDel = []; // update node - prev.piece.length -= 1; - prev.piece.lineFeedCnt -= 1; - let lineStarts = prev.piece.lineStarts; - // lineStarts.values.length >= 2 due to a `\r` - lineStarts.removeValues(lineStarts.values.length - 1, 1); - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); - this.updateMetadata(prev, - 1, -1); + if (this.isChangeBufferNode(prev)) { + prev.piece.length -= 1; + prev.piece.lineFeedCnt -= 1; + let lineStarts = (prev.piece).lineStarts; + // lineStarts.values.length >= 2 due to a `\r` + lineStarts.removeValues(lineStarts.values.length - 1, 1); + lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); + } else { + // prev ends with \r + let piece = prev.piece; + let lineStarts = this._buffers[piece.bufferIndex].lineStarts; + if (piece.end.column === 0) { + // it means, last line ends with \r, not \r\n + let newEnd: BufferCursor = { line: piece.end.line - 1, column: lineStarts[piece.end.line] - lineStarts[piece.end.line - 1] - 1 }; + piece.end = newEnd; + } else { + // \r\n + let newEnd: BufferCursor = { line: piece.end.line, column: piece.end.column - 1 }; + piece.end = newEnd; + } + piece.length -= 1; + piece.lineFeedCnt -= 1; + } + + this.updateMetadata(prev, - 1, -1); if (prev.piece.length === 0) { nodesToDel.push(prev); } // update nextNode - next.piece.length -= 1; - next.piece.offset += 1; - next.piece.lineFeedCnt -= 1; - lineStarts = next.piece.lineStarts; - lineStarts.removeValues(0, 1); + if (this.isChangeBufferNode(next)) { + next.piece.shift(1); + next.piece.lineFeedCnt -= 1; + let lineStarts = (next.piece).lineStarts; + lineStarts.removeValues(0, 1); + } else { + let piece = next.piece; + let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; + piece.start = newStart; + piece.length -= 1; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize + } + this.updateMetadata(next, - 1, -1); if (next.piece.length === 0) { nodesToDel.push(next); @@ -851,10 +1290,17 @@ export class PieceTableBase { if (nextNode.piece.length === 1) { this.rbDelete(nextNode); } else { - nextNode.piece.offset += 1; - nextNode.piece.length -= 1; - nextNode.piece.lineFeedCnt -= 1; - nextNode.piece.lineStarts.removeValues(0, 1); // remove the first line, which is empty. + if (this.isChangeBufferNode(nextNode)) { + nextNode.piece.shift(1); + nextNode.piece.lineFeedCnt -= 1; + (nextNode.piece).lineStarts.removeValues(0, 1); // remove the first line, which is empty. + } else { + let piece = nextNode.piece; + let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; + piece.start = newStart; + piece.length -= 1; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize + } this.updateMetadata(nextNode, -1, -1); } return true; @@ -924,7 +1370,7 @@ export class PieceTableBase { * / * z */ - rbInsertRight(node: TreeNode, p: Piece): TreeNode { + rbInsertRight(node: TreeNode, p: IPiece): TreeNode { let z = new TreeNode(p, NodeColor.Red); z.left = SENTINEL; z.right = SENTINEL; @@ -1244,7 +1690,15 @@ export class PieceTableBase { } let buffer = this._buffers[node.piece.bufferIndex]; - let currentContent = buffer.substr(node.piece.offset, node.piece.length); + let currentContent; + if (this.isChangeBufferNode(node)) { + currentContent = buffer.buffer.substr((node.piece).offset, node.piece.length); + } else { + let piece = node.piece; + let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + currentContent = buffer.buffer.substring(startOffset, endOffset); + } return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); } diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 10b8f0de082..251cb9dd6a1 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -86,24 +86,26 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer if (startPosition.node === endPosition.node) { let node = startPosition.node; - let buffer = this._buffers[node.piece.bufferIndex]; - return buffer.substring(node.piece.offset + startPosition.remainder, node.piece.offset + endPosition.remainder); + let buffer = this._buffers[node.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(node); + return buffer.substring(startOffset + startPosition.remainder, startOffset + endPosition.remainder); } - let x = startPosition.node; - let buffer = this._buffers[x.piece.bufferIndex]; - let ret = buffer.substring(x.piece.offset + startPosition.remainder, x.piece.offset + x.piece.length); + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); + let ret = buffer.substring(startOffset + startPosition.remainder, startOffset + x.piece.length); x = x.next(); while (x !== SENTINEL) { - let buffer = this._buffers[x.piece.bufferIndex]; + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); if (x === endPosition.node) { - ret += buffer.substring(x.piece.offset, x.piece.offset + endPosition.remainder); + ret += buffer.substring(startOffset, startOffset + endPosition.remainder); break; } else { - ret += buffer.substr(x.piece.offset, x.piece.length); + ret += buffer.substr(startOffset, x.piece.length); } x = x.next(); @@ -127,7 +129,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } else if (x.lf_left + x.piece.lineFeedCnt + 1 >= lineNumber) { leftLen += x.size_left; // lineNumber >= 2 - let accumualtedValInCurrentIndex = x.piece.lineStarts.getAccumulatedValue(lineNumber - x.lf_left - 2); + let accumualtedValInCurrentIndex = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); return leftLen += accumualtedValInCurrentIndex + column - 1; } else { lineNumber -= x.lf_left + x.piece.lineFeedCnt; @@ -148,11 +150,10 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer let originalOffset = offset; while (x !== SENTINEL) { - // console.log('getPositionAt while loop'); if (x.size_left !== 0 && x.size_left >= offset) { x = x.left; } else if (x.size_left + x.piece.length >= offset) { - let out = x.piece.lineStarts.getIndexOf(offset - x.size_left); + let out = this.getIndexOf(x, offset - x.size_left); lfCnt += x.lf_left + out.index; 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 3f65a3eb387..2abd6c10b95 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -9,6 +9,7 @@ import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTe 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'; +// import * as fs from 'fs'; let linesTextBufferBuilder = new LinesTextBufferBuilder(); let pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); @@ -32,3 +33,29 @@ console.log('|---|---|---|'); for (let i of [10, 100]) { modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTableTextBufferBuilder], i); } +/* +let fileName = `/Users/penlv/code/code-data-structures/samples/heapsnapshot.txt`; +const stream = fs.createReadStream(fileName, { encoding: 'utf8'}); +let done = false; +let builder = new PieceTableTextBufferBuilder(); + +console.time('builder'); +stream.on('data', (chunk) => { + builder.acceptChunk(chunk); +}); + +stream.on('error', (error) => { + if (!done) { + done = true; + } +}); + +stream.on('end', () => { + if (!done) { + done = true; + let factory = builder.finish(); + factory.create(DefaultEndOfLine.LF); + console.timeEnd('builder'); + } +}); + */ \ No newline at end of file From eeff55c4c705b1b54e08d4c80cee9a669959c19f Mon Sep 17 00:00:00 2001 From: Yannick Meeus Date: Wed, 10 Jan 2018 11:41:01 +0200 Subject: [PATCH 190/710] Set the minimum height of the xterm scrollbar thumb to 35px --- .../parts/terminal/electron-browser/media/scrollbar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css index 70af76ab868..ef7c099e199 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css @@ -19,6 +19,7 @@ } .monaco-workbench .panel.integrated-terminal .xterm-viewport::-webkit-scrollbar-thumb { + min-height: 35px; background-color: inherit; } From 956db66384ce103f15350ec8d3f502c0ef6a1714 Mon Sep 17 00:00:00 2001 From: Yannick Meeus Date: Sat, 13 Jan 2018 08:16:18 +0200 Subject: [PATCH 191/710] Set the minimum vertical scrollbar height to 20px in order for it to be consistent with the editor defaults --- .../parts/terminal/electron-browser/media/scrollbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css index ef7c099e199..ebe03196593 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/scrollbar.css @@ -19,7 +19,7 @@ } .monaco-workbench .panel.integrated-terminal .xterm-viewport::-webkit-scrollbar-thumb { - min-height: 35px; + min-height: 20px; background-color: inherit; } From fe06893436f1400c4ec9d9b87b662f53d563f241 Mon Sep 17 00:00:00 2001 From: Zuraiz Zafar Date: Sat, 13 Jan 2018 04:47:21 -0500 Subject: [PATCH 192/710] add copy command action to keybinding editor context me --- .../preferences/browser/keybindingsEditor.ts | 17 ++++++++++++++++- .../parts/preferences/common/preferences.ts | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts index ea68e3b1e2f..2f2ac77c17e 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts @@ -26,7 +26,7 @@ import { SearchWidget } from 'vs/workbench/parts/preferences/browser/preferences 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, - KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_SHOW_CONFLICTS + KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_SHOW_CONFLICTS } from 'vs/workbench/parts/preferences/common/preferences'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing'; @@ -245,6 +245,11 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor return TPromise.as(null); } + copyKeybindingCommand(keybinding: IKeybindingItemEntry): TPromise { + this.clipboardService.writeText(keybinding.keybindingItem.command); + return TPromise.as(null); + } + search(filter: string): void { this.searchWidget.focus(); } @@ -456,6 +461,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor getAnchor: () => e.anchor, getActions: () => TPromise.as([ this.createCopyAction(e.element), + this.createCopyCommandAction(e.element), new Separator(), this.createDefineAction(e.element), this.createRemoveAction(e.element), @@ -526,6 +532,15 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor }; } + private createCopyCommandAction(keybinding: IKeybindingItemEntry): IAction { + return { + label: localize('copyCommandLabel', "Copy Command"), + enabled: true, + id: KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, + run: () => this.copyKeybindingCommand(keybinding) + }; + } + private reportFilteringUsed(filter: string): void { if (filter) { let data = { diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 1c3024c9db1..059876eead8 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -202,6 +202,7 @@ export const KEYBINDINGS_EDITOR_COMMAND_DEFINE = 'keybindings.editor.defineKeybi export const KEYBINDINGS_EDITOR_COMMAND_REMOVE = 'keybindings.editor.removeKeybinding'; export const KEYBINDINGS_EDITOR_COMMAND_RESET = 'keybindings.editor.resetKeybinding'; export const KEYBINDINGS_EDITOR_COMMAND_COPY = 'keybindings.editor.copyKeybindingEntry'; +export const KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND = 'keybindings.editor.copyCommandKeybindingEntry'; export const KEYBINDINGS_EDITOR_COMMAND_SHOW_CONFLICTS = 'keybindings.editor.showConflicts'; export const KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS = 'keybindings.editor.focusKeybindings'; From b659590ed9c9570ffc655a182f52ff7e105a0236 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 13 Jan 2018 19:04:22 +0300 Subject: [PATCH 193/710] Running extension theming impovements Focused even rows not using proper colors Using css instead of typescript --- .../media/runtimeExtensionsEditor.css | 13 ++----------- .../electron-browser/runtimeExtensionsEditor.ts | 2 -- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css index ebd02442497..bad1b92e994 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css +++ b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css @@ -3,12 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd { - background-color: rgba(130, 130, 130, 0.1); -} - -.runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row:hover:not(.odd) { - background-color: transparent; +.runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row:nth-child(even):not(:hover):not(.focused) { + background-color: rgba(130, 130, 130, 0.08); } .runtime-extensions-editor .extension { @@ -86,11 +82,6 @@ background: url('save-inverse.svg') center center no-repeat; } -.vs-dark .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd, -.hc-black .runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd { - background-color: rgba(130, 130, 130, 0.1); -} - .runtime-extensions-editor .monaco-action-bar { padding-top: 21px; flex-shrink: 0; diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts index fe50f9bbe7b..19134fb1b09 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts @@ -294,8 +294,6 @@ export class RuntimeExtensionsEditor extends BaseEditor { data.elementDisposables = dispose(data.elementDisposables); - toggleClass(data.root, 'odd', index % 2 === 1); - data.name.textContent = element.marketplaceInfo ? element.marketplaceInfo.displayName : element.description.displayName; const activationTimes = element.status.activationTimes; From 8a02843a175e14f2f2ed00946664e7a50d972c46 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sat, 13 Jan 2018 17:29:20 +0100 Subject: [PATCH 194/710] implement closeEditors properly when passing in editors --- .../browser/parts/editor/editorPart.ts | 61 +++++++++++++++---- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 3d891c869cf..fe4c2e000b2 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -697,10 +697,19 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return; } - groups.forEach(group => this.doCloseEditors(group)); + groups.forEach(group => this.doCloseAllEditorsInGroup(group)); }); } + private doCloseAllEditorsInGroup(group: EditorGroup): void { + + // Update stacks model: remove all non active editors first to prevent opening the next editor in group + group.closeEditors(group.activeEditor); + + // Now close active editor in group which will close the group + this.doCloseActiveEditor(group); + } + public closeEditors(position: Position, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; public closeEditors(position: Position, editors: EditorInput[]): TPromise; public closeEditors(position: Position, filterOrEditors?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean } | EditorInput[]): TPromise { @@ -740,11 +749,44 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService return; } - this.doCloseEditors(group, filter); + // Close without filter + if (Array.isArray(filterOrEditors)) { + return this.doCloseEditors(group, editorsToClose); + } + + // Close with filter + return this.doCloseEditorsWithFilter(group, filter); }); } - private doCloseEditors(group: EditorGroup, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean } = Object.create(null)): void { + private doCloseEditors(group: EditorGroup, editors: EditorInput[]): void { + + // Close all editors in group + if (editors.length === group.count) { + this.doCloseAllEditorsInGroup(group); + } + + // Close specific editors in group + else { + + // Editors to close are not active, so we can just close them + if (!editors.some(editor => group.activeEditor.matches(editor))) { + editors.forEach(editor => this.doCloseInactiveEditor(group, editor)); + } + + // Active editor is also a candidate to close, thus we make the first + // non-candidate editor active and then close the other ones + else { + const firstEditorToKeep = group.getEditors(true).filter(editorInGroup => !editors.some(editor => editor.matches(editorInGroup)))[0]; + + this.openEditor(firstEditorToKeep, null, this.stacks.positionOfGroup(group)).done(() => { + editors.forEach(editor => this.doCloseInactiveEditor(group, editor)); + }, errors.onUnexpectedError); + } + } + } + + private doCloseEditorsWithFilter(group: EditorGroup, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): void { // Close all editors if there is no editor to except and // we either are not only closing unmodified editors or @@ -760,12 +802,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Close all editors in group if (closeAllEditors) { - - // Update stacks model: remove all non active editors first to prevent opening the next editor in group - group.closeEditors(group.activeEditor); - - // Now close active editor in group which will close the group - this.doCloseActiveEditor(group); + this.doCloseAllEditorsInGroup(group); } // Close unmodified editors in group @@ -779,10 +816,10 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Active editor is also a candidate to close, thus we make the first dirty editor // active and then close the other ones else { - const firstDirtyEditor = group.getEditors().filter(editor => editor.isDirty())[0]; + const firstDirtyEditor = group.getEditors(true).filter(editor => editor.isDirty())[0]; this.openEditor(firstDirtyEditor, null, this.stacks.positionOfGroup(group)).done(() => { - this.doCloseEditors(group, filter); + this.doCloseEditorsWithFilter(group, filter); }, errors.onUnexpectedError); } } @@ -803,7 +840,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // being the expected one, otherwise we end up in an endless loop trying to open the // editor if (filter.except.matches(group.activeEditor)) { - this.doCloseEditors(group, filter); + this.doCloseEditorsWithFilter(group, filter); } }, errors.onUnexpectedError); } From eff686fd6033288bde0e09cc75546738beafa5bc Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 13 Jan 2018 19:30:34 +0300 Subject: [PATCH 195/710] Keybindings editor theming impovements - Using css instead of typescript --- .../parts/preferences/browser/keybindingsEditor.ts | 1 - .../parts/preferences/browser/media/keybindingsEditor.css | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts index ea68e3b1e2f..abb6c66afd1 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts @@ -644,7 +644,6 @@ class KeybindingItemRenderer implements IRenderer .keybindings-body > .keybindings-list-container .monaco-list-row.even:not(.focused):not(.selected):not(:hover), -.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(:focus) .monaco-list-row.focused.even:not(.selected):not(:hover), -.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(.focused) .monaco-list-row.focused.even:not(.selected):not(:hover) { +.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list-row:nth-child(even):not(.focused):not(.selected):not(:hover), +.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(:focus) .monaco-list-row.focused:nth-child(even):not(.selected):not(:hover), +.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(.focused) .monaco-list-row.focused:nth-child(even):not(.selected):not(:hover) { background-color: rgba(130, 130, 130, 0.04); } From 522052931f780f5f948f7da6a7c204eced3164a1 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sat, 13 Jan 2018 18:23:17 +0100 Subject: [PATCH 196/710] clean up icon path confusion --- src/vs/code/electron-main/window.ts | 2 +- .../actions/browser/menuItemActionItem.ts | 52 ++++++++++++++++--- src/vs/platform/actions/common/actions.ts | 5 +- .../electron-browser/menusExtensionPoint.ts | 31 ++++------- .../electron-browser/media/codeEditor.css | 8 --- .../electron-browser/toggleWordWrap.ts | 5 +- .../fileActions.contribution.ts | 16 ++++-- .../electron-browser/media/fileactions.css | 16 ------ 8 files changed, 72 insertions(+), 63 deletions(-) delete mode 100644 src/vs/workbench/parts/codeEditor/electron-browser/media/codeEditor.css diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 4c37dd6e993..bbe6e486f12 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -953,7 +953,7 @@ export class CodeWindow implements ICodeWindow { const segments: ITouchBarSegment[] = items.map(item => { let icon: Electron.NativeImage; if (item.iconPath) { - icon = nativeImage.createFromPath(item.iconPath); + icon = nativeImage.createFromPath(typeof item.iconPath === 'string' ? item.iconPath : item.iconPath.dark); if (icon.isEmpty()) { icon = void 0; } diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts index 5d81043100e..787ae98fb14 100644 --- a/src/vs/platform/actions/browser/menuItemActionItem.ts +++ b/src/vs/platform/actions/browser/menuItemActionItem.ts @@ -7,7 +7,7 @@ import { localize } from 'vs/nls'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { IMenu, MenuItemAction, IMenuActionOptions } from 'vs/platform/actions/common/actions'; +import { IMenu, MenuItemAction, IMenuActionOptions, ICommandAction } from 'vs/platform/actions/common/actions'; import { IMessageService } from 'vs/platform/message/common/message'; import Severity from 'vs/base/common/severity'; import { IAction } from 'vs/base/common/actions'; @@ -17,6 +17,9 @@ 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'; class AltKeyEmitter extends Emitter { @@ -114,17 +117,22 @@ export function createActionItem(action: IAction, keybindingService: IKeybinding return undefined; } +const ids = new IdGenerator('menu-item-action-item-icon-'); + export class MenuItemActionItem extends ActionItem { + static readonly ICON_PATH_TO_CSS_RULES: Map = new Map(); + private _wantsAltCommand: boolean = false; + private _itemClassDispose: IDisposable; constructor( - action: MenuItemAction, + private action: MenuItemAction, @IKeybindingService private _keybindingService: IKeybindingService, @IMessageService protected _messageService: IMessageService, @IContextMenuService private _contextMenuService: IContextMenuService ) { - super(undefined, action, { icon: !!action.class, label: !action.class }); + super(undefined, action, { icon: !!(action.class || action.item.iconPath), label: !action.class && !action.item.iconPath }); } protected get _commandAction(): IAction { @@ -142,6 +150,8 @@ export class MenuItemActionItem extends ActionItem { render(container: HTMLElement): void { super.render(container); + this._updateItemClass(this.action.item); + let mouseOver = false; let altDown = false; @@ -189,13 +199,41 @@ export class MenuItemActionItem extends ActionItem { _updateClass(): void { if (this.options.icon) { - const element = this.$e.getHTMLElement(); if (this._commandAction !== this._action) { - element.classList.remove(this._action.class); + this._updateItemClass(this.action.alt.item); } else if ((this._action).alt) { - element.classList.remove((this._action).alt.class); + this._updateItemClass(this.action.item); } - element.classList.add('icon', this._commandAction.class); + } + } + + _updateItemClass(item: ICommandAction): void { + dispose(this._itemClassDispose); + this._itemClassDispose = undefined; + + if (item.iconPath) { + let iconClass: string; + if (typeof item.iconPath === 'string') { + if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath)) { + iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath); + } else { + iconClass = ids.nextId(); + createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath).toString()}")`); + MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath, iconClass); + } + } else { + if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath.dark)) { + iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath.dark); + } else { + iconClass = ids.nextId(); + createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.light).toString()}")`); + createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.dark).toString()}")`); + MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath.dark, iconClass); + } + } + + this.$e.getHTMLElement().classList.add('icon', iconClass); + this._itemClassDispose = { dispose: () => this.$e.getHTMLElement().classList.remove('icon', iconClass) }; } } } diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 5e0eaceed36..40703ce8563 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -23,8 +23,7 @@ export interface ICommandAction { id: string; title: string | ILocalizedString; category?: string | ILocalizedString; - iconClass?: string; - iconPath?: string; + iconPath?: string | { light: string; dark: string; }; precondition?: ContextKeyExpr; } @@ -180,7 +179,7 @@ export class MenuItemAction extends ExecuteCommandAction { @ICommandService commandService: ICommandService ) { typeof item.title === 'string' ? super(item.id, item.title, commandService) : super(item.id, item.title.value, commandService); - this._cssClass = item.iconClass; + this._cssClass = undefined; this._enabled = !item.precondition || contextKeyService.contextMatchesRules(item.precondition); this._options = options || {}; diff --git a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts index 2295ddd7b90..be1f3f20705 100644 --- a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts +++ b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts @@ -4,12 +4,9 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import URI from 'vs/base/common/uri'; -import { createCSSRule } from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import { isFalsyOrWhitespace } from 'vs/base/common/strings'; import { join } from 'path'; -import { IdGenerator } from 'vs/base/common/idGenerator'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { forEach } from 'vs/base/common/collections'; import { IExtensionPointUser, ExtensionMessageCollector, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry'; @@ -281,33 +278,27 @@ namespace schema { ExtensionsRegistry.registerExtensionPoint('commands', [], schema.commandsContribution).setHandler(extensions => { - const ids = new IdGenerator('contrib-cmd-icon-'); - function handleCommand(userFriendlyCommand: schema.IUserFriendlyCommand, extension: IExtensionPointUser) { if (!schema.isValidCommand(userFriendlyCommand, extension.collector)) { return; } - let { icon, category, title, command } = userFriendlyCommand; - let iconClass: string; - let iconPath: string; - if (icon) { - iconClass = ids.nextId(); - if (typeof icon === 'string') { - iconPath = join(extension.description.extensionFolderPath, icon); - createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(iconPath).toString()}")`); - } else { - const light = join(extension.description.extensionFolderPath, icon.light); - const dark = join(extension.description.extensionFolderPath, icon.dark); - createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(light).toString()}")`); - createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(dark).toString()}")`); + const { icon, category, title, command } = userFriendlyCommand; - iconPath = join(extension.description.extensionFolderPath, icon.dark); + let absoluteIcon: string | { light: string; dark: string; }; + if (icon) { + if (typeof icon === 'string') { + absoluteIcon = join(extension.description.extensionFolderPath, icon); + } else { + absoluteIcon = { + dark: join(extension.description.extensionFolderPath, icon.dark), + light: join(extension.description.extensionFolderPath, icon.light) + }; } } - if (MenuRegistry.addCommand({ id: command, title, category, iconClass, iconPath })) { + if (MenuRegistry.addCommand({ id: command, title, category, iconPath: absoluteIcon })) { extension.collector.info(localize('dup', "Command `{0}` appears multiple times in the `commands` section.", userFriendlyCommand.command)); } } diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/media/codeEditor.css b/src/vs/workbench/parts/codeEditor/electron-browser/media/codeEditor.css deleted file mode 100644 index 443058958ac..00000000000 --- a/src/vs/workbench/parts/codeEditor/electron-browser/media/codeEditor.css +++ /dev/null @@ -1,8 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -.toggle-word-wrap-action { - background: url('WordWrap_16x.svg') center center no-repeat; -} diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts index 39b0436ad9e..2cbe5f7900f 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/toggleWordWrap.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import 'vs/css!./media/codeEditor'; import * as nls from 'vs/nls'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { IEditorContribution } from 'vs/editor/common/editorCommon'; @@ -259,7 +258,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: 'editor.action.toggleWordWrap', title: nls.localize('unwrapMinified', "Disable wrapping for this file"), - iconClass: 'toggle-word-wrap-action' + iconPath: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/WordWrap_16x.svg')).fsPath }, group: 'navigation', order: 1, @@ -273,7 +272,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: 'editor.action.toggleWordWrap', title: nls.localize('wrapMinified', "Enable wrapping for this file"), - iconClass: 'toggle-word-wrap-action' + iconPath: URI.parse(require.toUrl('vs/workbench/parts/codeEditor/electron-browser/WordWrap_16x.svg')).fsPath }, group: 'navigation', order: 1, diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index f9e193a5a78..12350af78a8 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -23,7 +23,7 @@ import { OPEN_FOLDER_SETTINGS_COMMAND, OPEN_FOLDER_SETTINGS_LABEL } from 'vs/wor import { AutoSaveContext } from 'vs/workbench/services/textfile/common/textfiles'; import { ResourceContextKey } from 'vs/workbench/common/resources'; import { WorkbenchListDoubleSelection } from 'vs/platform/list/browser/listService'; - +import URI from 'vs/base/common/uri'; // Contribute Global Actions const category = nls.localize('filesCategory', "File"); @@ -116,17 +116,23 @@ function appendEditorTitleContextMenuItem(id: string, title: string, when: Conte } // Editor Title Menu for Conflict Resolution -appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localize('acceptLocalChanges', "Use your changes and overwrite disk contents"), 'save-conflict-action-accept-changes', -10, acceptLocalChangesCommand); -appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localize('revertLocalChanges', "Discard your changes and revert to content on disk"), 'save-conflict-action-revert-changes', -9, revertLocalChangesCommand); +appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localize('acceptLocalChanges', "Use your changes and overwrite disk contents"), { + light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check.svg`)).fsPath, + dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/check-inverse.svg`)).fsPath +}, -10, acceptLocalChangesCommand); +appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localize('revertLocalChanges', "Discard your changes and revert to content on disk"), { + light: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo.svg`)).fsPath, + dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo-inverse.svg`)).fsPath +}, -9, revertLocalChangesCommand); -function appendSaveConflictEditorTitleAction(id: string, title: string, iconClass: string, order: number, command: ICommandHandler): void { +function appendSaveConflictEditorTitleAction(id: string, title: string, iconPath: { dark: string; light: string; }, order: number, command: ICommandHandler): void { // Command CommandsRegistry.registerCommand(id, command); // Action MenuRegistry.appendMenuItem(MenuId.EditorTitle, { - command: { id, title, iconClass }, + command: { id, title, iconPath }, when: ContextKeyExpr.equals(CONFLICT_RESOLUTION_CONTEXT, true), group: 'navigation', order diff --git a/src/vs/workbench/parts/files/electron-browser/media/fileactions.css b/src/vs/workbench/parts/files/electron-browser/media/fileactions.css index a073640bc8f..2eb68b32b03 100644 --- a/src/vs/workbench/parts/files/electron-browser/media/fileactions.css +++ b/src/vs/workbench/parts/files/electron-browser/media/fileactions.css @@ -75,22 +75,6 @@ background-image: url('split-editor-horizontal-inverse.svg'); } -.monaco-workbench .save-conflict-action-accept-changes { - background: url('check.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .save-conflict-action-accept-changes { - background: url('check-inverse.svg') center center no-repeat; -} - -.monaco-workbench .save-conflict-action-revert-changes { - background: url('undo.svg') center center no-repeat; -} - -.vs-dark .monaco-workbench .save-conflict-action-revert-changes { - background: url('undo-inverse.svg') center center no-repeat; -} - .monaco-workbench .file-editor-action.action-open-preview { background: url('Preview.svg') center center no-repeat; } From 9b6f7e978c90f4b8443bed7bfbeae0bf94cd6a58 Mon Sep 17 00:00:00 2001 From: Anton Kosiakov Date: Sun, 14 Jan 2018 17:51:20 +0100 Subject: [PATCH 197/710] [monaco] fix Microsoft/monaco-editor#642: sync CompletionItemProvider api --- .../standalone/browser/standaloneLanguages.ts | 16 +++++++++++++++- src/vs/monaco.d.ts | 12 ++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts index 5c5b72caa39..67d2f593565 100644 --- a/src/vs/editor/standalone/browser/standaloneLanguages.ts +++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts @@ -525,6 +525,18 @@ export interface CompletionItem { * line completions were [requested](#CompletionItemProvider.provideCompletionItems) at.~~ */ textEdit?: model.ISingleEditOperation; + /** + * An optional array of additional text edits that are applied when + * selecting this completion. Edits must not overlap with the main edit + * nor with themselves. + */ + additionalTextEdits?: model.ISingleEditOperation[]; + /** + * An optional set of characters that when pressed while this completion is active will accept it first and + * then type that character. *Note* that all commit characters should have `length=1` and that superfluous + * characters will be ignored. + */ + commitCharacters?: string[]; } /** * Represents a collection of [completion items](#CompletionItem) to be presented @@ -634,7 +646,9 @@ class SuggestAdapter { command: item.command, sortText: item.sortText, filterText: item.filterText, - snippetType: 'internal' + snippetType: 'internal', + additionalTextEdits: item.additionalTextEdits, + commitCharacters: item.commitCharacters }; let editRange = item.textEdit ? item.textEdit.range : item.range; if (editRange) { diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 81d3e99523b..3d7bcb4b057 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -4166,6 +4166,18 @@ declare module monaco.languages { * line completions were [requested](#CompletionItemProvider.provideCompletionItems) at.~~ */ textEdit?: editor.ISingleEditOperation; + /** + * An optional array of additional text edits that are applied when + * selecting this completion. Edits must not overlap with the main edit + * nor with themselves. + */ + additionalTextEdits?: editor.ISingleEditOperation[]; + /** + * An optional set of characters that when pressed while this completion is active will accept it first and + * then type that character. *Note* that all commit characters should have `length=1` and that superfluous + * characters will be ignored. + */ + commitCharacters?: string[]; } /** From 5b14cbc145efd2ed46e562dba48a928026e98afe Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sun, 14 Jan 2018 18:35:26 +0100 Subject: [PATCH 198/710] tweak smoke test --- src/vs/code/electron-main/app.ts | 17 ----------- src/vs/code/electron-main/windows.ts | 20 ++----------- .../environment/common/environment.ts | 1 + src/vs/platform/environment/node/argv.ts | 1 + .../windows/electron-browser/windowService.ts | 30 +++---------------- .../src/areas/multiroot/multiroot.test.ts | 10 +++---- test/smoke/src/areas/quickopen/quickopen.ts | 3 -- .../src/areas/workbench/localization.test.ts | 2 +- test/smoke/src/spectron/application.ts | 14 ++++----- 9 files changed, 20 insertions(+), 78 deletions(-) diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index b72b6847723..ca4a569c0f6 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -51,13 +51,10 @@ import { KeyboardLayoutMonitor } from 'vs/code/electron-main/keyboard'; import URI from 'vs/base/common/uri'; import { WorkspacesChannel } from 'vs/platform/workspaces/common/workspacesIpc'; import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces'; -import { dirname, join } from 'path'; -import { touch } from 'vs/base/node/pfs'; import { getMachineId } from 'vs/base/node/id'; export class CodeApplication { - private static readonly APP_ICON_REFRESH_KEY = 'macOSAppIconRefresh3'; private static readonly MACHINE_ID_KEY = 'telemetry.machineId'; private toDispose: IDisposable[]; @@ -424,20 +421,6 @@ export class CodeApplication { // Start shared process here this.sharedProcess.spawn(); - - // Helps application icon refresh after an update with new icon is installed (macOS) - // TODO@Ben remove after a couple of releases - if (platform.isMacintosh) { - if (!this.stateService.getItem(CodeApplication.APP_ICON_REFRESH_KEY)) { - this.stateService.setItem(CodeApplication.APP_ICON_REFRESH_KEY, true); - - // 'exe' => /Applications/Visual Studio Code - Insiders.app/Contents/MacOS/Electron - const appPath = dirname(dirname(dirname(app.getPath('exe')))); - const infoPlistPath = join(appPath, 'Contents', 'Info.plist'); - touch(appPath).done(null, error => { /* ignore */ }); - touch(infoPlistPath).done(null, error => { /* ignore */ }); - } - } } private dispose(): void { diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index 0ac89554809..073f7dc441f 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -148,7 +148,7 @@ export class WindowsManager implements IWindowsMainService { this.windowsState.openedWindows = []; } - this.dialogs = new Dialogs(environmentService, telemetryService, stateService, this, this.logService); + this.dialogs = new Dialogs(environmentService, telemetryService, stateService, this); this.workspacesManager = new WorkspacesManager(workspacesMainService, backupMainService, environmentService, this); } @@ -369,7 +369,7 @@ export class WindowsManager implements IWindowsMainService { let foldersToRestore: string[] = []; let workspacesToRestore: IWorkspaceIdentifier[] = []; let emptyToRestore: string[] = []; - if (openConfig.initialStartup && !openConfig.cli.extensionDevelopmentPath) { + if (openConfig.initialStartup && !openConfig.cli.extensionDevelopmentPath && !openConfig.cli['disable-restore-windows']) { foldersToRestore = this.backupMainService.getFolderBackupPaths(); workspacesToRestore = this.backupMainService.getWorkspaceBackups(); // collect from workspaces with hot-exit backups @@ -1565,7 +1565,6 @@ class Dialogs { private telemetryService: ITelemetryService, private stateService: IStateService, private windowsMainService: IWindowsMainService, - private logService: ILogService // TODO@Ben remove logging when no longer needed ) { this.mapWindowToDialogQueue = new Map>(); this.noWindowDialogQueue = new Queue(); @@ -1645,31 +1644,22 @@ class Dialogs { private getDialogQueue(window?: ICodeWindow): Queue { if (!window) { - this.logService.info('getDialogQueue: using NO WINDOW queue. size: ', this.noWindowDialogQueue.size); return this.noWindowDialogQueue; } let windowDialogQueue = this.mapWindowToDialogQueue.get(window.id); if (!windowDialogQueue) { - this.logService.info('getDialogQueue: creating window dialog queue for window:', window.id); windowDialogQueue = new Queue(); this.mapWindowToDialogQueue.set(window.id, windowDialogQueue); - } else { - this.logService.info('getDialogQueue: found existing window dialog queue for window:', window.id); } - this.logService.info('getDialogQueue: size: ', windowDialogQueue.size); - return windowDialogQueue; } public showMessageBox(options: Electron.MessageBoxOptions, window?: ICodeWindow): TPromise { - this.logService.info('showMessageBox begin: ', options, window ? window.id : 'No Window'); return this.getDialogQueue(window).queue(() => { return new TPromise((c, e) => { - this.logService.info('showMessageBox opening'); dialog.showMessageBox(window ? window.win : void 0, options, (response: number, checkboxChecked: boolean) => { - this.logService.info('showMessageBox closed, response: ', response, checkboxChecked); c({ button: response, checkboxChecked }); }); }); @@ -1685,12 +1675,9 @@ class Dialogs { return path; } - this.logService.info('showSaveDialog begin: ', options, window ? window.id : 'No Window'); return this.getDialogQueue(window).queue(() => { return new TPromise((c, e) => { - this.logService.info('showSaveDialog opening'); dialog.showSaveDialog(window ? window.win : void 0, options, path => { - this.logService.info('showSaveDialog closed, response: ', path); c(normalizePath(path)); }); }); @@ -1706,12 +1693,9 @@ class Dialogs { return paths; } - this.logService.info('showOpenDialog begin: ', options, window ? window.id : 'No Window'); return this.getDialogQueue(window).queue(() => { return new TPromise((c, e) => { - this.logService.info('showOpenDialog opening'); dialog.showOpenDialog(window ? window.win : void 0, options, paths => { - this.logService.info('showOpenDialog closed, response: ', paths); c(normalizePaths(paths)); }); }); diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index 1194e4bc818..d75fdae4684 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -47,6 +47,7 @@ export interface ParsedArgs { 'skip-getting-started'?: boolean; 'skip-release-notes'?: boolean; 'sticky-quickopen'?: boolean; + 'disable-restore-windows'?: boolean; 'disable-telemetry'?: boolean; 'export-default-configuration'?: string; 'install-source'?: string; diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 8d4ecf47870..21a2f2d16c0 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -52,6 +52,7 @@ const options: minimist.Opts = { 'skip-getting-started', 'skip-release-notes', 'sticky-quickopen', + 'disable-restore-windows', 'disable-telemetry', 'disable-updates', 'disable-crash-reporter', diff --git a/src/vs/platform/windows/electron-browser/windowService.ts b/src/vs/platform/windows/electron-browser/windowService.ts index 677d4603464..8548cf17b9f 100644 --- a/src/vs/platform/windows/electron-browser/windowService.ts +++ b/src/vs/platform/windows/electron-browser/windowService.ts @@ -11,7 +11,6 @@ import { IWindowService, IWindowsService, INativeOpenDialogOptions, IEnterWorksp import { IRecentlyOpened } from 'vs/platform/history/common/history'; import { ICommandAction } from 'vs/platform/actions/common/actions'; import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces'; -import { ILogService } from 'vs/platform/log/common/log'; export class WindowService implements IWindowService { @@ -22,8 +21,7 @@ export class WindowService implements IWindowService { constructor( private windowId: number, private configuration: IWindowConfiguration, - @IWindowsService private windowsService: IWindowsService, - @ILogService private logService: ILogService // TODO@Ben remove logging when no longer needed + @IWindowsService private windowsService: IWindowsService ) { const onThisWindowFocus = mapEvent(filterEvent(windowsService.onWindowFocus, id => id === windowId), _ => true); const onThisWindowBlur = mapEvent(filterEvent(windowsService.onWindowBlur, id => id === windowId), _ => false); @@ -41,32 +39,24 @@ export class WindowService implements IWindowService { pickFileFolderAndOpen(options: INativeOpenDialogOptions): TPromise { options.windowId = this.windowId; - this.logService.info('pickFileFolderAndOpen: begin'); - return this.windowsService.pickFileFolderAndOpen(options); } pickFileAndOpen(options: INativeOpenDialogOptions): TPromise { options.windowId = this.windowId; - this.logService.info('pickFileAndOpen: begin'); - return this.windowsService.pickFileAndOpen(options); } pickFolderAndOpen(options: INativeOpenDialogOptions): TPromise { options.windowId = this.windowId; - this.logService.info('pickFolderAndOpen: begin'); - return this.windowsService.pickFolderAndOpen(options); } pickWorkspaceAndOpen(options: INativeOpenDialogOptions): TPromise { options.windowId = this.windowId; - this.logService.info('pickWorkspaceAndOpen: begin'); - return this.windowsService.pickWorkspaceAndOpen(options); } @@ -131,27 +121,15 @@ export class WindowService implements IWindowService { } showMessageBox(options: Electron.MessageBoxOptions): TPromise { - this.logService.info('showMessageBox begin: ', options); - return this.windowsService.showMessageBox(this.windowId, options).then(result => { - this.logService.info('showMessageBox closed, response: ', result); - return result; - }); + return this.windowsService.showMessageBox(this.windowId, options); } showSaveDialog(options: Electron.SaveDialogOptions): TPromise { - this.logService.info('showSaveDialog begin: ', options); - return this.windowsService.showSaveDialog(this.windowId, options).then(result => { - this.logService.info('showSaveDialog begin: ', result); - return result; - }); + return this.windowsService.showSaveDialog(this.windowId, options); } showOpenDialog(options: Electron.OpenDialogOptions): TPromise { - this.logService.info('showOpenDialog begin: ', options); - return this.windowsService.showOpenDialog(this.windowId, options).then(result => { - this.logService.info('showOpenDialog closed: ', result); - return result; - }); + return this.windowsService.showOpenDialog(this.windowId, options); } updateTouchBar(items: ICommandAction[][]): TPromise { diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts index 3575dfedd70..b81df706cf3 100644 --- a/test/smoke/src/areas/multiroot/multiroot.test.ts +++ b/test/smoke/src/areas/multiroot/multiroot.test.ts @@ -14,18 +14,16 @@ export function setup() { const app = this.app as SpectronApplication; - await app.restart([app.workspaceFilePath]); - - // for some reason Code opens 2 windows at this point - // so let's select the last one - await app.webclient.windowByIndex(1); + // restart with preventing additional windows from restoring + // to ensure the window after restart is the multi-root workspace + await app.restart({ workspaceOrFolder: app.workspaceFilePath, extraArgs: ['--disable-restore-windows'] }); }); it('shows results from all folders', async function () { const app = this.app as SpectronApplication; await app.workbench.quickopen.openQuickOpen('*.*'); - await app.workbench.quickopen.waitForQuickOpenElements(names => names.length >= 6); + await app.workbench.quickopen.waitForQuickOpenElements(names => names.length === 6); await app.workbench.quickopen.closeQuickOpen(); }); diff --git a/test/smoke/src/areas/quickopen/quickopen.ts b/test/smoke/src/areas/quickopen/quickopen.ts index 4f70d280c11..c3c5e29562c 100644 --- a/test/smoke/src/areas/quickopen/quickopen.ts +++ b/test/smoke/src/areas/quickopen/quickopen.ts @@ -50,9 +50,6 @@ export class QuickOpen { async waitForQuickOpenOpened(): Promise { await this.spectron.client.waitForActiveElement(QuickOpen.QUICK_OPEN_INPUT); - - // we gotta wait 50 milliseconds due to https://github.com/Microsoft/vscode/blob/master/src/vs/platform/list/browser/listService.ts#L59 - await new Promise(c => setTimeout(c, 50)); } private async waitForQuickOpenClosed(): Promise { diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts index 14185a13803..0251a9bf964 100644 --- a/test/smoke/src/areas/workbench/localization.test.ts +++ b/test/smoke/src/areas/workbench/localization.test.ts @@ -17,7 +17,7 @@ export function setup() { return; } - await app.restart(['--locale=DE']); + await app.restart({ extraArgs: ['--locale=DE'] }); }); it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () { diff --git a/test/smoke/src/spectron/application.ts b/test/smoke/src/spectron/application.ts index 7d8cdadbb9a..a8e8ba2c7d0 100644 --- a/test/smoke/src/spectron/application.ts +++ b/test/smoke/src/spectron/application.ts @@ -116,16 +116,16 @@ export class SpectronApplication { } } - async restart(codeArgs: string[] = []): Promise { + async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise { await this.stop(); await new Promise(c => setTimeout(c, 1000)); - await this._start(codeArgs); + await this._start(options.workspaceOrFolder, options.extraArgs); } - private async _start(codeArgs: string[] = []): Promise { + private async _start(workspaceOrFolder = this.options.workspacePath, extraArgs: string[] = []): Promise { await this.retrieveKeybindings(); cp.execSync('git checkout .', { cwd: this.options.workspacePath }); - await this.startApplication(codeArgs); + await this.startApplication(workspaceOrFolder, extraArgs); await this.checkWindowReady(); } @@ -148,7 +148,7 @@ export class SpectronApplication { } } - private async startApplication(codeArgs: string[] = []): Promise { + private async startApplication(workspaceOrFolder: string, extraArgs: string[] = []): Promise { let args: string[] = []; let chromeDriverArgs: string[] = []; @@ -157,7 +157,7 @@ export class SpectronApplication { args.push(process.env.VSCODE_REPOSITORY as string); } - args.push(this.options.workspacePath); + args.push(workspaceOrFolder); // Prevent 'Getting Started' web page from opening on clean user-data-dir args.push('--skip-getting-started'); @@ -182,7 +182,7 @@ export class SpectronApplication { // Ensure that running over custom extensions directory, rather than picking up the one that was used by a tester previously args.push(`--extensions-dir=${this.options.extensionsPath}`); - args.push(...codeArgs); + args.push(...extraArgs); chromeDriverArgs.push(`--user-data-dir=${this.options.userDataDir}`); From 05854360cc3cac7799898bd819ad1f9b6260c61f Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Sun, 14 Jan 2018 12:35:38 -0800 Subject: [PATCH 199/710] Fix typo --- 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 41b568cdabc..e6e3d58ae97 100644 --- a/extensions/emmet/src/util.ts +++ b/extensions/emmet/src/util.ts @@ -32,7 +32,7 @@ export function resolveUpdateExtensionsPath() { if (_currentExtensionsPath !== extensionsPath) { _currentExtensionsPath = extensionsPath; if (_currentExtensionsPath && !path.isAbsolute(_currentExtensionsPath)) { - vscode.window.showErrorMessage('The path provided in emmet.extensionsPath setting should be absoulte path'); + vscode.window.showErrorMessage('The path provided in emmet.extensionsPath setting should be absolute path'); _emmetHelper.updateExtensionsPath(); return; } From 1d9a9a1f6889532a7799c8d695367b3b1c53cfc3 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Sun, 14 Jan 2018 12:57:34 -0800 Subject: [PATCH 200/710] Add win32x64AppId to product.json This allows building the OSS version of the 64-bit windows installer --- product.json | 1 + 1 file changed, 1 insertion(+) diff --git a/product.json b/product.json index 49f852e2928..cbb7fbae771 100644 --- a/product.json +++ b/product.json @@ -10,6 +10,7 @@ "win32NameVersion": "Microsoft Code OSS", "win32RegValueName": "CodeOSS", "win32AppId": "{{E34003BB-9E10-4501-8C11-BE3FAA83F23F}", + "win32x64AppId": "{{D77B7E06-80BA-4137-BCF4-654B95CCEBC5}", "win32AppUserModelId": "Microsoft.CodeOSS", "win32ShellNameShort": "C&ode - OSS", "darwinBundleIdentifier": "com.visualstudio.code.oss", From b36655544f413f67aec02d64ce619d165749b957 Mon Sep 17 00:00:00 2001 From: Pascal Fong Kye Date: Mon, 15 Jan 2018 01:52:47 +0100 Subject: [PATCH 201/710] fix: wrap current node when no selection and cursor on opening or closing tag (#41602) --- extensions/emmet/src/abbreviationActions.ts | 9 ++- .../src/test/wrapWithAbbreviation.test.ts | 66 +++++++++++++++++-- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts index ee0e1b5a3be..feee6d684eb 100644 --- a/extensions/emmet/src/abbreviationActions.ts +++ b/extensions/emmet/src/abbreviationActions.ts @@ -24,6 +24,7 @@ export function wrapWithAbbreviation(args: any) { } const editor = vscode.window.activeTextEditor; + let rootNode = parseDocument(editor.document, false); const syntax = getSyntaxFromArgs({ language: editor.document.languageId }); if (!syntax) { @@ -47,7 +48,13 @@ export function wrapWithAbbreviation(args: any) { editor.selections.forEach(selection => { let rangeToReplace: vscode.Range = selection.isReversed ? new vscode.Range(selection.active, selection.anchor) : selection; if (rangeToReplace.isEmpty) { - rangeToReplace = new vscode.Range(rangeToReplace.start.line, 0, rangeToReplace.start.line, editor.document.lineAt(rangeToReplace.start.line).text.length); + let { active } = selection; + let currentNode = getNode(rootNode, active, true); + if (currentNode && (currentNode.start.line === active.line || currentNode.end.line === active.line)) { + rangeToReplace = new vscode.Range(currentNode.start, currentNode.end); + } else { + rangeToReplace = new vscode.Range(rangeToReplace.start.line, 0, rangeToReplace.start.line, editor.document.lineAt(rangeToReplace.start.line).text.length); + } } const firstLineOfSelection = editor.document.lineAt(rangeToReplace.start).text.substr(rangeToReplace.start.character); diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts index 2739fc496d9..801b24b273e 100644 --- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts +++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts @@ -131,7 +131,63 @@ suite('Tests for Wrap with Abbreviations', () => { editor.selections = [new Selection(2, 0, 2, 0)]; const promise = wrapWithAbbreviation({ abbreviation: 'li.hello|c' }); if (!promise) { - assert.equal(1, 2, 'Wrap returned udnefined instead of promise.'); + assert.equal(1, 2, 'Wrap returned undefined instead of promise.'); + return Promise.resolve(); + } + return promise.then(() => { + assert.equal(editor.document.getText(), expectedContents); + return Promise.resolve(); + }); + }); + }); + + test('Wrap with abbreviation entire node when cursor is on opening tag', () => { + const contents = ` +
    + hello +
    + `; + const expectedContents = ` +
    +
    + hello +
    +
    + `; + + return withRandomFileEditor(contents, 'html', (editor, doc) => { + editor.selections = [new Selection(1, 1, 1, 1)]; + const promise = wrapWithAbbreviation({ abbreviation: 'div' }); + if (!promise) { + assert.equal(1, 2, 'Wrap returned undefined instead of promise.'); + return Promise.resolve(); + } + return promise.then(() => { + assert.equal(editor.document.getText(), expectedContents); + return Promise.resolve(); + }); + }); + }); + + test('Wrap with abbreviation entire node when cursor is on closing tag', () => { + const contents = ` +
    + hello +
    + `; + const expectedContents = ` +
    +
    + hello +
    +
    + `; + + return withRandomFileEditor(contents, 'html', (editor, doc) => { + editor.selections = [new Selection(3, 1, 3, 1)]; + const promise = wrapWithAbbreviation({ abbreviation: 'div' }); + if (!promise) { + assert.equal(1, 2, 'Wrap returned undefined instead of promise.'); return Promise.resolve(); } return promise.then(() => { @@ -160,7 +216,7 @@ suite('Tests for Wrap with Abbreviations', () => { editor.selections = [new Selection(2, 2, 3, 33)]; const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' }); if (!promise) { - assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned udnefined.'); + assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.'); return Promise.resolve(); } return promise.then(() => { @@ -191,7 +247,7 @@ suite('Tests for Wrap with Abbreviations', () => { editor.selections = [new Selection(2, 2, 3, 33)]; const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello*|c' }); if (!promise) { - assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned udnefined.'); + assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.'); return Promise.resolve(); } return promise.then(() => { @@ -220,7 +276,7 @@ suite('Tests for Wrap with Abbreviations', () => { editor.selections = [new Selection(2, 3, 3, 16)]; const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*|t' }); if (!promise) { - assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned udnefined.'); + assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.'); return Promise.resolve(); } @@ -238,7 +294,7 @@ function testWrapWithAbbreviation(selections: Selection[], abbreviation: string, editor.selections = selections; const promise = wrapWithAbbreviation({ abbreviation }); if (!promise) { - assert.equal(1, 2, 'Wrap with Abbreviation returned udnefined.'); + assert.equal(1, 2, 'Wrap with Abbreviation returned undefined.'); return Promise.resolve(); } From 5b26eccb33f8558da6cdd57c290ab1762958e787 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 15 Jan 2018 10:09:28 +0100 Subject: [PATCH 202/710] #41535 Adopt TreeItem to have resourceUri --- src/vs/workbench/api/node/extHostTypes.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 154012715bf..b5034b14902 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -1440,11 +1440,20 @@ export enum ProgressLocation { export class TreeItem { + label?: string; + resourceUri?: URI; iconPath?: string | URI | { light: string | URI; dark: string | URI }; command?: vscode.Command; contextValue?: string; - constructor(public label: string, public collapsibleState: vscode.TreeItemCollapsibleState = TreeItemCollapsibleState.None) { + constructor(label: string, collapsibleState?: vscode.TreeItemCollapsibleState) + constructor(resourceUri: URI, collapsibleState?: vscode.TreeItemCollapsibleState) + constructor(arg1: string | URI, public collapsibleState: vscode.TreeItemCollapsibleState = TreeItemCollapsibleState.None) { + if (arg1 instanceof URI) { + this.resourceUri = arg1; + } else { + this.label = arg1; + } } } From d70bec3768f7020e0a0c7352b51aa1b93e3506bb Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 10:52:15 +0100 Subject: [PATCH 203/710] alt key open to the side for breakpoints and markers --- .../workbench/parts/debug/electron-browser/breakpointsView.ts | 4 ++-- src/vs/workbench/parts/markers/browser/markersPanel.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts index 64135e242aa..3807f7aa779 100644 --- a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts @@ -99,10 +99,10 @@ export class BreakpointsView extends ViewsViewletPanel { } })); this.disposables.push(this.list.onMouseDblClick(e => { - handleBreakpointFocus(false, false, true); + handleBreakpointFocus(false, e.browserEvent.altKey, true); })); this.disposables.push(this.list.onMouseClick(e => { - handleBreakpointFocus(true, false, false); + handleBreakpointFocus(true, e.browserEvent.altKey, false); })); this.list.splice(0, this.list.length, this.elements); diff --git a/src/vs/workbench/parts/markers/browser/markersPanel.ts b/src/vs/workbench/parts/markers/browser/markersPanel.ts index bfe9d25d339..99ef58222f1 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanel.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanel.ts @@ -233,7 +233,7 @@ export class MarkersPanel extends Panel { const fileResultsNavigation = this._register(new FileResultsNavigation(this.tree, { openOnFocus: true })); this._register(debounceEvent(fileResultsNavigation.openFile, (last, event) => event, 75, true)(options => { - this.openFileAtElement(options.element, options.editorOptions.preserveFocus, options.editorOptions.pinned, options.sideBySide); + this.openFileAtElement(options.element, options.editorOptions.preserveFocus, options.sideBySide, options.editorOptions.pinned); })); } From 96f41bd30d3c6e0087d63df672f63435ed6ac9e0 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 11:09:48 +0100 Subject: [PATCH 204/710] fix terminal commands fixes #41263 --- .../execution.contribution.ts | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 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 0ac2c650755..3f55964e72c 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -26,6 +26,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe import { IFileService } from 'vs/platform/files/common/files'; import { IListService } from 'vs/platform/list/browser/listService'; import { getResourceForCommand } from 'vs/workbench/parts/files/browser/files'; +import { CommandsRegistry } from 'vs/platform/commands/common/commands'; if (env.isWindows) { registerSingleton(ITerminalService, WinTerminalService); @@ -75,25 +76,18 @@ DEFAULT_TERMINAL_LINUX_READY.then(defaultTerminalLinux => { }); }); -const OPEN_CONSOLE_COMMAND_ID = 'workbench.action.terminal.openNativeConsole'; - -KeybindingsRegistry.registerCommandAndKeybindingRule({ - id: OPEN_CONSOLE_COMMAND_ID, - primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C, - when: KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED, - weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), +const OPEN_IN_TERMINAL_COMMAND_ID = 'openInTerminal'; +CommandsRegistry.registerCommand({ + id: OPEN_IN_TERMINAL_COMMAND_ID, handler: (accessor, resource: uri) => { const configurationService = accessor.get(IConfigurationService); - const historyService = accessor.get(IHistoryService); const editorService = accessor.get(IWorkbenchEditorService); const fileService = accessor.get(IFileService); const integratedTerminalService = accessor.get(IIntegratedTerminalService); const terminalService = accessor.get(ITerminalService); resource = getResourceForCommand(resource, accessor.get(IListService), editorService); - // Try workspace path first - const root = historyService.getLastActiveWorkspaceRoot('file'); - return !uri.isUri(resource) ? TPromise.as(root && root.fsPath) : fileService.resolveFile(resource).then(stat => { + return fileService.resolveFile(resource).then(stat => { return stat.isDirectory ? stat.resource.fsPath : paths.dirname(stat.resource.fsPath); }).then(directoryToOpen => { if (configurationService.getValue().terminal.explorerKind === 'integrated') { @@ -109,16 +103,33 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } }); +const OPEN_NATIVE_CONSOLE_COMMAND_ID = 'workbench.action.terminal.openNativeConsole'; +KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: OPEN_NATIVE_CONSOLE_COMMAND_ID, + primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_C, + when: KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED, + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), + handler: (accessor) => { + const historyService = accessor.get(IHistoryService); + const terminalService = accessor.get(ITerminalService); + const root = historyService.getLastActiveWorkspaceRoot('file'); + terminalService.openTerminal(root.fsPath); + } +}); + +MenuRegistry.appendMenuItem(MenuId.CommandPalette, { + command: { + id: OPEN_NATIVE_CONSOLE_COMMAND_ID, + title: env.isWindows ? nls.localize('globalConsoleActionWin', "Open New Command Prompt") : + nls.localize('globalConsoleActionMacLinux', "Open New Terminal") + } +}); + const openConsoleCommand = { - id: OPEN_CONSOLE_COMMAND_ID, + id: OPEN_IN_TERMINAL_COMMAND_ID, title: env.isWindows ? nls.localize('scopedConsoleActionWin', "Open in Command Prompt") : nls.localize('scopedConsoleActionMacLinux', "Open in Terminal") }; - -MenuRegistry.appendMenuItem(MenuId.CommandPalette, { - command: openConsoleCommand -}); - MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { group: 'navigation', order: 30, From 4b55cf7b5c019f092cbec418eeee16d1665c739c Mon Sep 17 00:00:00 2001 From: David Adams Date: Fri, 12 Jan 2018 13:36:58 -0700 Subject: [PATCH 205/710] fix grammar in walkthrough --- .../electron-browser/editor/vs_code_editor_walkthrough.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md index d9f30f401f6..946f83b6af0 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md @@ -88,7 +88,7 @@ function Book(title, author) { ### Refactoring via Extraction -Sometimes you want refactor already written code into a separate function or constant to use it later again. Select the lines you want to refactor out and press kb(editor.action.quickFix) or click the little light bulb and choose one of the respective `Extract to...` options. Try it by selecting the code inside the `if`-clause on line 3 or any other common code you want to refactor out. +Sometimes you want to refactor already written code into a separate function or constant to reuse it later. Select the lines you want to refactor out and press kb(editor.action.quickFix) or click the little light bulb and choose one of the respective `Extract to...` options. Try it by selecting the code inside the `if`-clause on line 3 or any other common code you want to refactor out. ```js function findFirstEvenNumber(arr) { From f94603326de36d952bac46c800328a9b37a237c7 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 15 Jan 2018 16:10:47 +0100 Subject: [PATCH 206/710] Fix #41535 --- src/vs/platform/list/browser/listService.ts | 2 +- src/vs/workbench/api/node/extHostTreeViews.ts | 11 ++-- .../parts/views}/media/collapsed-dark.svg | 0 .../parts/views}/media/collapsed-hc.svg | 0 .../parts/views}/media/collapsed.svg | 0 .../parts/views}/media/expanded-dark.svg | 0 .../parts/views}/media/expanded-hc.svg | 0 .../parts/views}/media/expanded.svg | 0 .../browser/parts/views/media/views.css | 66 +++++++++++++++++-- .../workbench/browser/parts/views/treeView.ts | 61 +++++++++++------ .../browser/parts/views/viewsViewlet.ts | 31 ++++++++- src/vs/workbench/common/views.ts | 5 +- .../media/explorerviewlet.css | 49 -------------- .../electron-browser/views/explorerView.ts | 16 +---- 14 files changed, 143 insertions(+), 98 deletions(-) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/collapsed-dark.svg (100%) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/collapsed-hc.svg (100%) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/collapsed.svg (100%) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/expanded-dark.svg (100%) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/expanded-hc.svg (100%) rename src/vs/workbench/{parts/files/electron-browser => browser/parts/views}/media/expanded.svg (100%) diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 8287d0efd79..05dc85f8165 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -151,7 +151,7 @@ export class WorkbenchPagedList extends PagedList { export class WorkbenchTree extends Tree { readonly contextKeyService: IContextKeyService; - private disposables: IDisposable[] = []; + protected disposables: IDisposable[] = []; private listDoubleSelection: IContextKey; constructor( diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 0f7194fcc70..67f75fd1386 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -6,6 +6,7 @@ import { localize } from 'vs/nls'; import * as vscode from 'vscode'; +import { basename } from 'vs/base/common/paths'; import URI from 'vs/base/common/uri'; import { debounceEvent } from 'vs/base/common/event'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -189,6 +190,7 @@ class ExtHostTreeView extends Disposable { handle, parentHandle, label: extensionTreeItem.label, + resourceUri: extensionTreeItem.resourceUri, command: extensionTreeItem.command ? this.commands.toInternal(extensionTreeItem.command) : void 0, contextValue: extensionTreeItem.contextValue, icon, @@ -197,17 +199,18 @@ class ExtHostTreeView extends Disposable { }; } - private createHandle(element: T, { label }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { + private createHandle(element: T, { label, resourceUri }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { if (typeof element === 'string') { return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${element}`; } const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX; - label = label.indexOf('/') !== -1 ? label.replace('/', '//') : label; + let elementId = label ? label : basename(resourceUri.path); + elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId; const existingHandle = this.nodes.has(element) ? this.nodes.get(element).handle : void 0; - for (let labelCount = 0; labelCount <= this.getChildrenHandles(parentHandle).length; labelCount++) { - const handle = `${prefix}/${labelCount}:${label}`; + for (let counter = 0; counter <= this.getChildrenHandles(parentHandle).length; counter++) { + const handle = `${prefix}/${counter}:${elementId}`; if (!this.elements.has(handle) || existingHandle === handle) { return handle; } diff --git a/src/vs/workbench/parts/files/electron-browser/media/collapsed-dark.svg b/src/vs/workbench/browser/parts/views/media/collapsed-dark.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/collapsed-dark.svg rename to src/vs/workbench/browser/parts/views/media/collapsed-dark.svg diff --git a/src/vs/workbench/parts/files/electron-browser/media/collapsed-hc.svg b/src/vs/workbench/browser/parts/views/media/collapsed-hc.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/collapsed-hc.svg rename to src/vs/workbench/browser/parts/views/media/collapsed-hc.svg diff --git a/src/vs/workbench/parts/files/electron-browser/media/collapsed.svg b/src/vs/workbench/browser/parts/views/media/collapsed.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/collapsed.svg rename to src/vs/workbench/browser/parts/views/media/collapsed.svg diff --git a/src/vs/workbench/parts/files/electron-browser/media/expanded-dark.svg b/src/vs/workbench/browser/parts/views/media/expanded-dark.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/expanded-dark.svg rename to src/vs/workbench/browser/parts/views/media/expanded-dark.svg diff --git a/src/vs/workbench/parts/files/electron-browser/media/expanded-hc.svg b/src/vs/workbench/browser/parts/views/media/expanded-hc.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/expanded-hc.svg rename to src/vs/workbench/browser/parts/views/media/expanded-hc.svg diff --git a/src/vs/workbench/parts/files/electron-browser/media/expanded.svg b/src/vs/workbench/browser/parts/views/media/expanded.svg similarity index 100% rename from src/vs/workbench/parts/files/electron-browser/media/expanded.svg rename to src/vs/workbench/browser/parts/views/media/expanded.svg diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css index 5eceb636e91..b72d184d21b 100644 --- a/src/vs/workbench/browser/parts/views/media/views.css +++ b/src/vs/workbench/browser/parts/views/media/views.css @@ -3,12 +3,72 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +/* File icon themeable tree style */ +.file-icon-themable-tree .monaco-tree-row .content { + display: flex; +} + +.file-icon-themable-tree .monaco-tree-row .content::before { + background-size: 16px; + background-position: 50% 50%; + background-repeat: no-repeat; + padding-right: 6px; + width: 16px; + height: 22px; + display: inline-block; + vertical-align: top; + content: ' '; +} + +.file-icon-themable-tree.align-icons-and-twisties .monaco-tree-row:not(.has-children) .content::before { + display: none; +} + +.file-icon-themable-tree .monaco-tree-row.has-children.expanded .content::before { + background-image: url("expanded.svg"); +} + +.file-icon-themable-tree .monaco-tree-row.has-children .content::before { + display: inline-block; + background-image: url("collapsed.svg"); +} + +.vs-dark .file-icon-themable-tree .monaco-tree-row.has-children.expanded .content::before { + background-image: url("expanded-dark.svg"); +} + +.vs-dark .file-icon-themable-tree .monaco-tree-row.has-children .content::before { + background-image: url("collapsed-dark.svg"); +} + +.hc-black .file-icon-themable-tree .monaco-tree-row.has-children.expanded .content::before { + background-image: url("expanded-hc.svg"); +} + +.hc-black .file-icon-themable-tree .monaco-tree-row.has-children .content::before { + background-image: url("collapsed-hc.svg"); +} + +.file-icon-themable-tree.hide-arrows .monaco-tree-row .content::before { + display: none; +} + .custom-view-tree-node-item { display: flex; height: 22px; line-height: 22px; } +.custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel { + flex: 1; +} + +.custom-view-tree-node-item > .custom-view-tree-node-item-label { + flex: 1; + text-overflow: ellipsis; + overflow: hidden; +} + .custom-view-tree-node-item > .custom-view-tree-node-item-icon { background-size: 16px; background-position: left center; @@ -17,10 +77,4 @@ width: 16px; height: 22px; -webkit-font-smoothing: antialiased; -} - -.custom-view-tree-node-item > .custom-view-tree-node-item-label { - flex: 1; - text-overflow: ellipsis; - overflow: hidden; } \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index d295d2728a1..c41395ca4b5 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -24,10 +24,15 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; -import { TreeViewsViewletPanel, IViewletViewOptions, IViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet'; +import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { TreeItemCollapsibleState, ITreeItem, ITreeViewDataProvider, TreeViewItemHandleArg } from 'vs/workbench/common/views'; import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; +import { ResourceLabel } from 'vs/workbench/browser/labels'; +import URI from 'vs/base/common/uri'; +import { basename } from 'vs/base/common/paths'; +import { FileKind } from 'vs/platform/files/common/files'; +import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; export class TreeView extends TreeViewsViewletPanel { @@ -45,7 +50,7 @@ export class TreeView extends TreeViewsViewletPanel { @IContextMenuService contextMenuService: IContextMenuService, @IInstantiationService private instantiationService: IInstantiationService, @IListService private listService: IListService, - @IThemeService private themeService: IThemeService, + @IThemeService private themeService: IWorkbenchThemeService, @IContextKeyService private contextKeyService: IContextKeyService, @IExtensionService private extensionService: IExtensionService, @ICommandService private commandService: ICommandService @@ -53,7 +58,7 @@ export class TreeView extends TreeViewsViewletPanel { super({ ...(options as IViewOptions), ariaHeaderLabel: options.name }, keybindingService, contextMenuService); this.menus = this.instantiationService.createInstance(Menus, this.id); this.menus.onDidChangeTitle(() => this.updateActions(), this, this.disposables); - this.themeService.onThemeChange(() => this.tree.refresh() /* soft refresh */, this, this.disposables); + themeService.onThemeChange(() => this.tree.refresh() /* soft refresh */, this, this.disposables); if (options.expanded) { this.activate(); } @@ -87,7 +92,7 @@ export class TreeView extends TreeViewsViewletPanel { const dataSource = this.instantiationService.createInstance(TreeDataSource, this.id); const renderer = this.instantiationService.createInstance(TreeRenderer); const controller = this.instantiationService.createInstance(TreeController, this.id, this.menus); - const tree = new WorkbenchTree( + const tree = new FileIconThemableWorkbenchTree( container.getHTMLElement(), { dataSource, renderer, controller }, { keyboardSupport: false }, @@ -263,8 +268,9 @@ class TreeDataSource implements IDataSource { } interface ITreeExplorerTemplateData { - icon: Builder; - label: Builder; + label: HTMLElement; + resourceLabel: ResourceLabel; + icon: HTMLElement; } class TreeRenderer implements IRenderer { @@ -272,7 +278,10 @@ class TreeRenderer implements IRenderer { private static readonly ITEM_HEIGHT = 22; private static readonly TREE_TEMPLATE_ID = 'treeExplorer'; - constructor( @IThemeService private themeService: IThemeService) { + constructor( + @IInstantiationService private instantiationService: IInstantiationService, + @IThemeService private themeService: IThemeService + ) { } public getHeight(tree: ITree, element: any): number { @@ -284,33 +293,43 @@ class TreeRenderer implements IRenderer { } public renderTemplate(tree: ITree, templateId: string, container: HTMLElement): ITreeExplorerTemplateData { - const el = $(container); - const item = $('.custom-view-tree-node-item'); - item.appendTo(el); + const el = DOM.append(container, DOM.$('.custom-view-tree-node-item')); - const icon = $('.custom-view-tree-node-item-icon').appendTo(item); - const label = $('.custom-view-tree-node-item-label').appendTo(item); - const link = $('a.label').appendTo(label); + const icon = DOM.append(el, DOM.$('.custom-view-tree-node-item-icon')); + const label = DOM.append(el, DOM.$('.custom-view-tree-node-item-label')); + const resourceLabelContainer = DOM.append(el, DOM.$('.custom-view-tree-node-item-resourceLabelContainer')); + const resourceLabel = this.instantiationService.createInstance(ResourceLabel, resourceLabelContainer, { supportHighlights: true }); - return { label: link, icon }; + return { label, resourceLabel, icon }; } public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void { - templateData.label.text(node.label).title(node.label); - + const resource = node.resourceUri ? URI.revive(node.resourceUri) : null; + const name = node.label || basename(resource.path); const theme = this.themeService.getTheme(); const icon = theme.type === LIGHT ? node.icon : node.iconDark; - if (icon) { - templateData.icon.getHTMLElement().style.backgroundImage = `url('${icon}')`; - DOM.addClass(templateData.icon.getHTMLElement(), 'custom-view-tree-node-item-icon'); + templateData.resourceLabel.clear(); + templateData.label.textContent = ''; + DOM.removeClass(templateData.label, 'custom-view-tree-node-item-label'); + DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel'); + DOM.removeClass(templateData.icon, 'custom-view-tree-node-item-icon'); + + if (resource && !icon) { + templateData.resourceLabel.setLabel({ name, resource }, { fileKind: node.collapsibleState === TreeItemCollapsibleState.Collapsed || node.collapsibleState === TreeItemCollapsibleState.Expanded ? FileKind.FOLDER : FileKind.FILE }); + DOM.addClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel'); } else { - templateData.icon.getHTMLElement().style.backgroundImage = ''; - DOM.removeClass(templateData.icon.getHTMLElement(), 'custom-view-tree-node-item-icon'); + templateData.label.textContent = name; + DOM.addClass(templateData.label, 'custom-view-tree-node-item-label'); + templateData.icon.style.backgroundImage = `url('${icon}')`; + if (icon) { + DOM.addClass(templateData.icon, 'custom-view-tree-node-item-icon'); + } } } public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void { + templateData.resourceLabel.dispose(); } } diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index a7cdde07173..346a1b1a23c 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -27,7 +27,9 @@ import { IContextKeyService, IContextKeyChangeEvent } from 'vs/platform/contextk import { StandardMouseEvent } from 'vs/base/browser/mouseEvent'; import { PanelViewlet, ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IPanelOptions } from 'vs/base/browser/ui/splitview/panelview'; -import { WorkbenchTree } from 'vs/platform/list/browser/listService'; +import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; +import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; +import { ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree'; export interface IViewOptions extends IPanelOptions { id: string; @@ -96,14 +98,12 @@ export abstract class ViewsViewletPanel extends ViewletPanel { } -// TODO@isidor @sandeep remove this class export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { readonly id: string; readonly name: string; protected treeContainer: HTMLElement; - // TODO@sandeep why is tree here? isn't this coming only from TreeView protected tree: WorkbenchTree; protected isDisposed: boolean; private dragHandler: DelayedDragHandler; @@ -722,3 +722,28 @@ export class PersistentViewsViewlet extends ViewsViewlet { Object.keys(viewsStates).forEach(id => this.viewsStates.set(id, viewsStates[id])); } } + +export class FileIconThemableWorkbenchTree extends WorkbenchTree { + + constructor( + container: HTMLElement, + configuration: ITreeConfiguration, + options: ITreeOptions, + @IContextKeyService contextKeyService: IContextKeyService, + @IListService listService: IListService, + @IThemeService themeService: IWorkbenchThemeService + ) { + super(container, configuration, { ...options, ...{ showTwistie: false, twistiePixels: 12 } }, contextKeyService, listService, themeService); + + DOM.addClass(container, 'file-icon-themable-tree'); + DOM.addClass(container, 'show-file-icons'); + + const onFileIconThemeChange = (fileIconTheme: IFileIconTheme) => { + DOM.toggleClass(container, 'align-icons-and-twisties', fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons); + DOM.toggleClass(container, 'hide-arrows', fileIconTheme.hidesExplorerArrows === true); + }; + + this.disposables.push(themeService.onDidFileIconThemeChange(onFileIconThemeChange)); + onFileIconThemeChange(themeService.getFileIconTheme()); + } +} \ No newline at end of file diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 00b5ddbc939..5d7b138ae5e 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -6,6 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import Event from 'vs/base/common/event'; import { Command } from 'vs/editor/common/modes'; +import { UriComponents } from 'vs/base/common/uri'; export type TreeViewItemHandleArg = { $treeViewId: string, @@ -24,12 +25,14 @@ export interface ITreeItem { parentHandle: string; - label: string; + label?: string; icon?: string; iconDark?: string; + resourceUri?: UriComponents; + contextValue?: string; command?: Command; diff --git a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css index ef3c88021fd..eb657380a67 100644 --- a/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css +++ b/src/vs/workbench/parts/files/electron-browser/media/explorerviewlet.css @@ -58,55 +58,6 @@ display: none; } -.explorer-folders-view .monaco-tree-row .content { - display: flex; -} - -.explorer-folders-view .monaco-tree-row .content::before { - background-size: 16px; - background-position: 50% 50%; - background-repeat: no-repeat; - padding-right: 6px; - width: 16px; - height: 22px; - display: inline-block; - vertical-align: top; - content: ' '; -} - -.explorer-folders-view.align-icons-and-twisties .monaco-tree-row:not(.has-children) .content::before { - display: none; -} - -.explorer-folders-view .monaco-tree-row.has-children.expanded .content::before { - background-image: url("expanded.svg"); -} - -.explorer-folders-view .monaco-tree-row.has-children .content::before { - display: inline-block; - background-image: url("collapsed.svg"); -} - -.vs-dark .explorer-folders-view .monaco-tree-row.has-children.expanded .content::before { - background-image: url("expanded-dark.svg"); -} - -.vs-dark .explorer-folders-view .monaco-tree-row.has-children .content::before { - background-image: url("collapsed-dark.svg"); -} - -.hc-black .explorer-folders-view .monaco-tree-row.has-children.expanded .content::before { - background-image: url("expanded-hc.svg"); -} - -.hc-black .explorer-folders-view .monaco-tree-row.has-children .content::before { - background-image: url("collapsed-hc.svg"); -} - -.explorer-folders-view.hide-arrows .monaco-tree-row .content::before { - display: none; -} - .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row:hover > .monaco-action-bar, .explorer-viewlet .explorer-open-editors .monaco-list.focused .monaco-list-row.focused > .monaco-action-bar, .explorer-viewlet .explorer-open-editors .monaco-list .monaco-list-row.dirty > .monaco-action-bar { 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 b2a9b1d732f..9f03496b5f8 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -24,7 +24,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import * as DOM from 'vs/base/browser/dom'; import { CollapseAction } from 'vs/workbench/browser/viewlet'; -import { TreeViewsViewletPanel, IViewletViewOptions, IViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet'; +import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { FileStat, Model } from 'vs/workbench/parts/files/common/explorerModel'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; @@ -39,7 +39,7 @@ import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { ResourceContextKey } from 'vs/workbench/common/resources'; import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources'; -import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; +import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { isLinux } from 'vs/base/common/platform'; import { IDecorationsService } from 'vs/workbench/services/decorations/browser/decorations'; import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; @@ -156,7 +156,6 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView public renderBody(container: HTMLElement): void { this.treeContainer = super.renderViewTree(container); DOM.addClass(this.treeContainer, 'explorer-folders-view'); - DOM.addClass(this.treeContainer, 'show-file-icons'); this.tree = this.createViewer($(this.treeContainer)); @@ -164,15 +163,8 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView this.toolbar.setActions(this.getActions(), this.getSecondaryActions())(); } - const onFileIconThemeChange = (fileIconTheme: IFileIconTheme) => { - DOM.toggleClass(this.treeContainer, 'align-icons-and-twisties', fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons); - DOM.toggleClass(this.treeContainer, 'hide-arrows', fileIconTheme.hidesExplorerArrows === true); - }; - - this.disposables.push(this.themeService.onDidFileIconThemeChange(onFileIconThemeChange)); this.disposables.push(this.contextService.onDidChangeWorkspaceFolders(e => this.refreshFromEvent(e.added))); this.disposables.push(this.contextService.onDidChangeWorkbenchState(e => this.refreshFromEvent())); - onFileIconThemeChange(this.themeService.getFileIconTheme()); } public getActions(): IAction[] { @@ -404,7 +396,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView const dnd = this.instantiationService.createInstance(FileDragAndDrop); const accessibilityProvider = this.instantiationService.createInstance(FileAccessibilityProvider); - this.explorerViewer = new WorkbenchTree(container.getHTMLElement(), { + this.explorerViewer = new FileIconThemableWorkbenchTree(container.getHTMLElement(), { dataSource, renderer, controller, @@ -415,8 +407,6 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView }, { autoExpandSingleChildren: true, ariaLabel: nls.localize('treeAriaLabel', "Files Explorer"), - twistiePixels: 12, - showTwistie: false, keyboardSupport: false }, this.contextKeyService, this.listService, this.themeService); From c609af00ced16cf62142f57b4d32c9d9d10f3ee2 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 16:32:40 +0100 Subject: [PATCH 207/710] Move RawContentChange events creation to TextModel --- src/vs/editor/common/model.ts | 3 +- .../model/linesTextBuffer/linesTextBuffer.ts | 24 ++---- src/vs/editor/common/model/textModel.ts | 74 +++++++++++++++++-- .../common/viewModel/splitLinesCollection.ts | 1 + src/vs/editor/test/common/model/model.test.ts | 3 - 5 files changed, 78 insertions(+), 27 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 9f25ed1118f..9d58b81cc05 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -12,7 +12,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { Position, IPosition } from 'vs/editor/common/core/position'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange, ModelRawChange } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange } from 'vs/editor/common/model/textModelEvents'; import { ThemeColor } from 'vs/platform/theme/common/themeService'; /** @@ -1098,7 +1098,6 @@ export class ApplyEditsResult { constructor( public readonly reverseEdits: IIdentifiedSingleEditOperation[], - public readonly rawChanges: ModelRawChange[], public readonly changes: IInternalModelContentChange[], public readonly trimAutoWhitespaceLineNumbers: number[] ) { } diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 09cafe2246c..1cbd9fe7c92 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -9,7 +9,6 @@ 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 { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { ISingleEditOperationIdentifier, IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; export interface IValidatedEditOperation { @@ -252,7 +251,7 @@ export class LinesTextBuffer implements ITextBuffer { public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { if (rawOperations.length === 0) { - return new ApplyEditsResult([], [], [], []); + return new ApplyEditsResult([], [], []); } let mightContainRTL = this._mightContainRTL; @@ -341,7 +340,7 @@ export class LinesTextBuffer implements ITextBuffer { this._mightContainRTL = mightContainRTL; this._mightContainNonBasicASCII = mightContainNonBasicASCII; - const [rawContentChanges, contentChanges] = this._doApplyEdits(operations); + const contentChanges = this._doApplyEdits(operations); let trimAutoWhitespaceLineNumbers: number[] = null; if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) { @@ -369,7 +368,6 @@ export class LinesTextBuffer implements ITextBuffer { return new ApplyEditsResult( reverseOperations, - rawContentChanges, contentChanges, trimAutoWhitespaceLineNumbers ); @@ -451,18 +449,16 @@ export class LinesTextBuffer implements ITextBuffer { }; } - private _setLineContent(lineNumber: number, content: string, rawContentChanges: ModelRawChange[]): void { + private _setLineContent(lineNumber: number, content: string): void { this._lines[lineNumber - 1] = content; this._lineStarts.changeValue(lineNumber - 1, content.length + this._EOL.length); - rawContentChanges.push(new ModelRawLineChanged(lineNumber, content)); } - private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { + private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] { // Sort operations descending operations.sort(LinesTextBuffer._sortOpsDescending); - let rawContentChanges: ModelRawChange[] = []; let contentChanges: IInternalModelContentChange[] = []; for (let i = 0, len = operations.length; i < len; i++) { @@ -497,7 +493,7 @@ export class LinesTextBuffer implements ITextBuffer { ); } - this._setLineContent(editLineNumber, editText, rawContentChanges); + this._setLineContent(editLineNumber, editText); } if (editingLinesCnt < deletingLinesCnt) { @@ -507,12 +503,10 @@ export class LinesTextBuffer implements ITextBuffer { const endLineRemains = this._lines[endLineNumber - 1].substring(endColumn - 1); // Reconstruct first line - this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains, rawContentChanges); + this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains); this._lines.splice(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); this._lineStarts.removeValues(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); - - rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); } if (editingLinesCnt < insertingLinesCnt) { @@ -527,7 +521,7 @@ export class LinesTextBuffer implements ITextBuffer { // Split last line const leftoverLine = this._lines[spliceLineNumber - 1].substring(spliceColumn - 1); - this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1), rawContentChanges); + this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1)); // Lines in the middle let newLines: string[] = new Array(insertingLinesCnt - editingLinesCnt); @@ -540,8 +534,6 @@ export class LinesTextBuffer implements ITextBuffer { newLinesLengths[newLines.length - 1] += leftoverLine.length; this._lines = arrays.arrayInsert(this._lines, startLineNumber + editingLinesCnt, newLines); this._lineStarts.insertValues(startLineNumber + editingLinesCnt, newLinesLengths); - - rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); } const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn); @@ -556,7 +548,7 @@ export class LinesTextBuffer implements ITextBuffer { }); } - return [rawContentChanges, contentChanges]; + return contentChanges; } /** diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 701c7274e71..023a1adb307 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -11,7 +11,7 @@ import { LanguageIdentifier, TokenizationRegistry, LanguageId } from 'vs/editor/ import { EditStack } from 'vs/editor/common/model/editStack'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged, ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { onUnexpectedError } from 'vs/base/common/errors'; import { IMarkdownString } from 'vs/base/common/htmlContent'; import * as strings from 'vs/base/common/strings'; @@ -1038,21 +1038,83 @@ export class TextModel extends Disposable implements model.ITextModel { } } + private static _eolCount(text: string): number { + let eolCount = 0; + for (let i = 0, len = text.length; i < len; i++) { + const chr = text.charCodeAt(i); + + if (chr === CharCode.CarriageReturn) { + eolCount++; + if (i + 1 < len && text.charCodeAt(i + 1) === CharCode.LineFeed) { + // \r\n... case + i++; // skip \n + } else { + // \r... case + } + } else if (chr === CharCode.LineFeed) { + eolCount++; + } + } + return eolCount; + } + private _applyEdits(rawOperations: model.IIdentifiedSingleEditOperation[]): model.IIdentifiedSingleEditOperation[] { for (let i = 0, len = rawOperations.length; i < len; i++) { rawOperations[i].range = this.validateRange(rawOperations[i].range); } + + const oldLineCount = this._buffer.getLineCount(); const result = this._buffer.applyEdits(rawOperations, this._options.trimAutoWhitespace); - const rawContentChanges = result.rawChanges; + const newLineCount = this._buffer.getLineCount(); + const contentChanges = result.changes; this._trimAutoWhitespaceLines = result.trimAutoWhitespaceLineNumbers; - if (rawContentChanges.length !== 0 || contentChanges.length !== 0) { + if (contentChanges.length !== 0) { + let rawContentChanges: ModelRawChange[] = []; + + let lineCount = oldLineCount; for (let i = 0, len = contentChanges.length; i < len; i++) { - const contentChange = contentChanges[i]; - this._tokens.applyEdits(contentChange.range, contentChange.lines); + const change = contentChanges[i]; + this._tokens.applyEdits(change.range, change.lines); this._onDidChangeDecorations.fire(); - this._decorationsTree.acceptReplace(contentChange.rangeOffset, contentChange.rangeLength, contentChange.text.length, contentChange.forceMoveMarkers); + this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers); + + const startLineNumber = change.range.startLineNumber; + const endLineNumber = change.range.endLineNumber; + + const deletingLinesCnt = endLineNumber - startLineNumber; + const insertingLinesCnt = TextModel._eolCount(change.text); + const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt); + + const changeLineCountDelta = (insertingLinesCnt - deletingLinesCnt); + + for (let j = editingLinesCnt; j >= 0; j--) { + const editLineNumber = startLineNumber + j; + const currentEditLineNumber = newLineCount - lineCount - changeLineCountDelta + editLineNumber; + rawContentChanges.push(new ModelRawLineChanged(editLineNumber, this.getLineContent(currentEditLineNumber))); + } + + if (editingLinesCnt < deletingLinesCnt) { + // Must delete some lines + const spliceStartLineNumber = startLineNumber + editingLinesCnt; + rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); + } + + if (editingLinesCnt < insertingLinesCnt) { + // Must insert some lines + const spliceLineNumber = startLineNumber + editingLinesCnt; + const cnt = insertingLinesCnt - editingLinesCnt; + const fromLineNumber = newLineCount - lineCount - cnt + spliceLineNumber + 1; + let newLines: string[] = []; + for (let i = 0; i < cnt; i++) { + let lineNumber = fromLineNumber + i; + newLines[lineNumber - fromLineNumber] = this.getLineContent(lineNumber); + } + rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); + } + + lineCount += changeLineCountDelta; } this._increaseVersionId(); diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index 9855eda6939..24009cea46a 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts @@ -403,6 +403,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection { insertPrefixSumValues[i] = outputLineCount; } + // TODO@Alex: use arrays.arrayInsert this.lines = this.lines.slice(0, fromLineNumber - 1).concat(insertLines).concat(this.lines.slice(fromLineNumber - 1)); this.prefixSumComputer.insertValues(fromLineNumber - 1, insertPrefixSumValues); diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index 92b7e5b714a..e610caa3ddf 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -129,7 +129,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nNo longer')]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My new line First Line'), new ModelRawLineChanged(1, 'My new line'), new ModelRawLinesInserted(2, 2, ['No longer First Line']), ], @@ -245,7 +244,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Second Line'), new ModelRawLinesDeleted(2, 2), ], @@ -266,7 +264,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Third Line'), new ModelRawLinesDeleted(2, 3), ], From 30b6df0ef564972d86948bcc187ad02092ef25f5 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 16:51:54 +0100 Subject: [PATCH 208/710] fix warning --- .../parts/execution/electron-browser/execution.contribution.ts | 1 - 1 file changed, 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 3f55964e72c..30be861e92f 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -6,7 +6,6 @@ import * as nls from 'vs/nls'; import * as env from 'vs/base/common/platform'; -import { TPromise } from 'vs/base/common/winjs.base'; import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; From 44fc5f1c85b5d7415c7be45a56c7a61c8593d96f Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 16:52:03 +0100 Subject: [PATCH 209/710] open editors enable multi select --- .../parts/files/electron-browser/views/openEditorsView.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 5c07be204af..efafc160364 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -147,8 +147,8 @@ export class OpenEditorsView extends ViewsViewletPanel { new EditorGroupRenderer(this.keybindingService, this.instantiationService, this.editorGroupService), new OpenEditorRenderer(this.instantiationService, this.keybindingService, this.configurationService, this.editorGroupService) ], { - identityProvider: element => element instanceof OpenEditor ? element.getId() : element.id.toString(), - multipleSelectionSupport: false + keyboardSupport: false, + identityProvider: element => element instanceof OpenEditor ? element.getId() : element.id.toString() }, this.contextKeyService, this.listService, this.themeService); this.updateSize(); @@ -332,7 +332,6 @@ export class OpenEditorsView extends ViewsViewletPanel { if (this.model.activeGroup && this.model.activeGroup.activeEditor /* could be empty */) { const index = this.getIndex(this.model.activeGroup, this.model.activeGroup.activeEditor); this.list.setFocus([index]); - this.list.setSelection([index]); this.list.reveal(index); } } From ab712fdfa0712c2f99cae92224be1491b67aac14 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 17:09:57 +0100 Subject: [PATCH 210/710] getResourcesForCommand respect open editors view --- src/vs/workbench/parts/files/browser/files.ts | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts index 3cdee5cb9d9..13f9340c0da 100644 --- a/src/vs/workbench/parts/files/browser/files.ts +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -11,6 +11,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; import { toResource } from 'vs/workbench/common/editor'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; +import { List } from 'vs/base/browser/ui/list/listWidget'; // Commands can get exeucted from a command pallete, from a context menu or from some list using a keybinding // To cover all these cases we need to properly compute the resource on which the command is being executed @@ -25,7 +26,7 @@ export function getResourceForCommand(resource: URI, listService: IListService, if (focus instanceof FileStat) { return focus.resource; } else if (focus instanceof OpenEditor) { - return focus.editorInput.getResource(); + return focus.getResource(); } } @@ -34,10 +35,21 @@ export function getResourceForCommand(resource: URI, listService: IListService, export function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; - if (list && list.isDOMFocused() && list instanceof Tree) { - const selection = list.getSelection(); - if (selection && selection.length > 1) { - return selection.map(fs => fs.resource); + if (list && list.isDOMFocused()) { + + // Explorer + if (list instanceof Tree) { + const selection = list.getSelection(); + if (selection && selection.length > 1) { + return selection.map(fs => fs.resource); + } + } + // Open editors view + if (list instanceof List) { + const selection = list.getSelectedElements(); + if (selection && selection.length > 1) { + return selection.filter(s => s instanceof OpenEditor).map((oe: OpenEditor) => oe.getResource()); + } } } From 6472a8af6c7f8f2723521454aee7f2646e6bdf1c Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 17:15:29 +0100 Subject: [PATCH 211/710] open editors: compare selected --- .../fileActions.contribution.ts | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index f9e193a5a78..448a7a7dff1 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -241,7 +241,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { title: nls.localize('compareWithSaved', "Compare with Saved"), precondition: DirtyEditorContext }, - when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay')) + when: ContextKeyExpr.and(ResourceContextKey.IsFile, AutoSaveContext.notEqualsTo('afterDelay'), WorkbenchListDoubleSelection.toNegated()) }); const compareResourceCommand = { @@ -252,7 +252,7 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { group: '3_compare', order: 20, command: compareResourceCommand, - when: ContextKeyExpr.and(ResourceContextKey.HasResource, ResourceSelectedForCompareContext) + when: ContextKeyExpr.and(ResourceContextKey.IsFile, ResourceSelectedForCompareContext, WorkbenchListDoubleSelection.toNegated()) }); const selectForCompareCommand = { @@ -263,7 +263,18 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { group: '3_compare', order: 30, command: selectForCompareCommand, - when: ResourceContextKey.HasResource + when: ContextKeyExpr.and(ResourceContextKey.IsFile, WorkbenchListDoubleSelection.toNegated()) +}); + +const compareSelectedCommand = { + id: COMPARE_SELECTED_COMMAND_ID, + title: nls.localize('compareSelected', "Compare Selected") +}; +MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { + group: '3_compare', + order: 30, + command: compareSelectedCommand, + when: ContextKeyExpr.and(ResourceContextKey.IsFile, WorkbenchListDoubleSelection) }); MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, { @@ -357,10 +368,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { MenuRegistry.appendMenuItem(MenuId.ExplorerContext, { group: '3_compare', order: 30, - command: { - id: COMPARE_SELECTED_COMMAND_ID, - title: nls.localize('compareSelected', "Compare Selected") - }, + command: compareSelectedCommand, when: ContextKeyExpr.and(ExplorerFolderContext.toNegated(), ResourceContextKey.IsFile, WorkbenchListDoubleSelection) }); From da3b3b61d6751a9c75445b02216d1b2aef5c2938 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:21:48 +0100 Subject: [PATCH 212/710] Hook up editing --- .../model/chunksTextBuffer/bufferPiece.ts | 6 +- .../chunksTextBuffer/chunksTextBuffer.ts | 334 +++++++++++++++++- .../chunksTextBufferBuilder.ts | 6 +- 3 files changed, 334 insertions(+), 12 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index cc1a887589d..6672bff60f3 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -82,7 +82,7 @@ export class BufferPiece { newLineStarts.set(targetLineStarts); // TODO: does this work correctly? return new BufferPiece( - target._str.substring(0, targetCharsLength - 1), + target._str.substr(0, targetCharsLength - 1), newLineStarts ); } @@ -139,7 +139,7 @@ export class BufferPiece { return; } - let pieces: string[]; + let pieces: string[] = new Array(2 * editsSize + 1); let originalFromIndex = 0; let piecesTextLength = 0; for (let i = 0; i < editsSize; i++) { @@ -155,7 +155,7 @@ export class BufferPiece { } // maintain the chars that survive to the right of the last edit - let text = target._str.substring(originalFromIndex, originalCharsLength - originalFromIndex); + let text = target._str.substr(originalFromIndex, originalCharsLength - originalFromIndex); pieces[2 * editsSize] = text; piecesTextLength += text.length; diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 1bf8fb01079..1c365f48aa9 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -5,10 +5,22 @@ 'use strict'; import { CharCode } from 'vs/base/common/charCode'; -import { ITextBuffer, EndOfLinePreference, IIdentifiedSingleEditOperation, ApplyEditsResult } from 'vs/editor/common/model'; +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'; + +export interface IValidatedEditOperation { + sortIndex: number; + identifier: ISingleEditOperationIdentifier; + range: Range; + rangeOffset: number; + rangeLength: number; + lines: string[]; + forceMoveMarkers: boolean; + isAutoWhitespaceEdit: boolean; +} export class ChunksTextBuffer implements ITextBuffer { @@ -131,8 +143,318 @@ export class ChunksTextBuffer implements ITextBuffer { setEOL(newEOL: string): void { throw new Error('TODO'); } + + 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 { - throw new Error('TODO'); + 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, + lines: op.lines, + 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; } } @@ -792,8 +1114,8 @@ class Buffer { text = text + '\n'; this._findOffsetCloseAfter(edit.offset + edit.length + 1, tmp, tmp2); - startLeafIndex = tmp2.leafIndex; - startInnerOffset = tmp2.offset - tmp2.leafStartOffset; + endLeafIndex = tmp2.leafIndex; + endInnerOffset = tmp2.offset - tmp2.leafStartOffset; // this._findOffset(edit.offset + edit.length + 1, tmp); // endLeafIndex = tmp.leafIndex; // endInnerOffset = tmp.offset - tmp.leafStartOffset; @@ -870,8 +1192,8 @@ class Buffer { const edits = this._resolveEdits(_edits); let accumulatedLeafIndex = 0; - let accumulatedLeafEdits: LeafOffsetLenEdit[]; - let replacements: LeafReplacement[]; + let accumulatedLeafEdits: LeafOffsetLenEdit[] = []; + let replacements: LeafReplacement[] = []; for (let i = 0, len = edits.length; i < len; i++) { const edit = edits[i]; diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index 1a16096fbbd..f27fa634ebe 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -45,7 +45,7 @@ export class TextBufferFactory implements ITextBufferFactory { // TODO console.warn(`mixed line endings not handled correctly at this time!`); } - return new ChunksTextBuffer(this._pieces, this._averageChunkSize, this._getEOL(defaultEOL)); + return new ChunksTextBuffer(this._pieces, this._averageChunkSize, this._getEOL(defaultEOL), this._containsRTL, this._isBasicASCII); } public getFirstLineText(lengthLimit: number): string { @@ -98,7 +98,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { 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.substring(0, chunk.length - 1), false); + this._acceptChunk1(chunk.substr(0, chunk.length - 1), false); this._hasPreviousChar = true; this._previousChar = lastChar; } else { @@ -139,7 +139,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { public finish(): TextBufferFactory { this._finish(); console.log(`${this.totalCRCount}, ${this.totalEOLCount}`); - return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.totalCRCount, this.totalEOLCount); + return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.totalCRCount, this.totalEOLCount, this.containsRTL, this.isBasicASCII); } private _finish(): void { From 21fe74802522831a179797fba4032c9e428491fa Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:22:04 +0100 Subject: [PATCH 213/710] Normalize eol --- .../model/chunksTextBuffer/bufferPiece.ts | 4 ++++ .../chunksTextBufferBuilder.ts | 20 +++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index 6672bff60f3..ec8b1a5ec4e 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -66,6 +66,10 @@ export class BufferPiece { 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(); diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index f27fa634ebe..87968b9c534 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -41,11 +41,15 @@ export class TextBufferFactory implements ITextBufferFactory { } public create(defaultEOL: DefaultEndOfLine): ITextBuffer { + const eol = this._getEOL(defaultEOL); + let pieces = this._pieces; if (this._totalCRCount > 0 && this._totalCRCount !== this._totalEOLCount) { - // TODO - console.warn(`mixed line endings not handled correctly at this time!`); + // Normalize pieces + for (let i = 0, len = pieces.length; i < len; i++) { + pieces[i] = BufferPiece.normalizeEOL(pieces[i], eol); + } } - return new ChunksTextBuffer(this._pieces, this._averageChunkSize, this._getEOL(defaultEOL), this._containsRTL, this._isBasicASCII); + return new ChunksTextBuffer(pieces, this._averageChunkSize, eol, this._containsRTL, this._isBasicASCII); } public getFirstLineText(lengthLimit: number): string { @@ -78,16 +82,6 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { 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; From a59c44284f8c0d6e0eeb7c5280eba6a61ae20cda Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:25:52 +0100 Subject: [PATCH 214/710] Fix getLineLength for last line --- .../common/model/chunksTextBuffer/chunksTextBuffer.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 1c365f48aa9..34060b9498c 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -824,7 +824,13 @@ class Buffer { throw new Error(`Line not found`); } - const result = end.offset - start.offset - this._eolLength; + 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); From 5d85f6d50a0f265cebc8ece5723a39709b1cc062 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:33:57 +0100 Subject: [PATCH 215/710] Better EOL normalization --- .../model/chunksTextBuffer/bufferPiece.ts | 12 ++++-- .../chunksTextBufferBuilder.ts | 38 +++++++++++-------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index ec8b1a5ec4e..ded929bb31a 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -222,29 +222,33 @@ export function createUint32Array(arr: number[]): Uint32Array { export class LineStarts { constructor( public readonly lineStarts: number[], - public readonly carriageReturnCnt: number + public readonly cr: number, + public readonly lf: number, + public readonly crlf: number ) { } } export function createLineStarts(str: string): LineStarts { let r: number[] = [], rLength = 0; - let carriageReturnCnt = 0; + let cr = 0, lf = 0, crlf = 0; for (let i = 0, len = str.length; i < len; i++) { const chr = str.charCodeAt(i); if (chr === CharCode.CarriageReturn) { - carriageReturnCnt++; 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; } } - return new LineStarts(r, carriageReturnCnt); + return new LineStarts(r, cr, lf, crlf); } diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index 87968b9c534..384eb608a4b 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -15,8 +15,9 @@ export class TextBufferFactory implements ITextBufferFactory { constructor( private readonly _pieces: BufferPiece[], private readonly _averageChunkSize: number, - private readonly _totalCRCount: number, - private readonly _totalEOLCount: number, + private readonly _cr: number, + private readonly _lf: number, + private readonly _crlf: number, private readonly _containsRTL: boolean, private readonly _isBasicASCII: boolean, ) { @@ -28,11 +29,13 @@ export class TextBufferFactory implements ITextBufferFactory { * Otherwise returns '\n'. More lines end with '\n'. */ private _getEOL(defaultEOL: DefaultEndOfLine): '\r\n' | '\n' { - if (this._totalEOLCount === 0) { + 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 (this._totalCRCount > this._totalEOLCount / 2) { + if (totalCRCount > totalEOLCount / 2) { // More than half of the file contains \r\n ending lines return '\r\n'; } @@ -43,7 +46,11 @@ export class TextBufferFactory implements ITextBufferFactory { public create(defaultEOL: DefaultEndOfLine): ITextBuffer { const eol = this._getEOL(defaultEOL); let pieces = this._pieces; - if (this._totalCRCount > 0 && this._totalCRCount !== this._totalEOLCount) { + + 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); @@ -65,8 +72,9 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { private _previousChar: number; private _averageChunkSize: number; - private totalCRCount: number; - private totalEOLCount: number; + private cr: number; + private lf: number; + private crlf: number; private containsRTL: boolean; private isBasicASCII: boolean; @@ -76,8 +84,9 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._previousChar = 0; this._averageChunkSize = 0; - this.totalCRCount = 0; - this.totalEOLCount = 0; + this.cr = 0; + this.lf = 0; + this.crlf = 0; this.containsRTL = false; this.isBasicASCII = true; } @@ -126,14 +135,14 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { const lineStarts = createLineStarts(chunk); this._rawPieces.push(new BufferPiece(chunk, createUint32Array(lineStarts.lineStarts))); - this.totalCRCount += lineStarts.carriageReturnCnt; - this.totalEOLCount += lineStarts.lineStarts.length; + this.cr += lineStarts.cr; + this.lf += lineStarts.lf; + this.crlf += lineStarts.crlf; } public finish(): TextBufferFactory { this._finish(); - console.log(`${this.totalCRCount}, ${this.totalEOLCount}`); - return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.totalCRCount, this.totalEOLCount, this.containsRTL, this.isBasicASCII); + return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.cr, this.lf, this.crlf, this.containsRTL, this.isBasicASCII); } private _finish(): void { @@ -152,8 +161,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { const newLastPiece = BufferPiece.join(lastPiece, tmp); this._rawPieces[this._rawPieces.length - 1] = newLastPiece; if (this._previousChar === CharCode.CarriageReturn) { - this.totalCRCount++; - this.totalEOLCount++; + this.cr++; } } } From 85a890d3d7e5b4535a97de5f1e2190e6abf7a9f8 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 17:34:13 +0100 Subject: [PATCH 216/710] open editors: save and revert multi select aware --- .../parts/files/electron-browser/fileCommands.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 4baa25ff2c2..b64912254bd 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -244,10 +244,10 @@ CommandsRegistry.registerCommand({ const editorService = accessor.get(IWorkbenchEditorService); const textFileService = accessor.get(ITextFileService); const messageService = accessor.get(IMessageService); - resource = getResourceForCommand(resource, accessor.get(IListService), editorService); + const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); if (resource && resource.scheme !== 'untitled') { - return textFileService.revert(resource, { force: true }).then(null, error => { + return textFileService.revertAll(resources, { force: true }).then(null, error => { messageService.show(Severity.Error, nls.localize('genericRevertError', "Failed to revert '{0}': {1}", basename(resource.fsPath), toErrorMessage(error, false))); }); } @@ -473,8 +473,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: SAVE_FILE_COMMAND_ID, handler: (accessor, resource: URI) => { const editorService = accessor.get(IWorkbenchEditorService); - resource = getResourceForCommand(resource, accessor.get(IListService), editorService); - return save(resource, false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); + const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); + return TPromise.join(resources.map(r => + save(r, false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)))); } }); From 91efcf9cf679233fb7e26b5301fd38a638aa9a4b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:43:43 +0100 Subject: [PATCH 217/710] Fix getLineContent for last line --- .../common/model/chunksTextBuffer/chunksTextBuffer.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 34060b9498c..16a31292cb3 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -807,7 +807,13 @@ class Buffer { throw new Error(`Line not found`); } - const result = this.extractString(start, end.offset - start.offset - this._eolLength); + 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); From 5cf50d5bedeb727e6578e699627b2df576df2fad Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 17:50:53 +0100 Subject: [PATCH 218/710] Correct sorting of edits before applying changes --- .../common/model/chunksTextBuffer/chunksTextBuffer.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 16a31292cb3..7c987dae12c 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -1199,7 +1199,16 @@ class Buffer { return prevLeaf; } + private static _compareEdits(a: OffsetLenEdit, b: OffsetLenEdit): number { + if (a.offset === b.offset) { + return (a.initialIndex - b.initialIndex); + } + return a.offset - b.offset; + } + public replaceOffsetLen(_edits: OffsetLenEdit[]): void { + _edits.sort(Buffer._compareEdits); + const initialLeafLength = this._leafs.length; const edits = this._resolveEdits(_edits); From 504b84187fc13ca6c15416f20cc9087940340f99 Mon Sep 17 00:00:00 2001 From: isidor Date: Mon, 15 Jan 2018 17:54:18 +0100 Subject: [PATCH 219/710] files.ts rename helper functions and add getMultiSelectedEditorContexts --- src/vs/workbench/common/editor.ts | 2 +- src/vs/workbench/parts/files/browser/files.ts | 16 +++++++++++++--- .../files/electron-browser/fileCommands.ts | 19 +++++++++---------- .../electron-browser/search.contribution.ts | 4 ++-- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index 9f4352f8d05..83459cd9818 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -785,7 +785,7 @@ export interface IEditorGroup { export interface IEditorIdentifier { group: IEditorGroup; - editor: IEditorInput; + editor?: IEditorInput; } export interface IEditorContext extends IEditorIdentifier { diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts index 13f9340c0da..985fb3281cb 100644 --- a/src/vs/workbench/parts/files/browser/files.ts +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri'; import { IListService } from 'vs/platform/list/browser/listService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; -import { toResource } from 'vs/workbench/common/editor'; +import { toResource, IEditorContext } from 'vs/workbench/common/editor'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { List } from 'vs/base/browser/ui/list/listWidget'; @@ -33,10 +33,9 @@ export function getResourceForCommand(resource: URI, listService: IListService, return toResource(editorService.getActiveEditorInput(), { supportSideBySide: true }); } -export function getResourcesForCommand(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { +export function getMultiSelectedResources(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; if (list && list.isDOMFocused()) { - // Explorer if (list instanceof Tree) { const selection = list.getSelection(); @@ -56,3 +55,14 @@ export function getResourcesForCommand(resource: URI, listService: IListService, const result = getResourceForCommand(resource, listService, editorService); return !!result ? [result] : []; } + +export function getMultiSelectedEditorContexts(listService: IListService): IEditorContext[] { + const list = listService.lastFocusedList; + if (list && list.isDOMFocused() && list instanceof List) { + return list.getSelectedElements().map(element => + element instanceof OpenEditor ? { group: element.editorGroup, editor: element.editorInput } : { group: element } + ); + } + + return []; +} diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index b64912254bd..0fcef88213d 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -39,7 +39,7 @@ import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes'; import { isWindows, isMacintosh } from 'vs/base/common/platform'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { sequence } from 'vs/base/common/async'; -import { getResourceForCommand, getResourcesForCommand } from 'vs/workbench/parts/files/browser/files'; +import { getResourceForCommand, getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; // Commands @@ -244,7 +244,7 @@ CommandsRegistry.registerCommand({ const editorService = accessor.get(IWorkbenchEditorService); const textFileService = accessor.get(ITextFileService); const messageService = accessor.get(IMessageService); - const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService); if (resource && resource.scheme !== 'untitled') { return textFileService.revertAll(resources, { force: true }).then(null, error => { @@ -267,7 +267,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ const editorService = accessor.get(IWorkbenchEditorService); const listService = accessor.get(IListService); const tree = listService.lastFocusedList; - const resources = getResourcesForCommand(resource, listService, editorService); + const resources = getMultiSelectedResources(resource, listService, editorService); // Remove highlight if (tree instanceof Tree) { @@ -344,7 +344,7 @@ CommandsRegistry.registerCommand({ id: COMPARE_SELECTED_COMMAND_ID, handler: (accessor, resource: URI) => { const editorService = accessor.get(IWorkbenchEditorService); - const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService); return editorService.openEditor({ leftResource: resources[0], @@ -373,7 +373,7 @@ CommandsRegistry.registerCommand({ const revealInOSHandler = (accessor: ServicesAccessor, resource: URI) => { // Without resource, try to look at the active editor - const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); if (resources.length) { const windowsService = accessor.get(IWindowsService); @@ -401,7 +401,7 @@ CommandsRegistry.registerCommand({ }); const copyPathHandler = (accessor, resource: URI) => { - const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)); if (resources.length) { const clipboardService = accessor.get(IClipboardService); const text = resources.map(r => r.scheme === 'file' ? labels.getPathLabel(r) : r.toString()).join('\n'); @@ -473,9 +473,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: SAVE_FILE_COMMAND_ID, handler: (accessor, resource: URI) => { const editorService = accessor.get(IWorkbenchEditorService); - const resources = getResourcesForCommand(resource, accessor.get(IListService), editorService); - return TPromise.join(resources.map(r => - save(r, false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)))); + const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService); + return saveAll(resources, editorService, accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService)); } }); @@ -521,7 +520,7 @@ CommandsRegistry.registerCommand({ const workspaceEditingService = accessor.get(IWorkspaceEditingService); const contextService = accessor.get(IWorkspaceContextService); const workspace = contextService.getWorkspace(); - const resources = getResourcesForCommand(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)).filter(r => + const resources = getMultiSelectedResources(resource, accessor.get(IListService), accessor.get(IWorkbenchEditorService)).filter(r => // Need to verify resources are workspaces since multi selection can trigger this command on some non workspace resources workspace.folders.some(f => f.uri.toString() === r.toString()) ); 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 c6cf0de7e59..cee75706fd2 100644 --- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts +++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts @@ -50,7 +50,7 @@ import { ResourceContextKey } from 'vs/workbench/common/resources'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IFileService } from 'vs/platform/files/common/files'; import { distinct } from 'vs/base/common/arrays'; -import { getResourcesForCommand } from 'vs/workbench/parts/files/browser/files'; +import { getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files'; registerSingleton(ISearchWorkbenchService, SearchWorkbenchService); replaceContributions(); @@ -193,7 +193,7 @@ CommandsRegistry.registerCommand({ const listService = accessor.get(IListService); const viewletService = accessor.get(IViewletService); const fileService = accessor.get(IFileService); - const resources = getResourcesForCommand(resource, listService, accessor.get(IWorkbenchEditorService)); + const resources = getMultiSelectedResources(resource, listService, accessor.get(IWorkbenchEditorService)); return viewletService.openViewlet(Constants.VIEWLET_ID, true).then(viewlet => { if (resources && resources.length) { From 5f1973e275c3cb498b59fbfa451a68e24be55671 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 15 Jan 2018 18:10:33 +0100 Subject: [PATCH 220/710] Fix #28634 --- .../browser/parts/views/media/views.css | 30 +++++++++++++++---- .../workbench/browser/parts/views/treeView.ts | 27 +++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css index b72d184d21b..f3b98771b75 100644 --- a/src/vs/workbench/browser/parts/views/media/views.css +++ b/src/vs/workbench/browser/parts/views/media/views.css @@ -53,23 +53,24 @@ display: none; } -.custom-view-tree-node-item { +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item { display: flex; height: 22px; line-height: 22px; -} - -.custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel { flex: 1; + text-overflow: ellipsis; + overflow: hidden; + flex-wrap: nowrap } -.custom-view-tree-node-item > .custom-view-tree-node-item-label { +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel, +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-label { flex: 1; text-overflow: ellipsis; overflow: hidden; } -.custom-view-tree-node-item > .custom-view-tree-node-item-icon { +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-icon { background-size: 16px; background-position: left center; background-repeat: no-repeat; @@ -77,4 +78,21 @@ width: 16px; height: 22px; -webkit-font-smoothing: antialiased; +} + +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .actions { + display: none; +} + +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row:hover .custom-view-tree-node-item > .actions, +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.selected .custom-view-tree-node-item > .actions, +.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.focused .custom-view-tree-node-item > .actions { + display: block; +} + +.tree-explorer-viewlet-tree-view .monaco-tree .custom-view-tree-node-item > .actions .action-label { + width: 16px; + height: 100%; + background-position: 50% 50%; + background-repeat: no-repeat; } \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index c41395ca4b5..7c31277a9a3 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -21,7 +21,7 @@ import { createActionItem, fillInActions } from 'vs/platform/actions/browser/men import { IProgressService } from 'vs/platform/progress/common/progress'; import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; +import { ActionItem, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet'; @@ -90,7 +90,7 @@ export class TreeView extends TreeViewsViewletPanel { public createViewer(container: Builder): WorkbenchTree { const dataSource = this.instantiationService.createInstance(TreeDataSource, this.id); - const renderer = this.instantiationService.createInstance(TreeRenderer); + const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, this.menus); const controller = this.instantiationService.createInstance(TreeController, this.id, this.menus); const tree = new FileIconThemableWorkbenchTree( container.getHTMLElement(), @@ -271,6 +271,7 @@ interface ITreeExplorerTemplateData { label: HTMLElement; resourceLabel: ResourceLabel; icon: HTMLElement; + actionBar: ActionBar; } class TreeRenderer implements IRenderer { @@ -279,6 +280,8 @@ class TreeRenderer implements IRenderer { private static readonly TREE_TEMPLATE_ID = 'treeExplorer'; constructor( + private treeViewId: string, + private menus: Menus, @IInstantiationService private instantiationService: IInstantiationService, @IThemeService private themeService: IThemeService ) { @@ -297,10 +300,13 @@ class TreeRenderer implements IRenderer { const icon = DOM.append(el, DOM.$('.custom-view-tree-node-item-icon')); const label = DOM.append(el, DOM.$('.custom-view-tree-node-item-label')); - const resourceLabelContainer = DOM.append(el, DOM.$('.custom-view-tree-node-item-resourceLabelContainer')); - const resourceLabel = this.instantiationService.createInstance(ResourceLabel, resourceLabelContainer, { supportHighlights: true }); + const resourceLabel = this.instantiationService.createInstance(ResourceLabel, el, {}); + const actionsContainer = DOM.append(el, DOM.$('.actions')); + const actionBar = new ActionBar(actionsContainer, { + actionRunner: new MultipleSelectionActionRunner(() => tree.getSelection()) + }); - return { label, resourceLabel, icon }; + return { label, resourceLabel, icon, actionBar }; } public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void { @@ -309,7 +315,9 @@ class TreeRenderer implements IRenderer { const theme = this.themeService.getTheme(); const icon = theme.type === LIGHT ? node.icon : node.iconDark; + // reset templateData.resourceLabel.clear(); + templateData.actionBar.clear(); templateData.label.textContent = ''; DOM.removeClass(templateData.label, 'custom-view-tree-node-item-label'); DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel'); @@ -326,6 +334,9 @@ class TreeRenderer implements IRenderer { DOM.addClass(templateData.icon, 'custom-view-tree-node-item-icon'); } } + + templateData.actionBar.context = ({ $treeViewId: this.treeViewId, $treeItemHandle: node.handle }); + templateData.actionBar.push(this.menus.getResourceActions(node), { icon: true, label: false }); } public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void { @@ -458,6 +469,10 @@ class Menus implements IDisposable { return this.titleSecondaryActions; } + getResourceActions(element: ITreeItem): IAction[] { + return this.getActions(MenuId.ViewItemContext, { key: 'viewItem', value: element.contextValue }).primary; + } + getResourceContextActions(element: ITreeItem): IAction[] { return this.getActions(MenuId.ViewItemContext, { key: 'viewItem', value: element.contextValue }).secondary; } @@ -471,7 +486,7 @@ class Menus implements IDisposable { const primary: IAction[] = []; const secondary: IAction[] = []; const result = { primary, secondary }; - fillInActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService); + fillInActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService, g => /^inline/.test(g)); menu.dispose(); contextKeyService.dispose(); From 7d8065a8893193ddf214a034543bbc5e4ad5cdf9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 15 Jan 2018 18:31:47 +0100 Subject: [PATCH 221/710] Adding more doc to `id` attribute --- src/vs/vscode.d.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index f4458445d4d..8c20bafb740 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4968,7 +4968,11 @@ declare module 'vscode' { label: string; /** - * Optional id for the tree item. + * Optional id for the tree item that has to be unique across tree. If not provided, an unique id is generated using the tree item's label. + * + * This is used by the view to preserve the selection and expansion state of the tree item. + * + * *Note:* With generated id, tree item's view state will be reset when label is changed. */ id?: string; From 77f1ef8445866e0ad9c9f14f5dee77e44a390f33 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 15 Jan 2018 18:31:52 +0100 Subject: [PATCH 222/710] :lipstick: --- .../workbench/parts/preferences/browser/preferencesEditor.ts | 3 +-- .../workbench/services/files/electron-browser/fileService.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 3f5312baea0..bc1516350e7 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -122,8 +122,7 @@ export class PreferencesEditor extends BaseEditor { @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IContextKeyService private contextKeyService: IContextKeyService, @IInstantiationService private instantiationService: IInstantiationService, - @IThemeService themeService: IThemeService, - @IStorageService storageService: IStorageService, + @IThemeService themeService: IThemeService ) { super(PreferencesEditor.ID, telemetryService, themeService); this.defaultSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(this.contextKeyService); diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts index 3d199425abc..5eeae64bf3a 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/electron-browser/fileService.ts @@ -100,7 +100,7 @@ export class FileService implements IFileService { // Forward to unexpected error handler errors.onUnexpectedError(msg); - // Detect if we run < .NET Framework 4.5 + // Detect if we run < .NET Framework 4.5 (TODO@ben remove with new watcher impl) if (typeof msg === 'string' && msg.indexOf(FileService.NET_VERSION_ERROR) >= 0 && !this.storageService.getBoolean(FileService.NET_VERSION_ERROR_IGNORE_KEY, StorageScope.WORKSPACE)) { this.messageService.show(Severity.Warning, { message: nls.localize('netVersionError', "The Microsoft .NET Framework 4.5 is required. Please follow the link to install it."), From 05e3a545fd6c22bf5ff8aa26c0a0d32416eb0d1d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 15 Jan 2018 18:50:46 +0100 Subject: [PATCH 223/710] fix list styling with decorations and selected item --- src/vs/base/browser/ui/iconLabel/iconlabel.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/base/browser/ui/iconLabel/iconlabel.css b/src/vs/base/browser/ui/iconLabel/iconlabel.css index 6e6a73fb542..66125a6d41a 100644 --- a/src/vs/base/browser/ui/iconLabel/iconlabel.css +++ b/src/vs/base/browser/ui/iconLabel/iconlabel.css @@ -63,8 +63,8 @@ /* make sure selection color wins when a label is being selected */ .monaco-tree.focused .selected .monaco-icon-label, /* tree */ .monaco-tree.focused .selected .monaco-icon-label::after, -.monaco-list:focus .focused.selected .monaco-icon-label, /* list */ -.monaco-list:focus .focused.selected .monaco-icon-label::after +.monaco-list:focus .selected .monaco-icon-label, /* list */ +.monaco-list:focus .selected .monaco-icon-label::after { color: inherit !important; } From e2de39efb297e0b00dcbb6f35914e70b77838812 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 15 Jan 2018 20:06:25 +0100 Subject: [PATCH 224/710] provide cross-position closeEditors methods --- .../browser/parts/editor/editorPart.ts | 59 ++++++++++++++++--- .../services/editor/common/editorService.ts | 26 ++++++-- .../editor/test/browser/editorService.test.ts | 9 ++- .../workbench/test/workbenchTestServices.ts | 10 ++-- 4 files changed, 85 insertions(+), 19 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index fe4c2e000b2..bae70a729c0 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -73,6 +73,10 @@ interface IEditorReplacement extends EditorIdentifier { options?: EditorOptions; } +export type ICloseEditorsFilter = { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }; +export type ICloseEditorsByFilterArgs = { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }; +export type ICloseEditorsArgs = { positionOne?: EditorInput[], positionTwo?: EditorInput[], positionThree?: EditorInput[] }; + /** * The editor part is the container for editors in the workbench. Based on the editor input being opened, it asks the registered * editor for the given input to show the contents. The editor part supports up to 3 side-by-side editors. @@ -710,16 +714,53 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this.doCloseActiveEditor(group); } - public closeEditors(position: Position, filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors: EditorInput[]): TPromise; - public closeEditors(position: Position, filterOrEditors?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean } | EditorInput[]): TPromise { + public closeEditors(editors: ICloseEditorsByFilterArgs): TPromise; + public closeEditors(editors: ICloseEditorsArgs): TPromise; + public closeEditors(positionOrEditors: Position | ICloseEditorsByFilterArgs | ICloseEditorsArgs, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { + + // First check for specific position passed in + if (typeof positionOrEditors === 'number') { + return this.doCloseEditorsAtPosition(positionOrEditors, filterOrEditors).then(veto => void 0); + } + + // Otherwise close by positions starting from last to first + // to prevent issues when editor groups close and thus move + // other editors around that are still open. + let positionThreeClose = TPromise.as(false); + if (positionOrEditors.positionThree) { + positionThreeClose = this.doCloseEditorsAtPosition(Position.THREE, positionOrEditors.positionThree); + } + + return positionThreeClose.then(veto => { + if (veto) { + return void 0; // return earlier when a veto is triggered by the user + } + + let positionTwoClose = TPromise.as(false); + if (positionOrEditors.positionTwo) { + positionTwoClose = this.doCloseEditorsAtPosition(Position.TWO, positionOrEditors.positionTwo); + } + + return positionTwoClose.then(veto => { + if (veto || !positionOrEditors.positionOne) { + return void 0; // return earlier when a veto is triggered by the user + } + + return this.doCloseEditorsAtPosition(Position.ONE, positionOrEditors.positionOne).then(veto => void 0); + }); + }); + } + + private doCloseEditorsAtPosition(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { const group = this.stacks.groupAt(position); if (!group) { - return TPromise.wrap(null); + return TPromise.wrap(false); } let editorsToClose: EditorInput[]; - let filter: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }; + let filter: ICloseEditorsFilter; if (Array.isArray(filterOrEditors)) { editorsToClose = filterOrEditors; filter = Object.create(null); @@ -746,16 +787,20 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Check for dirty and veto return this.handleDirty(editorsToClose.map(editor => { return { group, editor }; }), true /* ignore if opened in other group */).then(veto => { if (veto) { - return; + return true; } // Close without filter if (Array.isArray(filterOrEditors)) { - return this.doCloseEditors(group, editorsToClose); + this.doCloseEditors(group, editorsToClose); } // Close with filter - return this.doCloseEditorsWithFilter(group, filter); + else { + this.doCloseEditorsWithFilter(group, filter); + } + + return false; }); } diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index 215b03c98ad..71f81eeb0bd 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -29,6 +29,8 @@ export const IWorkbenchEditorService = createDecorator( export type IResourceInputType = IResourceInput | IUntitledResourceInput | IResourceDiffInput | IResourceSideBySideInput; +export type ICloseEditorsFilter = { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }; + /** * The editor service allows to open editors and work on the active * editor input and models. @@ -90,13 +92,23 @@ export interface IWorkbenchEditorService extends IEditorService { * will not be closed. The direction can be used in that case to control if all other editors should get closed, * or towards a specific direction. */ - closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; /** * Closes the provided editors of a specific group at the provided position. */ closeEditors(position: Position, editors: IEditorInput[]): TPromise; + /** + * Closes specific editors across all groups at once. + */ + closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; + + /** + * Closes specific editors across all groups at once. + */ + closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; + /** * Closes all editors across all groups. The optional position allows to keep one group alive. */ @@ -115,8 +127,10 @@ export interface IEditorPart { openEditors(editors: { input: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], sideBySide?: boolean): TPromise; replaceEditors(editors: { toReplace: IEditorInput, replaceWith: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], position?: Position): TPromise; closeEditor(position: Position, input: IEditorInput): TPromise; - closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; closeEditors(position: Position, editors: IEditorInput[]): TPromise; + closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; + closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; closeAllEditors(except?: Position): TPromise; getActiveEditor(): IEditor; getVisibleEditors(): IEditor[]; @@ -260,10 +274,12 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { return this.editorPart.closeEditor(position, input); } - public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors: IEditorInput[]): TPromise; - public closeEditors(position: Position, filterOrEditors?: any): TPromise { - return this.editorPart.closeEditors(position, filterOrEditors); + public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; + public closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; + public closeEditors(positionOrEditors: any, filterOrEditors?: any): TPromise { + return this.editorPart.closeEditors(positionOrEditors, filterOrEditors); } public closeAllEditors(except?: Position): TPromise { diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index 3e467c8e195..3e0c36641e2 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { Promise, TPromise } from 'vs/base/common/winjs.base'; import paths = require('vs/base/common/paths'); -import { Position, Direction, IEditor, IEditorInput } from 'vs/platform/editor/common/editor'; +import { Position, IEditor, IEditorInput } from 'vs/platform/editor/common/editor'; import URI from 'vs/base/common/uri'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { EditorInput, EditorOptions, TextEditorOptions } from 'vs/workbench/common/editor'; @@ -18,6 +18,7 @@ import { DelegatingWorkbenchEditorService, WorkbenchEditorService, IEditorPart } import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; +import { ICloseEditorsFilter } from 'vs/workbench/browser/parts/editor/editorPart'; let activeEditor: BaseEditor = { getSelection: function () { @@ -51,9 +52,11 @@ class TestEditorPart implements IEditorPart { return TPromise.as([]); } - public closeEditors(position: Position, filter?: { except?: EditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors?: EditorInput[]): TPromise; - public closeEditors(position: Position, filterOrEditors: any): TPromise { + public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; + public closeEditors(editors: { positionOne?: EditorInput[], positionTwo?: EditorInput[], positionThree?: EditorInput[] }): TPromise; + public closeEditors(positionOrEditors: any, filterOrEditors?: any): TPromise { return TPromise.as(null); } diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 636f79434ff..db5b67c803d 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -23,7 +23,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag import { IPartService, Parts, Position as PartPosition, Dimension } 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, Direction, IEditor, IResourceInput } from 'vs/platform/editor/common/editor'; +import { IEditorInput, IEditorOptions, Position, IEditor, IResourceInput } from 'vs/platform/editor/common/editor'; import { IUntitledEditorService, UntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IMessageService, IConfirmation, IConfirmationResult, IChoiceService } from 'vs/platform/message/common/message'; import { IWorkspaceContextService, IWorkspace as IWorkbenchWorkspace, WorkbenchState, IWorkspaceFolder, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace'; @@ -41,7 +41,7 @@ import { IRawTextContent, ITextFileService } from 'vs/workbench/services/textfil import { parseArgs } from 'vs/platform/environment/node/argv'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { IModeService } from 'vs/editor/common/services/modeService'; -import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IWorkbenchEditorService, ICloseEditorsFilter } from 'vs/workbench/services/editor/common/editorService'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; @@ -606,9 +606,11 @@ export class TestEditorService implements IWorkbenchEditorService { return TPromise.as([]); } - public closeEditors(position: Position, filter?: { except?: IEditorInput, direction?: Direction, unmodifiedOnly?: boolean }): TPromise; + public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors: IEditorInput[]): TPromise; - public closeEditors(position: Position, filterOrEditors?: any): TPromise { + public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; + public closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; + public closeEditors(positionOrEditors: any, filterOrEditors?: any): TPromise { return TPromise.as(null); } From 97a199d02c27d5571b67e8956e333cea484b8d34 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 11:03:45 -0800 Subject: [PATCH 225/710] wire up types, #36946 --- src/vs/workbench/api/node/extHost.api.impl.ts | 6 ++---- src/vs/workbench/api/node/extHostTypes.ts | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index a1d13f701f7..54deff05595 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -51,7 +51,6 @@ import { TextEditorCursorStyle } from 'vs/editor/common/config/editorOptions'; import { ProxyIdentifier } from 'vs/workbench/services/extensions/node/proxyIdentifier'; import { ExtHostDialogs } from 'vs/workbench/api/node/extHostDialogs'; import { ExtHostFileSystem } from 'vs/workbench/api/node/extHostFileSystem'; -import { FileChangeType, FileType } from 'vs/platform/files/common/files'; import { ExtHostDecorations } from 'vs/workbench/api/node/extHostDecorations'; import { toGlobPattern, toLanguageSelector } from 'vs/workbench/api/node/extHostTypeConverters'; import { ExtensionActivatedByAPI } from 'vs/workbench/api/node/extHostExtensionActivator'; @@ -616,9 +615,8 @@ export function createApiFactory( ConfigurationTarget: extHostTypes.ConfigurationTarget, RelativePattern: extHostTypes.RelativePattern, - // todo@remote - FileChangeType: FileChangeType, - FileType: FileType + FileChangeType: extHostTypes.FileChangeType, + FileType: extHostTypes.FileType }; }; } diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 4b5289a41e9..76c30af3a0f 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -1546,3 +1546,19 @@ export enum LogLevel { Critical = 6, Off = 7 } + +//#region file api +// todo@remote +export enum FileChangeType { + Updated = 0, + Added = 1, + Deleted = 2 +} + +export enum FileType { + File = 0, + Dir = 1, + Symlink = 2 +} + +//#endregion From d1ec084353bae62243b16333fa78627a4fc70180 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 11:11:21 -0800 Subject: [PATCH 226/710] tackle, #41637 --- .../services/files/node/watcher/nsfw/watcherService.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts index eb14be46361..675e464d805 100644 --- a/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts +++ b/src/vs/workbench/services/files/node/watcher/nsfw/watcherService.ts @@ -15,6 +15,7 @@ import { FileChangesEvent, IFilesConfiguration } from 'vs/platform/files/common/ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; +import { Schemas } from 'vs/base/common/network'; export class FileWatcher { private static readonly MAX_RESTARTS = 5; @@ -97,7 +98,10 @@ export class FileWatcher { return; } - this.service.setRoots(this.contextService.getWorkspace().folders.map(folder => { + this.service.setRoots(this.contextService.getWorkspace().folders.filter(folder => { + // Only workspace folders on disk + return folder.uri.scheme === Schemas.file; + }).map(folder => { // Fetch the root's watcherExclude setting and return it const configuration = this.configurationService.getValue({ resource: folder.uri @@ -128,4 +132,4 @@ export class FileWatcher { this.isDisposed = true; this.toDispose = dispose(this.toDispose); } -} \ No newline at end of file +} From 09e36c7d00d29764c369fcf4dceaafbdf95ed7b7 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 15 Jan 2018 20:20:37 +0100 Subject: [PATCH 227/710] allow to closeAllEditors across multiple groups --- src/vs/workbench/browser/parts/editor/editorPart.ts | 13 ++++++++++--- .../services/editor/common/editorService.ts | 12 ++++++++++-- .../editor/test/browser/editorService.test.ts | 4 +++- src/vs/workbench/test/workbenchTestServices.ts | 4 +++- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index bae70a729c0..91525db61cb 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -687,12 +687,19 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this.textCompareEditorVisible.set(this.visibleEditors.some(e => e && e.isVisible() && e.getId() === TEXT_DIFF_EDITOR_ID)); } - public closeAllEditors(except?: Position): TPromise { + public closeAllEditors(except?: Position): TPromise; + public closeAllEditors(positions?: Position[]): TPromise; + public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { let groups = this.stacks.groups.reverse(); // start from the end to prevent layout to happen through rochade // Remove position to exclude if we have any - if (typeof except === 'number') { - groups = groups.filter(group => this.stacks.positionOfGroup(group) !== except); + if (typeof exceptOrPositions === 'number') { + groups = groups.filter(group => this.stacks.positionOfGroup(group) !== exceptOrPositions); + } + + // Remove positions that are not being asked for + else if (Array.isArray(exceptOrPositions)) { + groups = groups.filter(group => exceptOrPositions.indexOf(this.stacks.positionOfGroup(group)) >= 0); } // Check for dirty and veto diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index 71f81eeb0bd..d480e2fa838 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -114,6 +114,11 @@ export interface IWorkbenchEditorService extends IEditorService { */ closeAllEditors(except?: Position): TPromise; + /** + * Closes all editors of the provided groups. + */ + closeAllEditors(positions: Position[]): TPromise; + /** * Allows to resolve an untyped input to a workbench typed instanceof editor input */ @@ -132,6 +137,7 @@ export interface IEditorPart { closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; closeAllEditors(except?: Position): TPromise; + closeAllEditors(positions?: Position[]): TPromise; getActiveEditor(): IEditor; getVisibleEditors(): IEditor[]; getActiveEditorInput(): IEditorInput; @@ -282,8 +288,10 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { return this.editorPart.closeEditors(positionOrEditors, filterOrEditors); } - public closeAllEditors(except?: Position): TPromise { - return this.editorPart.closeAllEditors(except); + public closeAllEditors(except?: Position): TPromise; + public closeAllEditors(positions?: Position[]): TPromise; + public closeAllEditors(exceptOrPositions?: any): TPromise { + return this.editorPart.closeAllEditors(exceptOrPositions); } public createInput(input: IEditorInput): EditorInput; diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index 3e0c36641e2..980d71eedd1 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -60,7 +60,9 @@ class TestEditorPart implements IEditorPart { return TPromise.as(null); } - public closeAllEditors(except?: Position): TPromise { + public closeAllEditors(except?: Position): TPromise; + public closeAllEditors(positions?: Position[]): TPromise; + public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { return TPromise.as(null); } diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index db5b67c803d..5ba18a3bcc6 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -614,7 +614,9 @@ export class TestEditorService implements IWorkbenchEditorService { return TPromise.as(null); } - public closeAllEditors(except?: Position): TPromise { + public closeAllEditors(except?: Position): TPromise; + public closeAllEditors(positions?: Position[]): TPromise; + public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { return TPromise.as(null); } From 9401875dfc432059cd8f15fcc52f1ece8998b99e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 11:25:22 -0800 Subject: [PATCH 228/710] more type fixes for #36946 --- .../api/electron-browser/mainThreadFileSystem.ts | 12 ++++++++---- src/vs/workbench/api/node/extHost.protocol.ts | 9 +++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index b98c0103c54..c2dc6e8aa81 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -6,7 +6,7 @@ import URI, { UriComponents } from 'vs/base/common/uri'; import { TPromise, PPromise } from 'vs/base/common/winjs.base'; -import { ExtHostContext, MainContext, IExtHostContext, MainThreadFileSystemShape, ExtHostFileSystemShape } from '../node/extHost.protocol'; +import { ExtHostContext, MainContext, IExtHostContext, MainThreadFileSystemShape, ExtHostFileSystemShape, IFileChangeDto } from '../node/extHost.protocol'; import { IFileService, IFileSystemProvider, IStat, IFileChange } from 'vs/platform/files/common/files'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import Event, { Emitter } from 'vs/base/common/event'; @@ -50,7 +50,7 @@ export class MainThreadFileSystem implements MainThreadFileSystemShape { this._workspaceEditingService.addFolders([{ uri: URI.revive(data) }], true).done(null, onUnexpectedError); } - $onFileSystemChange(handle: number, changes: IFileChange[]): void { + $onFileSystemChange(handle: number, changes: IFileChangeDto[]): void { this._provider.get(handle).$onFileSystemChange(changes); } @@ -118,8 +118,12 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv this._onDidChange.dispose(); } - $onFileSystemChange(changes: IFileChange[]): void { - this._onDidChange.fire(changes); + $onFileSystemChange(changes: IFileChangeDto[]): void { + this._onDidChange.fire(changes.map(RemoteFileSystemProvider._createFileChange)); + } + + private static _createFileChange(dto: IFileChangeDto): IFileChange { + return { resource: URI.revive(dto.resource), type: dto.type }; } // --- forwarding calls diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 44ca4d7f3cd..a08706a7e6b 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -48,7 +48,7 @@ import { ITreeItem } from 'vs/workbench/common/views'; import { ThemeColor } from 'vs/platform/theme/common/themeService'; import { IDisposable } from 'vs/base/common/lifecycle'; import { SerializedError } from 'vs/base/common/errors'; -import { IStat, IFileChange } from 'vs/platform/files/common/files'; +import { IStat, FileChangeType } from 'vs/platform/files/common/files'; import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry'; import { ParsedArgs } from 'vs/platform/environment/common/environment'; import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration'; @@ -366,12 +366,17 @@ export interface MainThreadWorkspaceShape extends IDisposable { $saveAll(includeUntitled?: boolean): Thenable; } +export interface IFileChangeDto { + resource: UriComponents; + type: FileChangeType; +} + export interface MainThreadFileSystemShape extends IDisposable { $registerFileSystemProvider(handle: number, scheme: string): void; $unregisterFileSystemProvider(handle: number): void; $onDidAddFileSystemRoot(root: UriComponents): void; - $onFileSystemChange(handle: number, resource: IFileChange[]): void; + $onFileSystemChange(handle: number, resource: IFileChangeDto[]): void; $reportFileChunk(handle: number, session: number, chunk: number[] | null): void; $handleFindMatch(handle: number, session, data: UriComponents | [UriComponents, ILineMatch]): void; From a54050a58e4a62a3304575d4f5e80f71baf573e0 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 15 Jan 2018 20:26:42 +0100 Subject: [PATCH 229/710] :lipstick: --- src/vs/workbench/browser/parts/editor/editorPart.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 91525db61cb..d433347b4d5 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -729,7 +729,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // First check for specific position passed in if (typeof positionOrEditors === 'number') { - return this.doCloseEditorsAtPosition(positionOrEditors, filterOrEditors).then(veto => void 0); + return this.doCloseEditorsAtPosition(positionOrEditors, filterOrEditors, true /* ignore if opened in other group */).then(veto => void 0); } // Otherwise close by positions starting from last to first @@ -760,7 +760,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService }); } - private doCloseEditorsAtPosition(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { + private doCloseEditorsAtPosition(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[], ignoreIfOpenedInOtherGroup?: boolean): TPromise { const group = this.stacks.groupAt(position); if (!group) { return TPromise.wrap(false); @@ -792,7 +792,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService } // Check for dirty and veto - return this.handleDirty(editorsToClose.map(editor => { return { group, editor }; }), true /* ignore if opened in other group */).then(veto => { + return this.handleDirty(editorsToClose.map(editor => { return { group, editor }; }), ignoreIfOpenedInOtherGroup).then(veto => { if (veto) { return true; } From 1038c4bff5efb1984b9e9465513d29eec4931eda Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 11:31:23 -0800 Subject: [PATCH 230/710] don't encode special character for labels, #40662 --- src/vs/base/common/labels.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/base/common/labels.ts b/src/vs/base/common/labels.ts index 3007f2757a0..e00cc11da16 100644 --- a/src/vs/base/common/labels.ts +++ b/src/vs/base/common/labels.ts @@ -30,7 +30,7 @@ export function getPathLabel(resource: URI | string, rootProvider?: IWorkspaceFo } if (resource.scheme !== 'file' && resource.scheme !== 'untitled') { - return resource.with({ query: null, fragment: null }).toString(false); + return resource.with({ query: null, fragment: null }).toString(true); } // return early if we can resolve a relative path label from the root From b4ee65d1e3308497b729f47abd2a8271d938b4a7 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 14:45:55 -0800 Subject: [PATCH 231/710] limit suggestions that can be remembered, #41060only items from the top bucket will be remembered and pre-selected the next time suggestion happens --- .../contrib/suggest/suggestController.ts | 32 +++++++++++-------- .../editor/contrib/suggest/suggestMemory.ts | 16 ++++++++++ .../editor/contrib/suggest/suggestWidget.ts | 27 +++++++++++----- .../contrib/suggest/test/suggestModel.test.ts | 5 +-- 4 files changed, 56 insertions(+), 24 deletions(-) diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index 7d7013aaa1a..c1222e825b2 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -25,7 +25,7 @@ import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2 import { Context as SuggestContext } from './suggest'; import { SuggestModel, State } from './suggestModel'; import { ICompletionItem } from './completionModel'; -import { SuggestWidget } from './suggestWidget'; +import { SuggestWidget, ISelectedSuggestion } from './suggestWidget'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { SuggestMemories } from 'vs/editor/contrib/suggest/suggestMemory'; @@ -34,9 +34,9 @@ class AcceptOnCharacterOracle { private _disposables: IDisposable[] = []; private _activeAcceptCharacters = new Set(); - private _activeItem: ICompletionItem; + private _activeItem: ISelectedSuggestion; - constructor(editor: ICodeEditor, widget: SuggestWidget, accept: (item: ICompletionItem) => any) { + constructor(editor: ICodeEditor, widget: SuggestWidget, accept: (selected: ISelectedSuggestion) => any) { this._disposables.push(widget.onDidShow(() => this._onItem(widget.getFocusedItem()))); this._disposables.push(widget.onDidFocus(this._onItem, this)); @@ -52,14 +52,14 @@ class AcceptOnCharacterOracle { })); } - private _onItem(item: ICompletionItem): void { - if (!item || isFalsyOrEmpty(item.suggestion.commitCharacters)) { + private _onItem(selected: ISelectedSuggestion): void { + if (!selected || isFalsyOrEmpty(selected.item.suggestion.commitCharacters)) { this.reset(); return; } - this._activeItem = item; + this._activeItem = selected; this._activeAcceptCharacters.clear(); - for (const ch of item.suggestion.commitCharacters) { + for (const ch of selected.item.suggestion.commitCharacters) { if (ch.length > 0) { this._activeAcceptCharacters.add(ch[0]); } @@ -148,7 +148,7 @@ export class SuggestController implements IEditorContribution { ); let makesTextEdit = SuggestContext.MakesTextEdit.bindTo(this._contextKeyService); - this._toDispose.push(this._widget.onDidFocus(item => { + this._toDispose.push(this._widget.onDidFocus(({ item }) => { const position = this._editor.getPosition(); const startColumn = item.position.column - item.suggestion.overwriteBefore; @@ -193,13 +193,13 @@ export class SuggestController implements IEditorContribution { } } - protected _onDidSelectItem(item: ICompletionItem): void { - if (!item) { + protected _onDidSelectItem(event: ISelectedSuggestion): void { + if (!event.item) { this._model.cancel(); return; } - const { suggestion, position } = item; + const { suggestion, position } = event.item; const editorColumn = this._editor.getPosition().column; const columnDelta = editorColumn - position.column; @@ -209,8 +209,12 @@ export class SuggestController implements IEditorContribution { this._editor.pushUndoStop(); } - // remember this word for future invocations - this._memory.remember(this._editor.getModel().getLanguageIdentifier(), item); + // remember this suggestion for future invocations + // when it wasn't the first suggestion but from the group + // of top suggestions (cons -> const, console, constructor) + if (event.model.items[0].score === event.item.score) { + this._memory.remember(this._editor.getModel().getLanguageIdentifier(), event.item); + } let { insertText } = suggestion; if (suggestion.snippetType !== 'textmate') { @@ -237,7 +241,7 @@ export class SuggestController implements IEditorContribution { this._model.cancel(); } - this._alertCompletionItem(item); + this._alertCompletionItem(event.item); } private _alertCompletionItem({ suggestion }: ICompletionItem): void { diff --git a/src/vs/editor/contrib/suggest/suggestMemory.ts b/src/vs/editor/contrib/suggest/suggestMemory.ts index 1d4c32c0281..46a02a46e85 100644 --- a/src/vs/editor/contrib/suggest/suggestMemory.ts +++ b/src/vs/editor/contrib/suggest/suggestMemory.ts @@ -79,7 +79,23 @@ export class SuggestMemory { } select(items: ICompletionItem[], last: ICompletionItem): number { + + if (items.length === 0) { + return -1; + } + + const topScore = items[0].score; + for (let i = 0; i < items.length; i++) { + + if (topScore !== items[i].score) { + // we only take a look at the bucket + // of top matches, hence we return + // as soon as we see an item that + // hasn't the top score anymore + return -1; + } + if (items[i] === last) { // prefer the last selected item when // there is one diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 1742ab97781..9365f672b0c 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -335,6 +335,12 @@ class SuggestionDetails { } } +export interface ISelectedSuggestion { + item: ICompletionItem; + index: number; + model: CompletionModel; +} + export class SuggestWidget implements IContentWidget, IDelegate, IDisposable { private static ID: string = 'editor.widget.suggestWidget'; @@ -368,14 +374,14 @@ export class SuggestWidget implements IContentWidget, IDelegate private showTimeout: TPromise; private toDispose: IDisposable[]; - private onDidSelectEmitter = new Emitter(); - private onDidFocusEmitter = new Emitter(); + private onDidSelectEmitter = new Emitter(); + private onDidFocusEmitter = new Emitter(); private onDidHideEmitter = new Emitter(); private onDidShowEmitter = new Emitter(); - readonly onDidSelect: Event = this.onDidSelectEmitter.event; - readonly onDidFocus: Event = this.onDidFocusEmitter.event; + readonly onDidSelect: Event = this.onDidSelectEmitter.event; + readonly onDidFocus: Event = this.onDidFocusEmitter.event; readonly onDidHide: Event = this.onDidHideEmitter.event; readonly onDidShow: Event = this.onDidShowEmitter.event; @@ -499,8 +505,9 @@ export class SuggestWidget implements IContentWidget, IDelegate } const item = e.elements[0]; + const index = e.indexes[0]; item.resolve().then(() => { - this.onDidSelectEmitter.fire(item); + this.onDidSelectEmitter.fire({ item, index, model: this.completionModel }); }); alert(nls.localize('suggestionAriaAccepted', "{0}, accepted", item.suggestion.label)); @@ -613,7 +620,7 @@ export class SuggestWidget implements IContentWidget, IDelegate .then(() => this.currentSuggestionDetails = null); // emit an event - this.onDidFocusEmitter.fire(item); + this.onDidFocusEmitter.fire({ item, index, model: this.completionModel }); } private setState(state: State): void { @@ -838,12 +845,16 @@ export class SuggestWidget implements IContentWidget, IDelegate } } - getFocusedItem(): ICompletionItem { + getFocusedItem(): ISelectedSuggestion { if (this.state !== State.Hidden && this.state !== State.Empty && this.state !== State.Loading) { - return this.list.getFocusedElements()[0]; + return { + item: this.list.getFocusedElements()[0], + index: this.list.getFocus()[0], + model: this.completionModel + }; } return undefined; } diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts index e50fd6a7731..e1c3d114de8 100644 --- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts @@ -25,6 +25,7 @@ import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands'; import { SuggestController } from 'vs/editor/contrib/suggest/suggestController'; import { IStorageService, NullStorageService } from 'vs/platform/storage/common/storage'; import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; +import { ISelectedSuggestion } from 'vs/editor/contrib/suggest/suggestWidget'; function createMockEditor(model: TextModel): TestCodeEditor { const contextKeyService = new MockContextKeyService(); @@ -590,7 +591,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () { return withOracle(async (sugget, editor) => { class TestCtrl extends SuggestController { - _onDidSelectItem(item) { + _onDidSelectItem(item: ISelectedSuggestion) { super._onDidSelectItem(item); } } @@ -606,7 +607,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () { const [first] = event.completionModel.items; assert.equal(first.suggestion.label, 'bar'); - ctrl._onDidSelectItem(first); + ctrl._onDidSelectItem({ item: first, index: 0, model: event.completionModel }); }); assert.equal( From c677bf31e27c7c8ba272a4f4d6a498ab80a02784 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 15:18:13 -0800 Subject: [PATCH 232/710] write meta.json file #41408 --- .../api/node/extHostExtensionService.ts | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 0767c62d320..d16146a5e0d 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -6,7 +6,7 @@ import { dispose } from 'vs/base/common/lifecycle'; import { join } from 'path'; -import { mkdirp, dirExists, realpath } from 'vs/base/node/pfs'; +import { mkdirp, dirExists, realpath, writeFile } from 'vs/base/node/pfs'; import Severity from 'vs/base/common/severity'; import { TPromise } from 'vs/base/common/winjs.base'; import { ExtensionDescriptionRegistry } from 'vs/workbench/services/extensions/node/extensionDescriptionRegistry'; @@ -88,24 +88,32 @@ class ExtensionStoragePath { return undefined; } - private _getOrCreateWorkspaceStoragePath(): TPromise { + private async _getOrCreateWorkspaceStoragePath(): TPromise { if (!this._workspace) { return TPromise.as(undefined); } + const storageName = this._workspace.id; const storagePath = join(this._environment.appSettingsHome, 'workspaceStorage', storageName); - return dirExists(storagePath).then(exists => { - if (exists) { - return storagePath; - } + const exists = await dirExists(storagePath); - return mkdirp(storagePath).then(success => { - return storagePath; - }, err => { - return undefined; - }); - }); + if (exists) { + return storagePath; + } + + try { + await mkdirp(storagePath); + await writeFile( + join(storagePath, 'meta.json'), + JSON.stringify({ id: this._workspace.id }) + ); + return storagePath; + + } catch (e) { + console.error(e); + return undefined; + } } } From c0278341edcb6d831d24b5da3e854c6189829b12 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Mon, 15 Jan 2018 17:36:00 -0800 Subject: [PATCH 233/710] link detection for remote file systems, #41482 --- src/vs/workbench/api/node/extHost.api.impl.ts | 42 ++++++++-------- .../workbench/api/node/extHostFileSystem.ts | 49 ++++++++++++++++++- 2 files changed, 69 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 54deff05595..4d6eb312357 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -106,8 +106,8 @@ export function createApiFactory( const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace)); rpcProtocol.set(ExtHostContext.ExtHostConfiguration, extHostConfiguration); const extHostDiagnostics = rpcProtocol.set(ExtHostContext.ExtHostDiagnostics, new ExtHostDiagnostics(rpcProtocol)); - const languageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics)); - const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol)); + const extHostLanguageFeatures = rpcProtocol.set(ExtHostContext.ExtHostLanguageFeatures, new ExtHostLanguageFeatures(rpcProtocol, extHostDocuments, extHostCommands, extHostHeapService, extHostDiagnostics)); + const extHostFileSystem = rpcProtocol.set(ExtHostContext.ExtHostFileSystem, new ExtHostFileSystem(rpcProtocol, extHostLanguageFeatures)); const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService()); const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, new ExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands)); const extHostTerminalService = rpcProtocol.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(rpcProtocol)); @@ -236,61 +236,61 @@ export function createApiFactory( return score(toLanguageSelector(selector), document.uri, document.languageId); }, registerCodeActionsProvider(selector: vscode.DocumentSelector, provider: vscode.CodeActionProvider): vscode.Disposable { - return languageFeatures.registerCodeActionProvider(selector, provider); + return extHostLanguageFeatures.registerCodeActionProvider(selector, provider); }, registerCodeLensProvider(selector: vscode.DocumentSelector, provider: vscode.CodeLensProvider): vscode.Disposable { - return languageFeatures.registerCodeLensProvider(selector, provider); + return extHostLanguageFeatures.registerCodeLensProvider(selector, provider); }, registerDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.DefinitionProvider): vscode.Disposable { - return languageFeatures.registerDefinitionProvider(selector, provider); + return extHostLanguageFeatures.registerDefinitionProvider(selector, provider); }, registerImplementationProvider(selector: vscode.DocumentSelector, provider: vscode.ImplementationProvider): vscode.Disposable { - return languageFeatures.registerImplementationProvider(selector, provider); + return extHostLanguageFeatures.registerImplementationProvider(selector, provider); }, registerTypeDefinitionProvider(selector: vscode.DocumentSelector, provider: vscode.TypeDefinitionProvider): vscode.Disposable { - return languageFeatures.registerTypeDefinitionProvider(selector, provider); + return extHostLanguageFeatures.registerTypeDefinitionProvider(selector, provider); }, registerHoverProvider(selector: vscode.DocumentSelector, provider: vscode.HoverProvider): vscode.Disposable { - return languageFeatures.registerHoverProvider(selector, provider, extension.id); + return extHostLanguageFeatures.registerHoverProvider(selector, provider, extension.id); }, registerDocumentHighlightProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentHighlightProvider): vscode.Disposable { - return languageFeatures.registerDocumentHighlightProvider(selector, provider); + return extHostLanguageFeatures.registerDocumentHighlightProvider(selector, provider); }, registerReferenceProvider(selector: vscode.DocumentSelector, provider: vscode.ReferenceProvider): vscode.Disposable { - return languageFeatures.registerReferenceProvider(selector, provider); + return extHostLanguageFeatures.registerReferenceProvider(selector, provider); }, registerRenameProvider(selector: vscode.DocumentSelector, provider: vscode.RenameProvider): vscode.Disposable { - return languageFeatures.registerRenameProvider(selector, provider); + return extHostLanguageFeatures.registerRenameProvider(selector, provider); }, registerDocumentSymbolProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider): vscode.Disposable { - return languageFeatures.registerDocumentSymbolProvider(selector, provider); + return extHostLanguageFeatures.registerDocumentSymbolProvider(selector, provider); }, registerWorkspaceSymbolProvider(provider: vscode.WorkspaceSymbolProvider): vscode.Disposable { - return languageFeatures.registerWorkspaceSymbolProvider(provider); + return extHostLanguageFeatures.registerWorkspaceSymbolProvider(provider); }, registerDocumentFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentFormattingEditProvider): vscode.Disposable { - return languageFeatures.registerDocumentFormattingEditProvider(selector, provider); + return extHostLanguageFeatures.registerDocumentFormattingEditProvider(selector, provider); }, registerDocumentRangeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentRangeFormattingEditProvider): vscode.Disposable { - return languageFeatures.registerDocumentRangeFormattingEditProvider(selector, provider); + return extHostLanguageFeatures.registerDocumentRangeFormattingEditProvider(selector, provider); }, registerOnTypeFormattingEditProvider(selector: vscode.DocumentSelector, provider: vscode.OnTypeFormattingEditProvider, firstTriggerCharacter: string, ...moreTriggerCharacters: string[]): vscode.Disposable { - return languageFeatures.registerOnTypeFormattingEditProvider(selector, provider, [firstTriggerCharacter].concat(moreTriggerCharacters)); + return extHostLanguageFeatures.registerOnTypeFormattingEditProvider(selector, provider, [firstTriggerCharacter].concat(moreTriggerCharacters)); }, registerSignatureHelpProvider(selector: vscode.DocumentSelector, provider: vscode.SignatureHelpProvider, ...triggerCharacters: string[]): vscode.Disposable { - return languageFeatures.registerSignatureHelpProvider(selector, provider, triggerCharacters); + return extHostLanguageFeatures.registerSignatureHelpProvider(selector, provider, triggerCharacters); }, registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable { - return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters); + return extHostLanguageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters); }, registerDocumentLinkProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable { - return languageFeatures.registerDocumentLinkProvider(selector, provider); + return extHostLanguageFeatures.registerDocumentLinkProvider(selector, provider); }, registerColorProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentColorProvider): vscode.Disposable { - return languageFeatures.registerColorProvider(selector, provider); + return extHostLanguageFeatures.registerColorProvider(selector, provider); }, setLanguageConfiguration: (language: string, configuration: vscode.LanguageConfiguration): vscode.Disposable => { - return languageFeatures.setLanguageConfiguration(language, configuration); + return extHostLanguageFeatures.setLanguageConfiguration(language, configuration); } }; diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index c89a461d1cc..62dbf9b67fe 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -12,19 +12,65 @@ import { IStat } from 'vs/platform/files/common/files'; import { IDisposable } from 'vs/base/common/lifecycle'; import { asWinJsPromise } from 'vs/base/common/async'; import { IPatternInfo } from 'vs/platform/search/common/search'; +import { values } from 'vs/base/common/map'; +import { Range } from 'vs/workbench/api/node/extHostTypes'; +import { ExtHostLanguageFeatures } from 'vs/workbench/api/node/extHostLanguageFeatures'; + +class FsLinkProvider implements vscode.DocumentLinkProvider { + + private _schemes = new Set(); + private _regex: RegExp; + + add(scheme: string): void { + this._regex = undefined; + this._schemes.add(scheme); + } + + delete(scheme: string): void { + if (this._schemes.delete(scheme)) { + this._regex = undefined; + } + } + + provideDocumentLinks(document: vscode.TextDocument, token: vscode.CancellationToken): vscode.ProviderResult { + if (this._schemes.size === 0) { + return undefined; + } + if (!this._regex) { + this._regex = new RegExp(`(${(values(this._schemes).join('|'))}):[^\\s]+`, 'gi'); + } + let result: vscode.DocumentLink[] = []; + let max = Math.min(document.lineCount, 2500); + for (let line = 0; line < max; line++) { + this._regex.lastIndex = 0; + let textLine = document.lineAt(line); + let m: RegExpMatchArray; + while (m = this._regex.exec(textLine.text)) { + const target = URI.parse(m[0]); + const range = new Range(line, this._regex.lastIndex - m[0].length, line, this._regex.lastIndex); + result.push({ target, range }); + } + } + return result; + } +} export class ExtHostFileSystem implements ExtHostFileSystemShape { private readonly _proxy: MainThreadFileSystemShape; private readonly _provider = new Map(); + private readonly _linkProvider = new FsLinkProvider(); + private _handlePool: number = 0; - constructor(mainContext: IMainContext) { + constructor(mainContext: IMainContext, extHostLanguageFeatures: ExtHostLanguageFeatures) { this._proxy = mainContext.getProxy(MainContext.MainThreadFileSystem); + extHostLanguageFeatures.registerDocumentLinkProvider('*', this._linkProvider); } registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider) { const handle = this._handlePool++; + this._linkProvider.add(scheme); this._provider.set(handle, provider); this._proxy.$registerFileSystemProvider(handle, scheme); if (provider.root) { @@ -40,6 +86,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { if (reg) { reg.dispose(); } + this._linkProvider.delete(scheme); this._provider.delete(handle); this._proxy.$unregisterFileSystemProvider(handle); } From a89ed2b1ee82fe72e1370e2f8d709ba2c1bafcff Mon Sep 17 00:00:00 2001 From: chrisdias Date: Mon, 15 Jan 2018 17:39:50 -0800 Subject: [PATCH 234/710] fixes #26044 --- .../platform/contextkey/common/contextkey.ts | 64 ++++++++++++++++++- .../contextkey/test/common/contextkey.test.ts | 11 +++- 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index 69381904e0a..f578e60070a 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -6,13 +6,15 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import Event from 'vs/base/common/event'; +import { match } from 'vs/base/common/glob'; export enum ContextKeyExprType { Defined = 1, Not = 2, Equals = 3, NotEquals = 4, - And = 5 + And = 5, + Glob = 6 } export abstract class ContextKeyExpr { @@ -29,6 +31,10 @@ export abstract class ContextKeyExpr { return new ContextKeyNotEqualsExpr(key, value); } + public static glob(key: string, value: string): ContextKeyExpr { + return new ContextKeyGlobExpr(key, value); + } + public static not(key: string): ContextKeyExpr { return new ContextKeyNotExpr(key); } @@ -60,6 +66,11 @@ export abstract class ContextKeyExpr { return new ContextKeyEqualsExpr(pieces[0].trim(), this._deserializeValue(pieces[1])); } + if (serializedOne.indexOf('=~') >= 0) { + let pieces = serializedOne.split('=~'); + return new ContextKeyGlobExpr(pieces[0].trim(), this._deserializeValue(pieces[1])); + } + if (/^\!\s*/.test(serializedOne)) { return new ContextKeyNotExpr(serializedOne.substr(1).trim()); } @@ -109,6 +120,8 @@ function cmp(a: ContextKeyExpr, b: ContextKeyExpr): number { return (a).cmp(b); case ContextKeyExprType.NotEquals: return (a).cmp(b); + case ContextKeyExprType.Glob: + return (a).cmp(b); default: throw new Error('Unknown ContextKeyExpr!'); } @@ -320,6 +333,55 @@ export class ContextKeyNotExpr implements ContextKeyExpr { } } +export class ContextKeyGlobExpr implements ContextKeyExpr { + + constructor(private key: string, private value: any) { + } + + public getType(): ContextKeyExprType { + return ContextKeyExprType.Glob; + } + + public cmp(other: ContextKeyGlobExpr): number { + if (this.key < other.key) { + return -1; + } + if (this.key > other.key) { + return 1; + } + if (this.value < other.value) { + return -1; + } + if (this.value > other.value) { + return 1; + } + return 0; + } + + public equals(other: ContextKeyExpr): boolean { + if (other instanceof ContextKeyGlobExpr) { + return (this.key === other.key && this.value === other.value); + } + return false; + } + + public evaluate(context: IContext): boolean { + return match(this.value, context.getValue(this.key)) + } + + public normalize(): ContextKeyExpr { + return this; + } + + public serialize(): string { + return this.key + ' =~ \'' + this.value + '\''; + } + + public keys(): string[] { + return [this.key]; + } +} + export class ContextKeyAndExpr implements ContextKeyExpr { public readonly expr: ContextKeyExpr[]; diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts index 69f8bca0930..4cdda5588c5 100644 --- a/src/vs/platform/contextkey/test/common/contextkey.test.ts +++ b/src/vs/platform/contextkey/test/common/contextkey.test.ts @@ -6,6 +6,7 @@ import * as assert from 'assert'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; +import { match } from 'vs/base/common/glob'; function createContext(ctx: any) { return { @@ -21,6 +22,8 @@ suite('ContextKeyExpr', () => { ContextKeyExpr.has('a1'), ContextKeyExpr.and(ContextKeyExpr.has('and.a')), ContextKeyExpr.has('a2'), + ContextKeyExpr.glob('d3', '**/d*'), + ContextKeyExpr.glob('d4', '**/3*'), ContextKeyExpr.equals('b1', 'bb1'), ContextKeyExpr.equals('b2', 'bb2'), ContextKeyExpr.notEquals('c1', 'cc1'), @@ -32,9 +35,11 @@ suite('ContextKeyExpr', () => { ContextKeyExpr.equals('b2', 'bb2'), ContextKeyExpr.notEquals('c1', 'cc1'), ContextKeyExpr.not('d1'), + ContextKeyExpr.glob('d4', '**/3*'), ContextKeyExpr.notEquals('c2', 'cc2'), ContextKeyExpr.has('a2'), ContextKeyExpr.equals('b1', 'bb1'), + ContextKeyExpr.glob('d3', '**/d*'), ContextKeyExpr.has('a1'), ContextKeyExpr.and(ContextKeyExpr.equals('and.a', true)), ContextKeyExpr.not('d2') @@ -59,9 +64,11 @@ suite('ContextKeyExpr', () => { let context = createContext({ 'a': true, 'b': false, - 'c': '5' + 'c': '5', + 'd': 'd' }); function testExpression(expr: string, expected: boolean): void { + console.log(expr + ' ' + expected); let rules = ContextKeyExpr.deserialize(expr); assert.equal(rules.evaluate(context), expected, expr); } @@ -74,11 +81,13 @@ suite('ContextKeyExpr', () => { testExpression(expr + ' == 5', value == '5'); testExpression(expr + ' != 5', value != '5'); testExpression('!' + expr, !value); + testExpression(expr + ' =~ **/d*', match('**/d*', value)); } testBatch('a', true); testBatch('b', false); testBatch('c', '5'); + testBatch('d', 'd'); testBatch('z', undefined); testExpression('a && !b', true && !false); From df96558335782a39ef4b2df9bdbee0612ec63eed Mon Sep 17 00:00:00 2001 From: chrisdias Date: Mon, 15 Jan 2018 17:40:10 -0800 Subject: [PATCH 235/710] hygene --- src/vs/platform/contextkey/common/contextkey.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index f578e60070a..5461a40cf07 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -366,7 +366,7 @@ export class ContextKeyGlobExpr implements ContextKeyExpr { } public evaluate(context: IContext): boolean { - return match(this.value, context.getValue(this.key)) + return match(this.value, context.getValue(this.key)); } public normalize(): ContextKeyExpr { From 4aacd87f2db1e39ff63078497b23e029f308c15d Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Mon, 15 Jan 2018 20:13:57 -0800 Subject: [PATCH 236/710] safe point before new line starts. --- .../pieceTableTextBuffer/pieceTableBase.ts | 20 +++++++--------- .../pieceTableTextBufferBuilder.ts | 24 +++++-------------- .../model/pieceTableTextBuffer/textSource.ts | 13 +++------- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 431343239db..d97cd56033f 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -6,7 +6,6 @@ import { Position } from 'vs/editor/common/core/position'; import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; -import { IRawPTBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; export const enum NodeColor { Black = 0, @@ -271,7 +270,7 @@ export class PieceTableBase { protected _root: TreeNode; protected _lineCnt: number; - constructor(chunks: IRawPTBuffer[]) { + constructor(chunks: StringBuffer[]) { this._buffers = [ new StringBuffer('', [0]) ]; @@ -280,22 +279,19 @@ export class PieceTableBase { let lastNode: TreeNode = null; for (let i = 0, len = chunks.length; i < len; i++) { - if (chunks[i].text.length > 0) { - let lineStarts: number[]; - if (chunks[i].lineStarts) { - lineStarts = chunks[i].lineStarts; - } else { - lineStarts = constructLineStarts(chunks[i].text); + if (chunks[i].buffer.length > 0) { + if (!chunks[i].lineStarts) { + chunks[i].lineStarts = constructLineStarts(chunks[i].buffer); } let piece = new OriginalPiece( i + 1, { line: 0, column: 0 }, - { line: lineStarts.length - 1, column: chunks[i].text.length - lineStarts[lineStarts.length - 1] }, - lineStarts.length - 1, - chunks[i].text.length + { line: chunks[i].lineStarts.length - 1, column: chunks[i].buffer.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1] }, + chunks[i].lineStarts.length - 1, + chunks[i].buffer.length ); - this._buffers.push(new StringBuffer(chunks[i].text, lineStarts)); + this._buffers.push(chunks[i]); lastNode = this.rbInsertRight(lastNode, piece); } } diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 7e091368f05..08522da2a85 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -6,8 +6,9 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } from 'vs/editor/common/model'; -import { TextSource, IRawTextSource, IRawPTBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; +import { TextSource, IRawTextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; +import { StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; export class PieceTableTextBufferFactory implements ITextBufferFactory { @@ -20,29 +21,24 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { } public getFirstLineText(lengthLimit: number): string { - return this.rawTextSource.chunks[0].text.substr(0, 100).split(/\r\n|\r|\n/)[0]; + return this.rawTextSource.chunks[0].buffer.substr(0, 100).split(/\r\n|\r|\n/)[0]; } } class PTBasedBuilder { - private chunks: IRawPTBuffer[]; + private chunks: StringBuffer[]; private lineFeedCnt: number; - // private lineStarts: number[]; - // private text: string[]; private BOM: string; private chunkIndex: number; private totalCRCount: number; private _regex: RegExp; - // private totalLength: number; constructor() { this.chunks = []; this.BOM = ''; this.chunkIndex = 0; - // this.lineStarts = [0]; this.totalCRCount = 0; this._regex = new RegExp(/\r\n|\r|\n/g); - // this.totalLength = 0; this.lineFeedCnt = 0; } @@ -91,21 +87,13 @@ class PTBasedBuilder { this.lineFeedCnt++; } while (m); - // this.text.push(chunk); - this.chunks.push({ - text: chunk, - lineStarts: lineStarts - }); - // this.totalLength += chunk.length; + this.chunks.push(new StringBuffer(chunk, lineStarts)); this.chunkIndex++; } public finish(containsRTL: boolean, isBasicASCII: boolean): PieceTableTextBufferFactory { if (this.chunks.length === 0) { - this.chunks.push({ - text: '', - lineStarts: [0] - }); + this.chunks.push(new StringBuffer('', [0])); } return new PieceTableTextBufferFactory({ chunks: this.chunks, diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts b/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts index b1f607876ba..aa7ba64c777 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts @@ -5,14 +5,7 @@ 'use strict'; import { DefaultEndOfLine } from 'vs/editor/common/model'; - -/** - * Raw text buffer for Piece Table. - */ -export interface IRawPTBuffer { - text: string; - lineStarts: number[]; -} +import { StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; /** * A processed string ready to be turned into an editor model. @@ -21,7 +14,7 @@ export interface IRawTextSource { /** * The text split into lines. */ - readonly chunks: IRawPTBuffer[]; + readonly chunks: StringBuffer[]; readonly lineFeedCnt: number; /** * The BOM (leading character sequence of the file). @@ -48,7 +41,7 @@ export interface ITextSource { /** * The text split into lines. */ - readonly chunks: IRawPTBuffer[]; + readonly chunks: StringBuffer[]; readonly lineFeedCnt: number; /** * The BOM (leading character sequence of the file). From dd922e2ff8c6761a8b3000032af8e0b494a52a83 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Jan 2018 07:42:08 +0300 Subject: [PATCH 237/710] Add time variables for snippets --- .../contrib/snippet/snippetVariables.ts | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index f3b77a67181..5b759d77ece 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -13,6 +13,13 @@ import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace } from 'v import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; export const KnownSnippetVariableNames = Object.freeze({ + 'CURRENT_YEAR': true, + 'CURRENT_YEAR_SHORT': true, + 'CURRENT_MONTH': true, + 'CURRENT_DATE': true, + 'CURRENT_HOUR': true, + 'CURRENT_MINUTE': true, + 'CURRENT_SECOND': true, 'SELECTION': true, 'CLIPBOARD': true, 'TM_SELECTED_TEXT': true, @@ -101,6 +108,26 @@ export class SelectionBasedVariableResolver implements VariableResolver { } else if (name === 'TM_LINE_NUMBER') { return String(this._selection.positionLineNumber); + + } else if (~['CURRENT_YEAR', 'CURRENT_YEAR_SHORT', 'CURRENT_MONTH', 'CURRENT_DATE', 'CURRENT_HOUR', 'CURRENT_MINUTE', 'CURRENT_SECOND'].indexOf(name)) { + const now = new Date(); + const zeroPad = (n: string): string => n.length < 2 ? `0${n}` : n; + + if (name === 'CURRENT_YEAR') { + return String(now.getFullYear()); + } else if (name === 'CURRENT_YEAR_SHORT') { + return String(now.getFullYear()).slice(-2); + } else if (name === 'CURRENT_MONTH') { + return zeroPad(String(now.getMonth().valueOf() + 1)); + } else if (name === 'CURRENT_DATE') { + return zeroPad(String(now.getDate())); + } else if (name === 'CURRENT_HOUR') { + return zeroPad(String(now.getHours())); + } else if (name === 'CURRENT_MINUTE') { + return zeroPad(String(now.getMinutes())); + } else if (name === 'CURRENT_SECOND') { + return zeroPad(String(now.getSeconds())); + } } return undefined; } From ef82d27ab8d7e90aab3080942a2f1170fc6b88f6 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Jan 2018 08:05:17 +0300 Subject: [PATCH 238/710] Redundant temp variable --- src/vs/editor/contrib/snippet/snippetVariables.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index 5b759d77ece..ef5ada5f71e 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -110,23 +110,22 @@ export class SelectionBasedVariableResolver implements VariableResolver { return String(this._selection.positionLineNumber); } else if (~['CURRENT_YEAR', 'CURRENT_YEAR_SHORT', 'CURRENT_MONTH', 'CURRENT_DATE', 'CURRENT_HOUR', 'CURRENT_MINUTE', 'CURRENT_SECOND'].indexOf(name)) { - const now = new Date(); const zeroPad = (n: string): string => n.length < 2 ? `0${n}` : n; if (name === 'CURRENT_YEAR') { - return String(now.getFullYear()); + return String(new Date().getFullYear()); } else if (name === 'CURRENT_YEAR_SHORT') { - return String(now.getFullYear()).slice(-2); + return String(new Date().getFullYear()).slice(-2); } else if (name === 'CURRENT_MONTH') { - return zeroPad(String(now.getMonth().valueOf() + 1)); + return zeroPad(String(new Date().getMonth().valueOf() + 1)); } else if (name === 'CURRENT_DATE') { - return zeroPad(String(now.getDate())); + return zeroPad(String(new Date().getDate())); } else if (name === 'CURRENT_HOUR') { - return zeroPad(String(now.getHours())); + return zeroPad(String(new Date().getHours())); } else if (name === 'CURRENT_MINUTE') { - return zeroPad(String(now.getMinutes())); + return zeroPad(String(new Date().getMinutes())); } else if (name === 'CURRENT_SECOND') { - return zeroPad(String(now.getSeconds())); + return zeroPad(String(new Date().getSeconds())); } } return undefined; From e0d2248ce505db02a0677d3addd7a15e7ee61408 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Jan 2018 08:28:32 +0300 Subject: [PATCH 239/710] Make separate class for time sinppets --- .../editor/contrib/snippet/snippetSession.ts | 5 ++- .../contrib/snippet/snippetVariables.ts | 45 +++++++++++-------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/vs/editor/contrib/snippet/snippetSession.ts b/src/vs/editor/contrib/snippet/snippetSession.ts index af22d663d0b..30a06931cd7 100644 --- a/src/vs/editor/contrib/snippet/snippetSession.ts +++ b/src/vs/editor/contrib/snippet/snippetSession.ts @@ -15,7 +15,7 @@ import { Range } from 'vs/editor/common/core/range'; import { IPosition } from 'vs/editor/common/core/position'; import { groupBy } from 'vs/base/common/arrays'; import { dispose } from 'vs/base/common/lifecycle'; -import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver } from './snippetVariables'; +import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver, TimeBasedVariableResolver } from './snippetVariables'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModel'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; @@ -318,7 +318,8 @@ export class SnippetSession { .resolveVariables(new CompositeSnippetVariableResolver([ modelBasedVariableResolver, new ClipboardBasedVariableResolver(clipboardService, idx, indexedSelections.length), - new SelectionBasedVariableResolver(model, selection) + new SelectionBasedVariableResolver(model, selection), + new TimeBasedVariableResolver ])); const offset = model.getOffsetAt(start) + delta; diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index ef5ada5f71e..6bd1dc34e47 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -108,25 +108,6 @@ export class SelectionBasedVariableResolver implements VariableResolver { } else if (name === 'TM_LINE_NUMBER') { return String(this._selection.positionLineNumber); - - } else if (~['CURRENT_YEAR', 'CURRENT_YEAR_SHORT', 'CURRENT_MONTH', 'CURRENT_DATE', 'CURRENT_HOUR', 'CURRENT_MINUTE', 'CURRENT_SECOND'].indexOf(name)) { - const zeroPad = (n: string): string => n.length < 2 ? `0${n}` : n; - - if (name === 'CURRENT_YEAR') { - return String(new Date().getFullYear()); - } else if (name === 'CURRENT_YEAR_SHORT') { - return String(new Date().getFullYear()).slice(-2); - } else if (name === 'CURRENT_MONTH') { - return zeroPad(String(new Date().getMonth().valueOf() + 1)); - } else if (name === 'CURRENT_DATE') { - return zeroPad(String(new Date().getDate())); - } else if (name === 'CURRENT_HOUR') { - return zeroPad(String(new Date().getHours())); - } else if (name === 'CURRENT_MINUTE') { - return zeroPad(String(new Date().getMinutes())); - } else if (name === 'CURRENT_SECOND') { - return zeroPad(String(new Date().getSeconds())); - } } return undefined; } @@ -196,3 +177,29 @@ export class ClipboardBasedVariableResolver implements VariableResolver { } } } + +export class TimeBasedVariableResolver implements VariableResolver { + + resolve(variable: Variable): string { + const { name } = variable; + const zeroPad = (n: string): string => n.length < 2 ? `0${n}` : n; + + if (name === 'CURRENT_YEAR') { + return String(new Date().getFullYear()); + } else if (name === 'CURRENT_YEAR_SHORT') { + return String(new Date().getFullYear()).slice(-2); + } else if (name === 'CURRENT_MONTH') { + return zeroPad(String(new Date().getMonth().valueOf() + 1)); + } else if (name === 'CURRENT_DATE') { + return zeroPad(String(new Date().getDate())); + } else if (name === 'CURRENT_HOUR') { + return zeroPad(String(new Date().getHours())); + } else if (name === 'CURRENT_MINUTE') { + return zeroPad(String(new Date().getMinutes())); + } else if (name === 'CURRENT_SECOND') { + return zeroPad(String(new Date().getSeconds())); + } + + return undefined; + } +} From 1eca6b9817f1f44486cc966d8fc448ee95728b8f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 16 Jan 2018 07:45:30 +0100 Subject: [PATCH 240/710] polish closeEditors API more --- .../browser/parts/editor/editorActions.ts | 8 +- .../browser/parts/editor/editorPart.ts | 171 +++++++++++------- .../services/editor/common/editorService.ts | 30 +-- .../editor/test/browser/editorService.test.ts | 7 +- .../workbench/test/workbenchTestServices.ts | 7 +- 5 files changed, 117 insertions(+), 106 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index 6dad076f492..d4206f2f46a 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -15,7 +15,7 @@ import { EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry, import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { Position, IEditor, Direction, IResourceInput, IEditorInput } from 'vs/platform/editor/common/editor'; +import { Position, IEditor, Direction, IResourceInput, IEditorInput, POSITIONS } from 'vs/platform/editor/common/editor'; import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IEditorGroupService, GroupArrangement } from 'vs/workbench/services/group/common/groupService'; @@ -617,7 +617,7 @@ export class CloseAllEditorsAction extends Action { // Just close all if there are no or one dirty editor if (this.textFileService.getDirty().length < 2) { - return this.editorService.closeAllEditors(); + return this.editorService.closeEditors(); } // Otherwise ask for combined confirmation @@ -635,7 +635,7 @@ export class CloseAllEditorsAction extends Action { return saveOrRevertPromise.then(success => { if (success) { - return this.editorService.closeAllEditors(); + return this.editorService.closeEditors(); } return void 0; @@ -686,7 +686,7 @@ export class CloseEditorsInOtherGroupsAction extends Action { } if (typeof position === 'number') { - return this.editorService.closeAllEditors(position); + return this.editorService.closeEditors(POSITIONS.filter(p => p !== position)); } return TPromise.as(false); diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index d433347b4d5..92f3a9c9c7d 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -47,6 +47,7 @@ import { join } from 'vs/base/common/paths'; import { IEditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { ThrottledEmitter } from 'vs/base/common/async'; import { isCodeEditor } from 'vs/editor/browser/editorBrowser'; +import { isUndefinedOrNull } from 'vs/base/common/types'; class ProgressMonitor { @@ -687,23 +688,77 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this.textCompareEditorVisible.set(this.visibleEditors.some(e => e && e.isVisible() && e.getId() === TEXT_DIFF_EDITOR_ID)); } - public closeAllEditors(except?: Position): TPromise; - public closeAllEditors(positions?: Position[]): TPromise; - public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { - let groups = this.stacks.groups.reverse(); // start from the end to prevent layout to happen through rochade + public closeEditors(positions?: Position[]): TPromise; + public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; + public closeEditors(position: Position, editors: EditorInput[]): TPromise; + public closeEditors(editors: ICloseEditorsByFilterArgs): TPromise; + public closeEditors(editors: ICloseEditorsArgs): TPromise; + public closeEditors(positionsOrEditors?: Position[] | Position | ICloseEditorsByFilterArgs | ICloseEditorsArgs, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { - // Remove position to exclude if we have any - if (typeof exceptOrPositions === 'number') { - groups = groups.filter(group => this.stacks.positionOfGroup(group) !== exceptOrPositions); + // First check for specific position to close + if (typeof positionsOrEditors === 'number') { + return this.doCloseEditorsAtPosition(positionsOrEditors, filterOrEditors); } - // Remove positions that are not being asked for - else if (Array.isArray(exceptOrPositions)) { - groups = groups.filter(group => exceptOrPositions.indexOf(this.stacks.positionOfGroup(group)) >= 0); + // Then check for array of positions to close + if (Array.isArray(positionsOrEditors) || isUndefinedOrNull(positionsOrEditors)) { + return this.doCloseAllEditorsAtPositions(positionsOrEditors as Position[]); + } + + // Finally, close specific editors at multiple positions + return this.doCloseEditorsAtPositions(positionsOrEditors); + } + + private doCloseEditorsAtPositions(editors: ICloseEditorsByFilterArgs | ICloseEditorsArgs): TPromise { + + // Extract editors to close for veto + const editorsToClose: EditorIdentifier[] = []; + POSITIONS.forEach(position => { + const details = (position === Position.ONE) ? editors.positionOne : (position === Position.TWO) ? editors.positionTwo : editors.positionThree; + if (details && this.stacks.groupAt(position)) { + editorsToClose.push(...this.extractCloseEditorDetails(position, details).editorsToClose); + } + }); + + // Check for dirty and veto + return this.handleDirty(editorsToClose).then(veto => { + if (veto) { + return void 0; + } + + // Close by positions starting from last to first to prevent issues when + // editor groups close and thus move other editors around that are still open. + [Position.THREE, Position.TWO, Position.ONE].forEach(position => { + const details = (position === Position.ONE) ? editors.positionOne : (position === Position.TWO) ? editors.positionTwo : editors.positionThree; + if (details && this.stacks.groupAt(position)) { + const { group, editorsToClose, filter } = this.extractCloseEditorDetails(position, details); + + // Close with filter + if (filter) { + this.doCloseEditorsWithFilter(group, filter); + } + + // Close without filter + else { + this.doCloseEditors(group, editorsToClose.map(e => e.editor)); + } + + return void 0; + } + }); + }); + } + + private doCloseAllEditorsAtPositions(positions?: Position[]): TPromise { + let groups = this.stacks.groups.reverse(); // start from the end to prevent layout to happen through rochade + + // Remove positions that are not being asked for if provided + if (Array.isArray(positions)) { + groups = groups.filter(group => positions.indexOf(this.stacks.positionOfGroup(group)) >= 0); } // Check for dirty and veto - return this.handleDirty(arrays.flatten(groups.map(group => group.getEditors(true /* in MRU order */).map(editor => { return { group, editor }; })))).then(veto => { + return this.handleDirty(arrays.flatten(groups.map(group => group.getEditors(true /* in MRU order */).map(editor => ({ group, editor }))))).then(veto => { if (veto) { return; } @@ -721,94 +776,70 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService this.doCloseActiveEditor(group); } - public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; - public closeEditors(position: Position, editors: EditorInput[]): TPromise; - public closeEditors(editors: ICloseEditorsByFilterArgs): TPromise; - public closeEditors(editors: ICloseEditorsArgs): TPromise; - public closeEditors(positionOrEditors: Position | ICloseEditorsByFilterArgs | ICloseEditorsArgs, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { - - // First check for specific position passed in - if (typeof positionOrEditors === 'number') { - return this.doCloseEditorsAtPosition(positionOrEditors, filterOrEditors, true /* ignore if opened in other group */).then(veto => void 0); + private doCloseEditorsAtPosition(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): TPromise { + const closeEditorsDetails = this.extractCloseEditorDetails(position, filterOrEditors); + if (!closeEditorsDetails) { + return TPromise.wrap(void 0); } - // Otherwise close by positions starting from last to first - // to prevent issues when editor groups close and thus move - // other editors around that are still open. - let positionThreeClose = TPromise.as(false); - if (positionOrEditors.positionThree) { - positionThreeClose = this.doCloseEditorsAtPosition(Position.THREE, positionOrEditors.positionThree); - } + const { group, editorsToClose, filter } = closeEditorsDetails; - return positionThreeClose.then(veto => { + // Check for dirty and veto + return this.handleDirty(editorsToClose, true /* ignore if opened in other group */).then(veto => { if (veto) { - return void 0; // return earlier when a veto is triggered by the user + return void 0; } - let positionTwoClose = TPromise.as(false); - if (positionOrEditors.positionTwo) { - positionTwoClose = this.doCloseEditorsAtPosition(Position.TWO, positionOrEditors.positionTwo); + // Close with filter + if (filter) { + this.doCloseEditorsWithFilter(group, filter); } - return positionTwoClose.then(veto => { - if (veto || !positionOrEditors.positionOne) { - return void 0; // return earlier when a veto is triggered by the user - } + // Close without filter + else { + this.doCloseEditors(group, editorsToClose.map(e => e.editor)); + } - return this.doCloseEditorsAtPosition(Position.ONE, positionOrEditors.positionOne).then(veto => void 0); - }); + return void 0; }); } - private doCloseEditorsAtPosition(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[], ignoreIfOpenedInOtherGroup?: boolean): TPromise { + private extractCloseEditorDetails(position: Position, filterOrEditors?: ICloseEditorsFilter | EditorInput[]): { group: EditorGroup, editorsToClose: EditorIdentifier[], filter?: ICloseEditorsFilter } { const group = this.stacks.groupAt(position); if (!group) { - return TPromise.wrap(false); + return void 0; } let editorsToClose: EditorInput[]; let filter: ICloseEditorsFilter; + + // Close: Specific Editors if (Array.isArray(filterOrEditors)) { editorsToClose = filterOrEditors; - filter = Object.create(null); - } else { + } + + // Close: By Filter or all + else { editorsToClose = group.getEditors(true /* in MRU order */); filter = filterOrEditors || Object.create(null); - } - // Filter: unmodified only - if (filter.unmodifiedOnly) { - editorsToClose = editorsToClose.filter(e => !e.isDirty()); - } - - // Filter: direction (left / right) - if (!types.isUndefinedOrNull(filter.direction)) { - editorsToClose = (filter.direction === Direction.LEFT) ? editorsToClose.slice(0, group.indexOf(filter.except)) : editorsToClose.slice(group.indexOf(filter.except) + 1); - } - - // Filter: except - else { - editorsToClose = editorsToClose.filter(e => !filter.except || !e.matches(filter.except)); - } - - // Check for dirty and veto - return this.handleDirty(editorsToClose.map(editor => { return { group, editor }; }), ignoreIfOpenedInOtherGroup).then(veto => { - if (veto) { - return true; + // Filter: unmodified only + if (filter.unmodifiedOnly) { + editorsToClose = editorsToClose.filter(e => !e.isDirty()); } - // Close without filter - if (Array.isArray(filterOrEditors)) { - this.doCloseEditors(group, editorsToClose); + // Filter: direction (left / right) + else if (!types.isUndefinedOrNull(filter.direction)) { + editorsToClose = (filter.direction === Direction.LEFT) ? editorsToClose.slice(0, group.indexOf(filter.except)) : editorsToClose.slice(group.indexOf(filter.except) + 1); } - // Close with filter - else { - this.doCloseEditorsWithFilter(group, filter); + // Filter: except + else if (filter.except) { + editorsToClose = editorsToClose.filter(e => !e.matches(filter.except)); } + } - return false; - }); + return { group, editorsToClose: editorsToClose.map(editor => ({ editor, group })), filter }; } private doCloseEditors(group: EditorGroup, editors: EditorInput[]): void { diff --git a/src/vs/workbench/services/editor/common/editorService.ts b/src/vs/workbench/services/editor/common/editorService.ts index d480e2fa838..b34c179fee1 100644 --- a/src/vs/workbench/services/editor/common/editorService.ts +++ b/src/vs/workbench/services/editor/common/editorService.ts @@ -87,6 +87,12 @@ export interface IWorkbenchEditorService extends IEditorService { */ closeEditor(position: Position, input: IEditorInput): TPromise; + /** + * Closes all editors of the provided groups, or all editors across all groups + * if no position is provided. + */ + closeEditors(positions?: Position[]): TPromise; + /** * Closes editors of a specific group at the provided position. If the optional editor is provided to exclude, it * will not be closed. The direction can be used in that case to control if all other editors should get closed, @@ -109,16 +115,6 @@ export interface IWorkbenchEditorService extends IEditorService { */ closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; - /** - * Closes all editors across all groups. The optional position allows to keep one group alive. - */ - closeAllEditors(except?: Position): TPromise; - - /** - * Closes all editors of the provided groups. - */ - closeAllEditors(positions: Position[]): TPromise; - /** * Allows to resolve an untyped input to a workbench typed instanceof editor input */ @@ -131,13 +127,12 @@ export interface IEditorPart { openEditors(editors: { input: IEditorInput, position?: Position, options?: IEditorOptions | ITextEditorOptions }[]): TPromise; openEditors(editors: { input: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], sideBySide?: boolean): TPromise; replaceEditors(editors: { toReplace: IEditorInput, replaceWith: IEditorInput, options?: IEditorOptions | ITextEditorOptions }[], position?: Position): TPromise; + closeEditors(positions?: Position[]): TPromise; closeEditor(position: Position, input: IEditorInput): TPromise; closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; closeEditors(position: Position, editors: IEditorInput[]): TPromise; closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; - closeAllEditors(except?: Position): TPromise; - closeAllEditors(positions?: Position[]): TPromise; getActiveEditor(): IEditor; getVisibleEditors(): IEditor[]; getActiveEditorInput(): IEditorInput; @@ -280,18 +275,13 @@ export class WorkbenchEditorService implements IWorkbenchEditorService { return this.editorPart.closeEditor(position, input); } + public closeEditors(positions?: Position[]): TPromise; public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors: IEditorInput[]): TPromise; public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; public closeEditors(editors: { positionOne?: IEditorInput[], positionTwo?: IEditorInput[], positionThree?: IEditorInput[] }): TPromise; - public closeEditors(positionOrEditors: any, filterOrEditors?: any): TPromise { - return this.editorPart.closeEditors(positionOrEditors, filterOrEditors); - } - - public closeAllEditors(except?: Position): TPromise; - public closeAllEditors(positions?: Position[]): TPromise; - public closeAllEditors(exceptOrPositions?: any): TPromise { - return this.editorPart.closeAllEditors(exceptOrPositions); + public closeEditors(positionsOrEditors: any, filterOrEditors?: any): TPromise { + return this.editorPart.closeEditors(positionsOrEditors, filterOrEditors); } public createInput(input: IEditorInput): EditorInput; diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts index 980d71eedd1..196825b2f11 100644 --- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts @@ -52,6 +52,7 @@ class TestEditorPart implements IEditorPart { return TPromise.as([]); } + public closeEditors(positions?: Position[]): TPromise; public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors?: EditorInput[]): TPromise; public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; @@ -60,12 +61,6 @@ class TestEditorPart implements IEditorPart { return TPromise.as(null); } - public closeAllEditors(except?: Position): TPromise; - public closeAllEditors(positions?: Position[]): TPromise; - public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { - return TPromise.as(null); - } - public closeEditor(position: Position, input: EditorInput): TPromise { return TPromise.as(null); } diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index 5ba18a3bcc6..e45bc1a4b10 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -606,6 +606,7 @@ export class TestEditorService implements IWorkbenchEditorService { return TPromise.as([]); } + public closeEditors(positions?: Position[]): TPromise; public closeEditors(position: Position, filter?: ICloseEditorsFilter): TPromise; public closeEditors(position: Position, editors: IEditorInput[]): TPromise; public closeEditors(editors: { positionOne?: ICloseEditorsFilter, positionTwo?: ICloseEditorsFilter, positionThree?: ICloseEditorsFilter }): TPromise; @@ -614,12 +615,6 @@ export class TestEditorService implements IWorkbenchEditorService { return TPromise.as(null); } - public closeAllEditors(except?: Position): TPromise; - public closeAllEditors(positions?: Position[]): TPromise; - public closeAllEditors(exceptOrPositions?: Position | Position[]): TPromise { - return TPromise.as(null); - } - public getActiveEditor(): IEditor { this.callback('getActiveEditor'); From c8bf5925a6c1f69895778fe4f240c5177220d4c7 Mon Sep 17 00:00:00 2001 From: Digized Date: Tue, 16 Jan 2018 03:12:11 -0500 Subject: [PATCH 241/710] add actions to keybindings registry --- .../parts/preferences/browser/keybindingsEditor.ts | 2 ++ .../parts/preferences/common/preferences.ts | 1 + .../electron-browser/preferences.contribution.ts | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts index 2f2ac77c17e..8d3a064395c 100644 --- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts @@ -246,6 +246,8 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor } copyKeybindingCommand(keybinding: IKeybindingItemEntry): TPromise { + this.selectEntry(keybinding); + this.reportKeybindingAction(KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, keybinding.keybindingItem.command, keybinding.keybindingItem.keybinding); this.clipboardService.writeText(keybinding.keybindingItem.command); return TPromise.as(null); } diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 059876eead8..63a3adeabfd 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -149,6 +149,7 @@ export interface IKeybindingsEditor extends IEditor { removeKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise; resetKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise; copyKeybinding(keybindingEntry: IKeybindingItemEntry): TPromise; + copyKeybindingCommand(keybindingEntry: IKeybindingItemEntry): TPromise; showConflicts(keybindingEntry: IKeybindingItemEntry): TPromise; } 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 24b637b2cea..986c46a2e34 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts @@ -19,7 +19,7 @@ import { KeybindingsEditor, KeybindingsEditorInput } from 'vs/workbench/parts/pr import { OpenRawDefaultSettingsAction, OpenGlobalSettingsAction, OpenGlobalKeybindingsAction, OpenGlobalKeybindingsFileAction, OpenWorkspaceSettingsAction, OpenFolderSettingsAction, ConfigureLanguageBasedSettingsAction, OPEN_FOLDER_SETTINGS_COMMAND } 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, - KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SHOW_CONFLICTS, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS + KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_SHOW_CONFLICTS, 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'; @@ -238,6 +238,17 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ } }); +KeybindingsRegistry.registerCommandAndKeybindingRule({ + id: KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, + weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), + when: ContextKeyExpr.and(CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDING_FOCUS), + primary: null, + handler: (accessor, args: any) => { + const editor = accessor.get(IWorkbenchEditorService).getActiveEditor() as IKeybindingsEditor; + editor.copyKeybindingCommand(editor.activeKeybindingEntry); + } +}); + KeybindingsRegistry.registerCommandAndKeybindingRule({ id: KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), From f3eff0f8cbb5d5a8edc82d683c726b5a28590cc2 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 09:29:14 +0100 Subject: [PATCH 242/710] Implement getLineFirstNonWhitespaceColumn --- .../model/chunksTextBuffer/bufferPiece.ts | 14 ++++++ .../chunksTextBuffer/chunksTextBuffer.ts | 43 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index ded929bb31a..91066193848 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -66,6 +66,20 @@ export class BufferPiece { return -1; } + public findLineFirstNonWhitespaceIndexInLeaf(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 -1; + } + 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)); } diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 7c987dae12c..6e253301c52 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -135,7 +135,11 @@ export class ChunksTextBuffer implements ITextBuffer { } getLineFirstNonWhitespaceColumn(lineNumber: number): number { - throw new Error('TODO'); + const result = this._actual.getLineFirstNonWhitespaceIndex(lineNumber); + if (result === -1) { + return 0; + } + return result + 1; } getLineLastNonWhitespaceColumn(lineNumber: number): number { throw new Error('TODO'); @@ -793,6 +797,10 @@ class Buffer { return true; } + public getLength(): number { + return this._nodes.length[1]; + } + public getLineCount(): number { return this._nodes.newLineCount[1] + 1; } @@ -843,6 +851,39 @@ class Buffer { 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.findLineFirstNonWhitespaceIndexInLeaf(searchStartOffset); + if (leafResult !== -1) { + return (leafResult - searchStartOffset) + totalDelta; + } + + leafIndex++; + + if (leafIndex >= leafsCount) { + return -1; + } + + totalDelta += (leaf.length() - searchStartOffset); + searchStartOffset = 0; + } + } + public getLinesContent(): string[] { let result: string[] = new Array(this.getLineCount()); let resultIndex = 0; From 4632cd1cdcf01f1bd02d9903287191fcb5f25705 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 09:56:27 +0100 Subject: [PATCH 243/710] Fix issue in offset -> (ln;col) conversion --- .../common/model/chunksTextBuffer/chunksTextBuffer.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 6e253301c52..5a349902425 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -978,10 +978,10 @@ class Buffer { 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); + const lineStartOffset = leafStartOffset + leaf.lineStartFor(lineStartIndex); result.set(lineStartOffset, leafIndex, leafStartOffset, leafStartNewLineCount); - return leafStartNewLineCount + lineStartIndex + 1; + return leafStartNewLineCount + lineStartIndex + 2; } /** @@ -995,7 +995,7 @@ class Buffer { while (true) { const leaf = this._leafs[leafIndex]; - if (leaf.newLineCount() > 1 && leaf.lineStartFor(0) + leafStartOffset >= offset) { + if (leaf.newLineCount() > 1 && leaf.lineStartFor(0) + leafStartOffset <= offset) { // must be in this leaf return this._findLineStartBeforeOffsetInLeaf(offset, leafIndex, leafStartOffset, leafStartNewLineCount, result); } From fe92d1e98392dbca63f3863298651f37d8a620af Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 10:04:32 +0100 Subject: [PATCH 244/710] explorer: do not make file assumptions in shouldRefreshFromEvent #36946 --- .../parts/files/electron-browser/views/explorerView.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 9f03496b5f8..f2cb5c1ca89 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -603,7 +603,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView const added = e.getAdded(); // Check added: Refresh if added file/folder is not part of resolved root and parent is part of it - const ignoredPaths: { [fsPath: string]: boolean } = <{ [fsPath: string]: boolean }>{}; + 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)) { @@ -611,22 +611,22 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView } // Find parent - const parent = paths.dirname(change.resource.fsPath); + const parent = resources.dirname(change.resource); // Continue if parent was already determined as to be ignored - if (ignoredPaths[parent]) { + if (ignoredPaths[parent.toString()]) { continue; } // Compute if parent is visible and added file not yet part of it - const parentStat = this.model.findClosest(URI.file(parent)); + const parentStat = this.model.findClosest(parent); if (parentStat && parentStat.isDirectoryResolved && !this.model.findClosest(change.resource)) { return true; } // Keep track of path that can be ignored for faster lookup if (!parentStat || !parentStat.isDirectoryResolved) { - ignoredPaths[parent] = true; + ignoredPaths[parent.toString()] = true; } } } From 1ccc3e0bbbf8493443d2e147f08e1c455e182c22 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 10:14:29 +0100 Subject: [PATCH 245/710] Implement ChunksTextBuffer.equals --- .../chunksTextBuffer/chunksTextBuffer.ts | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 5a349902425..dbde6393671 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -39,7 +39,10 @@ export class ChunksTextBuffer implements ITextBuffer { } equals(other: ITextBuffer): boolean { - throw new Error('TODO'); + if (!(other instanceof ChunksTextBuffer)) { + return false; + } + return this._actual.equals(other._actual); } mightContainRTL(): boolean { return this._mightContainRTL; @@ -587,6 +590,56 @@ class Buffer { 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 = 0, aLeaf = a._leafs[aLeafIndex], aLeafLength = aLeaf.length(), aLeafRemaining = aLeafLength; + let bLeafIndex = 0, bLeaf = b._leafs[bLeafIndex], bLeafLength = bLeaf.length(), bLeafRemaining = bLeafLength; + + while (remaining > 0) { + 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; + + 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; + } + } + + return true; + } + public getEOL(): string { return this._eol; } From 079b3090e14c387cf966aeddba272b1a4aa0ec44 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Tue, 16 Jan 2018 10:17:14 +0100 Subject: [PATCH 246/710] Updgrade markdown-it (fixes #40099) --- extensions/extension-editing/yarn.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock index 903a9f4e191..ce500bb28a0 100644 --- a/extensions/extension-editing/yarn.lock +++ b/extensions/extension-editing/yarn.lock @@ -31,8 +31,8 @@ linkify-it@^2.0.0: uc.micro "^1.0.1" markdown-it@^8.3.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.3.1.tgz#2f4b622948ccdc193d66f3ca2d43125ac4ac7323" + version "8.4.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.0.tgz#e2400881bf171f7018ed1bd9da441dac8af6306d" dependencies: argparse "^1.0.7" entities "~1.1.1" From fffbae872e2b0beec87534ee915d0fdf528b06d5 Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Tue, 16 Jan 2018 10:21:58 +0100 Subject: [PATCH 247/710] Increase timeout for search tests (fixes #40013) --- .../services/search/test/node/searchService.test.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 7fd40591eef..772f4e1e7bb 100644 --- a/src/vs/workbench/services/search/test/node/searchService.test.ts +++ b/src/vs/workbench/services/search/test/node/searchService.test.ts @@ -75,6 +75,8 @@ class TestSearchEngine implements ISearchEngine { } } +const testTimeout = 5000; + suite('SearchService', () => { const rawSearch: IRawSearch = { @@ -94,6 +96,7 @@ suite('SearchService', () => { }; test('Individual results', function () { + this.timeout(testTimeout); let i = 5; const Engine = TestSearchEngine.bind(null, () => i-- && rawMatch); const service = new RawSearchService(); @@ -113,6 +116,7 @@ suite('SearchService', () => { }); test('Batch results', function () { + this.timeout(testTimeout); let i = 25; const Engine = TestSearchEngine.bind(null, () => i-- && rawMatch); const service = new RawSearchService(); @@ -134,6 +138,7 @@ suite('SearchService', () => { }); test('Collect batched results', function () { + this.timeout(testTimeout); const uriPath = '/some/where'; let i = 25; const Engine = TestSearchEngine.bind(null, () => i-- && rawMatch); @@ -151,6 +156,7 @@ suite('SearchService', () => { }); test('Multi-root with include pattern and maxResults', function () { + this.timeout(testTimeout); const service = new RawSearchService(); const query: IRawSearch = { @@ -169,6 +175,7 @@ suite('SearchService', () => { }); test('Multi-root with include pattern and exists', function () { + this.timeout(testTimeout); const service = new RawSearchService(); const query: IRawSearch = { @@ -188,6 +195,7 @@ suite('SearchService', () => { }); test('Sorted results', function () { + this.timeout(testTimeout); const paths = ['bab', 'bbc', 'abb']; const matches: IRawFileMatch[] = paths.map(relativePath => ({ base: normalize('/some/where'), @@ -217,6 +225,7 @@ suite('SearchService', () => { }); test('Sorted result batches', function () { + this.timeout(testTimeout); let i = 25; const Engine = TestSearchEngine.bind(null, () => i-- && rawMatch); const service = new RawSearchService(); @@ -243,6 +252,7 @@ suite('SearchService', () => { }); test('Cached results', function () { + this.timeout(testTimeout); const paths = ['bcb', 'bbc', 'aab']; const matches: IRawFileMatch[] = paths.map(relativePath => ({ base: normalize('/some/where'), From aa0bcc80a139fb78c07be219d8a7e7ea7aab35e8 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 10:32:43 +0100 Subject: [PATCH 248/710] Doc feedback for id attribute --- src/vs/vscode.d.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 8c20bafb740..2e13c244bd6 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -4968,11 +4968,9 @@ declare module 'vscode' { label: string; /** - * Optional id for the tree item that has to be unique across tree. If not provided, an unique id is generated using the tree item's label. + * Optional id for the tree item that has to be unique across tree. The id is used to preserve the selection and expansion state of the tree item. * - * This is used by the view to preserve the selection and expansion state of the tree item. - * - * *Note:* With generated id, tree item's view state will be reset when label is changed. + * If not provided, an id is generated using the tree item's label. **Note** that when labels change, ids will change and that selection and expansion state cannot be kept stable anymore. */ id?: string; From adefb517f64c8950daa6a8f78b283c138a77af6f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 16 Jan 2018 10:41:35 +0100 Subject: [PATCH 249/710] :lipstick: --- src/vs/workbench/browser/parts/editor/editorPart.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 92f3a9c9c7d..b477666f086 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -713,15 +713,18 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService // Extract editors to close for veto const editorsToClose: EditorIdentifier[] = []; + let groupsWithEditorsToClose = 0; POSITIONS.forEach(position => { const details = (position === Position.ONE) ? editors.positionOne : (position === Position.TWO) ? editors.positionTwo : editors.positionThree; if (details && this.stacks.groupAt(position)) { + groupsWithEditorsToClose++; editorsToClose.push(...this.extractCloseEditorDetails(position, details).editorsToClose); } }); // Check for dirty and veto - return this.handleDirty(editorsToClose).then(veto => { + const ignoreDirtyIfOpenedInOtherGroup = (groupsWithEditorsToClose === 1); + return this.handleDirty(editorsToClose, ignoreDirtyIfOpenedInOtherGroup).then(veto => { if (veto) { return void 0; } @@ -758,7 +761,8 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService } // Check for dirty and veto - return this.handleDirty(arrays.flatten(groups.map(group => group.getEditors(true /* in MRU order */).map(editor => ({ group, editor }))))).then(veto => { + const ignoreDirtyIfOpenedInOtherGroup = (groups.length === 1); + return this.handleDirty(arrays.flatten(groups.map(group => group.getEditors(true /* in MRU order */).map(editor => ({ group, editor })))), ignoreDirtyIfOpenedInOtherGroup).then(veto => { if (veto) { return; } From 26359a948193b5d786d36990647de9a12c0bd8a7 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 10:46:03 +0100 Subject: [PATCH 250/710] Fix some (ln;col) -> offset conversion --- src/vs/editor/common/model.ts | 1 + .../chunksTextBuffer/chunksTextBuffer.ts | 45 +++++-------------- .../model/linesTextBuffer/linesTextBuffer.ts | 4 ++ src/vs/editor/common/model/textModel.ts | 3 +- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 9d58b81cc05..3ce343c7411 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -1079,6 +1079,7 @@ export interface ITextBuffer { getValueInRange(range: Range, eol: EndOfLinePreference): string; getValueLengthInRange(range: Range, eol: EndOfLinePreference): number; + getLength(): number; getLineCount(): number; getLinesContent(): string[]; getLineContent(lineNumber: number): string; diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index dbde6393671..2ab37067f60 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -116,6 +116,10 @@ export class ChunksTextBuffer implements ITextBuffer { return 0; } + public getLength(): number { + return this._actual.getLength(); + } + getLineCount(): number { return this._actual.getLineCount(); } @@ -1014,12 +1018,12 @@ class Buffer { public convertPositionToOffset(lineNumber: number, column: number): number { const r = BufferCursorPool.take(); - if (!this._getOffsetAt(lineNumber, column, r)) { + if (!this._findLineStart(lineNumber, r)) { BufferCursorPool.put(r); throw new Error(`Position not found`); } - const result = r.offset; + const result = r.offset + column - 1; BufferCursorPool.put(r); return result; @@ -1048,7 +1052,7 @@ class Buffer { while (true) { const leaf = this._leafs[leafIndex]; - if (leaf.newLineCount() > 1 && leaf.lineStartFor(0) + leafStartOffset <= offset) { + if (leaf.newLineCount() >= 1 && leaf.lineStartFor(0) + leafStartOffset <= offset) { // must be in this leaf return this._findLineStartBeforeOffsetInLeaf(offset, leafIndex, leafStartOffset, leafStartNewLineCount, result); } @@ -1113,48 +1117,23 @@ class Buffer { public getValueInRange(range: Range): string { const start = BufferCursorPool.take(); - const end = BufferCursorPool.take(); if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) { BufferCursorPool.put(start); - BufferCursorPool.put(end); throw new Error(`Line not found`); } - if (!this._getOffsetAt(range.endLineNumber, range.endColumn, end)) { - BufferCursorPool.put(start); - BufferCursorPool.put(end); - throw new Error(`Line not found`); - } - - const result = this.extractString(start, end.offset - start.offset); + const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn); + const result = this.extractString(start, endOffset - start.offset); BufferCursorPool.put(start); - BufferCursorPool.put(end); return result; } public getValueLengthInRange(range: Range): number { - const start = BufferCursorPool.take(); - const end = BufferCursorPool.take(); - - if (!this._getOffsetAt(range.startLineNumber, range.startColumn, start)) { - BufferCursorPool.put(start); - BufferCursorPool.put(end); - throw new Error(`Line not found`); - } - - if (!this._getOffsetAt(range.endLineNumber, range.endColumn, end)) { - BufferCursorPool.put(start); - BufferCursorPool.put(end); - throw new Error(`Line not found`); - } - - const result = end.offset - start.offset; - - BufferCursorPool.put(start); - BufferCursorPool.put(end); - return result; + const startOffset = this.convertPositionToOffset(range.startLineNumber, range.startColumn); + const endOffset = this.convertPositionToOffset(range.endLineNumber, range.endColumn); + return endOffset - startOffset; } //#region Editing diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 1cbd9fe7c92..73ac79ad7e5 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -190,6 +190,10 @@ export class LinesTextBuffer implements ITextBuffer { return endOffset - startOffset; } + public getLength(): number { + return this._lineStarts.getTotalValue(); + } + public getLineCount(): number { return this._lines.length; } diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 023a1adb307..bac60124491 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -895,7 +895,8 @@ export class TextModel extends Disposable implements model.ITextModel { public modifyPosition(rawPosition: IPosition, offset: number): Position { this._assertNotDisposed(); - return this.getPositionAt(this.getOffsetAt(rawPosition) + offset); + let candidate = this.getOffsetAt(rawPosition) + offset; + return this.getPositionAt(Math.min(this._buffer.getLength(), Math.max(0, candidate))); } public getFullModelRange(): Range { From 43e1d0917fe1752c011859b65271078ca69a5d4c Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 10:48:47 +0100 Subject: [PATCH 251/710] getMultiSelectedEditorContexts --- .../browser/parts/editor/editorCommands.ts | 23 +++++++++++++++++++ src/vs/workbench/parts/files/browser/files.ts | 18 ++++----------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index cbc3db4dcda..2bcc4c95f2f 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -19,6 +19,8 @@ import { TPromise } from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions'; +import { IListService } from 'vs/platform/list/browser/listService'; +import { List } from 'vs/base/browser/ui/list/listWidget'; export const CLOSE_UNMODIFIED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors'; export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup'; @@ -451,3 +453,24 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService return { position, input }; } + +export function getMultiSelectedEditorContexts(editorContext: IEditorContext, listService: IListService): IEditorContext[] { + const list = listService.lastFocusedList; + // Mapping for open editors view + const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element }; + + if (list instanceof List && list.isDOMFocused()) { + const selection = list.getSelectedElements(); + const focus = list.getFocusedElements(); + // Only respect selection if it contains focused element + if (focus.length && selection && selection.indexOf(focus[0]) >= 0) { + return list.getSelectedElements().map(elementToContext); + } + + if (focus) { + return focus.map(elementToContext); + } + } + + return !!editorContext ? [editorContext] : []; +} diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts index 985fb3281cb..72dd8337242 100644 --- a/src/vs/workbench/parts/files/browser/files.ts +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri'; import { IListService } from 'vs/platform/list/browser/listService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { FileStat, OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; -import { toResource, IEditorContext } from 'vs/workbench/common/editor'; +import { toResource } from 'vs/workbench/common/editor'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { List } from 'vs/base/browser/ui/list/listWidget'; @@ -36,17 +36,18 @@ export function getResourceForCommand(resource: URI, listService: IListService, export function getMultiSelectedResources(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; if (list && list.isDOMFocused()) { + const focus = list.getFocus(); // Explorer if (list instanceof Tree) { const selection = list.getSelection(); - if (selection && selection.length > 1) { + if (selection && selection.indexOf(focus) >= 0) { return selection.map(fs => fs.resource); } } // Open editors view if (list instanceof List) { const selection = list.getSelectedElements(); - if (selection && selection.length > 1) { + if (selection && selection.indexOf(focus) >= 0) { return selection.filter(s => s instanceof OpenEditor).map((oe: OpenEditor) => oe.getResource()); } } @@ -55,14 +56,3 @@ export function getMultiSelectedResources(resource: URI, listService: IListServi const result = getResourceForCommand(resource, listService, editorService); return !!result ? [result] : []; } - -export function getMultiSelectedEditorContexts(listService: IListService): IEditorContext[] { - const list = listService.lastFocusedList; - if (list && list.isDOMFocused() && list instanceof List) { - return list.getSelectedElements().map(element => - element instanceof OpenEditor ? { group: element.editorGroup, editor: element.editorInput } : { group: element } - ); - } - - return []; -} From 748f1763210da4a2a9671c36eb1286b6a33f920d Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 10:49:04 +0100 Subject: [PATCH 252/710] open editors: need to pass an {} when there is no uri to keep the order of arguments --- .../parts/files/electron-browser/views/openEditorsView.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index efafc160364..107fc77330d 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -298,7 +298,7 @@ export class OpenEditorsView extends ViewsViewletPanel { getAnchor: () => e.anchor, getActions: () => { const actions = []; - fillInActions(this.contributedContextMenu, { shouldForwardArgs: true, arg: element instanceof OpenEditor ? element.editorInput.getResource() : undefined }, actions, this.contextMenuService); + fillInActions(this.contributedContextMenu, { shouldForwardArgs: true, arg: element instanceof OpenEditor ? element.editorInput.getResource() : {} }, actions, this.contextMenuService); return TPromise.as(actions); }, getActionsContext: () => element instanceof OpenEditor ? { group: element.editorGroup, editor: element.editorInput } : { group: element } From 8a545292d8de1a0a4561cf5aa4009cd10740a7ac Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 10:49:13 +0100 Subject: [PATCH 253/710] open editors multi select: save all --- .../files/electron-browser/fileCommands.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 0fcef88213d..138d7cda4a7 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -41,6 +41,7 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService'; import { sequence } from 'vs/base/common/async'; import { getResourceForCommand, getMultiSelectedResources } from 'vs/workbench/parts/files/browser/files'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; +import { getMultiSelectedEditorContexts } from 'vs/workbench/browser/parts/editor/editorCommands'; // Commands @@ -488,18 +489,21 @@ CommandsRegistry.registerCommand({ CommandsRegistry.registerCommand({ id: SAVE_ALL_IN_GROUP_COMMAND_ID, handler: (accessor, resource: URI, editorContext: IEditorContext) => { + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); let saveAllArg: any; - if (!editorContext) { + if (!contexts.length) { saveAllArg = true; } else { const fileService = accessor.get(IFileService); - const editorGroup = editorContext.group; - saveAllArg = []; - editorGroup.getEditors().forEach(editor => { - const resource = toResource(editor, { supportSideBySide: true }); - if (resource && (resource.scheme === 'untitled' || fileService.canHandleResource(resource))) { - saveAllArg.push(resource); - } + contexts.forEach(context => { + const editorGroup = context.group; + saveAllArg = []; + editorGroup.getEditors().forEach(editor => { + const resource = toResource(editor, { supportSideBySide: true }); + if (resource && (resource.scheme === 'untitled' || fileService.canHandleResource(resource))) { + saveAllArg.push(resource); + } + }); }); } From de218362e82e46f82ffe3c5152bb3b2910bf697c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 11:04:21 +0100 Subject: [PATCH 254/710] Better edits sorting --- .../editor/common/model/chunksTextBuffer/chunksTextBuffer.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 2ab37067f60..ad85b50c12c 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -1274,7 +1274,10 @@ class Buffer { private static _compareEdits(a: OffsetLenEdit, b: OffsetLenEdit): number { if (a.offset === b.offset) { - return (a.initialIndex - b.initialIndex); + if (a.length === b.length) { + return (a.initialIndex - b.initialIndex); + } + return (a.length - b.length); } return a.offset - b.offset; } From ec1924769cd46d6409d6915b990839fd5d23ddbf Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Tue, 16 Jan 2018 11:04:49 +0100 Subject: [PATCH 255/710] Add alias for commands (#39778) --- extensions/merge-conflict/package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 02ca68b911e..1a0f35f9b34 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -24,51 +24,61 @@ { "category": "%command.category%", "title": "%command.accept.all-current%", + "original": "Accept All Current", "command": "merge-conflict.accept.all-current" }, { "category": "%command.category%", "title": "%command.accept.all-incoming%", + "original": "Accept All Incoming", "command": "merge-conflict.accept.all-incoming" }, { "category": "%command.category%", "title": "%command.accept.all-both%", + "original": "Accept All Both", "command": "merge-conflict.accept.all-both" }, { "category": "%command.category%", "title": "%command.accept.current%", + "original": "Accept Current", "command": "merge-conflict.accept.current" }, { "category": "%command.category%", "title": "%command.accept.incoming%", + "original": "Accept Incoming", "command": "merge-conflict.accept.incoming" }, { "category": "%command.category%", "title": "%command.accept.selection%", + "original": "Accept Selection", "command": "merge-conflict.accept.selection" }, { "category": "%command.category%", "title": "%command.accept.both%", + "original": "Accept Both", "command": "merge-conflict.accept.both" }, { "category": "%command.category%", "title": "%command.next%", + "original": "Next Conflict", "command": "merge-conflict.next" }, { "category": "%command.category%", "title": "%command.previous%", + "original": "Previous Conflict", "command": "merge-conflict.previous" }, { "category": "%command.category%", "title": "%command.compare%", + "original":"Compare Current Conflict", "command": "merge-conflict.compare" } ], From cad270088c035ab8df3101311ad7f99a274db217 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 11:10:48 +0100 Subject: [PATCH 256/710] Implement ChunksTextBuffer.setEOL --- src/vs/editor/common/model.ts | 2 +- .../chunksTextBuffer/chunksTextBuffer.ts | 19 +++++++++++++++++-- .../model/linesTextBuffer/linesTextBuffer.ts | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 3ce343c7411..6c208408ba3 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -1088,7 +1088,7 @@ export interface ITextBuffer { getLineFirstNonWhitespaceColumn(lineNumber: number): number; getLineLastNonWhitespaceColumn(lineNumber: number): number; - setEOL(newEOL: string): void; + setEOL(newEOL: '\r\n' | '\n'): void; applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult; } diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index ad85b50c12c..505489ac30d 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -151,8 +151,12 @@ export class ChunksTextBuffer implements ITextBuffer { getLineLastNonWhitespaceColumn(lineNumber: number): number { throw new Error('TODO'); } - setEOL(newEOL: string): void { - throw new Error('TODO'); + 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 { @@ -1365,6 +1369,17 @@ class Buffer { 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 { diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 73ac79ad7e5..d1ebb3ec17d 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -232,7 +232,7 @@ export class LinesTextBuffer implements ITextBuffer { //#region Editing - public setEOL(newEOL: string): void { + public setEOL(newEOL: '\r\n' | '\n'): void { this._EOL = newEOL; this._constructLineStarts(); } From 16bcbe19070361b346d823c3ef3b4b6d4b626ecb Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 11:19:24 +0100 Subject: [PATCH 257/710] close all unmodified multi select aware --- .../workbench/browser/parts/editor/editorCommands.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 2bcc4c95f2f..6c3c6a04068 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -21,6 +21,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions'; import { IListService } from 'vs/platform/list/browser/listService'; import { List } from 'vs/base/browser/ui/list/listWidget'; +import { distinct } from 'vs/base/common/arrays'; export const CLOSE_UNMODIFIED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors'; export const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup'; @@ -264,14 +265,11 @@ function registerEditorCommands() { handler: (accessor, resource: URI, editorContext: IEditorContext) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); + const positions = contexts.map(context => positionAndInput(editorGroupService, editorService, context).position); - const { position } = positionAndInput(editorGroupService, editorService, editorContext); - - if (typeof position === 'number') { - return editorService.closeEditors(position, { unmodifiedOnly: true }); - } - - return TPromise.as(false); + return TPromise.join(distinct(positions.filter(p => typeof p === 'number')) + .map(position => editorService.closeEditors(position, { unmodifiedOnly: true }))); } }); From 74d70805fd18cbf2b3dacebf6b5b143c81fa82d4 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 11:24:57 +0100 Subject: [PATCH 258/710] Fix edge case when searching for last offset in file --- src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 505489ac30d..75e2960ee3f 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -757,7 +757,7 @@ class Buffer { while (true) { const leaf = this._leafs[leafIndex]; - if (innerOffset < leaf.length()) { + if (innerOffset < leaf.length() || (innerOffset === leaf.length() && leafIndex + 1 === leafsCount)) { result.set(offset, leafIndex, leafStartOffset, leafStartNewLineCount); return true; } From 5db6bdddd8add87bd572ae7afaf3282b1fcc00d3 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 11:30:29 +0100 Subject: [PATCH 259/710] Fix NPE in Buffer.equals --- .../chunksTextBuffer/chunksTextBuffer.ts | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 75e2960ee3f..7677656adc8 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -613,23 +613,10 @@ class Buffer { } let remaining = aLength; - let aLeafIndex = 0, aLeaf = a._leafs[aLeafIndex], aLeafLength = aLeaf.length(), aLeafRemaining = aLeafLength; - let bLeafIndex = 0, bLeaf = b._leafs[bLeafIndex], bLeafLength = bLeaf.length(), bLeafRemaining = bLeafLength; + let aLeafIndex = -1, aLeaf = null, aLeafLength = 0, aLeafRemaining = 0; + let bLeafIndex = -1, bLeaf = null, bLeafLength = 0, bLeafRemaining = 0; while (remaining > 0) { - 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; - if (aLeafRemaining === 0) { aLeafIndex++; aLeaf = a._leafs[aLeafIndex]; @@ -643,6 +630,19 @@ class Buffer { 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; From af160c40ccc98eb056707934cb857ef4d7cd2d9d Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 11:38:25 +0100 Subject: [PATCH 260/710] Validate offset before passing it down --- src/vs/editor/common/model/textModel.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index bac60124491..472868a177f 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -635,8 +635,9 @@ export class TextModel extends Disposable implements model.ITextModel { return this._buffer.getOffsetAt(position.lineNumber, position.column); } - public getPositionAt(offset: number): Position { + public getPositionAt(rawOffset: number): Position { this._assertNotDisposed(); + let offset = (Math.min(this._buffer.getLength(), Math.max(0, rawOffset))); return this._buffer.getPositionAt(offset); } From 592e8761a327901cd432d5d8bfef0732e440679a Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 11:48:05 +0100 Subject: [PATCH 261/710] open editors view: remove unused actions --- .../browser/parts/editor/editorActions.ts | 40 +------------------ .../electron-browser/views/openEditorsView.ts | 14 ++----- 2 files changed, 6 insertions(+), 48 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index d4206f2f46a..a3fce23c4f2 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -22,7 +22,7 @@ import { IEditorGroupService, GroupArrangement } from 'vs/workbench/services/gro import { ICommandService } from 'vs/platform/commands/common/commands'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IWindowsService } from 'vs/platform/windows/common/windows'; -import { CLOSE_UNMODIFIED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, NAVIGATE_IN_GROUP_ONE_PREFIX, NAVIGATE_ALL_EDITORS_GROUP_PREFIX, NAVIGATE_IN_GROUP_THREE_PREFIX, NAVIGATE_IN_GROUP_TWO_PREFIX } from 'vs/workbench/browser/parts/editor/editorCommands'; +import { CLOSE_EDITOR_COMMAND_ID, NAVIGATE_IN_GROUP_ONE_PREFIX, NAVIGATE_ALL_EDITORS_GROUP_PREFIX, NAVIGATE_IN_GROUP_THREE_PREFIX, NAVIGATE_IN_GROUP_TWO_PREFIX } from 'vs/workbench/browser/parts/editor/editorCommands'; export class SplitEditorAction extends Action { @@ -644,24 +644,6 @@ export class CloseAllEditorsAction extends Action { } } -export class CloseUnmodifiedEditorsInGroupAction extends Action { - - public static readonly ID = 'workbench.action.closeUnmodifiedEditors'; - public static readonly LABEL = nls.localize('closeUnmodifiedEditors', "Close Unmodified Editors in Group"); - - constructor( - id: string, - label: string, - @ICommandService private commandService: ICommandService - ) { - super(id, label); - } - - public run(context?: IEditorContext): TPromise { - return this.commandService.executeCommand(CLOSE_UNMODIFIED_EDITORS_COMMAND_ID, void 0, context); - } -} - export class CloseEditorsInOtherGroupsAction extends Action { public static readonly ID = 'workbench.action.closeEditorsInOtherGroups'; @@ -693,24 +675,6 @@ export class CloseEditorsInOtherGroupsAction extends Action { } } -export class CloseEditorsInGroupAction extends Action { - - public static readonly ID = 'workbench.action.closeEditorsInGroup'; - public static readonly LABEL = nls.localize('closeEditorsInGroup', "Close All Editors in Group"); - - constructor( - id: string, - label: string, - @ICommandService private commandService: ICommandService - ) { - super(id, label); - } - - public run(context?: IEditorContext): TPromise { - return this.commandService.executeCommand(CLOSE_EDITORS_IN_GROUP_COMMAND_ID, void 0, context); - } -} - export class MoveGroupLeftAction extends Action { public static readonly ID = 'workbench.action.moveActiveEditorGroupLeft'; @@ -1446,4 +1410,4 @@ export class MoveEditorToThirdGroupAction extends MoveEditorToSpecificGroup { ) { super(id, label, Position.THREE, editorGroupService, editorService); } -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 107fc77330d..1d8c0b5b301 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -21,7 +21,7 @@ import { OpenEditorsFocusedContext, ExplorerFocusedContext, IFilesConfiguration import { ITextFileService, AutoSaveMode } from 'vs/workbench/services/textfile/common/textfiles'; import { OpenEditor } from 'vs/workbench/parts/files/common/explorerModel'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; -import { CloseAllEditorsAction, CloseUnmodifiedEditorsInGroupAction, CloseEditorsInGroupAction, CloseEditorAction } from 'vs/workbench/browser/parts/editor/editorActions'; +import { CloseAllEditorsAction, CloseEditorAction } from 'vs/workbench/browser/parts/editor/editorActions'; import { ToggleEditorLayoutAction } from 'vs/workbench/browser/actions/toggleEditorLayout'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { EditorGroup } from 'vs/workbench/common/editor/editorStacksModel'; @@ -453,15 +453,9 @@ class EditorGroupRenderer implements IRenderer { - const key = this.keybindingService.lookupKeybinding(a.id); - editorGroupTemplate.actionBar.push(a, { icon: true, label: false, keybinding: key ? key.getLabel() : void 0 }); - }); + const saveAllInGroupAction = this.instantiationService.createInstance(SaveAllInGroupAction, SaveAllInGroupAction.ID, SaveAllInGroupAction.LABEL); + const key = this.keybindingService.lookupKeybinding(saveAllInGroupAction.id); + editorGroupTemplate.actionBar.push(saveAllInGroupAction, { icon: true, label: false, keybinding: key ? key.getLabel() : void 0 }); editorGroupTemplate.toDispose = []; editorGroupTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, (e: DragEvent) => { From 45dccb50be1efa60559936af988031fdd695e0a6 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 11:50:16 +0100 Subject: [PATCH 262/710] close editors multi select aware --- src/vs/workbench/browser/parts/editor/editorCommands.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 6c3c6a04068..1461613b306 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -281,11 +281,12 @@ function registerEditorCommands() { handler: (accessor, resource: URI, editorContext: IEditorContext) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); + const positions = contexts.map(context => positionAndInput(editorGroupService, editorService, context).position); + const distinctPositions = distinct(positions.filter(p => typeof p === 'number')); - const { position } = positionAndInput(editorGroupService, editorService, editorContext); - - if (typeof position === 'number') { - return editorService.closeEditors(position); + if (distinctPositions.length) { + return editorService.closeEditors(distinctPositions); } return TPromise.as(false); From 01afb2549467ab6e0af979a2ab95983755b1ff1f Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 12:18:08 +0100 Subject: [PATCH 263/710] Optimize buffer creation --- .../model/chunksTextBuffer/bufferPiece.ts | 45 ++++++++++++++++--- .../chunksTextBufferBuilder.ts | 23 +++++----- 2 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index 91066193848..78c9915d8b8 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -23,7 +23,7 @@ export class BufferPiece { constructor(str: string, lineStarts: Uint32Array = null) { this._str = str; if (lineStarts === null) { - this._lineStarts = createUint32Array(createLineStarts(str).lineStarts); + this._lineStarts = createLineStartsFast(str); } else { this._lineStarts = lineStarts; } @@ -235,16 +235,41 @@ export function createUint32Array(arr: number[]): Uint32Array { export class LineStarts { constructor( - public readonly lineStarts: number[], + public readonly lineStarts: Uint32Array, public readonly cr: number, public readonly lf: number, - public readonly crlf: number + public readonly crlf: number, + public readonly isBasicASCII: boolean ) { } } -export function createLineStarts(str: string): LineStarts { +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); @@ -262,7 +287,17 @@ export function createLineStarts(str: string): LineStarts { } else if (chr === CharCode.LineFeed) { lf++; r[rLength++] = i + 1; + } else { + if (isBasicASCII) { + if (chr !== CharCode.Tab && (chr < 32 || chr > 126)) { + isBasicASCII = false; + } + } } } - return new LineStarts(r, cr, lf, crlf); + + const result = new LineStarts(createUint32Array(r), cr, lf, crlf, isBasicASCII); + r.length = 0; + + return result; } diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index 384eb608a4b..e1268de0dd5 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -6,7 +6,7 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model'; -import { BufferPiece, createLineStarts, createUint32Array } from 'vs/editor/common/model/chunksTextBuffer/bufferPiece'; +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'; @@ -71,6 +71,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { private _hasPreviousChar: boolean; private _previousChar: number; private _averageChunkSize: number; + private _tmpLineStarts: number[]; private cr: number; private lf: number; @@ -83,6 +84,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._hasPreviousChar = false; this._previousChar = 0; this._averageChunkSize = 0; + this._tmpLineStarts = []; this.cr = 0; this.lf = 0; @@ -109,13 +111,6 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._hasPreviousChar = false; this._previousChar = lastChar; } - - if (!this.containsRTL) { - this.containsRTL = strings.containsRTL(chunk); - } - if (this.isBasicASCII) { - this.isBasicASCII = strings.isBasicASCII(chunk); - } } private _acceptChunk1(chunk: string, allowEmptyStrings: boolean): void { @@ -132,12 +127,20 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { } private _acceptChunk2(chunk: string): void { - const lineStarts = createLineStarts(chunk); + const lineStarts = createLineStarts(this._tmpLineStarts, chunk); - this._rawPieces.push(new BufferPiece(chunk, createUint32Array(lineStarts.lineStarts))); + 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 { From fa82eeaef5ef8c069472a40001819b7688e9c973 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 12:24:56 +0100 Subject: [PATCH 264/710] Folding is not supported for huge files --- src/vs/editor/contrib/folding/folding.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts index 283801a2d60..21e8d35f4ce 100644 --- a/src/vs/editor/contrib/folding/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -133,7 +133,8 @@ export class FoldingController implements IEditorContribution { this.localToDispose = dispose(this.localToDispose); let model = this.editor.getModel(); - if (!this._isEnabled || !model) { + if (!this._isEnabled || !model || model.isTooLargeForTokenization()) { + // huge files get no view model, so they cannot support hidden areas return; } From f678d17b03ca9d50f5bb2cbdf7cb52e2191012f5 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 12:29:00 +0100 Subject: [PATCH 265/710] Optimize away looping through lines for huge files --- src/vs/editor/common/model/textModel.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 472868a177f..d7a914bb843 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -493,6 +493,10 @@ export class TextModel extends Disposable implements model.ITextModel { public isDominatedByLongLines(): boolean { this._assertNotDisposed(); + if (this.isTooLargeForTokenization()) { + // Cannot word wrap huge files anyways, so it doesn't really matter + return false; + } let smallLineCharCount = 0; let longLineCharCount = 0; From c74f95d1dc4a24796df1d4515eb8a51a922a749a Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 12:57:39 +0100 Subject: [PATCH 266/710] close editors and close other editors multi select aware --- .../browser/parts/editor/editorCommands.ts | 69 ++++++++++++------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 1461613b306..a2855fd1efe 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -303,31 +303,36 @@ function registerEditorCommands() { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); - const position = editorContext ? editorGroupService.getStacksModel().positionOfGroup(editorContext.group) : null; + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); + const groups = distinct(contexts.map(context => context.group)); - // Close Active Editor - if (typeof position !== 'number') { - const activeEditor = editorService.getActiveEditor(); - if (activeEditor) { - return editorService.closeEditor(activeEditor.position, activeEditor.input); - } - } + const editorsToClose = new Map(); + groups.forEach(group => { + const position = editorGroupService.getStacksModel().positionOfGroup(group); + editorsToClose.set(position, contexts.map(c => { + if (group === c.group) { + let input = c ? c.editor : undefined; + if (!input) { - let input = editorContext ? editorContext.editor : null; - if (!input) { + // Get Top Editor at Position + const visibleEditors = editorService.getVisibleEditors(); + if (visibleEditors[position]) { + input = visibleEditors[position].input; + } + } - // Get Top Editor at Position - const visibleEditors = editorService.getVisibleEditors(); - if (visibleEditors[position]) { - input = visibleEditors[position].input; - } - } + return input; + } - if (input) { - return editorService.closeEditor(position, input); - } + return undefined; + }).filter(input => !!input)); + }); - return TPromise.as(false); + return editorService.closeEditors({ + positionOne: editorsToClose.get(Position.ONE), + positionTwo: editorsToClose.get(Position.TWO), + positionThree: editorsToClose.get(Position.THREE) + }); } }); @@ -340,14 +345,28 @@ function registerEditorCommands() { handler: (accessor, resource: URI, editorContext: IEditorContext) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); + const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); + const groups = distinct(contexts.map(context => context.group)); + const editorsToClose = new Map(); - const { position, input } = positionAndInput(editorGroupService, editorService, editorContext); + groups.forEach(group => { + const inputsToSkip = contexts.map(c => { + if (!!c.editor && c.group === group) { + return c.editor; + } - if (typeof position === 'number' && input) { - return editorService.closeEditors(position, { except: input }); - } + return undefined; + }).filter(input => !!input); - return TPromise.as(false); + const toClose = group.getEditors().filter(input => inputsToSkip.indexOf(input) === -1); + editorsToClose.set(editorGroupService.getStacksModel().positionOfGroup(group), toClose); + }); + + return editorService.closeEditors({ + positionOne: editorsToClose.get(Position.ONE), + positionTwo: editorsToClose.get(Position.TWO), + positionThree: editorsToClose.get(Position.THREE) + }); } }); From bc0450fe4416c8ccc5e0a912b8de822c6a146fc4 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 15:16:30 +0100 Subject: [PATCH 267/710] get rid of IEditorContext, use IEditorIdentifier instead --- .../browser/parts/editor/editorActions.ts | 18 ++++++++--------- .../browser/parts/editor/editorCommands.ts | 20 +++++++++---------- src/vs/workbench/common/editor.ts | 4 ---- .../files/electron-browser/fileCommands.ts | 4 ++-- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts index a3fce23c4f2..81e001915bb 100644 --- a/src/vs/workbench/browser/parts/editor/editorActions.ts +++ b/src/vs/workbench/browser/parts/editor/editorActions.ts @@ -9,7 +9,7 @@ import nls = require('vs/nls'); import { Action } from 'vs/base/common/actions'; import { mixin } from 'vs/base/common/objects'; import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService'; -import { EditorInput, TextEditorOptions, EditorOptions, IEditorIdentifier, IEditorContext, ActiveEditorMoveArguments, ActiveEditorMovePositioning, EditorCommands, ConfirmResult } from 'vs/workbench/common/editor'; +import { EditorInput, TextEditorOptions, EditorOptions, IEditorIdentifier, ActiveEditorMoveArguments, ActiveEditorMovePositioning, EditorCommands, ConfirmResult } from 'vs/workbench/common/editor'; import { QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry, QuickOpenAction } from 'vs/workbench/browser/quickopen'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -38,7 +38,7 @@ export class SplitEditorAction extends Action { super(id, label, 'split-editor-action'); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { let editorToSplit: IEditor; if (context) { editorToSplit = this.editorService.getVisibleEditors()[this.editorGroupService.getStacksModel().positionOfGroup(context.group)]; @@ -119,7 +119,7 @@ export class JoinTwoGroupsAction extends Action { super(id, label); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { const editorStacksModel = this.editorGroupService.getStacksModel(); @@ -537,7 +537,7 @@ export class CloseEditorAction extends Action { super(id, label, 'close-editor-action'); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { return this.commandService.executeCommand(CLOSE_EDITOR_COMMAND_ID, void 0, context); } } @@ -589,7 +589,7 @@ export class CloseLeftEditorsInGroupAction extends Action { super(id, label); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { const editor = getTarget(this.editorService, this.groupService, context); if (editor) { return this.editorService.closeEditors(editor.position, { except: editor.input, direction: Direction.LEFT }); @@ -658,7 +658,7 @@ export class CloseEditorsInOtherGroupsAction extends Action { super(id, label); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { let position = context ? this.editorGroupService.getStacksModel().positionOfGroup(context.group) : null; if (typeof position !== 'number') { const activeEditor = this.editorService.getActiveEditor(); @@ -689,7 +689,7 @@ export class MoveGroupLeftAction extends Action { super(id, label); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { let position = context ? this.editorGroupService.getStacksModel().positionOfGroup(context.group) : null; if (typeof position !== 'number') { const activeEditor = this.editorService.getActiveEditor(); @@ -723,7 +723,7 @@ export class MoveGroupRightAction extends Action { super(id, label); } - public run(context?: IEditorContext): TPromise { + public run(context?: IEditorIdentifier): TPromise { let position = context ? this.editorGroupService.getStacksModel().positionOfGroup(context.group) : null; if (typeof position !== 'number') { const activeEditor = this.editorService.getActiveEditor(); @@ -802,7 +802,7 @@ export class MaximizeGroupAction extends Action { } } -function getTarget(editorService: IWorkbenchEditorService, editorGroupService: IEditorGroupService, context?: IEditorContext): { input: IEditorInput, position: Position } { +function getTarget(editorService: IWorkbenchEditorService, editorGroupService: IEditorGroupService, context?: IEditorIdentifier): { input: IEditorInput, position: Position } { if (context) { return { input: context.editor, position: editorGroupService.getStacksModel().positionOfGroup(context.group) }; } diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index a2855fd1efe..2958d3e54ff 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -8,7 +8,7 @@ import * as types from 'vs/base/common/types'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; -import { ActiveEditorMoveArguments, ActiveEditorMovePositioning, ActiveEditorMovePositioningBy, EditorCommands, TextCompareEditorVisible, IEditorContext, EditorInput } from 'vs/workbench/common/editor'; +import { ActiveEditorMoveArguments, ActiveEditorMovePositioning, ActiveEditorMovePositioningBy, EditorCommands, TextCompareEditorVisible, EditorInput, IEditorIdentifier } from 'vs/workbench/common/editor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditor, Position, POSITIONS, Direction, IEditorInput } from 'vs/platform/editor/common/editor'; import { EditorContextKeys } from 'vs/editor/common/editorContextKeys'; @@ -262,7 +262,7 @@ function registerEditorCommands() { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_U), - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); @@ -278,7 +278,7 @@ function registerEditorCommands() { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_W), - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); @@ -299,7 +299,7 @@ function registerEditorCommands() { when: void 0, primary: KeyMod.CtrlCmd | KeyCode.KEY_W, win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] }, - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); @@ -342,7 +342,7 @@ function registerEditorCommands() { when: void 0, primary: void 0, mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_T }, - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); @@ -375,7 +375,7 @@ function registerEditorCommands() { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: void 0, primary: void 0, - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); @@ -394,7 +394,7 @@ function registerEditorCommands() { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: void 0, primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.Enter), - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); @@ -413,7 +413,7 @@ function registerEditorCommands() { weight: KeybindingsRegistry.WEIGHT.workbenchContrib(), when: void 0, primary: void 0, - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); const quickOpenService = accessor.get(IQuickOpenService); @@ -458,7 +458,7 @@ function registerEditorCommands() { }); } -function positionAndInput(editorGroupService: IEditorGroupService, editorService: IWorkbenchEditorService, editorContext?: IEditorContext): { position: Position, input: IEditorInput } { +function positionAndInput(editorGroupService: IEditorGroupService, editorService: IWorkbenchEditorService, editorContext?: IEditorIdentifier): { position: Position, input: IEditorInput } { let position = editorContext ? editorGroupService.getStacksModel().positionOfGroup(editorContext.group) : null; let input = editorContext ? editorContext.editor : null; @@ -472,7 +472,7 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService return { position, input }; } -export function getMultiSelectedEditorContexts(editorContext: IEditorContext, listService: IListService): IEditorContext[] { +export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier, listService: IListService): IEditorIdentifier[] { const list = listService.lastFocusedList; // Mapping for open editors view const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element }; diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index 83459cd9818..a1d01775cf3 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -788,10 +788,6 @@ export interface IEditorIdentifier { editor?: IEditorInput; } -export interface IEditorContext extends IEditorIdentifier { - event?: any; -} - export interface IEditorCloseEvent extends IEditorIdentifier { replaced: boolean; index: number; diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 138d7cda4a7..23f1b15a206 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -12,7 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as labels from 'vs/base/common/labels'; import URI from 'vs/base/common/uri'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { toResource, IEditorContext } from 'vs/workbench/common/editor'; +import { toResource, IEditorIdentifier } from 'vs/workbench/common/editor'; import { IWindowsService } from 'vs/platform/windows/common/windows'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; @@ -488,7 +488,7 @@ CommandsRegistry.registerCommand({ CommandsRegistry.registerCommand({ id: SAVE_ALL_IN_GROUP_COMMAND_ID, - handler: (accessor, resource: URI, editorContext: IEditorContext) => { + handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); let saveAllArg: any; if (!contexts.length) { From f9237aa2e98eaa5c3e8aa8fe6368f345f53a399e Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 15:39:27 +0100 Subject: [PATCH 268/710] udpate explorer.openEditors.visible docs --- .../parts/files/electron-browser/files.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c893a744be8..ad7b20637ca 100644 --- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts @@ -303,7 +303,7 @@ configurationRegistry.registerConfiguration({ 'properties': { 'explorer.openEditors.visible': { 'type': 'number', - 'description': nls.localize({ key: 'openEditorsVisible', comment: ['Open is an adjective'] }, "Number of editors shown in the Open Editors pane. Set it to 0 to hide the pane."), + 'description': nls.localize({ key: 'openEditorsVisible', comment: ['Open is an adjective'] }, "Number of editors shown in the Open Editors pane."), 'default': 9 }, 'explorer.autoReveal': { From 3f38333b9b17dd2f31ef908e37abf7c7a8b03274 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 15:53:21 +0100 Subject: [PATCH 269/710] getMultiSelectedEditorContexts --- src/vs/workbench/browser/parts/editor/editorCommands.ts | 2 +- src/vs/workbench/common/editor.ts | 2 +- src/vs/workbench/parts/files/browser/files.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 2958d3e54ff..444f4b299a6 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -475,7 +475,7 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier, listService: IListService): IEditorIdentifier[] { const list = listService.lastFocusedList; // Mapping for open editors view - const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element }; + const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element, editor: undefined }; if (list instanceof List && list.isDOMFocused()) { const selection = list.getSelectedElements(); diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts index a1d01775cf3..03436fe0657 100644 --- a/src/vs/workbench/common/editor.ts +++ b/src/vs/workbench/common/editor.ts @@ -785,7 +785,7 @@ export interface IEditorGroup { export interface IEditorIdentifier { group: IEditorGroup; - editor?: IEditorInput; + editor: IEditorInput; } export interface IEditorCloseEvent extends IEditorIdentifier { diff --git a/src/vs/workbench/parts/files/browser/files.ts b/src/vs/workbench/parts/files/browser/files.ts index 72dd8337242..09a9d911524 100644 --- a/src/vs/workbench/parts/files/browser/files.ts +++ b/src/vs/workbench/parts/files/browser/files.ts @@ -36,9 +36,9 @@ export function getResourceForCommand(resource: URI, listService: IListService, export function getMultiSelectedResources(resource: URI, listService: IListService, editorService: IWorkbenchEditorService): URI[] { const list = listService.lastFocusedList; if (list && list.isDOMFocused()) { - const focus = list.getFocus(); // Explorer if (list instanceof Tree) { + const focus = list.getFocus(); const selection = list.getSelection(); if (selection && selection.indexOf(focus) >= 0) { return selection.map(fs => fs.resource); @@ -46,8 +46,9 @@ export function getMultiSelectedResources(resource: URI, listService: IListServi } // Open editors view if (list instanceof List) { + const focus = list.getFocusedElements(); const selection = list.getSelectedElements(); - if (selection && selection.indexOf(focus) >= 0) { + if (selection && focus.length && selection.indexOf(focus[0]) >= 0) { return selection.filter(s => s instanceof OpenEditor).map((oe: OpenEditor) => oe.getResource()); } } From b6e0f97f9743cd669b217345d572f6a32fc3715d Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 16:51:49 +0100 Subject: [PATCH 270/710] open editors: multi select dnd --- .../electron-browser/views/openEditorsView.ts | 47 ++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 1d8c0b5b301..4e2016ba3cc 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -143,9 +143,18 @@ export class OpenEditorsView extends ViewsViewletPanel { dom.addClass(container, 'show-file-icons'); const delegate = new OpenEditorsDelegate(); + const getSelectedElements = () => { + const selected = this.list.getSelectedElements(); + const focused = this.list.getFocusedElements(); + if (focused.length && selected.indexOf(focused[0]) >= 0) { + return selected; + } + + return focused; + }; this.list = new WorkbenchList(container, delegate, [ new EditorGroupRenderer(this.keybindingService, this.instantiationService, this.editorGroupService), - new OpenEditorRenderer(this.instantiationService, this.keybindingService, this.configurationService, this.editorGroupService) + new OpenEditorRenderer(getSelectedElements, this.instantiationService, this.keybindingService, this.configurationService, this.editorGroupService) ], { keyboardSupport: false, identityProvider: element => element instanceof OpenEditor ? element.getId() : element.id.toString() @@ -459,7 +468,7 @@ class EditorGroupRenderer implements IRenderer { - if (OpenEditorRenderer.DRAGGED_OPEN_EDITOR) { + if (OpenEditorRenderer.DRAGGED_OPEN_EDITORS) { dom.addClass(container, 'focused'); } })); @@ -468,10 +477,11 @@ class EditorGroupRenderer implements IRenderer { dom.removeClass(container, 'focused'); - if (OpenEditorRenderer.DRAGGED_OPEN_EDITOR) { + if (OpenEditorRenderer.DRAGGED_OPEN_EDITORS) { const model = this.editorGroupService.getStacksModel(); const positionOfTargetGroup = model.positionOfGroup(editorGroupTemplate.editorGroup); - this.editorGroupService.moveEditor(OpenEditorRenderer.DRAGGED_OPEN_EDITOR.editorInput, model.positionOfGroup(OpenEditorRenderer.DRAGGED_OPEN_EDITOR.editorGroup), positionOfTargetGroup, { preserveFocus: true }); + OpenEditorRenderer.DRAGGED_OPEN_EDITORS.forEach(oe => + this.editorGroupService.moveEditor(oe.editorInput, model.positionOfGroup(oe.editorGroup), positionOfTargetGroup, { preserveFocus: true })); this.editorGroupService.activateGroup(positionOfTargetGroup); } })); @@ -493,9 +503,10 @@ class EditorGroupRenderer implements IRenderer { static readonly ID = 'openeditor'; - public static DRAGGED_OPEN_EDITOR: OpenEditor; + public static DRAGGED_OPEN_EDITORS: OpenEditor[]; constructor( + private getSelectedElements: () => (OpenEditor | IEditorGroup)[], private instantiationService: IInstantiationService, private keybindingService: IKeybindingService, private configurationService: IConfigurationService, @@ -532,24 +543,26 @@ class OpenEditorRenderer implements IRenderer document.body.removeChild(dragImage), 0); - OpenEditorRenderer.DRAGGED_OPEN_EDITOR = editorTemplate.openEditor; + const dragged = this.getSelectedElements().filter(e => e instanceof OpenEditor); + OpenEditorRenderer.DRAGGED_OPEN_EDITORS = dragged; if (editorTemplate.openEditor && editorTemplate.openEditor.editorInput) { - const resource = editorTemplate.openEditor.editorInput.getResource(); - if (resource) { - const resourceStr = resource.toString(); + // enables dropping editor resource path into text controls + e.dataTransfer.setData(DataTransfers.TEXT, dragged.map(d => d.getResource()).map(resource => resource.scheme === 'file' ? getPathLabel(resource) : resource.toString()).join('\n')); + if (dragged.length === 1) { + const resource = dragged[0].getResource(); e.dataTransfer.setData(DataTransfers.URL, resource.toString()); // enables dropping editor into editor area - e.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(resource)); // enables dropping editor resource path into text controls - if (resource.scheme === 'file') { - e.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, getBaseLabel(resource), resourceStr].join(':')); // enables support to drag an editor as file to desktop + e.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, getBaseLabel(resource), resource.toString()].join(':')); // enables support to drag an editor as file to desktop } + } else { + e.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(dragged.map(s => s.getResource().toString()))); } } })); editorTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_OVER, () => { - if (OpenEditorRenderer.DRAGGED_OPEN_EDITOR) { + if (OpenEditorRenderer.DRAGGED_OPEN_EDITORS) { dom.addClass(container, 'focused'); } })); @@ -558,18 +571,18 @@ class OpenEditorRenderer implements IRenderer { dom.removeClass(container, 'focused'); - if (OpenEditorRenderer.DRAGGED_OPEN_EDITOR) { + if (OpenEditorRenderer.DRAGGED_OPEN_EDITORS) { const model = this.editorGroupService.getStacksModel(); const positionOfTargetGroup = model.positionOfGroup(editorTemplate.openEditor.editorGroup); const index = editorTemplate.openEditor.editorGroup.indexOf(editorTemplate.openEditor.editorInput); - this.editorGroupService.moveEditor(OpenEditorRenderer.DRAGGED_OPEN_EDITOR.editorInput, - model.positionOfGroup(OpenEditorRenderer.DRAGGED_OPEN_EDITOR.editorGroup), positionOfTargetGroup, { index, preserveFocus: true }); + OpenEditorRenderer.DRAGGED_OPEN_EDITORS.forEach(oe => + this.editorGroupService.moveEditor(oe.editorInput, model.positionOfGroup(oe.editorGroup), positionOfTargetGroup, { index, preserveFocus: true })); this.editorGroupService.activateGroup(positionOfTargetGroup); } })); editorTemplate.toDispose.push(dom.addDisposableListener(container, dom.EventType.DRAG_END, () => { - OpenEditorRenderer.DRAGGED_OPEN_EDITOR = undefined; + OpenEditorRenderer.DRAGGED_OPEN_EDITORS = undefined; })); return editorTemplate; From 49c5b17dc7a9e22e722ab5a6702c801db4e7561a Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 16:55:15 +0100 Subject: [PATCH 271/710] todo@isidor --- src/vs/workbench/browser/parts/editor/editorCommands.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 444f4b299a6..a2555b8247f 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -473,6 +473,7 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService } export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier, listService: IListService): IEditorIdentifier[] { + // TODO@Isidor this method is not nice since it assumes it is working on open editors view and maps elements on top of that const list = listService.lastFocusedList; // Mapping for open editors view const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element, editor: undefined }; From 540282cb13f25b1028ef48cd1659e1502735ab89 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 16 Jan 2018 19:01:07 +0300 Subject: [PATCH 272/710] Use existing pad helper --- src/vs/editor/contrib/snippet/snippetVariables.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index 6bd1dc34e47..9ca69afdfa4 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -9,7 +9,7 @@ import { basename, dirname } from 'vs/base/common/paths'; import { ITextModel } from 'vs/editor/common/model'; import { Selection } from 'vs/editor/common/core/selection'; import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/snippetParser'; -import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace } from 'vs/base/common/strings'; +import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace, pad } from 'vs/base/common/strings'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; export const KnownSnippetVariableNames = Object.freeze({ @@ -182,22 +182,21 @@ export class TimeBasedVariableResolver implements VariableResolver { resolve(variable: Variable): string { const { name } = variable; - const zeroPad = (n: string): string => n.length < 2 ? `0${n}` : n; if (name === 'CURRENT_YEAR') { return String(new Date().getFullYear()); } else if (name === 'CURRENT_YEAR_SHORT') { return String(new Date().getFullYear()).slice(-2); } else if (name === 'CURRENT_MONTH') { - return zeroPad(String(new Date().getMonth().valueOf() + 1)); + return pad((new Date().getMonth().valueOf() + 1), 2); } else if (name === 'CURRENT_DATE') { - return zeroPad(String(new Date().getDate())); + return pad(new Date().getDate().valueOf(), 2); } else if (name === 'CURRENT_HOUR') { - return zeroPad(String(new Date().getHours())); + return pad(new Date().getHours().valueOf(), 2); } else if (name === 'CURRENT_MINUTE') { - return zeroPad(String(new Date().getMinutes())); + return pad(new Date().getMinutes().valueOf(), 2); } else if (name === 'CURRENT_SECOND') { - return zeroPad(String(new Date().getSeconds())); + return pad(new Date().getSeconds().valueOf(), 2); } return undefined; From c66517cf0d588b3daa8bb358c84b72a056889c71 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 10:52:17 +0100 Subject: [PATCH 273/710] Fix #40018 --- src/vs/workbench/api/node/extHostTreeViews.ts | 10 ++-- .../api/extHostTreeViews.test.ts | 49 ++++++++++++------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 67f75fd1386..5a63e004f56 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -107,8 +107,8 @@ class ExtHostTreeView extends Disposable { asWinJsPromise(() => this.dataProvider.getTreeItem(element)) .then(extTreeItem => { if (extTreeItem) { - if (typeof element === 'string' && this.elements.has(this.createHandle(element, extTreeItem))) { - throw new Error(localize('treeView.duplicateElement', 'Element {0} is already registered', element)); + if (extTreeItem.id && this.elements.has(this.createHandle(element, extTreeItem))) { + throw new Error(localize('treeView.duplicateElement', 'Element with id {0} is already registered', extTreeItem.id)); } return { element, extTreeItem }; } @@ -199,9 +199,9 @@ class ExtHostTreeView extends Disposable { }; } - private createHandle(element: T, { label, resourceUri }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { - if (typeof element === 'string') { - return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${element}`; + private createHandle(element: T, { id, label, resourceUri }: vscode.TreeItem, parentHandle?: TreeItemHandle): TreeItemHandle { + if (id) { + return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`; } const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX; 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 8cf64585e53..71dea5ec0fd 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTreeViews.test.ts @@ -38,7 +38,7 @@ suite('ExtHostTreeView', function () { let testObject: ExtHostTreeViews; let target: RecordingShape; let onDidChangeTreeNode: Emitter<{ key: string }>; - let onDidChangeTreeKey: Emitter; + let onDidChangeTreeNodeWithId: Emitter<{ key: string }>; let tree, labels, nodes; setup(() => { @@ -68,9 +68,9 @@ suite('ExtHostTreeView', function () { target = new RecordingShape(); testObject = new ExtHostTreeViews(target, new ExtHostCommands(rpcProtocol, new ExtHostHeapService(), new NullLogService())); onDidChangeTreeNode = new Emitter<{ key: string }>(); - onDidChangeTreeKey = new Emitter(); + onDidChangeTreeNodeWithId = new Emitter<{ key: string }>(); testObject.registerTreeDataProvider('testNodeTreeProvider', aNodeTreeDataProvider()); - testObject.registerTreeDataProvider('testStringTreeProvider', aStringTreeDataProvider()); + testObject.registerTreeDataProvider('testNodeWithIdTreeProvider', aNodeWithIdTreeDataProvider()); testObject.$getElements('testNodeTreeProvider').then(elements => { for (const element of elements) { @@ -107,34 +107,47 @@ suite('ExtHostTreeView', function () { }); }); - test('construct string tree', () => { - return testObject.$getElements('testStringTreeProvider') + test('construct id tree', () => { + return testObject.$getElements('testNodeWithIdTreeProvider') .then(elements => { const actuals = elements.map(e => e.handle); assert.deepEqual(actuals, ['1/a', '1/b']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '1/a') + testObject.$getChildren('testNodeWithIdTreeProvider', '1/a') .then(children => { const actuals = children.map(e => e.handle); assert.deepEqual(actuals, ['1/aa', '1/ab']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '1/aa').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '1/ab').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeWithIdTreeProvider', '1/aa').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeWithIdTreeProvider', '1/ab').then(children => assert.equal(children.length, 0)) ]); }), - testObject.$getChildren('testStringTreeProvider', '1/b') + testObject.$getChildren('testNodeWithIdTreeProvider', '1/b') .then(children => { const actuals = children.map(e => e.handle); assert.deepEqual(actuals, ['1/ba', '1/bb']); return TPromise.join([ - testObject.$getChildren('testStringTreeProvider', '1/ba').then(children => assert.equal(children.length, 0)), - testObject.$getChildren('testStringTreeProvider', '1/bb').then(children => assert.equal(children.length, 0)) + testObject.$getChildren('testNodeWithIdTreeProvider', '1/ba').then(children => assert.equal(children.length, 0)), + testObject.$getChildren('testNodeWithIdTreeProvider', '1/bb').then(children => assert.equal(children.length, 0)) ]); }) ]); }); }); + test('error is thrown if id is not unique', () => { + tree['a'] = { + 'a': {} + }; + return testObject.$getElements('testNodeWithIdTreeProvider') + .then(elements => { + const actuals = elements.map(e => e.handle); + assert.deepEqual(actuals, ['1/a', '1/b']); + return testObject.$getChildren('testNodeWithIdTreeProvider', '1/a') + .then(children => assert.fail('Should fail with duplicate id'), () => null); + }); + }); + test('refresh root', function (done) { target.onRefresh.event(actuals => { assert.equal(undefined, actuals); @@ -359,15 +372,17 @@ suite('ExtHostTreeView', function () { }; } - function aStringTreeDataProvider(): TreeDataProvider { + function aNodeWithIdTreeDataProvider(): TreeDataProvider<{ key: string }> { return { - getChildren: (element: string): string[] => { - return getChildren(element); + getChildren: (element: { key: string }): { key: string }[] => { + return getChildren(element ? element.key : undefined).map(key => getNode(key)); }, - getTreeItem: (element: string): TreeItem => { - return getTreeItem(element); + getTreeItem: (element: { key: string }): TreeItem => { + const treeItem = getTreeItem(element.key); + treeItem.id = element.key; + return treeItem; }, - onDidChangeTreeData: onDidChangeTreeKey.event + onDidChangeTreeData: onDidChangeTreeNodeWithId.event }; } From f86c0f9a912cf44e160dd79e858c8322ba36e631 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 11:16:36 +0100 Subject: [PATCH 274/710] Remove the handle from the system when handle changes --- src/vs/workbench/api/node/extHostTreeViews.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index 5a63e004f56..a1807377c88 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -254,7 +254,10 @@ class ExtHostTreeView extends Disposable { // Update parent node if (node) { if (node.handle !== handle) { + // Remove the old handle from the system + this.elements.delete(node.handle); childrenHandles[childrenHandles.indexOf(node.handle)] = handle; + this.clearChildren(element); } } else { From 543bcec6efbecb8442aeb239ba43be61eecea5f9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 16:58:48 +0100 Subject: [PATCH 275/710] Fix #41071 --- .../api/browser/viewsExtensionPoint.ts | 2 +- .../electron-browser/mainThreadTreeViews.ts | 3 +- .../workbench/browser/parts/views/treeView.ts | 3 +- .../browser/parts/views/viewsRegistry.ts | 149 ----------------- .../browser/parts/views/viewsViewlet.ts | 13 +- src/vs/workbench/common/views.ts | 154 +++++++++++++++++- .../parts/debug/browser/debugViewlet.ts | 2 +- .../electron-browser/debug.contribution.ts | 2 +- .../electron-browser/extensionsViewlet.ts | 2 +- .../files/electron-browser/explorerViewlet.ts | 81 +++++---- .../electron-browser/files.contribution.ts | 5 +- .../quickopen/browser/viewPickerHandler.ts | 34 +++- 12 files changed, 253 insertions(+), 197 deletions(-) delete mode 100644 src/vs/workbench/browser/parts/views/viewsRegistry.ts diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts index 0ebf0e9893d..191ae51ea6d 100644 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts @@ -8,7 +8,7 @@ import { localize } from 'vs/nls'; import { forEach } from 'vs/base/common/collections'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { ExtensionMessageCollector, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry'; -import { ViewLocation, ViewsRegistry, IViewDescriptor } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewLocation, ViewsRegistry, IViewDescriptor } from 'vs/workbench/common/views'; import { TreeView } from 'vs/workbench/browser/parts/views/treeView'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { coalesce, } from 'vs/base/common/arrays'; diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts index e9730fb0ed4..67bd6438fe5 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts @@ -9,8 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Disposable } from 'vs/base/common/lifecycle'; import { ExtHostContext, MainThreadTreeViewsShape, ExtHostTreeViewsShape, MainContext, IExtHostContext } from '../node/extHost.protocol'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; -import { ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry'; -import { ITreeViewDataProvider, ITreeItem } from 'vs/workbench/common/views'; +import { ViewsRegistry, ITreeViewDataProvider, ITreeItem } from 'vs/workbench/common/views'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { assign } from 'vs/base/common/objects'; diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 7c31277a9a3..a1cb7fc9468 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -22,11 +22,10 @@ import { IProgressService } from 'vs/platform/progress/common/progress'; import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ActionItem, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; -import { ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewsRegistry, TreeItemCollapsibleState, ITreeItem, ITreeViewDataProvider, TreeViewItemHandleArg } from 'vs/workbench/common/views'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { TreeItemCollapsibleState, ITreeItem, ITreeViewDataProvider, TreeViewItemHandleArg } from 'vs/workbench/common/views'; import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; import { ResourceLabel } from 'vs/workbench/browser/labels'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/browser/parts/views/viewsRegistry.ts b/src/vs/workbench/browser/parts/views/viewsRegistry.ts deleted file mode 100644 index aa8ccb4bdca..00000000000 --- a/src/vs/workbench/browser/parts/views/viewsRegistry.ts +++ /dev/null @@ -1,149 +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 Event, { Emitter } from 'vs/base/common/event'; -import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { ITreeViewDataProvider } from 'vs/workbench/common/views'; -import { localize } from 'vs/nls'; - -export class ViewLocation { - - static readonly Explorer = new ViewLocation('explorer'); - static readonly Debug = new ViewLocation('debug'); - static readonly Extensions = new ViewLocation('extensions'); - - constructor(private _id: string) { - } - - get id(): string { - return this._id; - } - - static getContributedViewLocation(value: string): ViewLocation { - switch (value) { - case ViewLocation.Explorer.id: return ViewLocation.Explorer; - case ViewLocation.Debug.id: return ViewLocation.Debug; - } - return void 0; - } -} - -export interface IViewDescriptor { - - readonly id: string; - - readonly name: string; - - readonly location: ViewLocation; - - // TODO do we really need this?! - readonly ctor: any; - - readonly when?: ContextKeyExpr; - - readonly order?: number; - - readonly weight?: number; - - readonly collapsed?: boolean; - - readonly canToggleVisibility?: boolean; -} - -export interface IViewsRegistry { - - readonly onViewsRegistered: Event; - - readonly onViewsDeregistered: Event; - - readonly onTreeViewDataProviderRegistered: Event; - - registerViews(views: IViewDescriptor[]): void; - - deregisterViews(ids: string[], location: ViewLocation): void; - - registerTreeViewDataProvider(id: string, factory: ITreeViewDataProvider): void; - - deregisterTreeViewDataProviders(): void; - - getViews(loc: ViewLocation): IViewDescriptor[]; - - getTreeViewDataProvider(id: string): ITreeViewDataProvider; - -} - -export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry { - - private _onViewsRegistered: Emitter = new Emitter(); - readonly onViewsRegistered: Event = this._onViewsRegistered.event; - - private _onViewsDeregistered: Emitter = new Emitter(); - readonly onViewsDeregistered: Event = this._onViewsDeregistered.event; - - private _onTreeViewDataProviderRegistered: Emitter = new Emitter(); - readonly onTreeViewDataProviderRegistered: Event = this._onTreeViewDataProviderRegistered.event; - - private _views: Map = new Map(); - private _treeViewDataPoviders: Map = new Map(); - - registerViews(viewDescriptors: IViewDescriptor[]): void { - if (viewDescriptors.length) { - for (const viewDescriptor of viewDescriptors) { - let views = this._views.get(viewDescriptor.location); - if (!views) { - views = []; - this._views.set(viewDescriptor.location, views); - } - if (views.some(v => v.id === viewDescriptor.id)) { - throw new Error(localize('duplicateId', "A view with id `{0}` is already registered in the location `{1}`", viewDescriptor.id, viewDescriptor.location.id)); - } - views.push(viewDescriptor); - } - this._onViewsRegistered.fire(viewDescriptors); - } - } - - deregisterViews(ids: string[], location: ViewLocation): void { - const views = this._views.get(location); - - if (!views) { - return; - } - - const viewsToDeregister = views.filter(view => ids.indexOf(view.id) !== -1); - - if (viewsToDeregister.length) { - this._views.set(location, views.filter(view => ids.indexOf(view.id) === -1)); - } - - this._onViewsDeregistered.fire(viewsToDeregister); - } - - registerTreeViewDataProvider(id: string, factory: ITreeViewDataProvider) { - if (!this.isDataProviderRegistered(id)) { - // TODO: throw error - } - this._treeViewDataPoviders.set(id, factory); - this._onTreeViewDataProviderRegistered.fire(id); - } - - deregisterTreeViewDataProviders(): void { - this._treeViewDataPoviders.clear(); - } - - getViews(loc: ViewLocation): IViewDescriptor[] { - return this._views.get(loc) || []; - } - - getTreeViewDataProvider(id: string): ITreeViewDataProvider { - return this._treeViewDataPoviders.get(id); - } - - private isDataProviderRegistered(id: string): boolean { - let registered = false; - this._views.forEach(views => registered = registered || views.some(view => view.id === id)); - return registered; - } -}; diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 346a1b1a23c..e2f5a2f4007 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -17,7 +17,7 @@ import { DelayedDragHandler } from 'vs/base/browser/dnd'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { ViewsRegistry, ViewLocation, IViewDescriptor } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewsRegistry, ViewLocation, IViewDescriptor, IViewsViewlet } from 'vs/workbench/common/views'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -259,7 +259,7 @@ export interface IViewState { order: number; } -export class ViewsViewlet extends PanelViewlet { +export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { private viewHeaderContextMenuListeners: IDisposable[] = []; private viewletSettings: object; @@ -324,6 +324,15 @@ export class ViewsViewlet extends PanelViewlet { .then(() => void 0); } + focusView(id: string): void { + this.focus(); + const view = this.getView(id); + if (view) { + view.setExpanded(true); + view.focus(); + } + } + layout(dimension: Dimension): void { super.layout(dimension); this.dimension = dimension; diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 5d7b138ae5e..52bfe92583a 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -4,9 +4,161 @@ *--------------------------------------------------------------------------------------------*/ import { TPromise } from 'vs/base/common/winjs.base'; -import Event from 'vs/base/common/event'; import { Command } from 'vs/editor/common/modes'; import { UriComponents } from 'vs/base/common/uri'; +import Event, { Emitter } from 'vs/base/common/event'; +import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; +import { ITreeViewDataProvider } from 'vs/workbench/common/views'; +import { localize } from 'vs/nls'; +import { IViewlet } from 'vs/workbench/common/viewlet'; + +export class ViewLocation { + + static readonly Explorer = new ViewLocation('explorer'); + static readonly Debug = new ViewLocation('debug'); + static readonly Extensions = new ViewLocation('extensions'); + + constructor(private _id: string) { + } + + get id(): string { + return this._id; + } + + static getContributedViewLocation(value: string): ViewLocation { + switch (value) { + case ViewLocation.Explorer.id: return ViewLocation.Explorer; + case ViewLocation.Debug.id: return ViewLocation.Debug; + } + return void 0; + } +} + +export interface IViewDescriptor { + + readonly id: string; + + readonly name: string; + + readonly location: ViewLocation; + + // TODO do we really need this?! + readonly ctor: any; + + readonly when?: ContextKeyExpr; + + readonly order?: number; + + readonly weight?: number; + + readonly collapsed?: boolean; + + readonly canToggleVisibility?: boolean; +} + +export interface IViewsRegistry { + + readonly onViewsRegistered: Event; + + readonly onViewsDeregistered: Event; + + readonly onTreeViewDataProviderRegistered: Event; + + registerViews(views: IViewDescriptor[]): void; + + deregisterViews(ids: string[], location: ViewLocation): void; + + registerTreeViewDataProvider(id: string, factory: ITreeViewDataProvider): void; + + deregisterTreeViewDataProviders(): void; + + getViews(loc: ViewLocation): IViewDescriptor[]; + + getTreeViewDataProvider(id: string): ITreeViewDataProvider; + +} + +export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry { + + private _onViewsRegistered: Emitter = new Emitter(); + readonly onViewsRegistered: Event = this._onViewsRegistered.event; + + private _onViewsDeregistered: Emitter = new Emitter(); + readonly onViewsDeregistered: Event = this._onViewsDeregistered.event; + + private _onTreeViewDataProviderRegistered: Emitter = new Emitter(); + readonly onTreeViewDataProviderRegistered: Event = this._onTreeViewDataProviderRegistered.event; + + private _views: Map = new Map(); + private _treeViewDataPoviders: Map = new Map(); + + registerViews(viewDescriptors: IViewDescriptor[]): void { + if (viewDescriptors.length) { + for (const viewDescriptor of viewDescriptors) { + let views = this._views.get(viewDescriptor.location); + if (!views) { + views = []; + this._views.set(viewDescriptor.location, views); + } + if (views.some(v => v.id === viewDescriptor.id)) { + throw new Error(localize('duplicateId', "A view with id `{0}` is already registered in the location `{1}`", viewDescriptor.id, viewDescriptor.location.id)); + } + views.push(viewDescriptor); + } + this._onViewsRegistered.fire(viewDescriptors); + } + } + + deregisterViews(ids: string[], location: ViewLocation): void { + const views = this._views.get(location); + + if (!views) { + return; + } + + const viewsToDeregister = views.filter(view => ids.indexOf(view.id) !== -1); + + if (viewsToDeregister.length) { + this._views.set(location, views.filter(view => ids.indexOf(view.id) === -1)); + } + + this._onViewsDeregistered.fire(viewsToDeregister); + } + + registerTreeViewDataProvider(id: string, factory: ITreeViewDataProvider) { + if (!this.isDataProviderRegistered(id)) { + // TODO: throw error + } + this._treeViewDataPoviders.set(id, factory); + this._onTreeViewDataProviderRegistered.fire(id); + } + + deregisterTreeViewDataProviders(): void { + this._treeViewDataPoviders.clear(); + } + + getViews(loc: ViewLocation): IViewDescriptor[] { + return this._views.get(loc) || []; + } + + getTreeViewDataProvider(id: string): ITreeViewDataProvider { + return this._treeViewDataPoviders.get(id); + } + + private isDataProviderRegistered(id: string): boolean { + let registered = false; + this._views.forEach(views => registered = registered || views.some(view => view.id === id)); + return registered; + } +}; + +export interface IViewsViewlet extends IViewlet { + + focusView(id: string): void; + +} + +// Custom view export type TreeViewItemHandleArg = { $treeViewId: string, diff --git a/src/vs/workbench/parts/debug/browser/debugViewlet.ts b/src/vs/workbench/parts/debug/browser/debugViewlet.ts index 803cb32cb64..67381c841c1 100644 --- a/src/vs/workbench/parts/debug/browser/debugViewlet.ts +++ b/src/vs/workbench/parts/debug/browser/debugViewlet.ts @@ -22,7 +22,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; -import { ViewLocation } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewLocation } from 'vs/workbench/common/views'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts index 043476e62ce..f8768ff718e 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debug.contribution.ts @@ -41,7 +41,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import * as debugCommands from 'vs/workbench/parts/debug/electron-browser/debugCommands'; import { IQuickOpenRegistry, Extensions as QuickOpenExtensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen'; import { StatusBarColorProvider } from 'vs/workbench/parts/debug/electron-browser/statusbarColorProvider'; -import { ViewLocation, ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewLocation, ViewsRegistry } from 'vs/workbench/common/views'; import { isMacintosh } from 'vs/base/common/platform'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index 5adfee8f751..ac4d9aafbc7 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -45,7 +45,7 @@ import { IActivityService, ProgressBadge, NumberBadge } from 'vs/workbench/servi import { IThemeService } from 'vs/platform/theme/common/themeService'; import { inputForeground, inputBackground, inputBorder } from 'vs/platform/theme/common/colorRegistry'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { ViewsRegistry, ViewLocation, IViewDescriptor } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewsRegistry, ViewLocation, IViewDescriptor } from 'vs/workbench/common/views'; import { PersistentViewsViewlet, ViewsViewletPanel } from 'vs/workbench/browser/parts/views/viewsViewlet'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts index 7d3b763b318..7dd040a28c2 100644 --- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts +++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts @@ -30,50 +30,31 @@ import { IWorkbenchEditorService, DelegatingWorkbenchEditorService } from 'vs/wo import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ViewsRegistry, ViewLocation, IViewDescriptor } from 'vs/workbench/browser/parts/views/viewsRegistry'; +import { ViewsRegistry, ViewLocation, IViewDescriptor } from 'vs/workbench/common/views'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; +import { Disposable } from 'vs/base/common/lifecycle'; +import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorerViewlet { - private static readonly EXPLORER_VIEWS_STATE = 'workbench.explorer.views.state'; +export class ExplorerViewletViewsContribution extends Disposable implements IWorkbenchContribution { - private viewletState: FileViewletState; - private viewletVisibleContextKey: IContextKey; private openEditorsVisibleContextKey: IContextKey; constructor( - @ITelemetryService telemetryService: ITelemetryService, - @IWorkspaceContextService protected contextService: IWorkspaceContextService, - @IStorageService protected storageService: IStorageService, - @IEditorGroupService private editorGroupService: IEditorGroupService, - @IWorkbenchEditorService private editorService: IWorkbenchEditorService, + @IWorkspaceContextService private workspaceContextService: IWorkspaceContextService, @IConfigurationService private configurationService: IConfigurationService, - @IInstantiationService protected instantiationService: IInstantiationService, - @IContextKeyService contextKeyService: IContextKeyService, - @IThemeService themeService: IThemeService, - @IContextMenuService contextMenuService: IContextMenuService, - @IExtensionService extensionService: IExtensionService + @IContextKeyService contextKeyService: IContextKeyService ) { - super(VIEWLET_ID, ViewLocation.Explorer, ExplorerViewlet.EXPLORER_VIEWS_STATE, true, telemetryService, storageService, instantiationService, themeService, contextService, contextKeyService, contextMenuService, extensionService); - - this.viewletState = new FileViewletState(); - this.viewletVisibleContextKey = ExplorerViewletVisibleContext.bindTo(contextKeyService); - this.openEditorsVisibleContextKey = OpenEditorsVisibleContext.bindTo(contextKeyService); + super(); this.registerViews(); + + this.openEditorsVisibleContextKey = OpenEditorsVisibleContext.bindTo(contextKeyService); this.updateOpenEditorsVisibility(); + this._register(workspaceContextService.onDidChangeWorkbenchState(() => this.registerViews())); + this._register(workspaceContextService.onDidChangeWorkspaceFolders(() => this.registerViews())); this._register(this.configurationService.onDidChangeConfiguration(e => this.onConfigurationUpdated(e))); - this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea())); - this._register(this.contextService.onDidChangeWorkbenchState(() => this.registerViews())); - this._register(this.contextService.onDidChangeWorkspaceFolders(() => this.registerViews())); - } - - async create(parent: Builder): TPromise { - await super.create(parent); - - const el = parent.getHTMLElement(); - DOM.addClass(el, 'explorer-viewlet'); } private registerViews(): void { @@ -92,7 +73,7 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer if (!openEditorsViewDescriptorExists) { viewDescriptorsToRegister.push(openEditorsViewDescriptor); } - if (this.contextService.getWorkbenchState() === WorkbenchState.EMPTY || this.contextService.getWorkspace().folders.length === 0) { + if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY || this.workspaceContextService.getWorkspace().folders.length === 0) { if (explorerViewDescriptorExists) { viewDescriptorsToDeregister.push(explorerViewDescriptor.id); } @@ -157,7 +138,43 @@ export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorer } private updateOpenEditorsVisibility(): void { - this.openEditorsVisibleContextKey.set(this.isOpenEditorsVisible()); + this.openEditorsVisibleContextKey.set(this.workspaceContextService.getWorkbenchState() === WorkbenchState.EMPTY || this.configurationService.getValue('explorer.openEditors.visible') !== 0); + } +} + +export class ExplorerViewlet extends PersistentViewsViewlet implements IExplorerViewlet { + + private static readonly EXPLORER_VIEWS_STATE = 'workbench.explorer.views.state'; + + private viewletState: FileViewletState; + private viewletVisibleContextKey: IContextKey; + + constructor( + @ITelemetryService telemetryService: ITelemetryService, + @IWorkspaceContextService protected contextService: IWorkspaceContextService, + @IStorageService protected storageService: IStorageService, + @IEditorGroupService private editorGroupService: IEditorGroupService, + @IWorkbenchEditorService private editorService: IWorkbenchEditorService, + @IConfigurationService private configurationService: IConfigurationService, + @IInstantiationService protected instantiationService: IInstantiationService, + @IContextKeyService contextKeyService: IContextKeyService, + @IThemeService themeService: IThemeService, + @IContextMenuService contextMenuService: IContextMenuService, + @IExtensionService extensionService: IExtensionService + ) { + super(VIEWLET_ID, ViewLocation.Explorer, ExplorerViewlet.EXPLORER_VIEWS_STATE, true, telemetryService, storageService, instantiationService, themeService, contextService, contextKeyService, contextMenuService, extensionService); + + this.viewletState = new FileViewletState(); + this.viewletVisibleContextKey = ExplorerViewletVisibleContext.bindTo(contextKeyService); + + this._register(this.contextService.onDidChangeWorkspaceName(e => this.updateTitleArea())); + } + + async create(parent: Builder): TPromise { + await super.create(parent); + + const el = parent.getHTMLElement(); + DOM.addClass(el, 'explorer-viewlet'); } private isOpenEditorsVisible(): boolean { 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 ad7b20637ca..1f3a9ba56f3 100644 --- a/src/vs/workbench/parts/files/electron-browser/files.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/files.contribution.ts @@ -29,7 +29,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import * as platform from 'vs/base/common/platform'; import { DirtyFilesTracker } from 'vs/workbench/parts/files/common/dirtyFilesTracker'; -import { ExplorerViewlet } from 'vs/workbench/parts/files/electron-browser/explorerViewlet'; +import { ExplorerViewlet, ExplorerViewletViewsContribution } from 'vs/workbench/parts/files/electron-browser/explorerViewlet'; import { IEditorRegistry, EditorDescriptor, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { DataUriEditorInput } from 'vs/workbench/common/editor/dataUriEditorInput'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; @@ -139,6 +139,9 @@ class FileEditorInputFactory implements IEditorInputFactory { Registry.as(EditorInputExtensions.EditorInputFactories).registerEditorInputFactory(FILE_EDITOR_INPUT_ID, FileEditorInputFactory); +// Register Explorer views +Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(ExplorerViewletViewsContribution, LifecyclePhase.Starting); + // Register File Editor Tracker Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(FileEditorTracker, LifecyclePhase.Starting); diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index bcfefc9f74f..58741eab47b 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -19,6 +19,12 @@ import { Action } from 'vs/base/common/actions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { fuzzyContains, stripWildcards } from 'vs/base/common/strings'; import { matchesFuzzy } from 'vs/base/common/filters'; +import { ViewsRegistry, ViewLocation, IViewsViewlet } from 'vs/workbench/common/views'; +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; +import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; +import { VIEWLET_ID as DEBUG_VIEWLET_ID } from 'vs/workbench/parts/debug/common/debug'; +import { VIEWLET_ID as EXTENSIONS_VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions'; +import { ViewletDescriptor } from 'vs/workbench/browser/viewlet'; export const VIEW_PICKER_PREFIX = 'view '; @@ -69,7 +75,8 @@ export class ViewPickerHandler extends QuickOpenHandler { @IViewletService private viewletService: IViewletService, @IOutputService private outputService: IOutputService, @ITerminalService private terminalService: ITerminalService, - @IPanelService private panelService: IPanelService + @IPanelService private panelService: IPanelService, + @IContextKeyService private contextKeyService: IContextKeyService, ) { super(); } @@ -116,12 +123,31 @@ export class ViewPickerHandler extends QuickOpenHandler { private getViewEntries(): ViewEntry[] { const viewEntries: ViewEntry[] = []; + const getViewEntriesForViewlet = (viewlet: ViewletDescriptor, viewLocation: ViewLocation): ViewEntry[] => { + const views = ViewsRegistry.getViews(viewLocation); + const result: ViewEntry[] = []; + if (views.length) { + for (const view of views) { + if (this.contextKeyService.contextMatchesRules(view.when)) { + result.push(new ViewEntry(view.name, viewlet.name, () => this.viewletService.openViewlet(viewlet.id, true).done(viewlet => (viewlet).focusView(view.id), errors.onUnexpectedError))); + } + } + } + return result; + }; + // Viewlets const viewlets = this.viewletService.getViewlets(); viewlets.forEach((viewlet, index) => { - const viewsCategory = nls.localize('views', "Views"); - const entry = new ViewEntry(viewlet.name, viewsCategory, () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError)); - viewEntries.push(entry); + const viewLocation: ViewLocation = viewlet.id === EXPLORER_VIEWLET_ID ? ViewLocation.Explorer + : viewlet.id === DEBUG_VIEWLET_ID ? ViewLocation.Debug + : viewlet.id === EXTENSIONS_VIEWLET_ID ? ViewLocation.Extensions + : null; + + const viewEntriesForViewlet: ViewEntry[] = viewLocation ? getViewEntriesForViewlet(viewlet, viewLocation) + : [new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError))]; + + viewEntries.push(...viewEntriesForViewlet); }); const terminals = this.terminalService.terminalInstances; From e22eb95064cae5f400fd9b42c3d79ce4f777f2db Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 17:15:25 +0100 Subject: [PATCH 276/710] #41071 Add view category to the commands --- .../parts/quickopen/browser/quickopen.contribution.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts index 6d6da7ea870..91000b5b8f3 100644 --- a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts +++ b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts @@ -43,8 +43,9 @@ const inViewsPickerContext = ContextKeyExpr.and(inQuickOpenContext, ContextKeyEx const viewPickerKeybinding = { primary: KeyMod.CtrlCmd | KeyCode.KEY_Q, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_Q }, linux: { primary: null } }; -registry.registerWorkbenchAction(new SyncActionDescriptor(OpenViewPickerAction, OpenViewPickerAction.ID, OpenViewPickerAction.LABEL), 'Open View'); -registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenViewPickerAction, QuickOpenViewPickerAction.ID, QuickOpenViewPickerAction.LABEL, viewPickerKeybinding), 'Quick Open View'); +const viewCategory = nls.localize('view', "View"); +registry.registerWorkbenchAction(new SyncActionDescriptor(OpenViewPickerAction, OpenViewPickerAction.ID, OpenViewPickerAction.LABEL), 'View: Open View', viewCategory); +registry.registerWorkbenchAction(new SyncActionDescriptor(QuickOpenViewPickerAction, QuickOpenViewPickerAction.ID, QuickOpenViewPickerAction.LABEL, viewPickerKeybinding), 'View: Quick Open View', viewCategory); const quickOpenNavigateNextInViewPickerId = 'workbench.action.quickOpenNavigateNextInViewPicker'; KeybindingsRegistry.registerCommandAndKeybindingRule({ From b5bf2f90dbeff7ac16442a644432133b099425b5 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 17:24:42 +0100 Subject: [PATCH 277/710] #41071 Show the view on selected if hidden --- src/vs/workbench/browser/parts/views/viewsViewlet.ts | 10 +++++----- src/vs/workbench/common/views.ts | 2 +- .../parts/quickopen/browser/viewPickerHandler.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index e2f5a2f4007..eee4893938d 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -324,12 +324,14 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { .then(() => void 0); } - focusView(id: string): void { + openView(id: string): void { this.focus(); const view = this.getView(id); if (view) { view.setExpanded(true); view.focus(); + } else { + this.toggleViewVisibility(id); } } @@ -357,18 +359,16 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { } toggleViewVisibility(id: string): void { - const view = this.getView(id); let viewState = this.viewsStates.get(id); - if (!viewState) { return; } - viewState.isHidden = !!view; + viewState.isHidden = !!this.getView(id); this.updateViews() .then(() => { if (!viewState.isHidden) { - this.getView(id).focus(); + this.openView(id); } else { this.focus(); } diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 52bfe92583a..f7a59c538b0 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -154,7 +154,7 @@ export const ViewsRegistry: IViewsRegistry = new class implements IViewsRegistry export interface IViewsViewlet extends IViewlet { - focusView(id: string): void; + openView(id: string): void; } diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index 58741eab47b..2c1c4186639 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -129,7 +129,7 @@ export class ViewPickerHandler extends QuickOpenHandler { if (views.length) { for (const view of views) { if (this.contextKeyService.contextMatchesRules(view.when)) { - result.push(new ViewEntry(view.name, viewlet.name, () => this.viewletService.openViewlet(viewlet.id, true).done(viewlet => (viewlet).focusView(view.id), errors.onUnexpectedError))); + result.push(new ViewEntry(view.name, viewlet.name, () => this.viewletService.openViewlet(viewlet.id, true).done(viewlet => (viewlet).openView(view.id), errors.onUnexpectedError))); } } } From dfde8bf50148f82b48a8b2a68d3a7da6cfa2b3c2 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 08:40:06 -0800 Subject: [PATCH 278/710] Add test cases for piece buffer. --- .../pieceTableTextBuffer/pieceTableBase.ts | 742 +++------ .../pieceTableTextBuffer.test.ts | 1455 +++++++++++++++++ 2 files changed, 1689 insertions(+), 508 deletions(-) create mode 100644 src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index d97cd56033f..bc5eb2bf77b 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -101,11 +101,11 @@ export class TreeNode { color: NodeColor; // Piece - piece: IPiece; + piece: Piece; size_left: number; // size of the left subtree (not inorder) lf_left: number; // line feeds cnt in the left subtree (not in order) - constructor(piece: IPiece, color: NodeColor) { + constructor(piece: Piece, color: NodeColor) { this.piece = piece; this.color = color; this.size_left = 0; @@ -198,15 +198,7 @@ export interface BufferCursor { column: number; } -export interface IPiece { - bufferIndex: number; - length: number; - lineFeedCnt: number; - - shift(offset: number); -} - -export class OriginalPiece implements IPiece { +export class Piece { bufferIndex: number; start: BufferCursor; end: BufferCursor; @@ -220,38 +212,6 @@ export class OriginalPiece implements IPiece { this.lineFeedCnt = lineFeedCnt; this.length = length; } - - shift(offset: number) { - - } -} - -export class Piece implements IPiece { - bufferIndex: number; - offset: number; - length: number; // size of current piece - - lineFeedCnt: number; - lineStarts: PrefixSumComputer; - - constructor(bufferIndex: number, offset: number, length: number, lineFeedCnt: number, lineLengthsVal: Uint32Array) { - this.bufferIndex = bufferIndex; - this.offset = offset; - this.length = length; - this.lineFeedCnt = lineFeedCnt; - this.lineStarts = null; - - if (lineLengthsVal) { - let newVal = new Uint32Array(lineLengthsVal.length); - newVal.set(lineLengthsVal); - this.lineStarts = new PrefixSumComputer(newVal); - } - } - - shift(offset: number) { - this.offset += offset; - this.length -= offset; - } } export class StringBuffer { @@ -264,16 +224,17 @@ export class StringBuffer { } } - export class PieceTableBase { protected _buffers: StringBuffer[]; // 0 is change buffer, others are readonly original buffer. protected _root: TreeNode; protected _lineCnt: number; + private _lastChangeBufferPos: BufferCursor; constructor(chunks: StringBuffer[]) { this._buffers = [ new StringBuffer('', [0]) ]; + this._lastChangeBufferPos = { line: 0, column: 0 }; this._root = SENTINEL; this._lineCnt = 1; @@ -284,7 +245,7 @@ export class PieceTableBase { chunks[i].lineStarts = constructLineStarts(chunks[i].buffer); } - let piece = new OriginalPiece( + let piece = new Piece( i + 1, { line: 0, column: 0 }, { line: chunks[i].lineStarts.length - 1, column: chunks[i].buffer.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1] }, @@ -304,23 +265,26 @@ export class PieceTableBase { // todo, validate value and offset. if (this._root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); - if (this.isChangeBufferNode(node)) { + let piece = node.piece; + let bufferIndex = piece.bufferIndex; + let insertPosInBuffer = this.positionInBuffer(node, remainder); + if (node.piece.bufferIndex === 0 && + piece.end.line === this._lastChangeBufferPos.line && + piece.end.column === this._lastChangeBufferPos.column && + (nodeStartOffset + piece.length === offset) + ) { // changed buffer - this.insertToChangedPiece(node, remainder, nodeStartOffset, offset, value); + this.appendToNode(node, value); this.computeLineCount(); return; } - let piece = node.piece; - let bufferIndex = piece.bufferIndex; - let insertPosInBuffer = this.positionInBuffer(node, remainder); - if (nodeStartOffset === offset) { this.insertContentToNodeLeft(value, node); } else if (nodeStartOffset + node.piece.length > offset) { // we are inserting into the middle of a node. let nodesToDel = []; - let newRightPiece = new OriginalPiece( + let newRightPiece = new Piece( piece.bufferIndex, insertPosInBuffer, piece.end, @@ -345,17 +309,17 @@ export class PieceTableBase { let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); if (tailOfLeft === 13 /** \r */) { let previousPos = this.positionInBuffer(node, remainder - 1); - this.deleteOriginalNodeTail(node, previousPos); + this.deleteNodeTail(node, previousPos); value = '\r' + value; if (node.piece.length === 0) { nodesToDel.push(node); } } else { - this.deleteOriginalNodeTail(node, insertPosInBuffer); + this.deleteNodeTail(node, insertPosInBuffer); } } else { - this.deleteOriginalNodeTail(node, insertPosInBuffer); + this.deleteNodeTail(node, insertPosInBuffer); } let newPiece = this.createNewPiece(value); @@ -377,24 +341,85 @@ export class PieceTableBase { this.computeLineCount(); } + delete(offset: number, cnt: number): void { + if (cnt <= 0 || this._root === SENTINEL) { + return; + } + + let startPosition = this.nodeAt(offset); + let endPosition = this.nodeAt(offset + cnt); + let startNode = startPosition.node; + let endNode = endPosition.node; + + if (startNode === endNode) { + let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); + let endSplitPosInBuffer = this.positionInBuffer(startNode, endPosition.remainder); + + if (startPosition.nodeStartOffset === offset) { + if (cnt === startNode.piece.length) { // delete node + let next = startNode.next(); + this.rbDelete(startNode); + this.validateCRLFWithPrevNode(next); + this.computeLineCount(); + return; + } + this.deleteNodeHead(startNode, endSplitPosInBuffer); + this.validateCRLFWithPrevNode(startNode); + this.computeLineCount(); + return; + } + + if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { + this.deleteNodeTail(startNode, startSplitPosInBuffer); + this.validateCRLFWithNextNode(startNode); + this.computeLineCount(); + return; + } + + // delete content in the middle, this node will be splitted to nodes + this.shrinkNode(startNode, startSplitPosInBuffer, endSplitPosInBuffer); + this.computeLineCount(); + return; + } + + let nodesToDel = []; + + let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); + this.deleteNodeTail(startNode, startSplitPosInBuffer); + if (startNode.piece.length === 0) { + nodesToDel.push(startNode); + } + + // update last touched node + let endSplitPosInBuffer = this.positionInBuffer(endNode, endPosition.remainder); + this.deleteNodeHead(endNode, endSplitPosInBuffer); + if (endNode.piece.length === 0) { + nodesToDel.push(endNode); + } + + // delete nodes in between + let secondNode = startNode.next(); + for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { + nodesToDel.push(node); + } + + let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; + this.deleteNodes(nodesToDel); + this.validateCRLFWithNextNode(prev); + this.computeLineCount(); + } + insertContentToNodeLeft(value: string, node: TreeNode) { // we are inserting content to the beginning of node let nodesToDel = []; if (this.endWithCR(value) && this.startWithLF(node)) { // move `\n` to new node. - if (this.isChangeBufferNode(node)) { - let piece = node.piece; - piece.shift(1); - piece.lineFeedCnt--; - piece.lineStarts.removeValues(0, 1); - } else { - let piece = node.piece; - let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; - piece.start = newStart; - piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize - piece.length -= 1; - } + let piece = node.piece; + let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; + piece.start = newStart; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize + piece.length -= 1; value += '\n'; this.updateMetadata(node, -1, -1); @@ -422,199 +447,8 @@ export class PieceTableBase { this.validateCRLFWithPrevNode(newNode); } - insertToChangedPiece(node: TreeNode, remainder: number, nodeStartOffset: number, offset: number, value: string) { - let piece: Piece = node.piece; - let insertPos = piece.lineStarts.getIndexOf(remainder); - - if (piece.offset + piece.length === this._buffers[0].buffer.length && (nodeStartOffset + piece.length === offset)) { - this.appendToNode(node, value); - } else { - if (nodeStartOffset === offset) { - this.insertContentToNodeLeft(value, node); - } else if (nodeStartOffset + node.piece.length > offset) { - // we are inserting into the middle of a node. - let nodesToDel = []; - let newRightPiece = new Piece( - piece.bufferIndex, - piece.offset + remainder, - piece.length - remainder, - piece.lineFeedCnt - insertPos.index, - piece.lineStarts.values - ); - - if (this.endWithCR(value)) { - let headOfRight = this.nodeCharCodeAt(node, remainder); - - if (headOfRight === 10 /** \n */) { - newRightPiece.offset++; - newRightPiece.length--; - newRightPiece.lineFeedCnt--; - newRightPiece.lineStarts.removeValues(0, insertPos.index + 1); - value += '\n'; - } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); - } - } else { - this.deletePrefixSumHead(newRightPiece.lineStarts, insertPos); - } - - // reuse node for content before insertion point. - if (this.startWithLF(value)) { - let tailOfLeft = this.nodeCharCodeAt(node, remainder - 1); - if (tailOfLeft === 13 /** \r */) { - let previousPos = piece.lineStarts.getIndexOf(remainder - 1); - this.deleteNodeTail(node, previousPos); - value = '\r' + value; - - if (node.piece.length === 0) { - nodesToDel.push(node); - } - } else { - this.deleteNodeTail(node, insertPos); - } - } else { - this.deleteNodeTail(node, insertPos); - } - - let newPiece = this.createNewPiece(value); - if (newRightPiece.length > 0) { - this.rbInsertRight(node, newRightPiece); - } - this.rbInsertRight(node, newPiece); - this.deleteNodes(nodesToDel); - } else { - this.insertContentToNodeRight(value, node); - } - } - } - - deletePartOfChangedNode(startNode: TreeNode, offset: number, cnt: number, startPosition, endPosition) { - let piece = startNode.piece; - let startSplitPos = piece.lineStarts.getIndexOf(startPosition.remainder); - let endSplitPos = piece.lineStarts.getIndexOf(endPosition.remainder); - - if (startPosition.nodeStartOffset === offset) { - if (cnt === piece.length) { // delete node - let next = startNode.next(); - this.rbDelete(startNode); - this.validateCRLFWithPrevNode(next); - this.computeLineCount(); - return; - } - this.deleteNodeHead(startNode, endSplitPos); - this.validateCRLFWithPrevNode(startNode); - this.computeLineCount(); - return; - } - - if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { - this.deleteNodeTail(startNode, startSplitPos); - this.validateCRLFWithNextNode(startNode); - this.computeLineCount(); - return; - } - - // delete content in the middle, this node will be splitted to nodes - this.shrinkNode(startNode, startSplitPos, endSplitPos); - this.computeLineCount(); - return; - } - - delete(offset: number, cnt: number): void { - if (cnt <= 0 || this._root === SENTINEL) { - return; - } - - let startPosition = this.nodeAt(offset); - let endPosition = this.nodeAt(offset + cnt); - let startNode = startPosition.node; - let endNode = endPosition.node; - // let startSplitPos = startNode.piece.lineStarts.getIndexOf(startPosition.remainder); - - if (startNode === endNode) { - if (this.isChangeBufferNode(startNode)) { - return this.deletePartOfChangedNode(startNode, offset, cnt, startPosition, endPosition); - } - - let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); - let endSplitPosInBuffer = this.positionInBuffer(startNode, endPosition.remainder); - - if (startPosition.nodeStartOffset === offset) { - if (cnt === startNode.piece.length) { // delete node - let next = startNode.next(); - this.rbDelete(startNode); - this.validateCRLFWithPrevNode(next); - this.computeLineCount(); - return; - } - this.deleteOriginalNodeHead(startNode, endSplitPosInBuffer); - this.validateCRLFWithPrevNode(startNode); - this.computeLineCount(); - return; - } - - if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { - this.deleteOriginalNodeTail(startNode, startSplitPosInBuffer); - this.validateCRLFWithNextNode(startNode); - this.computeLineCount(); - return; - } - - // delete content in the middle, this node will be splitted to nodes - this.shrinkOriginalNode(startNode, startSplitPosInBuffer, endSplitPosInBuffer); - this.computeLineCount(); - return; - } - - let nodesToDel = []; - - if (this.isChangeBufferNode(startNode)) { - // changed buffer - let piece = startNode.piece; - let startSplitPos = piece.lineStarts.getIndexOf(startPosition.remainder); - // update first touched node - this.deleteNodeTail(startNode, startSplitPos); - if (startNode.piece.length === 0) { - nodesToDel.push(startNode); - } - } else { - let startSplitPosInBuffer = this.positionInBuffer(startNode, startPosition.remainder); - this.deleteOriginalNodeTail(startNode, startSplitPosInBuffer); - if (startNode.piece.length === 0) { - nodesToDel.push(startNode); - } - } - - // update last touched node - if (this.isChangeBufferNode(endNode)) { - let piece = endNode.piece; - let endSplitPos = piece.lineStarts.getIndexOf(endPosition.remainder); - this.deleteNodeHead(endNode, endSplitPos); - if (endNode.piece.length === 0) { - nodesToDel.push(endNode); - } - } else { - let endSplitPosInBuffer = this.positionInBuffer(endNode, endPosition.remainder); - this.deleteOriginalNodeHead(endNode, endSplitPosInBuffer); - if (endNode.piece.length === 0) { - nodesToDel.push(endNode); - } - } - - // delete nodes in between - let secondNode = startNode.next(); - for (let node = secondNode; node !== SENTINEL && node !== endNode; node = node.next()) { - nodesToDel.push(node); - } - - let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; - this.deleteNodes(nodesToDel); - this.validateCRLFWithNextNode(prev); - this.computeLineCount(); - } - positionInBuffer(node: TreeNode, remainder: number): BufferCursor { - let piece = node.piece; + let piece = node.piece; let bufferIndex = node.piece.bufferIndex; let lineStarts = this._buffers[bufferIndex].lineStarts; @@ -623,6 +457,10 @@ export class PieceTableBase { let offset = startOffset + remainder; + // if (offset > endOffset) { + // throw ('this should not happen'); + // } + // binary search offset between startOffset and endOffset let low = piece.start.line; let high = piece.end.line; @@ -704,10 +542,49 @@ export class PieceTableBase { } createNewPiece(text: string): Piece { - const startOffset = this._buffers[0].buffer.length; - this._buffers[0].buffer += text; - const lineLengths = this.constructLineLengths(text); - return new Piece(0, startOffset, text.length, lineLengths.length - 1, lineLengths); + let startOffset = this._buffers[0].buffer.length; + const lineStarts = constructLineStarts(text); + + let start = this._lastChangeBufferPos; + if (this._buffers[0].lineStarts[this._buffers[0].lineStarts.length - 1] === startOffset + && startOffset !== 0 + && this.startWithLF(text) + && this.endWithCR(this._buffers[0].buffer) // todo, we can check this._lastChangeBufferPos's column as it's the last one + ) { + this._lastChangeBufferPos = { line: this._lastChangeBufferPos.line, column: this._lastChangeBufferPos.column + 1 }; + start = this._lastChangeBufferPos; + + for (let i = 0; i < lineStarts.length; i++) { + lineStarts[i] += startOffset + 1; + } + this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + this._buffers[0].buffer += '_' + text; + startOffset += 1; + } else { + for (let i = 0; i < lineStarts.length; i++) { + lineStarts[i] += startOffset; + } + this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + this._buffers[0].buffer += text; + } + + const endOffset = this._buffers[0].buffer.length; + let endIndex = this._buffers[0].lineStarts.length - 1; + let endColumn = endOffset - this._buffers[0].lineStarts[endIndex]; + let endPos = { line: endIndex, column: endColumn }; + let newPiece = new Piece( + 0, + start, + endPos, + this.getLineFeedCnt(0, start, endPos), // @todo, optimize + endOffset - startOffset + ); + this._lastChangeBufferPos = endPos; + return newPiece; + } + + getLinesRawContent(): string { + return this.getContentOfSubTree(this._root); } getLineRawContent(lineNumber: number): string { @@ -772,54 +649,42 @@ export class PieceTableBase { // #region node operations getStartOffset(node: TreeNode) { - if (this.isChangeBufferNode(node)) { - return (node.piece).offset; - } else { - return this.offsetInBuffer(node.piece.bufferIndex, (node.piece).start); - } + return this.offsetInBuffer(node.piece.bufferIndex, node.piece.start); } getIndexOf(node: TreeNode, accumulatedValue: number): PrefixSumIndexOfResult { - if (this.isChangeBufferNode(node)) { - return (node.piece).lineStarts.getIndexOf(accumulatedValue); - } else { - let piece = node.piece; - let pos = this.positionInBuffer(node, accumulatedValue); - let lineCnt = pos.line - piece.start.line; + let piece = node.piece; + let pos = this.positionInBuffer(node, accumulatedValue); + let lineCnt = pos.line - piece.start.line; - if (this.offsetInBuffer(piece.bufferIndex, piece.end) - this.offsetInBuffer(piece.bufferIndex, piece.start) === accumulatedValue) { - // we are checking the end of this node, so a CRLF check is necessary. - let realLineCnt = this.getLineFeedCnt(node.piece.bufferIndex, piece.start, pos); - if (realLineCnt !== lineCnt) { - // aha yes, CRLF - return new PrefixSumIndexOfResult(realLineCnt, 0); - } + if (this.offsetInBuffer(piece.bufferIndex, piece.end) - this.offsetInBuffer(piece.bufferIndex, piece.start) === accumulatedValue) { + // we are checking the end of this node, so a CRLF check is necessary. + let realLineCnt = this.getLineFeedCnt(node.piece.bufferIndex, piece.start, pos); + if (realLineCnt !== lineCnt) { + // aha yes, CRLF + return new PrefixSumIndexOfResult(realLineCnt, 0); } - - return new PrefixSumIndexOfResult(lineCnt, pos.column); } + + return new PrefixSumIndexOfResult(lineCnt, pos.column); } getAccumulatedValue(node: TreeNode, index: number) { - if (this.isChangeBufferNode(node)) { - return (node.piece).lineStarts.getAccumulatedValue(index); + if (index < 0) { + return 0; + } + let piece = node.piece; + let lineStarts = this._buffers[piece.bufferIndex].lineStarts; + let expectedLineStartIndex = piece.start.line + index + 1; + if (expectedLineStartIndex > piece.end.line) { + return lineStarts[piece.end.line] + piece.end.column - lineStarts[piece.start.line] - piece.start.column; } else { - if (index < 0) { - return 0; - } - let piece = node.piece; - let lineStarts = this._buffers[piece.bufferIndex].lineStarts; - let expectedLineStartIndex = piece.start.line + index + 1; - if (expectedLineStartIndex > piece.end.line) { - return lineStarts[piece.end.line] + piece.end.column - lineStarts[piece.start.line] - piece.start.column; - } else { - return lineStarts[expectedLineStartIndex] - lineStarts[piece.start.line] - piece.start.column; - } + return lineStarts[expectedLineStartIndex] - lineStarts[piece.start.line] - piece.start.column; } } - deleteOriginalNodeTail(node: TreeNode, pos: BufferCursor) { - let piece = node.piece; + deleteNodeTail(node: TreeNode, pos: BufferCursor) { + let piece = node.piece; let originalLFCnt = piece.lineFeedCnt; let originalEndOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); piece.end = pos; @@ -831,8 +696,8 @@ export class PieceTableBase { this.updateMetadata(node, size_delta, lf_delta); } - deleteOriginalNodeHead(node: TreeNode, pos: BufferCursor) { - let piece = node.piece; + deleteNodeHead(node: TreeNode, pos: BufferCursor) { + let piece = node.piece; let originalLFCnt = piece.lineFeedCnt; let originalStartOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); @@ -845,8 +710,8 @@ export class PieceTableBase { this.updateMetadata(node, size_delta, lf_delta); } - shrinkOriginalNode(node: TreeNode, start: BufferCursor, end: BufferCursor) { - let piece = node.piece; + shrinkNode(node: TreeNode, start: BufferCursor, end: BufferCursor) { + let piece = node.piece; let originalStartPos = piece.start; let originalEndPos = piece.end; @@ -863,7 +728,7 @@ export class PieceTableBase { // new right piece // end, originalEndPos - let newPiece = new OriginalPiece( + let newPiece = new Piece( piece.bufferIndex, end, originalEndPos, @@ -875,104 +740,36 @@ export class PieceTableBase { this.validateCRLFWithPrevNode(newNode); } - deleteNodeHead(node: TreeNode, pos?: PrefixSumIndexOfResult) { - let piece = node.piece; - // it's okay to delete CR in CRLF. - let cnt = piece.lineStarts.getAccumulatedValue(pos.index - 1) + pos.remainder; - piece.length -= cnt; - piece.offset += cnt; - piece.lineFeedCnt -= pos.index; - this.deletePrefixSumHead(piece.lineStarts, pos); - this.updateMetadata(node, -cnt, -pos.index); - } - - deleteNodeTail(node: TreeNode, start: PrefixSumIndexOfResult) { - let piece = node.piece; - let cnt = node.piece.length - piece.lineStarts.getAccumulatedValue(start.index - 1) - start.remainder; - let hitCRLF = this.hitTestCRLF(node, piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder, start); - node.piece.length -= cnt; - let lf_delta = start.index - node.piece.lineFeedCnt; - node.piece.lineFeedCnt = start.index; - this.deletePrefixSumTail(piece.lineStarts, start); - - if (hitCRLF) { - node.piece.lineFeedCnt += 1; - lf_delta += 1; - piece.lineStarts.insertValues(piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); - } - - this.updateMetadata(node, -cnt, lf_delta); - } - - // remove start-end from node. - shrinkNode(node: TreeNode, start: PrefixSumIndexOfResult, end?: PrefixSumIndexOfResult) { - let piece = node.piece; - // read operation first - let oldLineLengthsVal = piece.lineStarts.values; - let offset = piece.lineStarts.getAccumulatedValue(start.index - 1) + start.remainder; - let endOffset = piece.lineStarts.getAccumulatedValue(end.index - 1) + end.remainder; - - // write. - let startHitCRLF = this.hitTestCRLF(node, offset, start); - let nodeOldLength = piece.length; - piece.length = offset; - let lf_delta = start.index - piece.lineFeedCnt; - piece.lineFeedCnt = start.index; - piece.lineStarts = new PrefixSumComputer(oldLineLengthsVal.slice(0, start.index + 1)); - piece.lineStarts.changeValue(start.index, start.remainder); - - if (startHitCRLF) { - node.piece.lineFeedCnt += 1; - lf_delta += 1; - piece.lineStarts.insertValues(piece.lineStarts.values.length, new Uint32Array(1) /*[0]*/); - } - this.updateMetadata(node, offset - nodeOldLength, lf_delta); - - let newPieceLength = nodeOldLength - endOffset; - if (newPieceLength <= 0) { - return; - } - - let newPiece: Piece = new Piece( - node.piece.bufferIndex, - endOffset + piece.offset, - newPieceLength, - oldLineLengthsVal.length - end.index - 1, - oldLineLengthsVal.slice(end.index) - ); - newPiece.lineStarts.changeValue(0, newPiece.lineStarts.values[0] - end.remainder); - - let newNode = this.rbInsertRight(node, newPiece); - this.validateCRLFWithPrevNode(newNode); - } - appendToNode(node: TreeNode, value: string): void { if (this.adjustCarriageReturnFromNext(value, node)) { value += '\n'; } let hitCRLF = this.startWithLF(value) && this.endWithCR(node); + const startOffset = this._buffers[0].buffer.length; this._buffers[0].buffer += value; - node.piece.length += value.length; - const lineLengths = this.constructLineLengths(value); - let lineFeedCount = lineLengths.length - 1; - - let lf_delta = lineFeedCount; - let piece = node.piece; - if (hitCRLF) { - node.piece.lineFeedCnt += lineFeedCount - 1; - lf_delta--; - let lineStarts = piece.lineStarts; - lineStarts.removeValues(lineStarts.values.length - 1, 1); - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + 1); - lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); - } else { - piece.lineFeedCnt += lineFeedCount; - let lineStarts = piece.lineStarts; - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] + lineLengths[0]); - lineStarts.insertValues(lineStarts.values.length, lineLengths.slice(1)); + const lineStarts = constructLineStarts(value); + for (let i = 0; i < lineStarts.length; i++) { + lineStarts[i] += startOffset; } - + if (hitCRLF) { + let prevStartOffset = this._buffers[0].lineStarts[this._buffers[0].lineStarts.length - 2]; + this._buffers[0].lineStarts.pop(); + // _lastChangeBufferPos is already wrong + this._lastChangeBufferPos = { line: this._lastChangeBufferPos.line - 1, column: startOffset - prevStartOffset }; + } + this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + const endOffset = this._buffers[0].buffer.length; + let endIndex = this._buffers[0].lineStarts.length - 1; + let endColumn = endOffset - this._buffers[0].lineStarts[endIndex]; + let endPos = { line: endIndex, column: endColumn }; + node.piece.end = endPos; + node.piece.length += value.length; + let oldLineFeedCnt = node.piece.lineFeedCnt; + let newLineFeedCnt = this.getLineFeedCnt(0, node.piece.start, endPos); + node.piece.lineFeedCnt = newLineFeedCnt; + let lf_delta = newLineFeedCnt - oldLineFeedCnt; + this._lastChangeBufferPos = endPos; this.updateMetadata(node, value.length, lf_delta); } @@ -1074,19 +871,8 @@ export class PieceTableBase { return -1; } let buffer = this._buffers[node.piece.bufferIndex]; - - if (this.isChangeBufferNode(node)) { - let piece = node.piece; - return buffer.buffer.charCodeAt(piece.offset + offset); - } else { - let piece = node.piece; - let newOffset = this.offsetInBuffer(piece.bufferIndex, piece.start) + offset; - return buffer.buffer.charCodeAt(newOffset); - } - } - - private isChangeBufferNode(node: TreeNode) { - return node.piece.bufferIndex === 0; + let newOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start) + offset; + return buffer.buffer.charCodeAt(newOffset); } offsetOfNode(node: TreeNode): number { @@ -1107,16 +893,9 @@ export class PieceTableBase { getNodeContent(node: TreeNode): string { let buffer = this._buffers[node.piece.bufferIndex]; - if (this.isChangeBufferNode(node)) { - let piece = node.piece; - let currentContent = buffer.buffer.substr(piece.offset, node.piece.length); - return currentContent; - } else { - let piece = node.piece; - let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); - let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); - return buffer.buffer.substring(startOffset, endOffset); - } + let startOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start); + let endOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.end); + return buffer.buffer.substring(startOffset, endOffset); } @@ -1144,30 +923,19 @@ export class PieceTableBase { return false; } - if (this.isChangeBufferNode(val)) { - let piece = val.piece; - - if (piece.lineStarts.getAccumulatedValue(0) !== 1 /* if it's \n, the first line is 1 char */) { - return false; - } - - // charCodeAt is expensive when the buffer is large. - return this.nodeCharCodeAt(val, 0) === 10; - } else { - let piece = val.piece; - let lineStarts = this._buffers[piece.bufferIndex].lineStarts; - let line = piece.start.line; - let startOffset = lineStarts[line] + piece.start.column; - if (line === lineStarts.length - 1) { - // last line, so there is no line feed at the end of this line - return false; - } - let nextLineOffset = lineStarts[line + 1]; - if (nextLineOffset > startOffset + 1) { - return false; - } - return this._buffers[piece.bufferIndex].buffer.charCodeAt(startOffset) === 10; + let piece = val.piece; + let lineStarts = this._buffers[piece.bufferIndex].lineStarts; + let line = piece.start.line; + let startOffset = lineStarts[line] + piece.start.column; + if (line === lineStarts.length - 1) { + // last line, so there is no line feed at the end of this line + return false; } + let nextLineOffset = lineStarts[line + 1]; + if (nextLineOffset > startOffset + 1) { + return false; + } + return this._buffers[piece.bufferIndex].buffer.charCodeAt(startOffset) === 10; } endWithCR(val: string | TreeNode): boolean { @@ -1182,20 +950,6 @@ export class PieceTableBase { return this.nodeCharCodeAt(val, val.piece.length - 1) === 13; } - hitTestCRLF(node: TreeNode, offset: number, position: PrefixSumIndexOfResult) { - if (node.piece.lineFeedCnt < 1) { - return false; - } - - let piece = node.piece; - let currentLineLen = piece.lineStarts.getAccumulatedValue(position.index); - if (offset === currentLineLen - 1) { - // charCodeAt becomes slow (single or even two digits ms) when the changed buffer is long - return this.nodeCharCodeAt(node, offset - 1) === 13/* \r */ && this.nodeCharCodeAt(node, offset) === 10 /* \n */; - } - return false; - } - validateCRLFWithPrevNode(nextNode: TreeNode) { if (this.startWithLF(nextNode)) { let node = nextNode.prev(); @@ -1217,49 +971,31 @@ export class PieceTableBase { fixCRLF(prev: TreeNode, next: TreeNode) { let nodesToDel = []; // update node - if (this.isChangeBufferNode(prev)) { - prev.piece.length -= 1; - prev.piece.lineFeedCnt -= 1; - let lineStarts = (prev.piece).lineStarts; - // lineStarts.values.length >= 2 due to a `\r` - lineStarts.removeValues(lineStarts.values.length - 1, 1); - lineStarts.changeValue(lineStarts.values.length - 1, lineStarts.values[lineStarts.values.length - 1] - 1); + let lineStarts = this._buffers[prev.piece.bufferIndex].lineStarts; + if (prev.piece.end.column === 0) { + // it means, last line ends with \r, not \r\n + let newEnd: BufferCursor = { line: prev.piece.end.line - 1, column: lineStarts[prev.piece.end.line] - lineStarts[prev.piece.end.line - 1] - 1 }; + prev.piece.end = newEnd; } else { - // prev ends with \r - let piece = prev.piece; - let lineStarts = this._buffers[piece.bufferIndex].lineStarts; - if (piece.end.column === 0) { - // it means, last line ends with \r, not \r\n - let newEnd: BufferCursor = { line: piece.end.line - 1, column: lineStarts[piece.end.line] - lineStarts[piece.end.line - 1] - 1 }; - piece.end = newEnd; - } else { - // \r\n - let newEnd: BufferCursor = { line: piece.end.line, column: piece.end.column - 1 }; - piece.end = newEnd; - } - - piece.length -= 1; - piece.lineFeedCnt -= 1; + // \r\n + let newEnd: BufferCursor = { line: prev.piece.end.line, column: prev.piece.end.column - 1 }; + prev.piece.end = newEnd; } + prev.piece.length -= 1; + prev.piece.lineFeedCnt -= 1; + this.updateMetadata(prev, - 1, -1); if (prev.piece.length === 0) { nodesToDel.push(prev); } // update nextNode - if (this.isChangeBufferNode(next)) { - next.piece.shift(1); - next.piece.lineFeedCnt -= 1; - let lineStarts = (next.piece).lineStarts; - lineStarts.removeValues(0, 1); - } else { - let piece = next.piece; - let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; - piece.start = newStart; - piece.length -= 1; - piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize - } + let newStart: BufferCursor = { line: next.piece.start.line + 1, column: 0 }; + next.piece.start = newStart; + next.piece.length -= 1; + next.piece.lineFeedCnt = this.getLineFeedCnt(next.piece.bufferIndex, next.piece.start, next.piece.end); // @todo, we can optimize + // } this.updateMetadata(next, - 1, -1); if (next.piece.length === 0) { @@ -1286,17 +1022,12 @@ export class PieceTableBase { if (nextNode.piece.length === 1) { this.rbDelete(nextNode); } else { - if (this.isChangeBufferNode(nextNode)) { - nextNode.piece.shift(1); - nextNode.piece.lineFeedCnt -= 1; - (nextNode.piece).lineStarts.removeValues(0, 1); // remove the first line, which is empty. - } else { - let piece = nextNode.piece; - let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; - piece.start = newStart; - piece.length -= 1; - piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize - } + + let piece = nextNode.piece; + let newStart: BufferCursor = { line: piece.start.line + 1, column: 0 }; + piece.start = newStart; + piece.length -= 1; + piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize this.updateMetadata(nextNode, -1, -1); } return true; @@ -1366,7 +1097,7 @@ export class PieceTableBase { * / * z */ - rbInsertRight(node: TreeNode, p: IPiece): TreeNode { + rbInsertRight(node: TreeNode, p: Piece): TreeNode { let z = new TreeNode(p, NodeColor.Red); z.left = SENTINEL; z.right = SENTINEL; @@ -1687,14 +1418,10 @@ export class PieceTableBase { let buffer = this._buffers[node.piece.bufferIndex]; let currentContent; - if (this.isChangeBufferNode(node)) { - currentContent = buffer.buffer.substr((node.piece).offset, node.piece.length); - } else { - let piece = node.piece; - let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); - let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); - currentContent = buffer.buffer.substring(startOffset, endOffset); - } + let piece = node.piece; + let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + currentContent = buffer.buffer.substring(startOffset, endOffset); return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); } @@ -1710,6 +1437,5 @@ export class PieceTableBase { return lineLengths; } - // #endregion } diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts new file mode 100644 index 00000000000..415533d7ae4 --- /dev/null +++ b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts @@ -0,0 +1,1455 @@ +/*--------------------------------------------------------------------------------------------- + * 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 { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; +import { Position } from 'vs/editor/common/core/position'; +import { Range } from 'vs/editor/common/core/range'; +import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { DefaultEndOfLine } from 'vs/editor/common/model'; + +const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n'; + +function randomChar() { + return alphabet[randomInt(alphabet.length)]; +} + +function randomInt(bound: number) { + return Math.floor(Math.random() * bound); +} + +function randomStr(len: number) { + if (len === null) { + len = 10; + } + return (function () { + var j, ref, results; + results = []; + for ( + j = 1, ref = len; + 1 <= ref ? j < ref : j > ref; + 1 <= ref ? j++ : j-- + ) { + results.push(randomChar()); + } + return results; + })().join(''); +} + +function trimLineFeed(text: string): string { + if (text.length === 0) { + return text; + } + + if (text.length === 1) { + if ( + text.charCodeAt(text.length - 1) === 10 || + text.charCodeAt(text.length - 1) === 13 + ) { + return ''; + } + return text; + } + + if (text.charCodeAt(text.length - 1) === 10) { + if (text.charCodeAt(text.length - 2) === 13) { + return text.slice(0, -2); + } + return text.slice(0, -1); + } + + if (text.charCodeAt(text.length - 1) === 13) { + return text.slice(0, -1); + } + + return text; +} + +function testLinesContent(str: string, pieceTable: PieceTableTextBuffer) { + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + assert.equal(pieceTable.getLinesRawContent(), str); + for (let i = 0; i < lines.length; i++) { + assert.equal(pieceTable.getLineContent(i + 1), lines[i]); + assert.equal( + trimLineFeed( + pieceTable.getValueInRange( + new Range( + i + 1, + 1, + i + 1, + lines[i].length + (i === lines.length - 1 ? 1 : 2) + ) + ) + ), + lines[i] + ); + } +} + +function testLineStarts(str: string, pieceTable: PieceTableTextBuffer) { + let lineStarts = [0]; + + // Reset regex to search from the beginning + let _regex = new RegExp(/\r\n|\r|\n/g); + _regex.lastIndex = 0; + let prevMatchStartIndex = -1; + let prevMatchLength = 0; + + let m: RegExpExecArray; + do { + if (prevMatchStartIndex + prevMatchLength === str.length) { + // Reached the end of the line + break; + } + + m = _regex.exec(str); + if (!m) { + break; + } + + const matchStartIndex = m.index; + const matchLength = m[0].length; + + if ( + matchStartIndex === prevMatchStartIndex && + matchLength === prevMatchLength + ) { + // Exit early if the regex matches the same range twice + break; + } + + prevMatchStartIndex = matchStartIndex; + prevMatchLength = matchLength; + + lineStarts.push(matchStartIndex + matchLength); + } while (m); + + for (let i = 0; i < lineStarts.length; i++) { + assert.deepEqual( + pieceTable.getPositionAt(lineStarts[i]), + new Position(i + 1, 1) + ); + assert.equal(pieceTable.getOffsetAt(i + 1, 1), lineStarts[i]); + } + + for (let i = 1; i < lineStarts.length; i++) { + let pos = pieceTable.getPositionAt(lineStarts[i] - 1); + assert.equal( + pieceTable.getOffsetAt(pos.lineNumber, pos.column), + lineStarts[i] - 1 + ); + } +} + +function createTextBuffer(val: string[]): PieceTableTextBuffer { + let bufferBuilder = new PieceTableTextBufferBuilder(); + for (let i = 0; i < val.length; i++) { + bufferBuilder.acceptChunk(val[i]); + } + let factory = bufferBuilder.finish(); + return factory.create(DefaultEndOfLine.LF); +} + +suite('inserts and deletes', () => { + test('basic insert/delete', () => { + let pieceTable = createTextBuffer([ + 'This is a document with some text.' + ]); + + pieceTable.insert(34, 'This is some more text to insert at offset 34.'); + assert.equal( + pieceTable.getLinesRawContent(), + 'This is a document with some text.This is some more text to insert at offset 34.' + ); + pieceTable.delete(42, 5); + assert.equal( + pieceTable.getLinesRawContent(), + 'This is a document with some text.This is more text to insert at offset 34.' + ); + }); + + test('more inserts', () => { + let pt = createTextBuffer(['']); + + pt.insert(0, 'AAA'); + assert.equal(pt.getLinesRawContent(), 'AAA'); + pt.insert(0, 'BBB'); + assert.equal(pt.getLinesRawContent(), 'BBBAAA'); + pt.insert(6, 'CCC'); + assert.equal(pt.getLinesRawContent(), 'BBBAAACCC'); + pt.insert(5, 'DDD'); + assert.equal(pt.getLinesRawContent(), 'BBBAADDDACCC'); + }); + + test('more deletes', () => { + let pt = createTextBuffer(['012345678']); + pt.delete(8, 1); + assert.equal(pt.getLinesRawContent(), '01234567'); + pt.delete(0, 1); + assert.equal(pt.getLinesRawContent(), '1234567'); + pt.delete(5, 1); + assert.equal(pt.getLinesRawContent(), '123457'); + pt.delete(5, 1); + assert.equal(pt.getLinesRawContent(), '12345'); + pt.delete(0, 5); + assert.equal(pt.getLinesRawContent(), ''); + }); + + test('random test 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'ceLPHmFzvCtFeHkCBej '); + str = str.substring(0, 0) + 'ceLPHmFzvCtFeHkCBej ' + str.substring(0); + assert.equal(pieceTable.getLinesRawContent(), str); + pieceTable.insert(8, 'gDCEfNYiBUNkSwtvB K '); + str = str.substring(0, 8) + 'gDCEfNYiBUNkSwtvB K ' + str.substring(8); + assert.equal(pieceTable.getLinesRawContent(), str); + pieceTable.insert(38, 'cyNcHxjNPPoehBJldLS '); + str = str.substring(0, 38) + 'cyNcHxjNPPoehBJldLS ' + str.substring(38); + assert.equal(pieceTable.getLinesRawContent(), str); + pieceTable.insert(59, 'ejMx\nOTgWlbpeDExjOk '); + str = + str.substring(0, 59) + 'ejMx\nOTgWlbpeDExjOk ' + str.substring(59); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random test 2', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'VgPG '); + str = str.substring(0, 0) + 'VgPG ' + str.substring(0); + pieceTable.insert(2, 'DdWF '); + str = str.substring(0, 2) + 'DdWF ' + str.substring(2); + pieceTable.insert(0, 'hUJc '); + str = str.substring(0, 0) + 'hUJc ' + str.substring(0); + pieceTable.insert(8, 'lQEq '); + str = str.substring(0, 8) + 'lQEq ' + str.substring(8); + pieceTable.insert(10, 'Gbtp '); + str = str.substring(0, 10) + 'Gbtp ' + str.substring(10); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random test 3', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'gYSz'); + str = str.substring(0, 0) + 'gYSz' + str.substring(0); + pieceTable.insert(1, 'mDQe'); + str = str.substring(0, 1) + 'mDQe' + str.substring(1); + pieceTable.insert(1, 'DTMQ'); + str = str.substring(0, 1) + 'DTMQ' + str.substring(1); + pieceTable.insert(2, 'GGZB'); + str = str.substring(0, 2) + 'GGZB' + str.substring(2); + pieceTable.insert(12, 'wXpq'); + str = str.substring(0, 12) + 'wXpq' + str.substring(12); + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random delete 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, 'vfb'); + str = str.substring(0, 0) + 'vfb' + str.substring(0); + assert.equal(pieceTable.getLinesRawContent(), str); + pieceTable.insert(0, 'zRq'); + str = str.substring(0, 0) + 'zRq' + str.substring(0); + assert.equal(pieceTable.getLinesRawContent(), str); + + pieceTable.delete(5, 1); + str = str.substring(0, 5) + str.substring(5 + 1); + assert.equal(pieceTable.getLinesRawContent(), str); + + pieceTable.insert(1, 'UNw'); + str = str.substring(0, 1) + 'UNw' + str.substring(1); + assert.equal(pieceTable.getLinesRawContent(), str); + + pieceTable.delete(4, 3); + str = str.substring(0, 4) + str.substring(4 + 3); + assert.equal(pieceTable.getLinesRawContent(), str); + + pieceTable.delete(1, 4); + str = str.substring(0, 1) + str.substring(1 + 4); + assert.equal(pieceTable.getLinesRawContent(), str); + + pieceTable.delete(0, 1); + str = str.substring(0, 0) + str.substring(0 + 1); + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random delete 2', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, 'IDT'); + str = str.substring(0, 0) + 'IDT' + str.substring(0); + pieceTable.insert(3, 'wwA'); + str = str.substring(0, 3) + 'wwA' + str.substring(3); + pieceTable.insert(3, 'Gnr'); + str = str.substring(0, 3) + 'Gnr' + str.substring(3); + pieceTable.delete(6, 3); + str = str.substring(0, 6) + str.substring(6 + 3); + pieceTable.insert(4, 'eHp'); + str = str.substring(0, 4) + 'eHp' + str.substring(4); + pieceTable.insert(1, 'UAi'); + str = str.substring(0, 1) + 'UAi' + str.substring(1); + pieceTable.insert(2, 'FrR'); + str = str.substring(0, 2) + 'FrR' + str.substring(2); + pieceTable.delete(6, 7); + str = str.substring(0, 6) + str.substring(6 + 7); + pieceTable.delete(3, 5); + str = str.substring(0, 3) + str.substring(3 + 5); + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random delete 3', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'PqM'); + str = str.substring(0, 0) + 'PqM' + str.substring(0); + pieceTable.delete(1, 2); + str = str.substring(0, 1) + str.substring(1 + 2); + pieceTable.insert(1, 'zLc'); + str = str.substring(0, 1) + 'zLc' + str.substring(1); + pieceTable.insert(0, 'MEX'); + str = str.substring(0, 0) + 'MEX' + str.substring(0); + pieceTable.insert(0, 'jZh'); + str = str.substring(0, 0) + 'jZh' + str.substring(0); + pieceTable.insert(8, 'GwQ'); + str = str.substring(0, 8) + 'GwQ' + str.substring(8); + pieceTable.delete(5, 6); + str = str.substring(0, 5) + str.substring(5 + 6); + pieceTable.insert(4, 'ktw'); + str = str.substring(0, 4) + 'ktw' + str.substring(4); + pieceTable.insert(5, 'GVu'); + str = str.substring(0, 5) + 'GVu' + str.substring(5); + pieceTable.insert(9, 'jdm'); + str = str.substring(0, 9) + 'jdm' + str.substring(9); + pieceTable.insert(15, 'na\n'); + str = str.substring(0, 15) + 'na\n' + str.substring(15); + pieceTable.delete(5, 8); + str = str.substring(0, 5) + str.substring(5 + 8); + pieceTable.delete(3, 4); + str = str.substring(0, 3) + str.substring(3 + 4); + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random insert/delete \\r bug 1', () => { + let str = 'a'; + let pieceTable = createTextBuffer(['a']); + pieceTable.delete(0, 1); + str = str.substring(0, 0) + str.substring(0 + 1); + pieceTable.insert(0, '\r\r\n\n'); + str = str.substring(0, 0) + '\r\r\n\n' + str.substring(0); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.insert(2, '\n\n\ra'); + str = str.substring(0, 2) + '\n\n\ra' + str.substring(2); + pieceTable.delete(4, 3); + str = str.substring(0, 4) + str.substring(4 + 3); + pieceTable.insert(2, '\na\r\r'); + str = str.substring(0, 2) + '\na\r\r' + str.substring(2); + pieceTable.insert(6, '\ra\n\n'); + str = str.substring(0, 6) + '\ra\n\n' + str.substring(6); + pieceTable.insert(0, 'aa\n\n'); + str = str.substring(0, 0) + 'aa\n\n' + str.substring(0); + pieceTable.insert(5, '\n\na\r'); + str = str.substring(0, 5) + '\n\na\r' + str.substring(5); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random insert/delete \\r bug 2', () => { + let str = 'a'; + let pieceTable = createTextBuffer(['a']); + pieceTable.insert(1, '\naa\r'); + str = str.substring(0, 1) + '\naa\r' + str.substring(1); + pieceTable.delete(0, 4); + str = str.substring(0, 0) + str.substring(0 + 4); + pieceTable.insert(1, '\r\r\na'); + str = str.substring(0, 1) + '\r\r\na' + str.substring(1); + pieceTable.insert(2, '\n\r\ra'); + str = str.substring(0, 2) + '\n\r\ra' + str.substring(2); + pieceTable.delete(4, 1); + str = str.substring(0, 4) + str.substring(4 + 1); + pieceTable.insert(8, '\r\n\r\r'); + str = str.substring(0, 8) + '\r\n\r\r' + str.substring(8); + pieceTable.insert(7, '\n\n\na'); + str = str.substring(0, 7) + '\n\n\na' + str.substring(7); + pieceTable.insert(13, 'a\n\na'); + str = str.substring(0, 13) + 'a\n\na' + str.substring(13); + pieceTable.delete(17, 3); + str = str.substring(0, 17) + str.substring(17 + 3); + pieceTable.insert(2, 'a\ra\n'); + str = str.substring(0, 2) + 'a\ra\n' + str.substring(2); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random insert/delete \\r bug 3', () => { + let str = 'a'; + let pieceTable = createTextBuffer(['a']); + pieceTable.insert(0, '\r\na\r'); + str = str.substring(0, 0) + '\r\na\r' + str.substring(0); + pieceTable.delete(2, 3); + str = str.substring(0, 2) + str.substring(2 + 3); + pieceTable.insert(2, 'a\r\n\r'); + str = str.substring(0, 2) + 'a\r\n\r' + str.substring(2); + pieceTable.delete(4, 2); + str = str.substring(0, 4) + str.substring(4 + 2); + pieceTable.insert(4, 'a\n\r\n'); + str = str.substring(0, 4) + 'a\n\r\n' + str.substring(4); + pieceTable.insert(1, 'aa\n\r'); + str = str.substring(0, 1) + 'aa\n\r' + str.substring(1); + pieceTable.insert(7, '\na\r\n'); + str = str.substring(0, 7) + '\na\r\n' + str.substring(7); + pieceTable.insert(5, '\n\na\r'); + str = str.substring(0, 5) + '\n\na\r' + str.substring(5); + pieceTable.insert(10, '\r\r\n\r'); + str = str.substring(0, 10) + '\r\r\n\r' + str.substring(10); + assert.equal(pieceTable.getLinesRawContent(), str); + pieceTable.delete(21, 3); + str = str.substring(0, 21) + str.substring(21 + 3); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + + test('random insert/delete \\r bug 4s', () => { + let str = 'a'; + let pieceTable = createTextBuffer(['a']); + pieceTable.delete(0, 1); + str = str.substring(0, 0) + str.substring(0 + 1); + pieceTable.insert(0, '\naaa'); + str = str.substring(0, 0) + '\naaa' + str.substring(0); + pieceTable.insert(2, '\n\naa'); + str = str.substring(0, 2) + '\n\naa' + str.substring(2); + pieceTable.delete(1, 4); + str = str.substring(0, 1) + str.substring(1 + 4); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.delete(1, 2); + str = str.substring(0, 1) + str.substring(1 + 2); + pieceTable.delete(0, 1); + str = str.substring(0, 0) + str.substring(0 + 1); + pieceTable.insert(0, 'a\n\n\r'); + str = str.substring(0, 0) + 'a\n\n\r' + str.substring(0); + pieceTable.insert(2, 'aa\r\n'); + str = str.substring(0, 2) + 'aa\r\n' + str.substring(2); + pieceTable.insert(3, 'a\naa'); + str = str.substring(0, 3) + 'a\naa' + str.substring(3); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); + test('random insert/delete \\r bug 5', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, '\n\n\n\r'); + str = str.substring(0, 0) + '\n\n\n\r' + str.substring(0); + pieceTable.insert(1, '\n\n\n\r'); + str = str.substring(0, 1) + '\n\n\n\r' + str.substring(1); + pieceTable.insert(2, '\n\r\r\r'); + str = str.substring(0, 2) + '\n\r\r\r' + str.substring(2); + pieceTable.insert(8, '\n\r\n\r'); + str = str.substring(0, 8) + '\n\r\n\r' + str.substring(8); + pieceTable.delete(5, 2); + str = str.substring(0, 5) + str.substring(5 + 2); + pieceTable.insert(4, '\n\r\r\r'); + str = str.substring(0, 4) + '\n\r\r\r' + str.substring(4); + pieceTable.insert(8, '\n\n\n\r'); + str = str.substring(0, 8) + '\n\n\n\r' + str.substring(8); + pieceTable.delete(0, 7); + str = str.substring(0, 0) + str.substring(0 + 7); + pieceTable.insert(1, '\r\n\r\r'); + str = str.substring(0, 1) + '\r\n\r\r' + str.substring(1); + pieceTable.insert(15, '\n\r\r\r'); + str = str.substring(0, 15) + '\n\r\r\r' + str.substring(15); + + assert.equal(pieceTable.getLinesRawContent(), str); + }); +}); + +suite('prefix sum for line feed', () => { + test('basic', () => { + let pieceTable = createTextBuffer(['1\n2\n3\n4']); + + assert.equal(pieceTable.getLineCount(), 4); + assert.deepEqual(pieceTable.getPositionAt(0), new Position(1, 1)); + assert.deepEqual(pieceTable.getPositionAt(1), new Position(1, 2)); + assert.deepEqual(pieceTable.getPositionAt(2), new Position(2, 1)); + assert.deepEqual(pieceTable.getPositionAt(3), new Position(2, 2)); + assert.deepEqual(pieceTable.getPositionAt(4), new Position(3, 1)); + assert.deepEqual(pieceTable.getPositionAt(5), new Position(3, 2)); + assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1)); + + assert.equal(pieceTable.getOffsetAt(1, 1), 0); + assert.equal(pieceTable.getOffsetAt(1, 2), 1); + assert.equal(pieceTable.getOffsetAt(2, 1), 2); + assert.equal(pieceTable.getOffsetAt(2, 2), 3); + assert.equal(pieceTable.getOffsetAt(3, 1), 4); + assert.equal(pieceTable.getOffsetAt(3, 2), 5); + assert.equal(pieceTable.getOffsetAt(4, 1), 6); + }); + + test('append', () => { + let pieceTable = createTextBuffer(['a\nb\nc\nde']); + pieceTable.insert(8, 'fh\ni\njk'); + + assert.equal(pieceTable.getLineCount(), 6); + assert.deepEqual(pieceTable.getPositionAt(9), new Position(4, 4)); + assert.equal(pieceTable.getOffsetAt(1, 1), 0); + }); + + test('insert', () => { + let pieceTable = createTextBuffer(['a\nb\nc\nde']); + pieceTable.insert(7, 'fh\ni\njk'); + + assert.equal(pieceTable.getLineCount(), 6); + assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1)); + assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2)); + assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3)); + assert.deepEqual(pieceTable.getPositionAt(9), new Position(4, 4)); + assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 1)); + assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 2)); + assert.deepEqual(pieceTable.getPositionAt(14), new Position(6, 3)); + + assert.equal(pieceTable.getOffsetAt(4, 1), 6); + assert.equal(pieceTable.getOffsetAt(4, 2), 7); + assert.equal(pieceTable.getOffsetAt(4, 3), 8); + assert.equal(pieceTable.getOffsetAt(4, 4), 9); + assert.equal(pieceTable.getOffsetAt(6, 1), 12); + assert.equal(pieceTable.getOffsetAt(6, 2), 13); + assert.equal(pieceTable.getOffsetAt(6, 3), 14); + }); + + test('delete', () => { + let pieceTable = createTextBuffer(['a\nb\nc\ndefh\ni\njk']); + pieceTable.delete(7, 2); + + assert.equal(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk'); + assert.equal(pieceTable.getLineCount(), 6); + assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1)); + assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2)); + assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3)); + assert.deepEqual(pieceTable.getPositionAt(9), new Position(5, 1)); + assert.deepEqual(pieceTable.getPositionAt(11), new Position(6, 1)); + assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 2)); + assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 3)); + + assert.equal(pieceTable.getOffsetAt(4, 1), 6); + assert.equal(pieceTable.getOffsetAt(4, 2), 7); + assert.equal(pieceTable.getOffsetAt(4, 3), 8); + assert.equal(pieceTable.getOffsetAt(5, 1), 9); + assert.equal(pieceTable.getOffsetAt(6, 1), 11); + assert.equal(pieceTable.getOffsetAt(6, 2), 12); + assert.equal(pieceTable.getOffsetAt(6, 3), 13); + }); + + test('add+delete 1', () => { + let pieceTable = createTextBuffer(['a\nb\nc\nde']); + pieceTable.insert(8, 'fh\ni\njk'); + pieceTable.delete(7, 2); + + assert.equal(pieceTable.getLinesRawContent(), 'a\nb\nc\ndh\ni\njk'); + assert.equal(pieceTable.getLineCount(), 6); + assert.deepEqual(pieceTable.getPositionAt(6), new Position(4, 1)); + assert.deepEqual(pieceTable.getPositionAt(7), new Position(4, 2)); + assert.deepEqual(pieceTable.getPositionAt(8), new Position(4, 3)); + assert.deepEqual(pieceTable.getPositionAt(9), new Position(5, 1)); + assert.deepEqual(pieceTable.getPositionAt(11), new Position(6, 1)); + assert.deepEqual(pieceTable.getPositionAt(12), new Position(6, 2)); + assert.deepEqual(pieceTable.getPositionAt(13), new Position(6, 3)); + + assert.equal(pieceTable.getOffsetAt(4, 1), 6); + assert.equal(pieceTable.getOffsetAt(4, 2), 7); + assert.equal(pieceTable.getOffsetAt(4, 3), 8); + assert.equal(pieceTable.getOffsetAt(5, 1), 9); + assert.equal(pieceTable.getOffsetAt(6, 1), 11); + assert.equal(pieceTable.getOffsetAt(6, 2), 12); + assert.equal(pieceTable.getOffsetAt(6, 3), 13); + }); + + test('insert random bug 1: prefixSumComputer.removeValues(start, cnt) cnt is 1 based.', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, ' ZX \n Z\nZ\n YZ\nY\nZXX '); + str = + str.substring(0, 0) + + ' ZX \n Z\nZ\n YZ\nY\nZXX ' + + str.substring(0); + pieceTable.insert(14, 'X ZZ\nYZZYZXXY Y XY\n '); + str = + str.substring(0, 14) + 'X ZZ\nYZZYZXXY Y XY\n ' + str.substring(14); + + assert.equal(pieceTable.getLinesRawContent(), str); + + let lineFeedIndex = -1; + let lineCnt = 1; + while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { + if (lineFeedIndex + 1 === str.length) { + // last line feed + break; + } + + lineCnt += 1; + assert.deepEqual( + pieceTable.getPositionAt(lineFeedIndex + 1), + new Position(lineCnt, 1) + ); + assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); + } + }); + + test('insert random bug 2: prefixSumComputer initialize does not do deep copy of UInt32Array.', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'ZYZ\nYY XY\nX \nZ Y \nZ '); + str = + str.substring(0, 0) + 'ZYZ\nYY XY\nX \nZ Y \nZ ' + str.substring(0); + pieceTable.insert(3, 'XXY \n\nY Y YYY ZYXY '); + str = str.substring(0, 3) + 'XXY \n\nY Y YYY ZYXY ' + str.substring(3); + + assert.equal(pieceTable.getLinesRawContent(), str); + + let lineFeedIndex = -1; + let lineCnt = 1; + while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { + if (lineFeedIndex + 1 === str.length) { + // last line feed + break; + } + + lineCnt += 1; + assert.deepEqual( + pieceTable.getPositionAt(lineFeedIndex + 1), + new Position(lineCnt, 1) + ); + assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); + } + }); + + test('delete random bug 1: I forgot to update the lineFeedCnt when deletion is on one single piece.', () => { + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'ba\na\nca\nba\ncbab\ncaa '); + pieceTable.insert(13, 'cca\naabb\ncac\nccc\nab '); + pieceTable.delete(5, 8); + pieceTable.delete(30, 2); + pieceTable.insert(24, 'cbbacccbac\nbaaab\n\nc '); + pieceTable.delete(29, 3); + pieceTable.delete(23, 9); + pieceTable.delete(21, 5); + pieceTable.delete(30, 3); + pieceTable.insert(3, 'cb\nac\nc\n\nacc\nbb\nb\nc '); + pieceTable.delete(19, 5); + pieceTable.insert(18, '\nbb\n\nacbc\ncbb\nc\nbb\n '); + pieceTable.insert(65, 'cbccbac\nbc\n\nccabba\n '); + pieceTable.insert(77, 'a\ncacb\n\nac\n\n\n\n\nabab '); + pieceTable.delete(30, 9); + pieceTable.insert(45, 'b\n\nc\nba\n\nbbbba\n\naa\n '); + pieceTable.insert(82, 'ab\nbb\ncabacab\ncbc\na '); + pieceTable.delete(123, 9); + pieceTable.delete(71, 2); + pieceTable.insert(33, 'acaa\nacb\n\naa\n\nc\n\n\n\n '); + + let str = pieceTable.getLinesRawContent(); + let lineFeedIndex = -1; + let lineCnt = 1; + + while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { + if (lineFeedIndex + 1 === str.length) { + // last line feed + break; + } + + lineCnt += 1; + assert.deepEqual( + pieceTable.getPositionAt(lineFeedIndex + 1), + new Position(lineCnt, 1) + ); + assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); + } + }); + + test('delete random bug rb tree 1', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + pieceTable.insert(0, 'YXXZ\n\nYY\n'); + str = str.substring(0, 0) + 'YXXZ\n\nYY\n' + str.substring(0); + pieceTable.delete(0, 5); + str = str.substring(0, 0) + str.substring(0 + 5); + pieceTable.insert(0, 'ZXYY\nX\nZ\n'); + str = str.substring(0, 0) + 'ZXYY\nX\nZ\n' + str.substring(0); + pieceTable.insert(10, '\nXY\nYXYXY'); + str = str.substring(0, 10) + '\nXY\nYXYXY' + str.substring(10); + let lineFeedIndex = -1; + let lineCnt = 1; + + while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { + if (lineFeedIndex + 1 === str.length) { + // last line feed + break; + } + + lineCnt += 1; + assert.deepEqual( + pieceTable.getPositionAt(lineFeedIndex + 1), + new Position(lineCnt, 1) + ); + assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); + } + }); + + test('delete random bug rb tree 2', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + pieceTable.insert(0, 'YXXZ\n\nYY\n'); + str = str.substring(0, 0) + 'YXXZ\n\nYY\n' + str.substring(0); + pieceTable.insert(0, 'ZXYY\nX\nZ\n'); + str = str.substring(0, 0) + 'ZXYY\nX\nZ\n' + str.substring(0); + pieceTable.insert(10, '\nXY\nYXYXY'); + str = str.substring(0, 10) + '\nXY\nYXYXY' + str.substring(10); + pieceTable.insert(8, 'YZXY\nZ\nYX'); + str = str.substring(0, 8) + 'YZXY\nZ\nYX' + str.substring(8); + pieceTable.insert(12, 'XX\nXXYXYZ'); + str = str.substring(0, 12) + 'XX\nXXYXYZ' + str.substring(12); + pieceTable.delete(0, 4); + str = str.substring(0, 0) + str.substring(0 + 4); + + testLineStarts(str, pieceTable); + }); + + test('delete random bug rb tree 3', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + pieceTable.insert(0, 'YXXZ\n\nYY\n'); + str = str.substring(0, 0) + 'YXXZ\n\nYY\n' + str.substring(0); + pieceTable.delete(7, 2); + str = str.substring(0, 7) + str.substring(7 + 2); + pieceTable.delete(6, 1); + str = str.substring(0, 6) + str.substring(6 + 1); + pieceTable.delete(0, 5); + str = str.substring(0, 0) + str.substring(0 + 5); + pieceTable.insert(0, 'ZXYY\nX\nZ\n'); + str = str.substring(0, 0) + 'ZXYY\nX\nZ\n' + str.substring(0); + pieceTable.insert(10, '\nXY\nYXYXY'); + str = str.substring(0, 10) + '\nXY\nYXYXY' + str.substring(10); + pieceTable.insert(8, 'YZXY\nZ\nYX'); + str = str.substring(0, 8) + 'YZXY\nZ\nYX' + str.substring(8); + pieceTable.insert(12, 'XX\nXXYXYZ'); + str = str.substring(0, 12) + 'XX\nXXYXYZ' + str.substring(12); + pieceTable.delete(0, 4); + str = str.substring(0, 0) + str.substring(0 + 4); + pieceTable.delete(30, 3); + str = str.substring(0, 30) + str.substring(30 + 3); + + testLineStarts(str, pieceTable); + }); +}); + +suite('offset 2 position', () => { + test('random tests bug 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'huuyYzUfKOENwGgZLqn '); + str = str.substring(0, 0) + 'huuyYzUfKOENwGgZLqn ' + str.substring(0); + pieceTable.delete(18, 2); + str = str.substring(0, 18) + str.substring(18 + 2); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.delete(12, 4); + str = str.substring(0, 12) + str.substring(12 + 4); + pieceTable.insert(3, 'hMbnVEdTSdhLlPevXKF '); + str = str.substring(0, 3) + 'hMbnVEdTSdhLlPevXKF ' + str.substring(3); + pieceTable.delete(22, 8); + str = str.substring(0, 22) + str.substring(22 + 8); + pieceTable.insert(4, 'S umSnYrqOmOAV\nEbZJ '); + str = str.substring(0, 4) + 'S umSnYrqOmOAV\nEbZJ ' + str.substring(4); + + testLineStarts(str, pieceTable); + }); +}); + +suite('get text in range', () => { + test('getContentInRange', () => { + let pieceTable = createTextBuffer(['a\nb\nc\nde']); + pieceTable.insert(8, 'fh\ni\njk'); + pieceTable.delete(7, 2); + // 'a\nb\nc\ndh\ni\njk' + + assert.equal(pieceTable.getValueInRange(new Range(1, 1, 1, 3)), 'a\n'); + assert.equal(pieceTable.getValueInRange(new Range(2, 1, 2, 3)), 'b\n'); + assert.equal(pieceTable.getValueInRange(new Range(3, 1, 3, 3)), 'c\n'); + assert.equal(pieceTable.getValueInRange(new Range(4, 1, 4, 4)), 'dh\n'); + assert.equal(pieceTable.getValueInRange(new Range(5, 1, 5, 3)), 'i\n'); + assert.equal(pieceTable.getValueInRange(new Range(6, 1, 6, 3)), 'jk'); + }); + + test('random test value in range', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + + pieceTable.insert(0, 'ZXXY'); + str = str.substring(0, 0) + 'ZXXY' + str.substring(0); + pieceTable.insert(1, 'XZZY'); + str = str.substring(0, 1) + 'XZZY' + str.substring(1); + pieceTable.insert(5, '\nX\n\n'); + str = str.substring(0, 5) + '\nX\n\n' + str.substring(5); + pieceTable.insert(3, '\nXX\n'); + str = str.substring(0, 3) + '\nXX\n' + str.substring(3); + pieceTable.insert(12, 'YYYX'); + str = str.substring(0, 12) + 'YYYX' + str.substring(12); + + testLinesContent(str, pieceTable); + }); + test('random test value in range exception', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + + pieceTable.insert(0, 'XZ\nZ'); + str = str.substring(0, 0) + 'XZ\nZ' + str.substring(0); + pieceTable.delete(0, 3); + str = str.substring(0, 0) + str.substring(0 + 3); + pieceTable.delete(0, 1); + str = str.substring(0, 0) + str.substring(0 + 1); + pieceTable.insert(0, 'ZYX\n'); + str = str.substring(0, 0) + 'ZYX\n' + str.substring(0); + pieceTable.delete(0, 4); + str = str.substring(0, 0) + str.substring(0 + 4); + + pieceTable.getValueInRange(new Range(1, 1, 1, 1)); + }); + + test('random tests bug 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'huuyYzUfKOENwGgZLqn '); + str = str.substring(0, 0) + 'huuyYzUfKOENwGgZLqn ' + str.substring(0); + pieceTable.delete(18, 2); + str = str.substring(0, 18) + str.substring(18 + 2); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.delete(12, 4); + str = str.substring(0, 12) + str.substring(12 + 4); + pieceTable.insert(3, 'hMbnVEdTSdhLlPevXKF '); + str = str.substring(0, 3) + 'hMbnVEdTSdhLlPevXKF ' + str.substring(3); + pieceTable.delete(22, 8); + str = str.substring(0, 22) + str.substring(22 + 8); + pieceTable.insert(4, 'S umSnYrqOmOAV\nEbZJ '); + str = str.substring(0, 4) + 'S umSnYrqOmOAV\nEbZJ ' + str.substring(4); + testLinesContent(str, pieceTable); + }); + + test('random tests bug 2', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'xfouRDZwdAHjVXJAMV\n '); + str = str.substring(0, 0) + 'xfouRDZwdAHjVXJAMV\n ' + str.substring(0); + pieceTable.insert(16, 'dBGndxpFZBEAIKykYYx '); + str = str.substring(0, 16) + 'dBGndxpFZBEAIKykYYx ' + str.substring(16); + pieceTable.delete(7, 6); + str = str.substring(0, 7) + str.substring(7 + 6); + pieceTable.delete(9, 7); + str = str.substring(0, 9) + str.substring(9 + 7); + pieceTable.delete(17, 6); + str = str.substring(0, 17) + str.substring(17 + 6); + pieceTable.delete(0, 4); + str = str.substring(0, 0) + str.substring(0 + 4); + pieceTable.insert(9, 'qvEFXCNvVkWgvykahYt '); + str = str.substring(0, 9) + 'qvEFXCNvVkWgvykahYt ' + str.substring(9); + pieceTable.delete(4, 6); + str = str.substring(0, 4) + str.substring(4 + 6); + pieceTable.insert(11, 'OcSChUYT\nzPEBOpsGmR '); + str = + str.substring(0, 11) + 'OcSChUYT\nzPEBOpsGmR ' + str.substring(11); + pieceTable.insert(15, 'KJCozaXTvkE\nxnqAeTz '); + str = + str.substring(0, 15) + 'KJCozaXTvkE\nxnqAeTz ' + str.substring(15); + + testLinesContent(str, pieceTable); + }); + + test('get line content', () => { + let pieceTable = createTextBuffer(['1']); + assert.equal(pieceTable.getLineRawContent(1), '1'); + pieceTable.insert(1, '2'); + assert.equal(pieceTable.getLineRawContent(1), '12'); + }); + + test('get line content basic', () => { + let pieceTable = createTextBuffer(['1\n2\n3\n4']); + assert.equal(pieceTable.getLineRawContent(1), '1\n'); + assert.equal(pieceTable.getLineRawContent(2), '2\n'); + assert.equal(pieceTable.getLineRawContent(3), '3\n'); + assert.equal(pieceTable.getLineRawContent(4), '4'); + }); + + test('get line content after inserts/deletes', () => { + let pieceTable = createTextBuffer(['a\nb\nc\nde']); + pieceTable.insert(8, 'fh\ni\njk'); + pieceTable.delete(7, 2); + // 'a\nb\nc\ndh\ni\njk' + + assert.equal(pieceTable.getLineRawContent(1), 'a\n'); + assert.equal(pieceTable.getLineRawContent(2), 'b\n'); + assert.equal(pieceTable.getLineRawContent(3), 'c\n'); + assert.equal(pieceTable.getLineRawContent(4), 'dh\n'); + assert.equal(pieceTable.getLineRawContent(5), 'i\n'); + assert.equal(pieceTable.getLineRawContent(6), 'jk'); + }); + + test('random 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, 'J eNnDzQpnlWyjmUu\ny '); + str = str.substring(0, 0) + 'J eNnDzQpnlWyjmUu\ny ' + str.substring(0); + pieceTable.insert(0, 'QPEeRAQmRwlJqtZSWhQ '); + str = str.substring(0, 0) + 'QPEeRAQmRwlJqtZSWhQ ' + str.substring(0); + pieceTable.delete(5, 1); + str = str.substring(0, 5) + str.substring(5 + 1); + + testLinesContent(str, pieceTable); + }); + + test('random 2', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'DZoQ tglPCRHMltejRI '); + str = str.substring(0, 0) + 'DZoQ tglPCRHMltejRI ' + str.substring(0); + pieceTable.insert(10, 'JRXiyYqJ qqdcmbfkKX '); + str = str.substring(0, 10) + 'JRXiyYqJ qqdcmbfkKX ' + str.substring(10); + pieceTable.delete(16, 3); + str = str.substring(0, 16) + str.substring(16 + 3); + pieceTable.delete(25, 1); + str = str.substring(0, 25) + str.substring(25 + 1); + pieceTable.insert(18, 'vH\nNlvfqQJPm\nSFkhMc '); + str = + str.substring(0, 18) + 'vH\nNlvfqQJPm\nSFkhMc ' + str.substring(18); + + testLinesContent(str, pieceTable); + }); +}); + +suite('CRLF', () => { + test('delete CR in CRLF 1', () => { + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'a\r\nb'); + pieceTable.delete(0, 2); + + assert.equal(pieceTable.getLineCount(), 2); + }); + + test('delete CR in CRLF 2', () => { + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, 'a\r\nb'); + pieceTable.delete(2, 2); + + assert.equal(pieceTable.getLineCount(), 2); + }); + + test('random bug 1', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + pieceTable.insert(0, '\n\n\r\r'); + str = str.substring(0, 0) + '\n\n\r\r' + str.substring(0); + pieceTable.insert(1, '\r\n\r\n'); + str = str.substring(0, 1) + '\r\n\r\n' + str.substring(1); + pieceTable.delete(5, 3); + str = str.substring(0, 5) + str.substring(5 + 3); + pieceTable.delete(2, 3); + str = str.substring(0, 2) + str.substring(2 + 3); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + test('random bug 2', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\r\n\r'); + str = str.substring(0, 0) + '\n\r\n\r' + str.substring(0); + pieceTable.insert(2, '\n\r\r\r'); + str = str.substring(0, 2) + '\n\r\r\r' + str.substring(2); + pieceTable.delete(4, 1); + str = str.substring(0, 4) + str.substring(4 + 1); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + test('random bug 3', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\n\n\r'); + str = str.substring(0, 0) + '\n\n\n\r' + str.substring(0); + pieceTable.delete(2, 2); + str = str.substring(0, 2) + str.substring(2 + 2); + pieceTable.delete(0, 2); + str = str.substring(0, 0) + str.substring(0 + 2); + pieceTable.insert(0, '\r\r\r\r'); + str = str.substring(0, 0) + '\r\r\r\r' + str.substring(0); + pieceTable.insert(2, '\r\n\r\r'); + str = str.substring(0, 2) + '\r\n\r\r' + str.substring(2); + pieceTable.insert(3, '\r\r\r\n'); + str = str.substring(0, 3) + '\r\r\r\n' + str.substring(3); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + test('random bug 4', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\n\n\n'); + str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.insert(1, '\r\r\r\r'); + str = str.substring(0, 1) + '\r\r\r\r' + str.substring(1); + pieceTable.insert(6, '\r\n\n\r'); + str = str.substring(0, 6) + '\r\n\n\r' + str.substring(6); + pieceTable.delete(5, 3); + str = str.substring(0, 5) + str.substring(5 + 3); + + testLinesContent(str, pieceTable); + }); + test('random bug 5', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\n\n\n'); + str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.insert(0, '\n\r\r\n'); + str = str.substring(0, 0) + '\n\r\r\n' + str.substring(0); + pieceTable.insert(4, '\n\r\r\n'); + str = str.substring(0, 4) + '\n\r\r\n' + str.substring(4); + pieceTable.delete(4, 3); + str = str.substring(0, 4) + str.substring(4 + 3); + pieceTable.insert(5, '\r\r\n\r'); + str = str.substring(0, 5) + '\r\r\n\r' + str.substring(5); + pieceTable.insert(12, '\n\n\n\r'); + str = str.substring(0, 12) + '\n\n\n\r' + str.substring(12); + pieceTable.insert(5, '\r\r\r\n'); + str = str.substring(0, 5) + '\r\r\r\n' + str.substring(5); + pieceTable.insert(20, '\n\n\r\n'); + str = str.substring(0, 20) + '\n\n\r\n' + str.substring(20); + + testLinesContent(str, pieceTable); + }); + test('random bug 6', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\r\r\n'); + str = str.substring(0, 0) + '\n\r\r\n' + str.substring(0); + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(3, '\r\n\n\n'); + str = str.substring(0, 3) + '\r\n\n\n' + str.substring(3); + pieceTable.delete(4, 8); + str = str.substring(0, 4) + str.substring(4 + 8); + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(0, '\r\n\n\r'); + str = str.substring(0, 0) + '\r\n\n\r' + str.substring(0); + pieceTable.delete(4, 0); + str = str.substring(0, 4) + str.substring(4 + 0); + pieceTable.delete(8, 4); + str = str.substring(0, 8) + str.substring(8 + 4); + + testLinesContent(str, pieceTable); + }); + test('random bug 8', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\r\n\n\r'); + str = str.substring(0, 0) + '\r\n\n\r' + str.substring(0); + pieceTable.delete(1, 0); + str = str.substring(0, 1) + str.substring(1 + 0); + pieceTable.insert(3, '\n\n\n\r'); + str = str.substring(0, 3) + '\n\n\n\r' + str.substring(3); + pieceTable.insert(7, '\n\n\r\n'); + str = str.substring(0, 7) + '\n\n\r\n' + str.substring(7); + + testLinesContent(str, pieceTable); + }); + test('random bug 7', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\r\r\n\n'); + str = str.substring(0, 0) + '\r\r\n\n' + str.substring(0); + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(7, '\n\r\r\r'); + str = str.substring(0, 7) + '\n\r\r\r' + str.substring(7); + pieceTable.insert(11, '\n\n\r\n'); + str = str.substring(0, 11) + '\n\n\r\n' + str.substring(11); + testLinesContent(str, pieceTable); + }); + + test('random bug 10', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, 'qneW'); + str = str.substring(0, 0) + 'qneW' + str.substring(0); + pieceTable.insert(0, 'YhIl'); + str = str.substring(0, 0) + 'YhIl' + str.substring(0); + pieceTable.insert(0, 'qdsm'); + str = str.substring(0, 0) + 'qdsm' + str.substring(0); + pieceTable.delete(7, 0); + str = str.substring(0, 7) + str.substring(7 + 0); + pieceTable.insert(12, 'iiPv'); + str = str.substring(0, 12) + 'iiPv' + str.substring(12); + pieceTable.insert(9, 'V\rSA'); + str = str.substring(0, 9) + 'V\rSA' + str.substring(9); + + testLinesContent(str, pieceTable); + }); + + test('random bug 9', () => { + let str = ''; + let pieceTable = createTextBuffer(['']); + + pieceTable.insert(0, '\n\n\n\n'); + str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); + pieceTable.insert(3, '\n\r\n\r'); + str = str.substring(0, 3) + '\n\r\n\r' + str.substring(3); + pieceTable.insert(2, '\n\r\n\n'); + str = str.substring(0, 2) + '\n\r\n\n' + str.substring(2); + pieceTable.insert(0, '\n\n\r\r'); + str = str.substring(0, 0) + '\n\n\r\r' + str.substring(0); + pieceTable.insert(3, '\r\r\r\r'); + str = str.substring(0, 3) + '\r\r\r\r' + str.substring(3); + pieceTable.insert(3, '\n\n\r\r'); + str = str.substring(0, 3) + '\n\n\r\r' + str.substring(3); + + testLinesContent(str, pieceTable); + }); +}); + +suite('centralized lineStarts with CRLF', () => { + test('delete CR in CRLF 1', () => { + let pieceTable = createTextBuffer(['a\r\nb']); + pieceTable.delete(2, 2); + assert.equal(pieceTable.getLineCount(), 2); + }); + test('delete CR in CRLF 2', () => { + let pieceTable = createTextBuffer(['a\r\nb']); + pieceTable.delete(0, 2); + + assert.equal(pieceTable.getLineCount(), 2); + }); + + test('random bug 1', () => { + let str = '\n\n\r\r'; + let pieceTable = createTextBuffer(['\n\n\r\r']); + pieceTable.insert(1, '\r\n\r\n'); + str = str.substring(0, 1) + '\r\n\r\n' + str.substring(1); + pieceTable.delete(5, 3); + str = str.substring(0, 5) + str.substring(5 + 3); + pieceTable.delete(2, 3); + str = str.substring(0, 2) + str.substring(2 + 3); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + test('random bug 2', () => { + let str = '\n\r\n\r'; + let pieceTable = createTextBuffer(['\n\r\n\r']); + + pieceTable.insert(2, '\n\r\r\r'); + str = str.substring(0, 2) + '\n\r\r\r' + str.substring(2); + pieceTable.delete(4, 1); + str = str.substring(0, 4) + str.substring(4 + 1); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + + test('random bug 3', () => { + let str = '\n\n\n\r'; + let pieceTable = createTextBuffer(['\n\n\n\r']); + + pieceTable.delete(2, 2); + str = str.substring(0, 2) + str.substring(2 + 2); + pieceTable.delete(0, 2); + str = str.substring(0, 0) + str.substring(0 + 2); + pieceTable.insert(0, '\r\r\r\r'); + str = str.substring(0, 0) + '\r\r\r\r' + str.substring(0); + pieceTable.insert(2, '\r\n\r\r'); + str = str.substring(0, 2) + '\r\n\r\r' + str.substring(2); + pieceTable.insert(3, '\r\r\r\n'); + str = str.substring(0, 3) + '\r\r\r\n' + str.substring(3); + + let lines = str.split(/\r\n|\r|\n/); + assert.equal(pieceTable.getLineCount(), lines.length); + }); + + test('random bug 4', () => { + let str = '\n\n\n\n'; + let pieceTable = createTextBuffer(['\n\n\n\n']); + + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.insert(1, '\r\r\r\r'); + str = str.substring(0, 1) + '\r\r\r\r' + str.substring(1); + pieceTable.insert(6, '\r\n\n\r'); + str = str.substring(0, 6) + '\r\n\n\r' + str.substring(6); + pieceTable.delete(5, 3); + str = str.substring(0, 5) + str.substring(5 + 3); + + testLinesContent(str, pieceTable); + }); + + test('random bug 5', () => { + let str = '\n\n\n\n'; + let pieceTable = createTextBuffer(['\n\n\n\n']); + + pieceTable.delete(3, 1); + str = str.substring(0, 3) + str.substring(3 + 1); + pieceTable.insert(0, '\n\r\r\n'); + str = str.substring(0, 0) + '\n\r\r\n' + str.substring(0); + pieceTable.insert(4, '\n\r\r\n'); + str = str.substring(0, 4) + '\n\r\r\n' + str.substring(4); + pieceTable.delete(4, 3); + str = str.substring(0, 4) + str.substring(4 + 3); + pieceTable.insert(5, '\r\r\n\r'); + str = str.substring(0, 5) + '\r\r\n\r' + str.substring(5); + pieceTable.insert(12, '\n\n\n\r'); + str = str.substring(0, 12) + '\n\n\n\r' + str.substring(12); + pieceTable.insert(5, '\r\r\r\n'); + str = str.substring(0, 5) + '\r\r\r\n' + str.substring(5); + pieceTable.insert(20, '\n\n\r\n'); + str = str.substring(0, 20) + '\n\n\r\n' + str.substring(20); + + testLinesContent(str, pieceTable); + }); + + test('random bug 6', () => { + let str = '\n\r\r\n'; + let pieceTable = createTextBuffer(['\n\r\r\n']); + + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(3, '\r\n\n\n'); + str = str.substring(0, 3) + '\r\n\n\n' + str.substring(3); + pieceTable.delete(4, 8); + str = str.substring(0, 4) + str.substring(4 + 8); + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(0, '\r\n\n\r'); + str = str.substring(0, 0) + '\r\n\n\r' + str.substring(0); + pieceTable.delete(4, 0); + str = str.substring(0, 4) + str.substring(4 + 0); + pieceTable.delete(8, 4); + str = str.substring(0, 8) + str.substring(8 + 4); + + testLinesContent(str, pieceTable); + }); + + test('random bug 7', () => { + let str = '\r\n\n\r'; + let pieceTable = createTextBuffer(['\r\n\n\r']); + + pieceTable.delete(1, 0); + str = str.substring(0, 1) + str.substring(1 + 0); + pieceTable.insert(3, '\n\n\n\r'); + str = str.substring(0, 3) + '\n\n\n\r' + str.substring(3); + pieceTable.insert(7, '\n\n\r\n'); + str = str.substring(0, 7) + '\n\n\r\n' + str.substring(7); + + testLinesContent(str, pieceTable); + }); + + test('random bug 8', () => { + let str = '\r\r\n\n'; + let pieceTable = createTextBuffer(['\r\r\n\n']); + + pieceTable.insert(4, '\r\n\n\r'); + str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); + pieceTable.insert(7, '\n\r\r\r'); + str = str.substring(0, 7) + '\n\r\r\r' + str.substring(7); + pieceTable.insert(11, '\n\n\r\n'); + str = str.substring(0, 11) + '\n\n\r\n' + str.substring(11); + testLinesContent(str, pieceTable); + }); + + test('random bug 9', () => { + let str = 'qneW'; + let pieceTable = createTextBuffer(['qneW']); + + pieceTable.insert(0, 'YhIl'); + str = str.substring(0, 0) + 'YhIl' + str.substring(0); + pieceTable.insert(0, 'qdsm'); + str = str.substring(0, 0) + 'qdsm' + str.substring(0); + pieceTable.delete(7, 0); + str = str.substring(0, 7) + str.substring(7 + 0); + pieceTable.insert(12, 'iiPv'); + str = str.substring(0, 12) + 'iiPv' + str.substring(12); + pieceTable.insert(9, 'V\rSA'); + str = str.substring(0, 9) + 'V\rSA' + str.substring(9); + + testLinesContent(str, pieceTable); + }); + + test('random bug 10', () => { + let str = '\n\n\n\n'; + let pieceTable = createTextBuffer(['\n\n\n\n']); + + pieceTable.insert(3, '\n\r\n\r'); + str = str.substring(0, 3) + '\n\r\n\r' + str.substring(3); + pieceTable.insert(2, '\n\r\n\n'); + str = str.substring(0, 2) + '\n\r\n\n' + str.substring(2); + pieceTable.insert(0, '\n\n\r\r'); + str = str.substring(0, 0) + '\n\n\r\r' + str.substring(0); + pieceTable.insert(3, '\r\r\r\r'); + str = str.substring(0, 3) + '\r\r\r\r' + str.substring(3); + pieceTable.insert(3, '\n\n\r\r'); + str = str.substring(0, 3) + '\n\n\r\r' + str.substring(3); + + testLinesContent(str, pieceTable); + }); + + test('random chunk bug 1', () => { + let pieceTable = createTextBuffer(['\n\r\r\n\n\n\r\n\r']); + let str = '\n\r\r\n\n\n\r\n\r'; + pieceTable.delete(0, 2); + str = str.substring(0, 0) + str.substring(0 + 2); + pieceTable.insert(1, '\r\r\n\n'); + str = str.substring(0, 1) + '\r\r\n\n' + str.substring(1); + pieceTable.insert(7, '\r\r\r\r'); + str = str.substring(0, 7) + '\r\r\r\r' + str.substring(7); + + assert.equal(pieceTable.getLinesRawContent(), str); + testLineStarts(str, pieceTable); + }); + + test('random chunk bug 2', () => { + let pieceTable = createTextBuffer([ + '\n\r\n\n\n\r\n\r\n\r\r\n\n\n\r\r\n\r\n' + ]); + let str = '\n\r\n\n\n\r\n\r\n\r\r\n\n\n\r\r\n\r\n'; + pieceTable.insert(16, '\r\n\r\r'); + str = str.substring(0, 16) + '\r\n\r\r' + str.substring(16); + pieceTable.insert(13, '\n\n\r\r'); + str = str.substring(0, 13) + '\n\n\r\r' + str.substring(13); + pieceTable.insert(19, '\n\n\r\n'); + str = str.substring(0, 19) + '\n\n\r\n' + str.substring(19); + pieceTable.delete(5, 0); + str = str.substring(0, 5) + str.substring(5 + 0); + pieceTable.delete(11, 2); + str = str.substring(0, 11) + str.substring(11 + 2); + + assert.equal(pieceTable.getLinesRawContent(), str); + testLineStarts(str, pieceTable); + }); + + test('random chunk bug 3', () => { + let pieceTable = createTextBuffer(['\r\n\n\n\n\n\n\r\n']); + let str = '\r\n\n\n\n\n\n\r\n'; + pieceTable.insert(4, '\n\n\r\n\r\r\n\n\r'); + str = str.substring(0, 4) + '\n\n\r\n\r\r\n\n\r' + str.substring(4); + pieceTable.delete(4, 4); + str = str.substring(0, 4) + str.substring(4 + 4); + pieceTable.insert(11, '\r\n\r\n\n\r\r\n\n'); + str = str.substring(0, 11) + '\r\n\r\n\n\r\r\n\n' + str.substring(11); + pieceTable.delete(1, 2); + str = str.substring(0, 1) + str.substring(1 + 2); + + assert.equal(pieceTable.getLinesRawContent(), str); + testLineStarts(str, pieceTable); + }); + + test('random chunk bug 4', () => { + let pieceTable = createTextBuffer(['\n\r\n\r']); + let str = '\n\r\n\r'; + pieceTable.insert(4, '\n\n\r\n'); + str = str.substring(0, 4) + '\n\n\r\n' + str.substring(4); + pieceTable.insert(3, '\r\n\n\n'); + str = str.substring(0, 3) + '\r\n\n\n' + str.substring(3); + + assert.equal(pieceTable.getLinesRawContent(), str); + testLineStarts(str, pieceTable); + }); +}); + +suite('test case from vscode', () => { + let str = 'line one\nline two'; + let pieceTable = createTextBuffer([str]); + + assert.deepEqual(pieceTable.getPositionAt(20), new Position(2, 9)); +}); + +suite('random is unsupervised', () => { + test('random insert delete', () => { + let str = ''; + let pieceTable = createTextBuffer([str]); + + for (let i = 0; i < 1000; i++) { + if (Math.random() < 0.6) { + // insert + let text = randomStr(100); + let pos = randomInt(str.length + 1); + pieceTable.insert(pos, text); + str = str.substring(0, pos) + text + str.substring(pos); + } else { + // delete + let pos = randomInt(str.length); + let length = Math.min( + str.length - pos, + Math.floor(Math.random() * 10) + ); + pieceTable.delete(pos, length); + str = str.substring(0, pos) + str.substring(pos + length); + } + } + + assert.equal(pieceTable.getLinesRawContent(), str); + + testLineStarts(str, pieceTable); + testLinesContent(str, pieceTable); + }); + + test('random chunks', () => { + let chunks = []; + for (let i = 0; i < 1; i++) { + chunks.push(randomStr(1000)); + } + + let pieceTable = createTextBuffer(chunks); + let str = chunks.join(''); + + for (let i = 0; i < 1000; i++) { + if (Math.random() < 0.6) { + // insert + let text = randomStr(100); + let pos = randomInt(str.length + 1); + pieceTable.insert(pos, text); + str = str.substring(0, pos) + text + str.substring(pos); + } else { + // delete + let pos = randomInt(str.length); + let length = Math.min( + str.length - pos, + Math.floor(Math.random() * 10) + ); + pieceTable.delete(pos, length); + str = str.substring(0, pos) + str.substring(pos + length); + } + } + + assert.equal(pieceTable.getLinesRawContent(), str); + testLineStarts(str, pieceTable); + testLinesContent(str, pieceTable); + }); +}); From d502615bf2b58ac9272c2bab3406b9ed70290a28 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 08:54:51 -0800 Subject: [PATCH 279/710] Avoid CR at the end of chunk. --- .../pieceTableTextBufferBuilder.ts | 26 +++++++++++++++++++ .../pieceTableTextBuffer.test.ts | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 08522da2a85..6b3525505a7 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -9,6 +9,7 @@ import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } import { TextSource, IRawTextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; import { StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { CharCode } from 'vs/base/common/charCode'; export class PieceTableTextBufferFactory implements ITextBufferFactory { @@ -26,6 +27,7 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { } class PTBasedBuilder { + private leftoverEndsInCR: boolean; private chunks: StringBuffer[]; private lineFeedCnt: number; private BOM: string; @@ -34,6 +36,7 @@ class PTBasedBuilder { private _regex: RegExp; constructor() { + this.leftoverEndsInCR = false; this.chunks = []; this.BOM = ''; this.chunkIndex = 0; @@ -43,6 +46,10 @@ class PTBasedBuilder { } public acceptChunk(chunk: string): void { + if (chunk.length === 0) { + return; + } + let lineStarts = [0]; if (this.chunkIndex === 0) { if (strings.startsWithUTF8BOM(chunk)) { @@ -51,6 +58,17 @@ class PTBasedBuilder { } } + 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; + } + // Reset regex to search from the beginning this._regex.lastIndex = 0; let prevMatchStartIndex = -1; @@ -95,6 +113,14 @@ class PTBasedBuilder { if (this.chunks.length === 0) { this.chunks.push(new StringBuffer('', [0])); } + + if (this.leftoverEndsInCR) { + // we don't want need to create a new chunk for this standalone \r + let lastChunk = this.chunks[this.chunks.length - 1]; + lastChunk.buffer += '\r'; + lastChunk.lineStarts.push(lastChunk.buffer.length); + } + return new PieceTableTextBufferFactory({ chunks: this.chunks, lineFeedCnt: this.lineFeedCnt, diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts index 415533d7ae4..6cb275030c0 100644 --- a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts @@ -1422,7 +1422,7 @@ suite('random is unsupervised', () => { test('random chunks', () => { let chunks = []; - for (let i = 0; i < 1; i++) { + for (let i = 0; i < 5; i++) { chunks.push(randomStr(1000)); } From 916c27c003939c78aa828376e7138a8a290a7724 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 09:02:27 -0800 Subject: [PATCH 280/710] Remove unnecessary prefixsum related types. --- .../pieceTableTextBuffer/pieceTableBase.ts | 26 ++++-------------- .../model/benchmark/modelbuilder.benchmark.ts | 27 ------------------- 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index bc5eb2bf77b..6906b2edd78 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -5,7 +5,6 @@ 'use strict'; import { Position } from 'vs/editor/common/core/position'; -import { PrefixSumComputer, PrefixSumIndexOfResult } from 'vs/editor/common/viewModel/prefixSumComputer'; export const enum NodeColor { Black = 0, @@ -652,7 +651,7 @@ export class PieceTableBase { return this.offsetInBuffer(node.piece.bufferIndex, node.piece.start); } - getIndexOf(node: TreeNode, accumulatedValue: number): PrefixSumIndexOfResult { + getIndexOf(node: TreeNode, accumulatedValue: number): { index: number, remainder: number } { let piece = node.piece; let pos = this.positionInBuffer(node, accumulatedValue); let lineCnt = pos.line - piece.start.line; @@ -662,11 +661,11 @@ export class PieceTableBase { let realLineCnt = this.getLineFeedCnt(node.piece.bufferIndex, piece.start, pos); if (realLineCnt !== lineCnt) { // aha yes, CRLF - return new PrefixSumIndexOfResult(realLineCnt, 0); + return { index: realLineCnt, remainder: 0 }; } } - return new PrefixSumIndexOfResult(lineCnt, pos.column); + return { index: lineCnt, remainder: pos.column }; } getAccumulatedValue(node: TreeNode, index: number) { @@ -715,8 +714,7 @@ export class PieceTableBase { let originalStartPos = piece.start; let originalEndPos = piece.end; - // old piece - // originalStartPos, start + // old piece, originalStartPos, start let oldLength = piece.length; let oldLFCnt = piece.lineFeedCnt; piece.end = start; @@ -726,8 +724,7 @@ export class PieceTableBase { piece.length = newLength; this.updateMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt); - // new right piece - // end, originalEndPos + // new right piece, end, originalEndPos let newPiece = new Piece( piece.bufferIndex, end, @@ -896,19 +893,6 @@ export class PieceTableBase { let startOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start); let endOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.end); return buffer.buffer.substring(startOffset, endOffset); - - } - - deletePrefixSumTail(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { - prefixSum.removeValues(position.index + 1, prefixSum.values.length - position.index - 1); - prefixSum.changeValue(position.index, position.remainder); - } - - deletePrefixSumHead(prefixSum: PrefixSumComputer, position: PrefixSumIndexOfResult): void { - prefixSum.changeValue(position.index, prefixSum.values[position.index] - position.remainder); - if (position.index > 0) { - prefixSum.removeValues(0, position.index); - } } // #endregion 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 2abd6c10b95..3f65a3eb387 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -9,7 +9,6 @@ import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTe 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'; -// import * as fs from 'fs'; let linesTextBufferBuilder = new LinesTextBufferBuilder(); let pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); @@ -33,29 +32,3 @@ console.log('|---|---|---|'); for (let i of [10, 100]) { modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTableTextBufferBuilder], i); } -/* -let fileName = `/Users/penlv/code/code-data-structures/samples/heapsnapshot.txt`; -const stream = fs.createReadStream(fileName, { encoding: 'utf8'}); -let done = false; -let builder = new PieceTableTextBufferBuilder(); - -console.time('builder'); -stream.on('data', (chunk) => { - builder.acceptChunk(chunk); -}); - -stream.on('error', (error) => { - if (!done) { - done = true; - } -}); - -stream.on('end', () => { - if (!done) { - done = true; - let factory = builder.finish(); - factory.create(DefaultEndOfLine.LF); - console.timeEnd('builder'); - } -}); - */ \ No newline at end of file From b939d90808610212d4bae60bdf9aaedca827f27e Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 16 Jan 2018 18:04:46 +0100 Subject: [PATCH 281/710] fix #40224 --- extensions/git/src/commands.ts | 2 +- extensions/git/src/main.ts | 4 ++-- extensions/git/src/repository.ts | 2 +- src/vs/platform/integrity/node/integrityServiceImpl.ts | 2 +- .../parts/codeEditor/electron-browser/wordWrapMigration.ts | 2 +- .../parts/extensions/electron-browser/extensionTipsService.ts | 4 ++-- .../parts/terminal/electron-browser/terminalService.ts | 2 +- src/vs/workbench/parts/update/electron-browser/update.ts | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts index 10f4cd7150e..84a011a8881 100644 --- a/extensions/git/src/commands.ts +++ b/extensions/git/src/commands.ts @@ -1448,7 +1448,7 @@ export class CommandCenter { if (shouldPrompt) { const message = localize('sync is unpredictable', "This action will push and pull commits to and from '{0}'.", HEAD.upstream); const yes = localize('ok', "OK"); - const neverAgain = localize('never again', "OK, Never Show Again"); + const neverAgain = localize('never again', "OK, Don't Show Again"); const pick = await window.showWarningMessage(message, { modal: true }, yes, neverAgain); if (pick === neverAgain) { diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index d3e07cd4da0..d82223f0099 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -77,7 +77,7 @@ async function _activate(context: ExtensionContext, disposables: Disposable[]): outputChannel.show(); const download = localize('downloadgit', "Download Git"); - const neverShowAgain = localize('neverShowAgain', "Don't show again"); + const neverShowAgain = localize('neverShowAgain', "Don't Show Again"); const choice = await window.showWarningMessage( localize('notfound', "Git not found. Install it or configure it using the 'git.path' setting."), download, @@ -116,7 +116,7 @@ async function checkGitVersion(info: IGit): Promise { } const update = localize('updateGit', "Update Git"); - const neverShowAgain = localize('neverShowAgain', "Don't show again"); + const neverShowAgain = localize('neverShowAgain', "Don't Show Again"); const choice = await window.showWarningMessage( localize('git20', "You seem to have git {0} installed. Code works best with git >= 2", info.version), diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts index fadf17aa535..cd9c8a197a6 100644 --- a/extensions/git/src/repository.ts +++ b/extensions/git/src/repository.ts @@ -916,7 +916,7 @@ export class Repository implements Disposable { if (didHitLimit && !shouldIgnore && !this.didWarnAboutLimit) { const ok = { title: localize('ok', "OK"), isCloseAffordance: true }; - const neverAgain = { title: localize('neveragain', "Never Show Again") }; + const neverAgain = { title: localize('neveragain', "Don't Show Again") }; window.showWarningMessage(localize('huge', "The git repository at '{0}' has too many active changes, only a subset of Git features will be enabled.", this.repository.root), ok, neverAgain).then(result => { if (result === neverAgain) { diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts index 96798846b0b..63c7816a33c 100644 --- a/src/vs/platform/integrity/node/integrityServiceImpl.ts +++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts @@ -97,7 +97,7 @@ export class IntegrityServiceImpl implements IIntegrityService { ); const dontShowAgainAction = new Action( 'integrity.dontShowAgain', - nls.localize('integrity.dontShowAgain', "Don't show again"), + nls.localize('integrity.dontShowAgain', "Don't Show Again"), null, true, () => { diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.ts b/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.ts index 023bb504812..48b4ecdae9c 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.ts @@ -109,7 +109,7 @@ class WordWrapMigrationController extends Disposable implements IEditorContribut ); const dontShowAgainAction = new Action( 'wordWrapMigration.dontShowAgain', - nls.localize('wordWrapMigration.dontShowAgain', "Don't show again"), + nls.localize('wordWrapMigration.dontShowAgain', "Don't Show Again"), null, true, () => { diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 1e651f87f83..d097b862e8e 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -310,7 +310,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe const options = [ localize('install', 'Install'), recommendationsAction.label, - localize('neverShowAgain', "Don't show again"), + localize('neverShowAgain', "Don't Show Again"), localize('close', "Close") ]; @@ -395,7 +395,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe const options = [ installAllAction.label, showAction.label, - localize('neverShowAgain', "Don't show again"), + localize('neverShowAgain', "Don't Show Again"), localize('close', "Close") ]; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts index 24eeeb6e16b..915b0fd5b84 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts @@ -121,7 +121,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina } const message = nls.localize('terminal.integrated.chooseWindowsShellInfo', "You can change the default terminal shell by selecting the customize button."); - const options = [nls.localize('customize', "Customize"), nls.localize('cancel', "Cancel"), nls.localize('never again', "OK, Never Show Again")]; + const options = [nls.localize('customize', "Customize"), nls.localize('cancel', "Cancel"), nls.localize('never again', "OK, Don't Show Again")]; this._choiceService.choose(Severity.Info, message, options, 1).then(choice => { switch (choice) { case 0: diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts index fca8ccd73a6..a64d44eed6c 100644 --- a/src/vs/workbench/parts/update/electron-browser/update.ts +++ b/src/vs/workbench/parts/update/electron-browser/update.ts @@ -241,7 +241,7 @@ class NeverShowAgain { private readonly key: string; - readonly action = new Action(`neverShowAgain:${this.key}`, nls.localize('neveragain', "Never Show Again"), undefined, true, () => { + readonly action = new Action(`neverShowAgain:${this.key}`, nls.localize('neveragain', "Don't Show Again"), undefined, true, () => { return TPromise.wrap(this.storageService.store(this.key, true, StorageScope.GLOBAL)); }); From d53bb74cce7f92d794595ec0569bbe2fbaeb2a31 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 16 Jan 2018 18:18:29 +0100 Subject: [PATCH 282/710] fix cmd+w not working --- src/vs/workbench/browser/parts/editor/editorCommands.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index a2555b8247f..a09a31f09cf 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -307,6 +307,14 @@ function registerEditorCommands() { const groups = distinct(contexts.map(context => context.group)); const editorsToClose = new Map(); + + if (groups.length === 0) { + const activeEditor = editorService.getActiveEditor(); + if (activeEditor) { + return editorService.closeEditor(activeEditor.position, activeEditor.input); + } + } + groups.forEach(group => { const position = editorGroupService.getStacksModel().positionOfGroup(group); editorsToClose.set(position, contexts.map(c => { From 48628fb65ee4b6308ace6946bfea977361cb1da5 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 16 Jan 2018 18:20:46 +0100 Subject: [PATCH 283/710] log editorGroupMoved --- .../browser/parts/editor/editorGroupsControl.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index a6e2d0b65b7..de984fe2657 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -36,6 +36,7 @@ import { Themable, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_T import { attachProgressBarStyler } from 'vs/platform/theme/common/styler'; import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; import { EditorAreaDropHandler } from 'vs/workbench/browser/parts/editor/editorAreaDropHandler'; +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; export enum Rochade { NONE, @@ -144,7 +145,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro @IContextKeyService private contextKeyService: IContextKeyService, @IExtensionService private extensionService: IExtensionService, @IInstantiationService private instantiationService: IInstantiationService, - @IThemeService themeService: IThemeService + @IThemeService themeService: IThemeService, + @ITelemetryService private telemetryService: ITelemetryService ) { super(themeService); @@ -1518,6 +1520,14 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro // Move to valid position if any if (moveTo !== null) { + // TODO@Ben remove me after a while + /* __GDPR__ + "editorGroupMoved" : { + "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, + "moveTo": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + this.telemetryService.publicLog('editorGroupMoved', { source: position, to: moveTo }); this.editorGroupService.moveGroup(position, moveTo); } From c0cfc0e20de537a61cbeaaea907f61c5f5e7cc27 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 16 Jan 2018 18:25:41 +0100 Subject: [PATCH 284/710] :lipstick: --- src/vs/workbench/browser/parts/editor/editorGroupsControl.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index de984fe2657..bb490659d9f 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -1523,8 +1523,8 @@ export class EditorGroupsControl extends Themable implements IEditorGroupsContro // TODO@Ben remove me after a while /* __GDPR__ "editorGroupMoved" : { - "from" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "moveTo": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + "source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, + "to": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ this.telemetryService.publicLog('editorGroupMoved', { source: position, to: moveTo }); From e48281d14b027b2e4fd87787698ac36cbd9f2660 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 16 Jan 2018 19:03:21 +0100 Subject: [PATCH 285/710] #35462 Store the hidden views in global storage --- .../browser/parts/views/viewsViewlet.ts | 35 +++++++++++++++++-- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index eee4893938d..5b7544394ff 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -30,6 +30,7 @@ import { IPanelOptions } from 'vs/base/browser/ui/splitview/panelview'; import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; import { IWorkbenchThemeService, IFileIconTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree'; +import Event, { Emitter } from 'vs/base/common/event'; export interface IViewOptions extends IPanelOptions { id: string; @@ -270,6 +271,9 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { protected viewsStates: Map = new Map(); private areExtensionsReady: boolean = false; + private _onDidChangeViewVisibilityState: Emitter = new Emitter(); + readonly onDidChangeViewVisibilityState: Event = this._onDidChangeViewVisibilityState.event; + constructor( id: string, private location: ViewLocation, @@ -367,6 +371,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { viewState.isHidden = !!this.getView(id); this.updateViews() .then(() => { + this._onDidChangeViewVisibilityState.fire(id); if (!viewState.isHidden) { this.openView(id); } else { @@ -579,7 +584,7 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { getAnchor: () => anchor, getActions: () => TPromise.as([{ id: `${view.id}.removeView`, - label: nls.localize('hideView', "Hide from Side Bar"), + label: nls.localize('hideView', "Hide"), enabled: true, run: () => this.toggleViewVisibility(view.id) }]), @@ -675,10 +680,12 @@ export class ViewsViewlet extends PanelViewlet implements IViewsViewlet { export class PersistentViewsViewlet extends ViewsViewlet { + private readonly hiddenViewsStorageId: string; + constructor( id: string, location: ViewLocation, - private viewletStateStorageId: string, + private readonly viewletStateStorageId: string, showHeaderInTitleWhenSingleView: boolean, @ITelemetryService telemetryService: ITelemetryService, @IStorageService storageService: IStorageService, @@ -690,6 +697,8 @@ export class PersistentViewsViewlet extends ViewsViewlet { @IExtensionService extensionService: IExtensionService ) { super(id, location, showHeaderInTitleWhenSingleView, telemetryService, storageService, instantiationService, themeService, contextKeyService, contextMenuService, extensionService); + this.hiddenViewsStorageId = `${this.viewletStateStorageId}.hidden`; + this._register(this.onDidChangeViewVisibilityState(id => this.onViewVisibilityChanged(id))); } create(parent: Builder): TPromise { @@ -728,7 +737,27 @@ export class PersistentViewsViewlet extends ViewsViewlet { protected loadViewsStates(): void { const viewsStates = JSON.parse(this.storageService.get(this.viewletStateStorageId, this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY ? StorageScope.WORKSPACE : StorageScope.GLOBAL, '{}')); - Object.keys(viewsStates).forEach(id => this.viewsStates.set(id, viewsStates[id])); + const hiddenViews = this.loadHiddenViews(); + Object.keys(viewsStates).forEach(id => this.viewsStates.set(id, { ...viewsStates[id], ...{ isHidden: hiddenViews.indexOf(id) !== -1 } })); + } + + private onViewVisibilityChanged(id: string) { + const hiddenViews = this.loadHiddenViews(); + const index = hiddenViews.indexOf(id); + if (this.getView(id) && index !== -1) { + hiddenViews.splice(index, 1); + } else if (index === -1) { + hiddenViews.push(id); + } + this.storeHiddenViews(hiddenViews); + } + + private storeHiddenViews(hiddenViews: string[]): void { + this.storageService.store(this.hiddenViewsStorageId, JSON.stringify(hiddenViews), StorageScope.GLOBAL); + } + + private loadHiddenViews(): string[] { + return JSON.parse(this.storageService.get(this.hiddenViewsStorageId, StorageScope.GLOBAL, '[]')); } } From 4a45d92f044874c87ce0096372db73aeaa4ceffe Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 10:19:14 -0800 Subject: [PATCH 286/710] slight follow up on #38636 --- src/vs/editor/contrib/suggest/suggestWidget.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 9365f672b0c..6624f1ca547 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -508,11 +508,9 @@ export class SuggestWidget implements IContentWidget, IDelegate const index = e.indexes[0]; item.resolve().then(() => { this.onDidSelectEmitter.fire({ item, index, model: this.completionModel }); + alert(nls.localize('suggestionAriaAccepted', "{0}, accepted", item.suggestion.label)); + this.editor.focus(); }); - - alert(nls.localize('suggestionAriaAccepted', "{0}, accepted", item.suggestion.label)); - - this.editor.focus(); } private _getSuggestionAriaAlertLabel(item: ICompletionItem): string { From f17d0bcc82b382870b7f748805e9e3b81489a330 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 10:20:08 -0800 Subject: [PATCH 287/710] set `problems.decorations.enabled` to `true`, #782 --- .../workbench/parts/markers/browser/markersFileDecorations.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts index 7f09b13a275..447a5f43abf 100644 --- a/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts +++ b/src/vs/workbench/parts/markers/browser/markersFileDecorations.ts @@ -102,7 +102,7 @@ Registry.as(ConfigurationExtensions.Configuration).regis 'problems.decorations.enabled': { 'description': localize('markers.showOnFile', "Show Errors & Warnings on files and folder."), 'type': 'boolean', - 'default': false + 'default': true } } }); From 688f853578348e71ebdef898e9a43ff0de43c643 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 10:42:27 -0800 Subject: [PATCH 288/710] use extfs#watch, #41700 --- .../snippets/electron-browser/snippetsService.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index 443fb4b43b8..3d28a54b1d4 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -18,7 +18,7 @@ import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { join, basename, extname } from 'path'; import { mkdirp, readdir, exists } from 'vs/base/node/pfs'; -import { watch } from 'fs'; +import { watch } from 'vs/base/node/extfs'; import { SnippetFile, Snippet } from 'vs/workbench/parts/snippets/electron-browser/snippetsFile'; import { ISnippetsService } from 'vs/workbench/parts/snippets/electron-browser/snippets.contribution'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; @@ -217,9 +217,7 @@ class SnippetsService implements ISnippetsService { } }).then(() => { // watch - const watcher = watch(userSnippetsFolder); - this._disposables.push({ dispose: () => watcher.close() }); - watcher.on('change', (type, filename) => { + const watcher = watch(userSnippetsFolder, (type, filename) => { if (typeof filename !== 'string') { return; } @@ -238,6 +236,13 @@ class SnippetsService implements ISnippetsService { } }); }); + this._disposables.push({ + dispose: () => { + watcher.removeAllListeners(); + watcher.close(); + } + }); + }).then(undefined, err => { this._logService.error('Failed to load user snippets', err); }); From 4b5c0ec9d1bb96086eb02faadca160ae0cc67699 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 10:59:37 -0800 Subject: [PATCH 289/710] remote - a few more todo-tags after a 'file'-scheme search --- src/vs/workbench/api/node/extHostDocumentContentProviders.ts | 2 ++ src/vs/workbench/api/node/extHostDocumentData.ts | 2 ++ src/vs/workbench/services/search/node/searchService.ts | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts index fe2b2937aad..719db9d89b8 100644 --- a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts +++ b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts @@ -32,6 +32,8 @@ export class ExtHostDocumentContentProvider implements ExtHostDocumentContentPro } registerTextDocumentContentProvider(scheme: string, provider: vscode.TextDocumentContentProvider): vscode.Disposable { + // todo@remote + // check with scheme from fs-providers! if (scheme === 'file' || scheme === 'untitled') { throw new Error(`scheme '${scheme}' already registered`); } diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts index 20c9fe31052..2be3ac6908d 100644 --- a/src/vs/workbench/api/node/extHostDocumentData.ts +++ b/src/vs/workbench/api/node/extHostDocumentData.ts @@ -68,6 +68,8 @@ export class ExtHostDocumentData extends MirrorTextModel { this._document = { get uri() { return data._uri; }, get fileName() { return data._uri.fsPath; }, + // todo@remote + // documents from other fs-provider must not be untitled get isUntitled() { return data._uri.scheme !== 'file'; }, get languageId() { return data._languageId; }, get version() { return data._versionId; }, diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts index b6307b38dd4..8284c0f6c74 100644 --- a/src/vs/workbench/services/search/node/searchService.ts +++ b/src/vs/workbench/services/search/node/searchService.ts @@ -158,6 +158,9 @@ export class SearchService implements ISearchService { } // Don't support other resource schemes than files for now + // todo@remote + // why is that? we should search for resources from other + // schemes else if (resource.scheme !== 'file') { return; } From 205c49a94c36172d8c7fc32a4e88bdfd3d4397f6 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 16 Jan 2018 11:04:40 -0800 Subject: [PATCH 290/710] Fix settings search telemetry metadata for settings edited from editable side of settings editor --- .../workbench/parts/preferences/common/preferencesModels.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index 70ef306b89c..18b63f4e9c0 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -176,10 +176,12 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti }; } + const groupWithMetadata = first(resultGroups, group => !!group.result.metadata); return { allGroups: this.settingsGroups, filteredGroups: filteredGroup ? [filteredGroup] : [], - matches + matches, + metadata: groupWithMetadata && groupWithMetadata.result.metadata }; } } From 42de6cc82f2dcd7866b0b88bccf0984f9d4d9e90 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 12:31:34 -0800 Subject: [PATCH 291/710] add TextSearchOptions, only search in folder contributed by provider, #41536 --- src/vs/vscode.proposed.d.ts | 7 ++++++- .../electron-browser/mainThreadFileSystem.ts | 21 ++++++++++++++++--- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- .../workbench/api/node/extHostFileSystem.ts | 4 ++-- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 51f8b8f5e5d..7cbea7b4289 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -90,6 +90,11 @@ declare module 'vscode' { isWordMatch?: boolean; } + export interface TextSearchOptions { + includes: GlobPattern[]; + excludes: GlobPattern[]; + } + export interface TextSearchResult { uri: Uri; range: Range; @@ -147,7 +152,7 @@ declare module 'vscode' { // find files by names // todo@joh, move into its own provider findFiles?(query: string, progress: Progress, token: CancellationToken): Thenable; - provideTextSearchResults?(query: TextSearchQuery, include: GlobPattern, exclude: GlobPattern, progress: Progress, token: CancellationToken): Thenable; + provideTextSearchResults?(query: TextSearchQuery, options: TextSearchOptions, progress: Progress, token: CancellationToken): Thenable; } export namespace workspace { diff --git a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts index c2dc6e8aa81..7778851490a 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadFileSystem.ts @@ -16,6 +16,7 @@ import { ISearchResultProvider, ISearchQuery, ISearchComplete, ISearchProgressIt import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing'; import { onUnexpectedError } from 'vs/base/common/errors'; import { values } from 'vs/base/common/map'; +import { isFalsyOrEmpty } from 'vs/base/common/arrays'; @extHostNamedCustomer(MainContext.MainThreadFileSystem) export class MainThreadFileSystem implements MainThreadFileSystemShape { @@ -103,12 +104,12 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv constructor( fileService: IFileService, searchService: ISearchService, - scheme: string, + private readonly _scheme: string, private readonly _handle: number, private readonly _proxy: ExtHostFileSystemShape ) { this._registrations = [ - fileService.registerProvider(scheme, this), + fileService.registerProvider(_scheme, this), searchService.registerSearchResultProvider(this), ]; } @@ -170,6 +171,20 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv search(query: ISearchQuery): PPromise { + if (isFalsyOrEmpty(query.folderQueries)) { + return PPromise.as(undefined); + } + + let includes = { ...query.includePattern }; + let excludes = { ...query.excludePattern }; + + for (const folderQuery of query.folderQueries) { + if (folderQuery.folder.scheme === this._scheme) { + includes = { ...includes, ...folderQuery.includePattern }; + excludes = { ...excludes, ...folderQuery.excludePattern }; + } + } + return new PPromise((resolve, reject, report) => { const search = new SearchOperation(report); @@ -177,7 +192,7 @@ class RemoteFileSystemProvider implements IFileSystemProvider, ISearchResultProv const promise = query.type === QueryType.File ? this._proxy.$findFiles(this._handle, search.id, query.filePattern) - : this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, undefined, undefined); + : this._proxy.$provideTextSearchResults(this._handle, search.id, query.contentPattern, { excludes: Object.keys(excludes), includes: Object.keys(includes) }); promise.then(() => { this._searches.delete(search.id); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index a08706a7e6b..ea9d6e8b960 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -549,7 +549,7 @@ export interface ExtHostFileSystemShape { $readdir(handle: number, resource: UriComponents): TPromise<[UriComponents, IStat][]>; $rmdir(handle: number, resource: UriComponents): TPromise; $findFiles(handle: number, session: number, query: string): TPromise; - $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, include: string, exclude: string): TPromise; + $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, options: { includes: string[], excludes: string[] }): TPromise; } export interface ExtHostExtensionServiceShape { diff --git a/src/vs/workbench/api/node/extHostFileSystem.ts b/src/vs/workbench/api/node/extHostFileSystem.ts index 62dbf9b67fe..7a8b780fcc4 100644 --- a/src/vs/workbench/api/node/extHostFileSystem.ts +++ b/src/vs/workbench/api/node/extHostFileSystem.ts @@ -137,7 +137,7 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { }; return asWinJsPromise(token => provider.findFiles(query, progress, token)); } - $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, include: string, exclude: string): TPromise { + $provideTextSearchResults(handle: number, session: number, pattern: IPatternInfo, options: { includes: string[], excludes: string[] }): TPromise { const provider = this._provider.get(handle); if (!provider.provideTextSearchResults) { return TPromise.as(undefined); @@ -151,6 +151,6 @@ export class ExtHostFileSystem implements ExtHostFileSystemShape { }]); } }; - return asWinJsPromise(token => provider.provideTextSearchResults(pattern, include, exclude, progress, token)); + return asWinJsPromise(token => provider.provideTextSearchResults(pattern, options, progress, token)); } } From cbf9ae23ed165078e98e00a658a218ce690a6dfd Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 16 Jan 2018 12:50:14 -0800 Subject: [PATCH 292/710] Allow loading webview outside of file: origin (#41698) * Allow loading webview outside of file: origin **Problem** Webviews are currently always loaded from a file on the disk. This results in the webview running in the file origin, potentially allowing it to access any file on disk. If a webview fails to sanitize workspace or remote input, untrusted code could potentially access files on the user's system. **Fix** Add a new option to serve the webview out of a "data:" uri instead. This prevents access to `file://` resources. In order to allow webviews to still load resources from disk, add a new protocol called `vscode-core-resource://` that only allows access to resources inside of the vscode directory. Moves extension pages and our release notes to use this new option. These already are pretty locked down. We cannot move the htmlpreview command to use this option as it would break a huge number of existing extensions, however the new webview API will always have this new option enabled. * Shorted protocol name --- src/vs/code/electron-main/app.ts | 12 +++- .../extensions/browser/extensionEditor.ts | 21 ++++--- .../parts/html/browser/htmlPreviewPart.ts | 14 +++-- .../parts/html/browser/webview-pre.js | 4 +- .../workbench/parts/html/browser/webview.ts | 57 +++++++++++++++---- .../electron-browser/releaseNotesEditor.ts | 23 +++++--- 6 files changed, 95 insertions(+), 36 deletions(-) diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index ca4a569c0f6..faffd00b753 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -126,8 +126,16 @@ export class CodeApplication { } }); - const isValidWebviewSource = (source: string) => - !source || (URI.parse(source.toLowerCase()).toString() as any).startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString()); + const isValidWebviewSource = (source: string): boolean => { + if (!source) { + return false; + } + if (source === 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%09%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E') { + return true; + } + const srcUri: any = URI.parse(source.toLowerCase()).toString(); + return srcUri.startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString()); + }; app.on('web-contents-created', (_event: any, contents) => { contents.on('will-attach-webview', (event: Electron.Event, webPreferences, params) => { diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index 95a51e0fadc..43a5d963e96 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -52,6 +52,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { Color } from 'vs/base/common/color'; import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; /** A context key that is set when an extension editor webview has focus. */ export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey('extensionEditorWebviewFocus', undefined); @@ -62,13 +63,17 @@ export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED = new /** A context key that is set when the find widget find input in extension editor webview is not focused. */ export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.toNegated(); -function renderBody(body: string): string { +function renderBody( + body: string, + environmentService: IEnvironmentService +): string { + const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://' + environmentService.appRoot, 'vscode-core-resource://'); return ` - - + + @@ -194,7 +199,9 @@ export class ExtensionEditor extends BaseEditor { @IPartService private partService: IPartService, @IContextViewService private contextViewService: IContextViewService, @IContextKeyService private contextKeyService: IContextKeyService, - @IExtensionTipsService private extensionTipsService: IExtensionTipsService + @IExtensionTipsService private extensionTipsService: IExtensionTipsService, + @IEnvironmentService private environmentService: IEnvironmentService + ) { super(ExtensionEditor.ID, telemetryService, themeService); this.disposables = []; @@ -408,12 +415,12 @@ export class ExtensionEditor extends BaseEditor { private openMarkdown(content: TPromise, noContentCopy: string) { return this.loadContents(() => content .then(marked.parse) - .then(renderBody) + .then(content => renderBody(content, this.environmentService)) .then(removeEmbeddedSVGs) .then(body => { const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders; - const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : undefined; - this.activeWebview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions); + const webViewOptions = allowedBadgeProviders.length > 0 ? { allowScripts: false, allowSvgs: false, svgWhiteList: allowedBadgeProviders } : {}; + this.activeWebview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this.contextViewService, this.contextKey, this.findInputFocusContextKey, webViewOptions, false); const removeLayoutParticipant = arrays.insert(this.layoutParticipants, this.activeWebview); this.contentDisposables.push(toDisposable(removeLayoutParticipant)); diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts index 9674b857ced..edee199e773 100644 --- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts @@ -25,6 +25,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import Webview, { WebviewOptions } from './webview'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { WebviewEditor } from './webviewEditor'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; /** @@ -46,13 +47,14 @@ export class HtmlPreviewPart extends WebviewEditor { constructor( @ITelemetryService telemetryService: ITelemetryService, - @ITextModelService private textModelResolverService: ITextModelService, @IThemeService themeService: IThemeService, - @IOpenerService private readonly openerService: IOpenerService, - @IPartService private partService: IPartService, @IStorageService storageService: IStorageService, - @IContextViewService private _contextViewService: IContextViewService, - @IContextKeyService contextKeyService: IContextKeyService + @IContextKeyService contextKeyService: IContextKeyService, + @ITextModelService private readonly textModelResolverService: ITextModelService, + @IOpenerService private readonly openerService: IOpenerService, + @IPartService private readonly partService: IPartService, + @IContextViewService private readonly _contextViewService: IContextViewService, + @IEnvironmentService private readonly _environmentService: IEnvironmentService ) { super(HtmlPreviewPart.ID, telemetryService, themeService, storageService, contextKeyService); } @@ -84,7 +86,7 @@ export class HtmlPreviewPart extends WebviewEditor { webviewOptions = this.input.options; } - this._webview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._contextViewService, this.contextKey, this.findInputFocusContextKey, webviewOptions); + this._webview = new Webview(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._environmentService, this._contextViewService, this.contextKey, this.findInputFocusContextKey, webviewOptions, true); if (this.input && this.input instanceof HtmlInput) { const state = this.loadViewState(this.input.getResource()); this.scrollYPercentage = state ? state.scrollYPercentage : 0; diff --git a/src/vs/workbench/parts/html/browser/webview-pre.js b/src/vs/workbench/parts/html/browser/webview-pre.js index ebb69c9bd46..17c09cdc32f 100644 --- a/src/vs/workbench/parts/html/browser/webview-pre.js +++ b/src/vs/workbench/parts/html/browser/webview-pre.js @@ -264,7 +264,7 @@ contentWindow.addEventListener('scroll', handleInnerScroll); pendingMessages.forEach(function (data) { - contentWindow.postMessage(data, document.location.origin); + contentWindow.postMessage(data, '*'); }); pendingMessages = []; } @@ -303,7 +303,7 @@ } else { const target = getActiveFrame(); if (target) { - target.contentWindow.postMessage(data, document.location.origin); + target.contentWindow.postMessage(data, '*'); } } }); diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts index c4954e1f376..b46ee754598 100644 --- a/src/vs/workbench/parts/html/browser/webview.ts +++ b/src/vs/workbench/parts/html/browser/webview.ts @@ -14,6 +14,9 @@ import { ITheme, LIGHT, DARK } from 'vs/platform/theme/common/themeService'; import { WebviewFindWidget } from './webviewFindWidget'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IContextKey } from 'vs/platform/contextkey/common/contextkey'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; +import { normalize, join } from 'vs/base/common/paths'; +import { startsWith } from 'vs/base/common/strings'; export interface WebviewElementFindInPageOptions { forward?: boolean; @@ -39,8 +42,6 @@ export interface WebviewOptions { } export default class Webview { - private static index: number = 0; - private readonly _webview: Electron.WebviewTag; private _ready: Promise; private _disposables: IDisposable[] = []; @@ -55,13 +56,15 @@ export default class Webview { constructor( private readonly parent: HTMLElement, private readonly _styleElement: Element, - @IContextViewService private readonly _contextViewService: IContextViewService, + private readonly _environmentService: IEnvironmentService, + private readonly _contextViewService: IContextViewService, private readonly _contextKey: IContextKey, private readonly _findInputContextKey: IContextKey, - private _options: WebviewOptions = {}, + private _options: WebviewOptions, + useSameOriginForRoot: boolean ) { this._webview = document.createElement('webview'); - this._webview.setAttribute('partition', this._options.allowSvgs ? 'webview' : `webview${Webview.index++}`); + this._webview.setAttribute('partition', this._options.allowSvgs ? 'webview' : `webview${Date.now()}`); // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick) this._webview.setAttribute('disableblinkfeatures', 'Auxclick'); @@ -75,7 +78,7 @@ export default class Webview { this._webview.style.outline = '0'; this._webview.preload = require.toUrl('./webview-pre.js'); - this._webview.src = require.toUrl('./webview.html'); + this._webview.src = useSameOriginForRoot ? require.toUrl('./webview.html') : 'data:text/html;charset=utf-8,%3C%21DOCTYPE%20html%3E%0D%0A%3Chtml%20lang%3D%22en%22%20style%3D%22width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3Chead%3E%0D%0A%09%3Ctitle%3EVirtual%20Document%3C%2Ftitle%3E%0D%0A%3C%2Fhead%3E%0D%0A%3Cbody%20style%3D%22margin%3A%200%3B%20overflow%3A%20hidden%3B%20width%3A%20100%25%3B%20height%3A%20100%25%22%3E%0D%0A%3C%2Fbody%3E%0D%0A%3C%2Fhtml%3E'; this._ready = new Promise(resolve => { const subscription = addDisposableListener(this._webview, 'ipc-message', (event) => { @@ -89,9 +92,24 @@ export default class Webview { }); }); + if (!useSameOriginForRoot) { + let loaded = false; + this._disposables.push(addDisposableListener(this._webview, 'did-start-loading', () => { + if (loaded) { + return; + } + loaded = true; + + const contents = this._webview.getWebContents(); + if (contents && !contents.isDestroyed()) { + registerFileProtocol(contents, 'vscode-core-resource', this._environmentService.appRoot); + } + })); + } + if (!this._options.allowSvgs) { let loaded = false; - const subscription = addDisposableListener(this._webview, 'did-start-loading', () => { + this._disposables.push(addDisposableListener(this._webview, 'did-start-loading', () => { if (loaded) { return; } @@ -124,9 +142,7 @@ export default class Webview { } return callback({ cancel: false, responseHeaders: details.responseHeaders }); }); - }); - - this._disposables.push(subscription); + })); } this._disposables.push( @@ -397,3 +413,24 @@ export default class Webview { this._webviewFindWidget.showPreviousFindTerm(); } } + +function registerFileProtocol( + contents: Electron.WebContents, + protocol: string, + root: string +) { + contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => { + const requestPath = URI.parse(request.url).path; + const normalizedPath = normalize(join(root, requestPath)); + if (startsWith(normalizedPath, root)) { + callback({ path: normalizedPath }); + } else { + callback({ error: 'Cannot load resource outside of protocol root' }); + } + }, (error) => { + if (error) { + console.error('Failed to register protocol ' + protocol); + } + }); +} + diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index 27632cdde54..53e1440adbd 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -29,14 +29,19 @@ import { onUnexpectedError } from 'vs/base/common/errors'; import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils'; import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization'; -function renderBody(body: string, css: string): string { +function renderBody( + body: string, + css: string, + environmentService: IEnvironmentService +): string { + const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://' + environmentService.appRoot, 'vscode-core-resource://'); return ` - - + + ${body} @@ -52,14 +57,14 @@ export class ReleaseNotesEditor extends WebviewEditor { constructor( @ITelemetryService telemetryService: ITelemetryService, - @IEnvironmentService private environmentService: IEnvironmentService, @IThemeService protected themeService: IThemeService, + @IStorageService storageService: IStorageService, + @IContextKeyService contextKeyService: IContextKeyService, + @IEnvironmentService private environmentService: IEnvironmentService, @IOpenerService private openerService: IOpenerService, @IModeService private modeService: IModeService, @IPartService private partService: IPartService, - @IStorageService storageService: IStorageService, - @IContextViewService private _contextViewService: IContextViewService, - @IContextKeyService contextKeyService: IContextKeyService + @IContextViewService private _contextViewService: IContextViewService ) { super(ReleaseNotesEditor.ID, telemetryService, themeService, storageService, contextKeyService); } @@ -99,8 +104,8 @@ export class ReleaseNotesEditor extends WebviewEditor { const colorMap = TokenizationRegistry.getColorMap(); const css = generateTokensCSSForColorMap(colorMap); - const body = renderBody(marked(text, { renderer }), css); - this._webview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this._contextViewService, this.contextKey, this.findInputFocusContextKey); + const body = renderBody(marked(text, { renderer }), css, this.environmentService); + this._webview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this._contextViewService, this.contextKey, this.findInputFocusContextKey, {}, false); if (this.input && this.input instanceof ReleaseNotesInput) { const state = this.loadViewState(this.input.version); if (state) { From 2809ed713fd1c4c22bcd96c63ebfaffd3d48a227 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 16 Jan 2018 12:57:51 -0800 Subject: [PATCH 293/710] Include groupId in copySetting pref telemetry --- .../preferences/browser/preferencesEditor.ts | 6 ++-- .../browser/preferencesRenderers.ts | 30 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index bc1516350e7..1eb818aa04b 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -418,7 +418,7 @@ class PreferencesRenderersController extends Disposable { this._defaultPreferencesRendererDisposables = dispose(this._defaultPreferencesRendererDisposables); if (this._defaultPreferencesRenderer) { - this._defaultPreferencesRenderer.onUpdatePreference(({ key, value, source, index }) => this._updatePreference(key, value, source, index, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); + this._defaultPreferencesRenderer.onUpdatePreference(({ key, value, source }) => this._updatePreference(key, value, source, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); this._defaultPreferencesRenderer.onFocusPreference(preference => this._focusPreference(preference, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); this._defaultPreferencesRenderer.onClearFocusPreference(preference => this._clearFocus(preference, this._editablePreferencesRenderer), this, this._defaultPreferencesRendererDisposables); } @@ -548,9 +548,9 @@ class PreferencesRenderersController extends Disposable { } } - private _updatePreference(key: string, value: any, source: ISetting, index: number, preferencesRenderer: IPreferencesRenderer): void { + private _updatePreference(key: string, value: any, source: ISetting, preferencesRenderer: IPreferencesRenderer): void { if (preferencesRenderer) { - preferencesRenderer.updatePreference(key, value, source, index); + preferencesRenderer.updatePreference(key, value, source); } } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 1ae612e71fd..659b652788a 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -40,10 +40,10 @@ export interface IPreferencesRenderer extends IDisposable { onFocusPreference: Event; onClearFocusPreference: Event; - onUpdatePreference?: Event<{ key: string, value: any, source: T, index: number }>; + onUpdatePreference?: Event<{ key: string, value: any, source: T }>; render(): void; - updatePreference(key: string, value: any, source: T, index: number): void; + updatePreference(key: string, value: any, source: T): void; focusPreference(setting: T): void; clearFocus(setting: T): void; filterPreferences(filterResult: IFilterResult): void; @@ -75,7 +75,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend this.settingHighlighter = this._register(instantiationService.createInstance(SettingHighlighter, editor, this._onFocusPreference, this._onClearFocusPreference)); this.highlightMatchesRenderer = this._register(instantiationService.createInstance(HighlightMatchesRenderer, editor)); this.editSettingActionRenderer = this._register(this.instantiationService.createInstance(EditSettingRenderer, this.editor, this.preferencesModel, this.settingHighlighter)); - this._register(this.editSettingActionRenderer.onUpdateSetting(({ key, value, source, index }) => this.updatePreference(key, value, source, index, true))); + this._register(this.editSettingActionRenderer.onUpdateSetting(({ key, value, source }) => this.updatePreference(key, value, source, true))); this._register(this.editor.getModel().onDidChangeContent(() => this.modelChangeDelayer.trigger(() => this.onModelChanged()))); this.createHeader(); @@ -101,7 +101,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend } } - public updatePreference(key: string, value: any, source: ISetting, index: number, fromEditableSettings?: boolean): void { + public updatePreference(key: string, value: any, source: IIndexedSetting, fromEditableSettings?: boolean): void { const data = { userConfigurationKeys: [key] }; @@ -110,7 +110,8 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend data['query'] = this.filterResult.query; data['fuzzy'] = !!this.filterResult.metadata; data['duration'] = this.filterResult.metadata && this.filterResult.metadata.duration; - data['index'] = index; + data['index'] = source.index; + data['groupId'] = source.groupId; data['editableSide'] = !!fromEditableSettings; } @@ -249,8 +250,8 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR private bracesHidingRenderer: BracesHidingRenderer; private filterResult: IFilterResult; - private _onUpdatePreference: Emitter<{ key: string, value: any, source: ISetting, index: number }> = new Emitter<{ key: string, value: any, source: ISetting, index: number }>(); - public readonly onUpdatePreference: Event<{ key: string, value: any, source: ISetting, index: number }> = this._onUpdatePreference.event; + private _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); + public readonly onUpdatePreference: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdatePreference.event; private _onFocusPreference: Emitter = new Emitter(); public readonly onFocusPreference: Event = this._onFocusPreference.event; @@ -828,8 +829,9 @@ export class HighlightMatchesRenderer extends Disposable { } } -interface IIndexedSetting extends ISetting { +export interface IIndexedSetting extends ISetting { index: number; + groupId: string; } class EditSettingRenderer extends Disposable { @@ -841,8 +843,8 @@ class EditSettingRenderer extends Disposable { public associatedPreferencesModel: IPreferencesEditorModel; private toggleEditPreferencesForMouseMoveDelayer: Delayer; - private _onUpdateSetting: Emitter<{ key: string, value: any, source: ISetting, index: number }> = new Emitter<{ key: string, value: any, source: ISetting, index: number }>(); - public readonly onUpdateSetting: Event<{ key: string, value: any, source: ISetting, index: number }> = this._onUpdateSetting.event; + private _onUpdateSetting: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>(); + public readonly onUpdateSetting: Event<{ key: string, value: any, source: IIndexedSetting }> = this._onUpdateSetting.event; constructor(private editor: ICodeEditor, private masterSettingsModel: ISettingsEditorModel, private settingHighlighter: SettingHighlighter, @@ -978,7 +980,7 @@ class EditSettingRenderer extends Disposable { // index of setting, across all groups/sections let index = 0; - const settings = []; + const settings: IIndexedSetting[] = []; for (const group of this.settingsGroups) { if (group.range.startLineNumber > lineNumber) { break; @@ -994,11 +996,11 @@ class EditSettingRenderer extends Disposable { // Only one level because override settings cannot have override settings for (const overrideSetting of setting.overrides) { if (lineNumber >= overrideSetting.range.startLineNumber && lineNumber <= overrideSetting.range.endLineNumber) { - settings.push({ ...overrideSetting, index }); + settings.push({ ...overrideSetting, index, groupId: group.id }); } } } else { - settings.push({ ...setting, index }); + settings.push({ ...setting, index, groupId: group.id }); } } @@ -1069,7 +1071,7 @@ class EditSettingRenderer extends Disposable { } private updateSetting(key: string, value: any, source: IIndexedSetting): void { - this._onUpdateSetting.fire({ key, value, source, index: source.index }); + this._onUpdateSetting.fire({ key, value, source }); } } From a1b6fed0a0e8df2e2ff132f45df6b9d848b5b722 Mon Sep 17 00:00:00 2001 From: Daniel Ye Date: Tue, 16 Jan 2018 13:23:29 -0800 Subject: [PATCH 294/710] 2018-01-16. Merged in translations from Transifex. --- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../chs/extensions/git/out/commands.i18n.json | 10 ++++-- i18n/chs/extensions/git/package.i18n.json | 4 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/chs/src/vs/base/node/ps.i18n.json | 8 +++++ .../config/commonEditorConfig.i18n.json | 3 +- .../common/view/editorColorRegistry.i18n.json | 2 +- .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 4 +-- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 31 +++++++++-------- .../node/extensionManagementService.i18n.json | 9 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 22 ++++++------- .../mainThreadSaveParticipant.i18n.json | 8 +++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 15 ++++++++- .../parts/editor/editorActions.i18n.json | 11 +++---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 10 ++++-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../electron-browser/window.i18n.json | 3 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 9 +++++ .../electron-browser/feedback.i18n.json | 1 + .../feedbackStatusbarItem.i18n.json | 8 +++++ .../fileActions.contribution.i18n.json | 23 ++++++++++++- .../electron-browser/fileActions.i18n.json | 33 ++++++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/explorerViewer.i18n.json | 1 + .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 18 ++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 6 +++- .../scm/electron-browser/scmViewlet.i18n.json | 3 ++ .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 15 +++++++++ .../snippets.contribution.i18n.json | 7 ++-- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 4 +-- .../terminal.contribution.i18n.json | 3 ++ .../terminalActions.i18n.json | 2 ++ .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../cht/extensions/git/out/commands.i18n.json | 9 +++-- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/cht/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 2 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 30 +++++++++-------- .../node/extensionManagementService.i18n.json | 8 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 3 -- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../browser/debugActionsWidget.i18n.json | 3 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 8 +++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 5 +-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 20 +++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 4 ++- .../scm/electron-browser/scmViewlet.i18n.json | 1 + .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminal.contribution.i18n.json | 1 + .../terminalActions.i18n.json | 1 + .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../deu/extensions/git/out/commands.i18n.json | 8 +++-- .../extensions/git/out/repository.i18n.json | 2 +- i18n/deu/extensions/git/package.i18n.json | 3 +- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/deu/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 2 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 30 +++++++++-------- .../node/extensionManagementService.i18n.json | 8 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 8 +++-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../electron-browser/window.i18n.json | 3 +- .../browser/debugActionsWidget.i18n.json | 3 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 19 +++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 9 +++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 5 ++- .../scm/electron-browser/scmViewlet.i18n.json | 2 ++ .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminal.contribution.i18n.json | 1 + .../terminalActions.i18n.json | 2 ++ .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 3 +- .../remoteFileService.i18n.json | 2 ++ .../services/files/node/fileService.i18n.json | 1 + .../keybindingService.i18n.json | 3 +- .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 ++- .../esn/extensions/git/out/commands.i18n.json | 5 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 6 ++++ i18n/esn/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 1 - .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 24 +++++++------- .../node/extensionManagementService.i18n.json | 5 +-- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 10 ++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 3 -- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 13 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 3 +- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 22 +++++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 3 +- .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../remoteFileService.i18n.json | 1 + .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 ++- .../fra/extensions/git/out/commands.i18n.json | 5 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 6 ++++ i18n/fra/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 1 - .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 24 +++++++------- .../node/extensionManagementService.i18n.json | 5 +-- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 3 -- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 13 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 3 +- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 17 ++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 3 +- .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../hun/extensions/git/out/commands.i18n.json | 10 ++++-- i18n/hun/extensions/git/out/main.i18n.json | 2 +- .../extensions/git/out/repository.i18n.json | 2 +- i18n/hun/extensions/git/package.i18n.json | 4 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/hun/src/vs/base/node/ps.i18n.json | 8 +++++ .../config/commonEditorConfig.i18n.json | 3 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../toggleTabFocusMode.i18n.json | 2 +- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 30 +++++++++-------- .../node/extensionManagementService.i18n.json | 9 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 8 +++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 15 ++++++++- .../parts/editor/editorActions.i18n.json | 11 +++---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 24 ++++++++------ .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../electron-browser/window.i18n.json | 3 +- .../wordWrapMigration.i18n.json | 2 +- .../browser/debugActionsWidget.i18n.json | 3 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 9 +++++ .../electron-browser/feedback.i18n.json | 1 + .../feedbackStatusbarItem.i18n.json | 8 +++++ .../fileActions.contribution.i18n.json | 22 ++++++++++++- .../electron-browser/fileActions.i18n.json | 30 ++++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 12 +++++++ .../electron-browser/logsActions.i18n.json | 24 ++++++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 11 +++++++ .../electron-browser/outputServices.i18n.json | 9 +++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 6 +++- .../scm/electron-browser/scmViewlet.i18n.json | 3 ++ .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 7 +++- .../configureSnippets.i18n.json | 15 +++++++++ .../snippets.contribution.i18n.json | 7 ++-- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminal.contribution.i18n.json | 5 ++- .../terminalActions.i18n.json | 2 ++ .../terminalColorRegistry.i18n.json | 2 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 3 +- .../remoteFileService.i18n.json | 2 ++ .../services/files/node/fileService.i18n.json | 1 + .../keybindingService.i18n.json | 3 +- .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 ++- .../ita/extensions/git/out/commands.i18n.json | 5 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../resourceviewer/resourceViewer.i18n.json | 2 +- .../ui/selectBox/selectBoxCustom.i18n.json | 6 ++++ i18n/ita/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 1 - .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 24 +++++++------- .../node/extensionManagementService.i18n.json | 5 +-- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 10 ++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 3 -- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 12 +++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 3 +- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 23 +++++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 3 +- .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../out/settingsDocumentHelper.i18n.json | 4 +-- i18n/jpn/extensions/css/package.i18n.json | 14 ++++---- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../jpn/extensions/git/out/commands.i18n.json | 12 ++++--- i18n/jpn/extensions/git/package.i18n.json | 8 +++-- .../jpn/extensions/markdown/package.i18n.json | 2 +- i18n/jpn/extensions/php/package.i18n.json | 2 +- .../typescript/out/commands.i18n.json | 15 +++++++++ .../extensions/typescript/package.i18n.json | 2 +- .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/jpn/src/vs/base/node/ps.i18n.json | 8 +++++ .../src/vs/code/electron-main/menus.i18n.json | 4 +-- .../src/vs/code/node/cliProcessMain.i18n.json | 2 +- .../config/commonEditorConfig.i18n.json | 3 +- .../common/view/editorColorRegistry.i18n.json | 2 +- .../editor/contrib/folding/folding.i18n.json | 2 +- .../contrib/gotoError/gotoError.i18n.json | 4 +-- .../contrib/multicursor/multicursor.i18n.json | 8 ++--- .../toggleTabFocusMode.i18n.json | 2 +- .../wordHighlighter/wordHighlighter.i18n.json | 4 +-- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 31 +++++++++-------- .../node/extensionManagementService.i18n.json | 9 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 22 ++++++------- .../mainThreadSaveParticipant.i18n.json | 8 +++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 15 ++++++++- .../parts/editor/editorActions.i18n.json | 11 +++---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 10 ++++-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../electron-browser/window.i18n.json | 3 +- .../electron-browser/accessibility.i18n.json | 2 +- .../toggleMultiCursorModifier.i18n.json | 2 +- .../debug/browser/debugActions.i18n.json | 2 +- .../browser/debugActionsWidget.i18n.json | 3 +- .../debug/browser/debugQuickOpen.i18n.json | 2 +- .../debug/electron-browser/repl.i18n.json | 2 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 9 +++++ .../electron-browser/feedback.i18n.json | 1 + .../feedbackStatusbarItem.i18n.json | 8 +++++ .../fileActions.contribution.i18n.json | 23 ++++++++++++- .../electron-browser/fileActions.i18n.json | 33 ++++++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/explorerViewer.i18n.json | 1 + .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 12 +++++++ .../electron-browser/logsActions.i18n.json | 24 ++++++++++++++ .../parts/markers/common/messages.i18n.json | 6 ++-- .../output.contribution.i18n.json | 11 +++++++ .../electron-browser/outputServices.i18n.json | 9 +++++ .../browser/keybindingWidgets.i18n.json | 2 +- .../browser/keybindingsEditor.i18n.json | 4 +-- .../browser/preferencesEditor.i18n.json | 2 ++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 6 +++- .../scm/electron-browser/scmViewlet.i18n.json | 3 ++ .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 7 +++- .../configureSnippets.i18n.json | 15 +++++++++ .../snippets.contribution.i18n.json | 7 ++-- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 4 +-- .../terminal.contribution.i18n.json | 3 ++ .../terminalActions.i18n.json | 2 ++ .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 3 +- .../vs_code_welcome_page.i18n.json | 2 +- .../remoteFileService.i18n.json | 2 ++ .../services/files/node/fileService.i18n.json | 1 + .../keybindingService.i18n.json | 11 ++++--- .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 4 +-- .../kor/extensions/git/out/commands.i18n.json | 5 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 6 ++++ i18n/kor/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 2 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 25 +++++++------- .../node/extensionManagementService.i18n.json | 7 ++-- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 10 ++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 4 +-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 13 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 4 +-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 11 +++++++ .../electron-browser/logsActions.i18n.json | 21 ++++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 11 +++++++ .../electron-browser/outputServices.i18n.json | 8 +++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 3 +- .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 2 ++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../ptb/extensions/git/out/commands.i18n.json | 7 ++-- .../extensions/git/out/repository.i18n.json | 2 +- i18n/ptb/extensions/git/package.i18n.json | 4 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/ptb/src/vs/base/node/ps.i18n.json | 8 +++++ .../config/commonEditorConfig.i18n.json | 3 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 4 +-- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 30 +++++++++-------- .../node/extensionManagementService.i18n.json | 9 ++--- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 12 +------ .../mainThreadSaveParticipant.i18n.json | 8 +++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 10 ++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 10 ++++-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../electron-browser/window.i18n.json | 3 +- .../browser/debugActionsWidget.i18n.json | 3 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 8 +++++ .../fileActions.contribution.i18n.json | 22 ++++++++++++- .../electron-browser/fileActions.i18n.json | 29 ++++------------ .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 12 +++++++ .../electron-browser/logsActions.i18n.json | 23 +++++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 11 +++++++ .../electron-browser/outputServices.i18n.json | 9 +++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 6 +++- .../scm/electron-browser/scmViewlet.i18n.json | 3 ++ .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 14 ++++++++ .../snippets.contribution.i18n.json | 7 ++-- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminal.contribution.i18n.json | 1 + .../terminalActions.i18n.json | 2 ++ .../terminalColorRegistry.i18n.json | 2 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 3 +- .../remoteFileService.i18n.json | 2 ++ .../services/files/node/fileService.i18n.json | 1 + .../keybindingService.i18n.json | 3 +- .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 ++- .../rus/extensions/git/out/commands.i18n.json | 5 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/rus/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 2 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 24 +++++++------- .../node/extensionManagementService.i18n.json | 5 +-- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 6 ++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 6 ---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 4 +-- .../parts/editor/titleControl.i18n.json | 6 ---- .../src/vs/workbench/common/theme.i18n.json | 3 -- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 10 +++--- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 2 +- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 21 +++++++++++- .../electron-browser/fileActions.i18n.json | 28 +++------------- .../electron-browser/fileCommands.i18n.json | 12 +++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 3 +- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 20 +++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../scm.contribution.i18n.json | 3 +- .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 2 ++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../remoteFileService.i18n.json | 1 + .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- .../extensions/git/out/autofetch.i18n.json | 5 +-- .../trk/extensions/git/out/commands.i18n.json | 10 ++++-- i18n/trk/extensions/git/out/main.i18n.json | 2 +- i18n/trk/extensions/git/package.i18n.json | 4 ++- .../typescript/out/commands.i18n.json | 15 +++++++++ .../ui/selectBox/selectBoxCustom.i18n.json | 8 +++++ i18n/trk/src/vs/base/node/ps.i18n.json | 6 ++++ .../config/commonEditorConfig.i18n.json | 2 +- .../common/view/editorColorRegistry.i18n.json | 1 - .../contrib/gotoError/gotoError.i18n.json | 2 -- .../wordHighlighter/wordHighlighter.i18n.json | 2 -- .../menusExtensionPoint.i18n.json | 3 +- .../platform/environment/node/argv.i18n.json | 30 +++++++++-------- .../node/extensionManagementService.i18n.json | 8 ++--- .../node/integrityServiceImpl.i18n.json | 2 +- .../platform/message/common/message.i18n.json | 4 ++- .../theme/common/colorRegistry.i18n.json | 11 ------- .../mainThreadSaveParticipant.i18n.json | 8 +++++ .../api/node/extHostTreeViews.i18n.json | 4 +-- .../actions/workspaceActions.i18n.json | 8 +---- .../actions/workspaceCommands.i18n.json | 11 +++++++ .../editor/editor.contribution.i18n.json | 14 +++++++- .../parts/editor/editorActions.i18n.json | 11 +++---- .../parts/editor/editorCommands.i18n.json | 4 +-- .../parts/editor/textDiffEditor.i18n.json | 3 +- .../parts/editor/titleControl.i18n.json | 6 ---- .../parts/titlebar/titlebarPart.i18n.json | 2 ++ .../src/vs/workbench/common/theme.i18n.json | 10 ++++-- .../src/vs/workbench/common/views.i18n.json | 8 +++++ .../electron-browser/actions.i18n.json | 19 +---------- .../main.contribution.i18n.json | 11 ++++--- .../electron-browser/window.i18n.json | 3 +- .../wordWrapMigration.i18n.json | 2 +- .../terminalSupport.i18n.json | 3 +- .../execution.contribution.i18n.json | 3 +- .../extensionTipsService.i18n.json | 4 +-- .../feedback.contribution.i18n.json | 8 +++++ .../feedbackStatusbarItem.i18n.json | 6 ++++ .../fileActions.contribution.i18n.json | 22 ++++++++++++- .../electron-browser/fileActions.i18n.json | 30 ++++------------- .../electron-browser/fileCommands.i18n.json | 14 ++++++-- .../files.contribution.i18n.json | 2 -- .../saveErrorHandler.i18n.json | 8 +++-- .../views/openEditorsView.i18n.json | 8 +---- .../logs.contribution.i18n.json | 8 +++++ .../electron-browser/logsActions.i18n.json | 19 +++++++++++ .../parts/markers/common/messages.i18n.json | 2 -- .../output.contribution.i18n.json | 10 ++++++ .../electron-browser/outputServices.i18n.json | 6 ++++ .../browser/preferencesWidgets.i18n.json | 4 +-- .../common/preferencesModels.i18n.json | 1 - .../browser/quickopen.contribution.i18n.json | 1 + .../search/browser/searchActions.i18n.json | 2 -- .../search.contribution.i18n.json | 4 +++ .../configureSnippets.i18n.json | 9 +++++ .../snippets.contribution.i18n.json | 4 --- .../electron-browser/snippetsFile.i18n.json | 8 +++++ .../snippetsService.i18n.json | 3 +- .../terminalColorRegistry.i18n.json | 3 +- .../terminalService.i18n.json | 1 - .../update/electron-browser/update.i18n.json | 1 + .../remoteFileService.i18n.json | 2 ++ .../textFileService.i18n.json | 2 -- .../workbenchThemeService.i18n.json | 4 +-- .../node/workspaceEditingService.i18n.json | 6 +--- 798 files changed, 3306 insertions(+), 2070 deletions(-) create mode 100644 i18n/chs/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/chs/src/vs/base/node/ps.i18n.json create mode 100644 i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/chs/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/cht/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/cht/src/vs/base/node/ps.i18n.json create mode 100644 i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/cht/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/deu/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/deu/src/vs/base/node/ps.i18n.json create mode 100644 i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/deu/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/esn/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/esn/src/vs/base/node/ps.i18n.json create mode 100644 i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/esn/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/fra/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/fra/src/vs/base/node/ps.i18n.json create mode 100644 i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/fra/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/hun/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/hun/src/vs/base/node/ps.i18n.json create mode 100644 i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/hun/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/ita/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/ita/src/vs/base/node/ps.i18n.json create mode 100644 i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/ita/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/jpn/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/jpn/src/vs/base/node/ps.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/kor/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/kor/src/vs/base/node/ps.i18n.json create mode 100644 i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/kor/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/ptb/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/ptb/src/vs/base/node/ps.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/rus/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/rus/src/vs/base/node/ps.i18n.json create mode 100644 i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/rus/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json create mode 100644 i18n/trk/extensions/typescript/out/commands.i18n.json create mode 100644 i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json create mode 100644 i18n/trk/src/vs/base/node/ps.i18n.json create mode 100644 i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json create mode 100644 i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json create mode 100644 i18n/trk/src/vs/workbench/common/views.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json create mode 100644 i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json diff --git a/i18n/chs/extensions/git/out/autofetch.i18n.json b/i18n/chs/extensions/git/out/autofetch.i18n.json index 6df74592845..823bb93043f 100644 --- a/i18n/chs/extensions/git/out/autofetch.i18n.json +++ b/i18n/chs/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "是", + "read more": "了解详细信息", "no": "否", - "not now": "不是现在", - "suggest auto fetch": "是否启用自动抓取 Git 存储库?" + "not now": "稍后询问", + "suggest auto fetch": "您希望 Code 定期运行 \"git fetch\" 吗?" } \ 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 8f5f2a83f79..dcd0b9e0ae9 100644 --- a/i18n/chs/extensions/git/out/commands.i18n.json +++ b/i18n/chs/extensions/git/out/commands.i18n.json @@ -41,6 +41,10 @@ "confirm discard all 2": "{0}\n\n此操作不可撤销，你当前的工作集将会永远丢失。", "yes discard tracked": "放弃 1 个已跟踪的文件", "yes discard tracked multiple": "放弃 {0} 个已跟踪的文件", + "unsaved files single": "以下文件尚未保存：{0}。\n\n您要在提交之前保存吗?", + "unsaved files": "当前有 {0} 个文件尚未保存。\n\n您要在提交之前保存吗?", + "save and commit": "全部保存并提交", + "commit": "仍要提交", "no staged changes": "现在没有暂存的更改以供提交\n\n是否要直接自动暂存所有更改并提交？", "always": "始终", "no changes": "没有要提交的更改。", @@ -64,12 +68,12 @@ "no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。", "pick remote pull repo": "选择要从其拉取分支的远程位置", "no remotes to push": "存储库未配置任何要推送到的远程存储库。", - "push with tags success": "已成功带标签进行推送。", "nobranch": "请签出一个分支以推送到远程。", + "confirm publish branch": "分支“{0}”没有上游分支。您要发布此分支吗?", + "ok": "确定", + "push with tags success": "已成功带标签进行推送。", "pick remote": "选取要将分支“{0}”发布到的远程:", "sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。", - "ok": "确定", - "never again": "好，永不再显示", "no remotes to publish": "存储库未配置任何要发布到的远程存储库。", "no changes stash": "没有要储藏的更改。", "provide stash message": "提供储藏消息(可选)", diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json index cb8443b7aec..33772606c95 100644 --- a/i18n/chs/extensions/git/package.i18n.json +++ b/i18n/chs/extensions/git/package.i18n.json @@ -54,6 +54,7 @@ "command.stashPopLatest": "弹出最新储藏", "config.enabled": "是否启用 Git", "config.path": "Git 可执行文件路径", + "config.autoRepositoryDetection": "是否自动检测存储库", "config.autorefresh": "是否启用自动刷新", "config.autofetch": "是否启用自动拉取", "config.enableLongCommitWarning": "是否针对长段提交消息进行警告", @@ -72,5 +73,6 @@ "colors.deleted": "已删除资源的颜色。", "colors.untracked": "未跟踪资源的颜色。", "colors.ignored": "已忽略资源的颜色。", - "colors.conflict": "存在冲突的资源的颜色。" + "colors.conflict": "存在冲突的资源的颜色。", + "colors.submodule": "子模块资源的颜色。" } \ No newline at end of file diff --git a/i18n/chs/extensions/typescript/out/commands.i18n.json b/i18n/chs/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..36b3b2d5f6b --- /dev/null +++ b/i18n/chs/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目", + "typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型", + "typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目", + "typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目", + "typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目", + "typescript.configureTsconfigQuickPick": "配置 tsconfig.json", + "typescript.configureJsconfigQuickPick": "配置 jsconfig.json", + "typescript.projectConfigLearnMore": "了解详细信息" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/chs/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/base/node/ps.i18n.json b/i18n/chs/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..da69e94cccc --- /dev/null +++ b/i18n/chs/src/vs/base/node/ps.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "collecting": "正在收集 CPU 与内存信息。这可能需要几秒钟的时间。" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json index 9c145d8c4d9..b2f32f3d15b 100644 --- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "将行号显示为绝对行数。", "lineNumbers.relative": "将行号显示为与光标相隔的行数。", "lineNumbers.interval": "每 10 行显示一次行号。", - "lineNumbers": "控制行号的显示。可选值为 \"on\"、\"off\" 和 \"relative\"。", + "lineNumbers": "控制行号的显示。可选值为 \"on\"、\"off\"、\"relative\" 和 \"interval\"。", "rulers": "在一定数量的等宽字符后显示垂直标尺。输入多个值，显示多个标尺。若数组为空，则不绘制标尺。", "wordSeparators": "执行文字相关的导航或操作时将用作文字分隔符的字符", "tabSize": "一个制表符等于的空格数。该设置在 \"editor.detectIndentation\" 启用时根据文件内容可能会被覆盖。", @@ -72,6 +72,7 @@ "cursorBlinking": "控制光标动画样式，可能的值为 \"blink\"、\"smooth\"、\"phase\"、\"expand\" 和 \"solid\"", "mouseWheelZoom": "通过使用鼠标滚轮同时按住 Ctrl 可缩放编辑器的字体", "cursorStyle": "控制光标样式，接受的值为 \"block\"、\"block-outline\"、\"line\"、\"line-thin\" 、\"underline\" 和 \"underline-thin\"", + "lineCursorWidth": "当 editor.cursorStyle 设置为 \"line\" 时控制光标的宽度。", "fontLigatures": "启用字体连字", "hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。", "renderWhitespace": "控制编辑器中呈现空白字符的方式，可能为“无”、“边界”和“全部”。“边界”选项不会在单词之间呈现单空格。", 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 168dd2fb958..6d1dfc8be23 100644 --- a/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/chs/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,7 @@ { "lineHighlight": "光标所在行高亮内容的背景颜色。", "lineHighlightBorderBox": "光标所在行四周边框的背景颜色。", - "rangeHighlight": "高亮范围的背景色，例如由 \"Quick Open\" 和“查找”功能高亮的范围。", + "rangeHighlight": "高亮范围的背景色，例如由 \"Quick Open\" 和“查找”功能高亮的范围。颜色必须透明，这样不会挡住其下的其他元素。", "caret": "编辑器光标颜色。", "editorCursorBackground": "编辑器光标的背景色。可以自定义块型光标覆盖字符的颜色。", "editorWhitespaces": "编辑器中空白字符的颜色。", 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 8dc6ee58760..1613d026f4c 100644 --- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "转到下一个错误或警告", - "markerAction.previous.label": "转到上一个错误或警告", "editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。", "editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。", "editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。", 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 7926047995c..185a3d31620 100644 --- a/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/chs/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "读取访问时符号的背景颜色，例如读取变量时。", - "wordHighlightStrong": "写入访问时符号的背景颜色，例如写入变量时。", + "wordHighlight": "进行读取访问操作时符号的背景颜色，例如读取变量时。颜色必须透明，这样不会挡住其下的其他元素。", + "wordHighlightStrong": "进行写入访问操作时符号的背景颜色，例如写入变量时。颜色必须透明，这样不会挡住其下的其他元素。", "overviewRulerWordHighlightForeground": "概述符号突出显示的标尺标记颜色。", "overviewRulerWordHighlightStrongForeground": "概述写访问符号突出显示的标尺标记颜色。", "wordHighlight.next.label": "转到下一个突出显示的符号", diff --git a/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index d14243882a7..dd181ef9f45 100644 --- a/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/chs/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "“{0}”为无效菜单标识符", "missing.command": "菜单项引用未在“命令”部分进行定义的命令“{0}”。", "missing.altCommand": "菜单项引用了未在 \"commands\" 部分定义的替代命令“{0}”。", - "dupe.command": "菜单项引用的命令中默认和替代命令相同", - "nosupport.altCommand": "抱歉，目前仅有 \"editor/title\" 菜单的 \"navigation\" 组支持替代命令" + "dupe.command": "菜单项引用的命令中默认和替代命令相同" } \ No newline at end of file diff --git a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json index 9a1faa5d983..30d7fd225a2 100644 --- a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,35 @@ "diff": "将两个文件相互比较。", "add": "将文件夹添加到最后一个活动窗口。", "goto": "打开路径下的文件并定位到特定行和特定列。", - "locale": "要使用的区域设置(例如 en-US 或 zh-TW)。", "newWindow": "强制创建一个新的 Code 实例。", - "performance": "通过启用 \"Developer: Startup Performance\" 命令开始。", - "prof-startup": "启动期间运行 CPU 探查器", - "inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。", - "inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。", "reuseWindow": "在上一活动窗口中强制打开文件或文件夹。", - "userDataDir": "指定存放用户数据的目录。此目录在以 root 身份运行时十分有用。", - "log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。", - "verbose": "打印详细输出(隐含 --wait 参数)。", "wait": "等文件关闭后再返回。", + "locale": "要使用的区域设置(例如 en-US 或 zh-TW)。", + "userDataDir": "指定存放用户数据的目录。此目录在以 root 身份运行时十分有用。", + "version": "打印版本。", + "help": "打印使用情况。", "extensionHomePath": "设置扩展的根路径。", "listExtensions": "列出已安装的扩展。", "showVersions": "使用 --list-extension 时，显示已安装扩展的版本。", "installExtension": "安装扩展。", "uninstallExtension": "卸载扩展。", "experimentalApis": "启用扩展程序实验性 api 功能。", - "disableExtensions": "禁用所有已安装的扩展。", - "disableGPU": "禁用 GPU 硬件加速。", + "verbose": "打印详细输出(隐含 --wait 参数)。", + "log": "使用的日志级别。默认值为 \"info\"。允许的值为 \"critical\" (关键)、\"error\" (错误)、\"warn\" (警告)、\"info\" (信息)、\"debug\" (调试)、\"trace\" (跟踪) 和 \"off\" (关闭)。", "status": "打印进程使用情况和诊断信息。", - "version": "打印版本。", - "help": "打印使用情况。", + "performance": "通过启用 \"Developer: Startup Performance\" 命令开始。", + "prof-startup": "启动期间运行 CPU 探查器", + "disableExtensions": "禁用所有已安装的扩展。", + "inspect-extensions": "允许进行扩展的调试与分析。检查开发人员工具可获取连接 URI。", + "inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。", + "disableGPU": "禁用 GPU 硬件加速。", + "uploadLogs": "将当前会话的日志上传到安全端点。", "usage": "使用情况", "options": "选项", "paths": "路径", - "optionsUpperCase": "选项" + "stdinWindows": "要读取其他程序的输出，请追加 \"-\" (例如 \"echo Hello World\" | {0} -')", + "stdinUnix": "要从 stdin 中读取，请追加 \"-\" (例如 \"ps aux | grep code | {0} -')", + "optionsUpperCase": "选项", + "extensionsManagement": "扩展管理", + "troubleshooting": "故障排查" } \ 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 a6e3a8ea7bc..c72b93d1de9 100644 --- a/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,15 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "扩展无效: package.json 不是 JSON 文件。", - "restartCodeLocal": "请先重启 Code 再重新安装 {0}。", + "restartCode": "请先重启 Code 再重新安装 {0}。", "installingOutdatedExtension": "您已安装此扩展的新版程序。是否要使用旧版覆盖？", "override": "覆盖", "cancel": "取消", - "notFoundCompatible": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的扩展“{0}”。", - "quitCode": "无法安装，因为此扩展的一个过时实例仍在运行。请先完全重启 VS Code，再重新安装。", - "exitCode": "无法安装，因为此扩展的一个过时实例仍在运行。请先完全重启 VS Code，再重新安装。", + "errorInstallingDependencies": "安装依赖项时出错。{0}", + "notFoundCompatible": "无法安装“{0}”；没有可用的版本与 VS Code “{1}”兼容。", "notFoundCompatibleDependency": "无法安装。找不到与 VS Code 当前版本 ({1}) 兼容的依赖扩展“{0}”。", + "quitCode": "无法安装扩展。请在重启 VS Code 后重新安装。", + "exitCode": "无法安装扩展。请在重启 VS Code 后重新安装。", "uninstallDependeciesConfirmation": "要仅卸载“{0}”或者其依赖项也一起卸载?", "uninstallOnly": "仅", "uninstallAll": "全部", diff --git a/i18n/chs/src/vs/platform/message/common/message.i18n.json b/i18n/chs/src/vs/platform/message/common/message.i18n.json index 864f82423ea..6ab699b790e 100644 --- a/i18n/chs/src/vs/platform/message/common/message.i18n.json +++ b/i18n/chs/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "关闭", "later": "稍后", - "cancel": "取消" + "cancel": "取消", + "moreFile": "...1 个其他文件未显示", + "moreFiles": "...{0} 个其他文件未显示" } \ 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 7c3d96dd488..0e3e7d546d3 100644 --- a/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/chs/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,12 @@ "editorWidgetBorder": "编辑器小部件的边框颜色。此颜色仅在小部件有边框且不被小部件重写时适用。", "editorSelectionBackground": "编辑器所选内容的颜色。", "editorSelectionForeground": "用以彰显高对比度的所选文本的颜色。", - "editorInactiveSelection": "非活动编辑器中所选内容的颜色。", - "editorSelectionHighlight": "与所选内容具有相同内容的区域颜色。", + "editorInactiveSelection": "非活动编辑器选择内容的颜色。颜色必须透明，这样不会挡住其下的其他元素。", + "editorSelectionHighlight": "与已选项内容相同区域的颜色。颜色必须透明，这样不会挡住其下的其他元素。", "editorFindMatch": "当前搜索匹配项的颜色。", - "findMatchHighlight": "其他搜索匹配项的颜色。", - "findRangeHighlight": "限制搜索的范围的颜色。", - "hoverHighlight": "悬停提示显示时文本底下的高亮颜色。", + "findMatchHighlight": "其他搜索匹配项的颜色。颜色必须透明，这样不会挡住其下的其他元素。", + "findRangeHighlight": "搜索限制范围的颜色。颜色必须透明，这样不会挡住其下的其他元素。", + "hoverHighlight": "悬停提示显示时文本的高亮颜色。颜色必须透明，这样不会挡住其下的其他元素。", "hoverBackground": "编辑器悬停提示的背景颜色。", "hoverBorder": "光标悬停时编辑器的边框颜色。", "activeLinkForeground": "活动链接颜色。", @@ -76,12 +76,12 @@ "diffEditorRemoved": "被删除文本的背景颜色。", "diffEditorInsertedOutline": "插入的文本的轮廓颜色。", "diffEditorRemovedOutline": "被删除文本的轮廓颜色。", - "mergeCurrentHeaderBackground": "内联合并冲突中当前版本区域的标头背景色。", - "mergeCurrentContentBackground": "内联合并冲突中当前版本区域的内容背景色。", - "mergeIncomingHeaderBackground": "内联合并冲突中传入的版本区域的标头背景色。", - "mergeIncomingContentBackground": "内联合并冲突中传入的版本区域的内容背景色。", - "mergeCommonHeaderBackground": "内联合并冲突中共同祖先区域的标头背景色。", - "mergeCommonContentBackground": "内联合并冲突中共同祖先区域的内容背景色。", + "mergeCurrentHeaderBackground": "内联合并冲突中当前版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。", + "mergeCurrentContentBackground": "内联合并冲突中当前版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。", + "mergeIncomingHeaderBackground": "内联合并冲突中传入版本区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。", + "mergeIncomingContentBackground": "内联合并冲突中传入版本区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。", + "mergeCommonHeaderBackground": "内联合并冲突中共同上级区域头部的背景色。颜色必须透明，这样不会挡住其下的其他元素。", + "mergeCommonContentBackground": "内联合并冲突中共同上级区域内容的背景色。颜色必须透明，这样不会挡住其下的其他元素。", "mergeBorder": "内联合并冲突中标头和分割线的边框颜色。", "overviewRulerCurrentContentForeground": "内联合并冲突中当前版本区域的概览标尺前景色。", "overviewRulerIncomingContentForeground": "内联合并冲突中传入的版本区域的概览标尺前景色。", 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 new file mode 100644 index 00000000000..519a8e806a7 --- /dev/null +++ b/i18n/chs/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "saveParticipants": "正在运行保存参与程序..." +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 7bfb0b886de..903f7203bbb 100644 --- a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。", - "treeItem.notFound": "没有在树中找到 ID 为“{0}”的项目。", - "treeView.duplicateElement": "已注册元素 {0}。" + "treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json index b282efac3d0..0ac87020d7b 100644 --- a/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "打开文件...", "openFolder": "打开文件夹...", "openFileFolder": "打开...", - "addFolderToWorkspace": "将文件夹添加到工作区...", - "add": "添加(&&A)", - "addFolderToWorkspaceTitle": "将文件夹添加到工作区", "globalRemoveFolderFromWorkspace": "将文件夹从工作区删除…", - "removeFolderFromWorkspace": "将文件夹从工作区删除", - "openFolderSettings": "打开文件夹设置", "saveWorkspaceAsAction": "将工作区另存为...", "save": "保存(&&S)", "saveWorkspace": "保存工作区", "openWorkspaceAction": "打开工作区...", "openWorkspaceConfigFile": "打开工作区配置文件", - "openFolderAsWorkspaceInNewWindow": "在新窗口中将文件夹作为工作区打开", - "workspaceFolderPickerPlaceholder": "选择工作区文件夹" + "openFolderAsWorkspaceInNewWindow": "在新窗口中将文件夹作为工作区打开" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..ff43d2fcbf7 --- /dev/null +++ b/i18n/chs/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "将文件夹添加到工作区...", + "add": "添加(&&A)", + "addFolderToWorkspaceTitle": "将文件夹添加到工作区", + "workspaceFolderPickerPlaceholder": "选择工作区文件夹" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index a2f0727f579..d2749a69222 100644 --- a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,18 @@ "groupThreePicker": "在第三组中显示编辑器", "allEditorsPicker": "显示所有已打开的编辑器", "view": "查看", - "file": "文件" + "file": "文件", + "close": "关闭", + "closeOthers": "关闭其他", + "closeRight": "关闭到右侧", + "closeAllUnmodified": "关闭未更改", + "closeAll": "全部关闭", + "keepOpen": "保持打开状态", + "toggleInlineView": "切换内联视图", + "showOpenedEditors": "显示打开的编辑器", + "keepEditor": "保留编辑器", + "closeEditorsInGroup": "关闭组中的所有编辑器", + "closeUnmodifiedEditors": "关闭组中未作更改的编辑器", + "closeOtherEditors": "关闭其他编辑器", + "closeRightEditors": "关闭右侧编辑器" } \ 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 dd3e01e846c..1d48cf8bccc 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,18 +17,13 @@ "closeEditor": "关闭编辑器", "revertAndCloseActiveEditor": "还原并关闭编辑器", "closeEditorsToTheLeft": "关闭左侧编辑器", - "closeEditorsToTheRight": "关闭右侧编辑器", "closeAllEditors": "关闭所有编辑器", - "closeUnmodifiedEditors": "关闭组中未作更改的编辑器", "closeEditorsInOtherGroups": "关闭其他组中的编辑器", - "closeOtherEditorsInGroup": "关闭其他编辑器", - "closeEditorsInGroup": "关闭组中的所有编辑器", "moveActiveGroupLeft": "向左移动编辑器组", "moveActiveGroupRight": "向右移动编辑器组", "minimizeOtherEditorGroups": "最小化其他编辑器组", "evenEditorGroups": "编辑器组平均宽度", "maximizeEditor": "最大化编辑器组并隐藏边栏", - "keepEditor": "保留编辑器", "openNextEditor": "打开下一个编辑器", "openPreviousEditor": "打开上一个编辑器", "nextEditorInGroup": "打开组中的下一个编辑器", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "在第一组中显示编辑器", "showEditorsInSecondGroup": "在第二组中显示编辑器", "showEditorsInThirdGroup": "在第三组中显示编辑器", - "showEditorsInGroup": "显示组中的编辑器", "showAllEditors": "显示所有编辑器", "openPreviousRecentlyUsedEditorInGroup": "打开组中上一个最近使用的编辑器", "openNextRecentlyUsedEditorInGroup": "打开组中下一个最近使用的编辑器", @@ -54,5 +48,8 @@ "moveEditorLeft": "向左移动编辑器", "moveEditorRight": "向右移动编辑器", "moveEditorToPreviousGroup": "将编辑器移动到上一组", - "moveEditorToNextGroup": "将编辑器移动到下一组" + "moveEditorToNextGroup": "将编辑器移动到下一组", + "moveEditorToFirstGroup": "将编辑器移动到第一组", + "moveEditorToSecondGroup": "将编辑器移动到第二组", + "moveEditorToThirdGroup": "将编辑器移动到第三组" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 9c9da616c68..94ef2c116b8 100644 --- a/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "按标签或按组移动活动编辑器", "editorCommand.activeEditorMove.arg.name": "活动编辑器移动参数", - "editorCommand.activeEditorMove.arg.description": "参数属性:\n\t* \"to\": 提供向何处移动的字符串值。\n\t* \"by\": 提供移动的单位的字符串值。按选项卡或按组。\n\t* \"value\": 提供移动的位置数量或移动到的绝对位置的数字型值。", - "commandDeprecated": "已删除命令 **{0}**。你可以改用 **{1}**", - "openKeybindings": "配置键盘快捷方式" + "editorCommand.activeEditorMove.arg.description": "参数属性:\n\t* \"to\": 提供向何处移动的字符串值。\n\t* \"by\": 提供移动的单位的字符串值。按选项卡或按组。\n\t* \"value\": 提供移动的位置数量或移动到的绝对位置的数字型值。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 9d821488d27..d5044cab660 100644 --- a/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "文本文件比较编辑器。", "navigate.next.label": "下一个更改", "navigate.prev.label": "上一个更改", - "inlineDiffLabel": "切换到内联视图", - "sideBySideDiffLabel": "切换到并行视图" + "toggleIgnoreTrimWhitespace.label": "忽略可裁剪的空白字符" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 90dedb611fa..d7a330cd5e2 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "关闭", - "closeOthers": "关闭其他", - "closeRight": "关闭到右侧", - "closeAll": "全部关闭", - "closeAllUnmodified": "关闭未更改", - "keepOpen": "保持打开状态", - "showOpenedEditors": "显示打开的编辑器", "araLabelEditorActions": "编辑器操作" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index 452ee0335c5..1b911dc5296 100644 --- a/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[不受支持]", + "userIsAdmin": "[管理员]", + "userIsSudo": "[超级用户]", "devExtensionWindowTitlePrefix": "[扩展开发主机]" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/common/theme.i18n.json b/i18n/chs/src/vs/workbench/common/theme.i18n.json index 8ebf8f723db..1b50f1b309f 100644 --- a/i18n/chs/src/vs/workbench/common/theme.i18n.json +++ b/i18n/chs/src/vs/workbench/common/theme.i18n.json @@ -6,9 +6,13 @@ { "tabActiveBackground": "活动选项卡的背景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", "tabInactiveBackground": "非活动选项卡的背景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", + "tabHoverBackground": "选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", + "tabUnfocusedHoverBackground": "非焦点组选项卡被悬停时的背景色。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", "tabBorder": "用于将选项卡彼此分隔开的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。", "tabActiveBorder": "用于高亮活动的选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。", "tabActiveUnfocusedBorder": "用于高亮一个失去焦点的编辑器组中的活动选项卡的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以存在多个编辑器组。", + "tabHoverBorder": "选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", + "tabUnfocusedHoverBorder": "非焦点组选项卡被悬停时用于突出显示的边框。选项卡是编辑器区域中编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", "tabActiveForeground": "活动组中活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", "tabInactiveForeground": "活动组中非活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", "tabUnfocusedActiveForeground": "一个失去焦点的编辑器组中的活动选项卡的前景色。在编辑器区域，选项卡是编辑器的容器。可在一个编辑器组中打开多个选项卡。可以有多个编辑器组。", @@ -16,7 +20,7 @@ "editorGroupBackground": "编辑器组的背景颜色。编辑器组是编辑器的容器。此颜色在拖动编辑器组时显示。", "tabsContainerBackground": "启用选项卡时编辑器组标题的背景颜色。编辑器组是编辑器的容器。", "tabsContainerBorder": "选项卡启用时编辑器组标题的边框颜色。编辑器组是编辑器的容器。", - "editorGroupHeaderBackground": "禁用选项卡时编辑器组标题的背景颜色。编辑器组是编辑器的容器。", + "editorGroupHeaderBackground": "禁用选项卡 (\"workbench.editor.showTabs\": false) 时编辑器组标题颜色。编辑器组是编辑器的容器。", "editorGroupBorder": "将多个编辑器组彼此分隔开的颜色。编辑器组是编辑器的容器。", "editorDragAndDropBackground": "拖动编辑器时的背景颜色。此颜色应有透明度，以便编辑器内容能透过背景。", "panelBackground": "面板的背景色。面板显示在编辑器区域下方，可包含输出和集成终端等视图。", @@ -33,8 +37,8 @@ "statusBarNoFolderBorder": "当没有打开文件夹时，用来使状态栏与侧边栏、编辑器分隔的状态栏边框颜色。状态栏显示在窗口底部。", "statusBarItemActiveBackground": "单击时的状态栏项背景色。状态栏显示在窗口底部。", "statusBarItemHoverBackground": "悬停时的状态栏项背景色。状态栏显示在窗口底部。", - "statusBarProminentItemBackground": "状态栏突出显示项的背景颜色。突出显示项比状态栏中的其他条目更显眼，表明其重要性更高。状态栏显示在窗口底部。", - "statusBarProminentItemHoverBackground": "状态栏突出显示项在悬停时的背景颜色。突出显示项比状态栏中的其他条目更显眼，表明其重要性更高。状态栏显示在窗口底部。", + "statusBarProminentItemBackground": "状态栏突出显示项的背景颜色。突出显示项比状态栏中的其他条目更醒目以表明其重要性。在命令面板中更改“切换 Tab 键是否移动焦点”可查看示例。状态栏显示在窗口底部。", + "statusBarProminentItemHoverBackground": "状态栏突出显示项在被悬停时的背景颜色。突出显示项比状态栏中的其他条目更醒目以表明其重要性。在命令面板中更改“切换 Tab 键是否移动焦点”可查看示例。状态栏显示在窗口底部。", "activityBarBackground": "活动栏背景色。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。", "activityBarForeground": "活动栏前景色(例如用于图标)。活动栏显示在最左侧或最右侧，并允许在侧边栏的视图间切换。", "activityBarBorder": "活动栏分隔侧边栏的边框颜色。活动栏显示在最左侧或最右侧，并可以切换侧边栏的视图。", diff --git a/i18n/chs/src/vs/workbench/common/views.i18n.json b/i18n/chs/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..85f57daaba0 --- /dev/null +++ b/i18n/chs/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "ID 为“{0}”的视图在位置“{1}”已被注册" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json index 24ec2fcb7bd..f941d8a0956 100644 --- a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "关闭编辑器", "closeWindow": "关闭窗口", "closeWorkspace": "关闭工作区", "noWorkspaceOpened": "此实例当前没有打开工作区，无法关闭。", @@ -52,21 +51,5 @@ "displayLanguage": "定义 VSCode 的显示语言。", "doc": "请参阅 {0}，了解支持的语言列表。", "restart": "更改此值需要重启 VSCode。", - "fail.createSettings": "无法创建“{0}”({1})。", - "openLogsFolder": "打开日志文件夹", - "showLogs": "显示日志...", - "mainProcess": "主进程", - "sharedProcess": "共享进程", - "rendererProcess": "渲染器进程", - "extensionHost": "扩展主机", - "selectProcess": "选择进程", - "setLogLevel": "设置日志级别", - "trace": "跟踪", - "debug": "调试", - "info": "信息", - "warn": "警告", - "err": "错误", - "critical": "关键", - "off": "关闭", - "selectLogLevel": "选择日志级别" + "fail.createSettings": "无法创建“{0}”({1})。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json index e93318a00b8..62b6aada113 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 @@ -7,8 +7,9 @@ "view": "查看", "help": "帮助", "file": "文件", - "developer": "开发者", "workspaces": "工作区", + "developer": "开发者", + "workbenchConfigurationTitle": "工作台", "showEditorTabs": "控制打开的编辑器是否显示在选项卡中。", "workbench.editor.labelFormat.default": "显示文件名。当启用选项卡且在同一组内有两个相同名称的文件时，将添加每个文件路径中可以用于区分的部分。在选项卡被禁用且编辑器活动时，将显示相对于工作区文件夹的路径。", "workbench.editor.labelFormat.short": "在文件的目录名之后显示文件名。", @@ -20,23 +21,23 @@ "showIcons": "控制打开的编辑器是否随图标一起显示。这还需启用图标主题。", "enablePreview": "控制是否将打开的编辑器显示为预览。预览编辑器将会重用至其被保留(例如，通过双击或编辑)，且其字体样式将为斜体。", "enablePreviewFromQuickOpen": "控制 Quick Open 中打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，通过双击或编辑)。", + "closeOnFileDelete": "控制文件被其他某些进程删除或重命名时是否应该自动关闭显示文件的编辑器。禁用此项会保持编辑器作为此类事件的脏文件打开。请注意，从应用程序内部进行删除操作会始终关闭编辑器，并且脏文件始终不会关闭以保存数据。", "editorOpenPositioning": "控制打开编辑器的位置。选择“左侧”或“右侧”以在当前活动位置的左侧或右侧打开编辑器。选择“第一个”或“最后一个”以从当前活动位置独立打开编辑器。", "revealIfOpen": "控制打开时编辑器是否显示在任何可见组中。如果禁用，编辑器会优先在当前活动编辑器组中打开。如果启用，会显示已打开的编辑器而不是在当前活动编辑器组中再次打开。请注意，有些情况下会忽略此设置，例如强制编辑器在特定组中或在当前活动组的边侧打开时。", + "swipeToNavigate": "使用三指横扫在打开的文件之间导航", "commandHistory": "控制命令面板中保留最近使用命令的数量。设置为 0 时禁用命令历史功能。", "preserveInput": "控制是否在再次打开命令面板时恢复上一次的输入内容。", "closeOnFocusLost": "控制 Quick Open 是否应在失去焦点时自动关闭。", "openDefaultSettings": "控制打开设置时是否打开显示所有默认设置的编辑器。", "sideBarLocation": "控制边栏的位置。它可显示在工作台的左侧或右侧。", + "panelDefaultLocation": "控制此面板的默认位置。可显示在工作台的底部或右侧。", "statusBarVisibility": "控制工作台底部状态栏的可见性。", "activityBarVisibility": "控制工作台中活动栏的可见性。", - "closeOnFileDelete": "控制文件被其他某些进程删除或重命名时是否应该自动关闭显示文件的编辑器。禁用此项会保持编辑器作为此类事件的脏文件打开。请注意，从应用程序内部进行删除操作会始终关闭编辑器，并且脏文件始终不会关闭以保存数据。", - "enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。", "fontAliasing": "控制工作台中字体的渲染方式\n- default: 次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字\n- antialiased: 进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细\n- none: 禁用字体平滑。将显示边缘粗糙、有锯齿的文字", "workbench.fontAliasing.default": "次像素平滑字体。将在大多数非 retina 显示器上显示最清晰的文字。", "workbench.fontAliasing.antialiased": "进行像素而不是次像素级别的字体平滑。可能会导致字体整体显示得更细。", "workbench.fontAliasing.none": "禁用字体平滑。将显示边缘粗糙、有锯齿的文字。", - "swipeToNavigate": "使用三指横扫在打开的文件之间导航", - "workbenchConfigurationTitle": "工作台", + "enableNaturalLanguageSettingsSearch": "控制是否在设置中启用自然语言搜索模式。", "windowConfigurationTitle": "窗口", "window.openFilesInNewWindow.on": "文件将在新窗口中打开", "window.openFilesInNewWindow.off": "文件将在该文件的文件夹打开的窗口中打开，或在上一个活动窗口中打开", diff --git a/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json index b2c1d0e6763..a2e4b30b59e 100644 --- a/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/chs/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "剪切", "copy": "复制", "paste": "粘贴", - "selectAll": "全选" + "selectAll": "全选", + "runningAsRoot": "不建议以 root 用户身份运行 {0}。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 3fee2b4ab47..0fa0e030ff2 100644 --- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "调试对象", - "debug.terminal.not.available.error": "集成终端不可用" + "debug.terminal.title": "调试对象" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index f54abac52da..2db5cdad108 100644 --- a/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "打开新命令提示符", "globalConsoleActionMacLinux": "打开新终端", "scopedConsoleActionWin": "在命令提示符中打开", - "scopedConsoleActionMacLinux": "在终端中打开", - "openFolderInIntegratedTerminal": "在终端中打开" + "scopedConsoleActionMacLinux": "在终端中打开" } \ 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 efe5507494d..5d553a4d9cd 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 @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。", "workspaceRecommendation": "当前工作区的用户推荐此扩展。", + "fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。", "exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。", "reallyRecommended2": "建议对这种类型的文件使用“{0}”扩展。", "reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。", diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..475d836e696 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.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. +{ + "workbenchConfigurationTitle": "工作台", + "feedbackVisibility": "控制是否显示工作台底部状态栏中的 Twitter 反馈 (笑脸图标)。" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json index a2b15babb5f..84925c604c1 100644 --- a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json @@ -16,6 +16,7 @@ "request a missing feature": "请求缺失功能", "tell us why?": "告诉我们原因?", "commentsHeader": "注释", + "showFeedback": "在状态栏中显示反馈笑脸图标", "tweet": "Tweet", "character left": "剩余字符", "characters left": "剩余字符", diff --git a/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..c5b0fd0e5a5 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "hide": "隐藏" +} \ 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 30c68b4c7ad..2854354d6af 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 @@ -7,5 +7,26 @@ "filesCategory": "文件", "revealInSideBar": "在侧边栏中显示", "acceptLocalChanges": "使用你的更改并覆盖磁盘上的内容。", - "revertLocalChanges": "放弃你的更改并还原为磁盘上的内容" + "revertLocalChanges": "放弃你的更改并还原为磁盘上的内容", + "copyPathOfActive": "复制活动文件的路径", + "saveAllInGroup": "保存组中的全部内容", + "revert": "还原文件", + "compareActiveWithSaved": "比较活动与已保存的文件", + "closeEditor": "关闭编辑器", + "view": "查看", + "openToSide": "打开到侧边", + "revealInWindows": "在资源管理器中显示", + "revealInMac": "在 Finder 中显示", + "openContainer": "打开所在的文件夹", + "copyPath": "复制路径", + "saveAll": "全部保存", + "compareWithSaved": "与已保存文件比较", + "compareWithSelected": "与已选项目进行比较", + "compareSource": "选择以进行比较", + "compareSelected": "将已选项进行比较", + "close": "关闭", + "closeOthers": "关闭其他", + "closeUnmodified": "关闭未更改", + "closeAll": "全部关闭", + "deleteFile": "永久删除" } \ No newline at end of file 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 f9208415003..513e4e1f0d7 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "重试", - "rename": "重命名", "newFile": "新建文件", "newFolder": "新建文件夹", + "rename": "重命名", + "delete": "删除", + "copyFile": "复制", + "pasteFile": "粘贴", + "retry": "重试", "openFolderFirst": "先打开一个文件夹，以在其中创建文件或文件夹。", "newUntitledFile": "新的无标题文件", "createNewFile": "新建文件", @@ -15,39 +18,32 @@ "deleteButtonLabelRecycleBin": "移动到回收站(&&M)", "deleteButtonLabelTrash": "移动到回收站(&&M)", "deleteButtonLabel": "删除(&&D)", + "dirtyMessageFilesDelete": "你删除的文件中具有未保存的更改。是否继续?", "dirtyMessageFolderOneDelete": "你正在删除的文件夹有 1 个文件具有未保存的更改。是否继续?", "dirtyMessageFolderDelete": "你正在删除的文件夹有 {0} 个文件具有未保存的更改。是否继续?", "dirtyMessageFileDelete": "你正在删除的文件具有未保存的更改。是否继续?", "dirtyWarning": "如果不保存，更改将丢失。", + "confirmMoveTrashMessageMultiple": "是否确定要删除以下 {0} 个文件?", "confirmMoveTrashMessageFolder": "是否确实要删除“{0}”及其内容?", "confirmMoveTrashMessageFile": "是否确实要删除“{0}”?", "undoBin": "可以从回收站还原。", "undoTrash": "可以从回收站还原。", "doNotAskAgain": "不再询问", + "confirmDeleteMessageMultiple": "是否确定要永久删除以下 {0} 个文件?", "confirmDeleteMessageFolder": "是否确定要永久删除“{0}”及其内容?", "confirmDeleteMessageFile": "是否确定要永久删除“{0}”?", "irreversible": "此操作不可逆!", "permDelete": "永久删除", - "delete": "删除", "importFiles": "导入文件", "confirmOverwrite": "目标文件夹中已存在具有相同名称的文件或文件夹。是否要替换它?", "replaceButtonLabel": "替换(&&R)", - "copyFile": "复制", - "pasteFile": "粘贴", + "fileDeleted": "文件已被删除或移动", + "fileIsAncestor": "复制的项目是目标文件夹的上级", "duplicateFile": "重复", - "openToSide": "打开到侧边", - "compareSource": "选择以进行比较", "globalCompareFile": "比较活动文件与...", "openFileToCompare": "首先打开文件以将其与另外一个文件比较。", - "compareWith": "将“{0}”与“{1}”比较", - "compareFiles": "比较文件", "refresh": "刷新", - "save": "保存", - "saveAs": "另存为...", - "saveAll": "全部保存", "saveAllInGroup": "保存组中的全部内容", - "saveFiles": "保存所有文件", - "revert": "还原文件", "focusOpenEditors": "专注于“打开的编辑器”视图", "focusFilesExplorer": "关注文件资源浏览器", "showInExplorer": "在侧边栏中显示活动文件", @@ -56,20 +52,11 @@ "refreshExplorer": "刷新资源管理器", "openFileInNewWindow": "在新窗口中打开活动文件", "openFileToShowInNewWindow": "请先打开要在新窗口中打开的文件", - "revealInWindows": "在资源管理器中显示", - "revealInMac": "在 Finder 中显示", - "openContainer": "打开所在的文件夹", - "revealActiveFileInWindows": "Windows 资源管理器中显示活动文件", - "revealActiveFileInMac": "在 Finder 中显示活动文件", - "openActiveFileContainer": "打开活动文件所在的文件夹", "copyPath": "复制路径", - "copyPathOfActive": "复制活动文件的路径", "emptyFileNameError": "必须提供文件或文件夹名。", "fileNameExistsError": "此位置已存在文件或文件夹 **{0}**。请选择其他名称。", "invalidFileNameError": "名称 **{0}** 作为文件或文件夹名无效。请选择其他名称。", "filePathTooLongError": "名称 **{0}** 导致路径太长。请选择更短的名称。", - "compareWithSaved": "比较活动与已保存的文件", - "modifiedLabel": "{0} (磁盘上) ↔ {1}", "compareWithClipboard": "比较活动文件与剪贴板", "clipboardComparisonLabel": "剪贴板 ↔ {0}" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index 702c021c5f3..5687f75d023 100644 --- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "首先打开文件以复制其路径", - "openFileToReveal": "首先打开文件以展现" + "revealInWindows": "在资源管理器中显示", + "revealInMac": "在 Finder 中显示", + "openContainer": "打开所在的文件夹", + "saveAs": "另存为...", + "save": "保存", + "saveAll": "全部保存", + "saveFiles": "保存所有文件", + "removeFolderFromWorkspace": "将文件夹从工作区删除", + "genericRevertError": "未能还原“{0}”: {1}", + "modifiedLabel": "{0} (磁盘上) ↔ {1}", + "openFileToReveal": "首先打开文件以展现", + "openFileToCopy": "首先打开文件以复制其路径" } \ No newline at end of file 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 63427668f5f..da879d0ffdd 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 @@ -36,8 +36,6 @@ "editorConfigurationTitle": "编辑器", "formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。", "explorerConfigurationTitle": "文件资源管理器", - "openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。将其设置为 0 可隐藏窗格。", - "dynamicHeight": "控制打开的编辑器部分的高度是否应动态适应元素数量。", "autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。", "enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。", "confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。", diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 8ebee88ce98..4911cddc49b 100644 --- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "使用右侧编辑器工具栏的操作来**撤消**你的更改或用你的更改来**覆盖**磁盘上的内容", - "discard": "放弃", + "overwriteElevated": "以管理员身份覆盖...", + "saveElevated": "以管理员身份重试...", "overwrite": "覆盖", "retry": "重试", - "readonlySaveError": "无法保存“{0}”: 文件写保护。选择“覆盖”以删除保护。 ", + "discard": "放弃", + "readonlySaveErrorAdmin": "无法保存“{0}”: 文件写保护。选择“以管理员身份覆盖”可作为管理员重试。 ", + "readonlySaveError": "无法保存“{0}”: 文件写保护。选择“覆盖”可尝试移除保护。", + "permissionDeniedSaveError": "无法保存“{0}”: 权限不足。选择“以管理员身份覆盖”可作为管理员重试。", "genericSaveError": "未能保存“{0}”: {1}", "staleSaveError": "无法保存“{0}”: 磁盘上的内容较新。单击 **比较** 以比较你的版本和磁盘上的版本。", "compareChanges": "比较", 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 d97098d02f7..0be09e75862 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 @@ -10,6 +10,7 @@ "dropFolder": "你是否要将文件夹添加到工作区?", "addFolders": "添加文件夹(&&A)", "addFolder": "添加文件夹(&&A)", + "confirmMultiMove": "是否确定要移动以下 {0} 个文件?", "confirmMove": "是否确实要移动“{0}”?", "doNotAskAgain": "不再询问", "moveButtonLabel": "移动(&&M)", diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index 0c93f41d44d..f501bedc60f 100644 --- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "打开的编辑器", "openEditosrSection": "打开的编辑器部分", - "dirtyCounter": "{0} 个未保存", - "saveAll": "全部保存", - "closeAllUnmodified": "关闭未更改", - "closeAll": "全部关闭", - "compareWithSaved": "与已保存文件比较", - "close": "关闭", - "closeOthers": "关闭其他" + "dirtyCounter": "{0} 个未保存" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..c1b32a5c26c --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "开发者" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..98d55d28fe6 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "打开日志文件夹", + "showLogs": "显示日志...", + "mainProcess": "主进程", + "sharedProcess": "共享进程", + "rendererProcess": "窗口", + "selectProcess": "选择进程", + "debug": "调试", + "info": "信息", + "warn": "警告", + "err": "错误", + "off": "关闭" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json index 3e34c78c26a..7e174f3cfaf 100644 --- a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // 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": "问题", 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 new file mode 100644 index 00000000000..a96772cdf43 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "输出", + "viewCategory": "查看", + "clearOutput.label": "清除输出" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 5c28c560886..10c2fc221a5 100644 --- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "试试自然语言搜索!", "defaultSettings": "将您的设置放入右侧编辑器以覆盖。", "noSettingsFound": "未找到设置。", "settingsSwitcherBarAriaLabel": "设置转换器", "userSettings": "用户设置", "workspaceSettings": "工作区设置", - "folderSettings": "文件夹设置", - "enableFuzzySearch": "启用自然语言搜索" + "folderSettings": "文件夹设置" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 26f355bb382..ef307afdfbd 100644 --- a/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "常用设置", - "mostRelevant": "最相关", "defaultKeybindingsHeader": "通过将键绑定放入键绑定文件中来覆盖键绑定。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 4fff98737e8..0f609a35000 100644 --- a/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "查看", "commandsHandlerDescriptionDefault": "显示并运行命令", "gotoLineDescriptionMac": "转到行", "gotoLineDescriptionWin": "转到行", diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index cc08da73602..ebf378aac85 100644 --- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,9 @@ "toggleGitViewlet": "显示 Git", "source control": "源代码管理", "toggleSCMViewlet": "显示源代码管理", - "view": "查看" + "view": "查看", + "scmConfigurationTitle": "源代码管理", + "alwaysShowProviders": "是否总是显示源代码管理提供程序部分。", + "diffDecorations": "控制编辑器中差异的显示效果。", + "inputCounter": "控制何时显示输入计数。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index eb08e1a3030..dc3530badc8 100644 --- a/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,9 @@ { "scm providers": "源代码管理提供程序", "hideRepository": "隐藏", + "commitMessageInfo": "当前行有 {0} 个字符", + "commitMessageCountdown": "当前行剩余 {0} 个字符", + "commitMessageWarning": "当前行比 {1} 超出 {0} 个字符", "installAdditionalSCMProviders": "安装其他源代码管理提供程序...", "no open repo": "没有活动的源代码管理提供程序。", "source control": "源代码管理", 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 ebf392aa07d..65d9e1b855d 100644 --- a/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "显示上一个搜索词", "showSearchViewlet": "显示搜索", "findInFiles": "在文件中查找", - "findInFilesWithSelectedText": "在文件中查找所选文本", "replaceInFiles": "在文件中替换", - "replaceInFilesWithSelectedText": "在文件中替换所选文本", "RefreshAction.label": "刷新", "CollapseDeepestExpandedLevelAction.label": "全部折叠", "ClearSearchResultsAction.label": "清除", diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 971f3dddcce..d457d977632 100644 --- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "在文件夹中查找...", + "findInWorkspace": "在工作区中查找...", "showTriggerActions": "转到工作区中的符号...", "name": "搜索", "search": "搜索", + "showSearchViewlet": "显示搜索", "view": "查看", + "findInFiles": "在文件中查找", "openAnythingHandlerDescription": "转到文件", "openSymbolDescriptionNormal": "转到工作区中的符号", "searchOutputChannelTitle": "搜索", diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..b6d24a6f921 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.scope": "(全局)", + "global.1": "({0})", + "new.global": "新建全局代码片段文件...", + "group.global": "现有代码片段", + "new.global.sep": "新代码片段", + "openSnippet.pickLanguage": "选择代码片段文件或创建代码片段", + "openSnippet.label": "配置用户代码片段", + "preferences": "首选项" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 6023eaf614f..84c29334b81 100644 --- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,13 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "选择代码片段的语言", - "openSnippet.errorOnCreate": "无法创建 {0}", - "openSnippet.label": "打开用户代码段", - "preferences": "首选项", "snippetSchema.json.default": "空代码片段", "snippetSchema.json": "用户代码片段配置", "snippetSchema.json.prefix": "在 Intellisense 中选择代码片段时将使用的前缀", "snippetSchema.json.body": "代码片段的内容。使用“$1”和“${1:defaultText}”定义光标位置，使用“$0”定义最终光标位置。使用“${varName}”和“${varName:defaultText}”插入变量值，例如“这是文件：$TM_FILENAME”。", - "snippetSchema.json.description": "代码片段描述。" + "snippetSchema.json.description": "代码片段描述。", + "snippetSchema.json.scope": "此代码片段适用语言的名称列表，例如 \"typescript,javascript\"。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..bfcf4616bc8 --- /dev/null +++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "用户代码片段" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index e4e7302f246..7c00034a89a 100644 --- a/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}", "invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}", + "invalid.language.0": "省略语言时，\"contributes.{0}.path\" 的值必须为一个 \".code-snippets\" 文件。提供的值: {1}", + "invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}", "invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。", "vscode.extension.contributes.snippets": "添加代码段。", "vscode.extension.contributes.snippets-language": "此代码片段参与的语言标识符。", "vscode.extension.contributes.snippets-path": "代码片段文件的路径。该路径相对于扩展文件夹，通常以 \"./snippets/\" 开头。", "badVariableUse": "扩展“{0}”中的一个或多个代码片段很可能混淆了片段变量和片段占位符 (有关详细信息，请访问 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax )", "badFile": "无法读取代码片段文件“{0}”。", - "source.snippet": "用户代码片段", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}，{1}" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 75d151b4bb5..199139684a9 100644 --- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -14,6 +14,7 @@ "terminal.integrated.shell.windows": "终端在 Windows 使用的 shell 路径。使用随 Windows 一起提供的 shell (cmd、PowerShell 或 Bash on Ubuntu) 时。", "terminal.integrated.shellArgs.windows": "在 Windows 终端上时使用的命令行参数。", "terminal.integrated.rightClickCopyPaste": "设置后，在终端内右键单击时，这将阻止显示上下文菜单，相反，它将在有选项时进行复制，并且在没有选项时进行粘贴。", + "terminal.integrated.copyOnSelection": "设置后，终端中选中的文字将被复制到剪贴板。", "terminal.integrated.fontFamily": "控制终端的字体系列，这在编辑器中是默认的。fontFamily 的值。", "terminal.integrated.fontSize": "控制终端的字号(以像素为单位)。", "terminal.integrated.lineHeight": "控制终端的行高，此数字乘上终端字号得到实际行高(以像素为单位)。", @@ -24,10 +25,12 @@ "terminal.integrated.setLocaleVariables": "控制是否在终端启动时设置区域设置变量，在 OS X 上默认设置为 true，在其他平台上为 false。", "terminal.integrated.cwd": "将在其中启动终端的一个显式起始路径，它用作 shell 进程的当前工作目录(cwd)。当根目录为不方便的 cwd 时，此路径在工作区设置中可能十分有用。", "terminal.integrated.confirmOnExit": "在存在活动终端会话的情况下，退出时是否要确认。", + "terminal.integrated.enableBell": "是否启用终端响铃。", "terminal.integrated.commandsToSkipShell": "一组命令 ID，其键绑定不发送到 shell 而始终由 Code 处理。这使得通常由 shell 使用的键绑定的使用效果与未将终端设为焦点时相同，例如按 Ctrl+P 启动 Quick Open。", "terminal.integrated.env.osx": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 OS X 终端使用。", "terminal.integrated.env.linux": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Linux 终端使用。", "terminal.integrated.env.windows": "要添加到 VS Code 进程中的带有环境变量的对象，其会被 Windows 终端使用。", + "terminal.integrated.showExitAlert": "当退出代码非零时，显示“终端进程以某退出代码终止”的警告。", "terminalCategory": "终端", "viewCategory": "查看" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index d96d23dca0e..ca6d8ab62f9 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 @@ -14,6 +14,8 @@ "workbench.action.terminal.deleteWordRight": "删除右侧的字符", "workbench.action.terminal.new": "新建集成终端", "workbench.action.terminal.new.short": "新的终端", + "workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端", + "workbench.action.terminal.newInActiveWorkspace": "新建集成终端 (活动工作区)", "workbench.action.terminal.focus": "聚焦于终端", "workbench.action.terminal.focusNext": "聚焦于下一终端", "workbench.action.terminal.focusPrevious": "聚焦于上一终端", diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 25d612371f7..d0a2a31bbb9 100644 --- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "可通过选择“自定义”按钮来更改默认的终端 shell。", "customize": "自定义", "cancel": "取消", - "never again": "我已了解，不再提示", "terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改", "terminalService.terminalCloseConfirmationSingular": "存在一个活动的终端会话，是否要终止此会话?", "terminalService.terminalCloseConfirmationPlural": "存在 {0} 个活动的终端会话，是否要终止这些会话?" 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 d43fc9ca29b..9460987e42b 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 @@ -23,6 +23,7 @@ "commandPalette": "命令面板...", "settings": "设置", "keyboardShortcuts": "键盘快捷方式", + "userSnippets": "用户代码片段", "selectTheme.label": "颜色主题", "themes.selectIconTheme.label": "文件图标主题", "not available": "更新不可用", diff --git a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 80b697be3d3..fdbcd8bad77 100644 --- a/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/chs/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "文件是目录", + "fileNotModifiedError": "自以下时间未修改的文件:", "fileBinaryError": "文件似乎是二进制文件，无法作为文档打开" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 6bee4318397..ba2101635d0 100644 --- a/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/chs/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "是否要保存对 {0} 的更改?", "saveChangesMessages": "是否要保存对下列 {0} 个文件的更改?", - "moreFile": "...1 个其他文件未显示", - "moreFiles": "...{0} 个其他文件未显示", "saveAll": "全部保存(&&S)", "save": "保存(&&S)", "dontSave": "不保存(&&N)", diff --git a/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index af35cdf722b..fbf48931d61 100644 --- a/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/chs/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "无文件图标", "iconThemeError": "文件图标主题未知或未安装。", "workbenchColors": "覆盖当前所选颜色主题的颜色。", - "editorColors": "覆盖当前所选颜色主题中的编辑器颜色和字体样式。", "editorColors.comments": "设置注释的颜色和样式", "editorColors.strings": "设置字符串文本的颜色和样式", "editorColors.keywords": "设置关键字的颜色和样式。", @@ -19,5 +18,6 @@ "editorColors.types": "设置类型定义与引用的颜色和样式。", "editorColors.functions": "设置函数定义与引用的颜色和样式。", "editorColors.variables": "设置变量定义和引用的颜色和样式。", - "editorColors.textMateRules": "使用 TextMate 主题规则设置颜色和样式(高级)。" + "editorColors.textMateRules": "使用 TextMate 主题规则设置颜色和样式(高级)。", + "editorColors": "覆盖当前所选颜色主题中的编辑器颜色和字体样式。" } \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 11ecec6e1ac..b9142ec415a 100644 --- a/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/chs/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "无法写入工作区配置文件。请打开文件以更正错误或警告，然后重试。", "errorWorkspaceConfigurationFileDirty": "文件已变更，因此无法写入工作区配置文件。请先保存此文件，然后重试。", "openWorkspaceConfigurationFile": "打开工作区配置文件", - "close": "关闭", - "enterWorkspace.close": "关闭", - "enterWorkspace.dontShowAgain": "不再显示", - "enterWorkspace.moreInfo": "详细信息", - "enterWorkspace.prompt": "了解有关在 VS Code 中使用多个文件夹的详细信息。" + "close": "关闭" } \ No newline at end of file diff --git a/i18n/cht/extensions/git/out/autofetch.i18n.json b/i18n/cht/extensions/git/out/autofetch.i18n.json index 78cd65caa1f..a9b802babec 100644 --- a/i18n/cht/extensions/git/out/autofetch.i18n.json +++ b/i18n/cht/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "是", + "read more": "閱讀其他資訊", "no": "否", - "not now": "不是現在", - "suggest auto fetch": "是否啟用 Git 儲存庫的自動擷取？" + "not now": "稍後詢問我", + "suggest auto fetch": "您想要 Code 定期的執行 `git fetch` 嗎？" } \ 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 1ace18f1610..3b5fb4974c3 100644 --- a/i18n/cht/extensions/git/out/commands.i18n.json +++ b/i18n/cht/extensions/git/out/commands.i18n.json @@ -41,6 +41,9 @@ "confirm discard all 2": "{0}\n\n這項動作無法復原，您會永久失去目前的工作集。", "yes discard tracked": "捨棄 1 個追蹤的檔案", "yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案", + "unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？", + "save and commit": "儲存全部且認可", + "commit": "無論如何仍認可", "no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?", "always": "永遠", "no changes": "沒有任何變更要認可。", @@ -64,12 +67,12 @@ "no remotes to pull": "您的儲存庫未設定要提取的遠端來源。", "pick remote pull repo": "挑選要將分支提取出的遠端", "no remotes to push": "您的儲存庫未設定要推送的遠端目標。", - "push with tags success": "已成功使用標籤推送。", "nobranch": "請簽出分支以推送到遠端。", + "confirm publish branch": "分支 '{0}' 沒有任何上游分支。 您仍想發布這個分支嗎？", + "ok": "確定", + "push with tags success": "已成功使用標籤推送。", "pick remote": "挑選要發行分支 '{0}' 的目標遠端:", "sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。", - "ok": "確定", - "never again": "確定不要再顯示", "no remotes to publish": "您的儲存庫未設定要發行的遠端目標。", "no changes stash": "沒有變更可供隱藏。", "provide stash message": "可選擇提供隱藏訊息", diff --git a/i18n/cht/extensions/typescript/out/commands.i18n.json b/i18n/cht/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..628429984fc --- /dev/null +++ b/i18n/cht/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "請在 VS Code 中開啟資料夾，以使用 TypeScript 或 JavaScript 專案", + "typescript.projectConfigUnsupportedFile": "無法判斷 TypeScript 或 JavaScript 專案。不支援的檔案類型", + "typescript.projectConfigCouldNotGetInfo": "無法判斷 TypeScript 或 JavaScript 專案", + "typescript.noTypeScriptProjectConfig": "檔案不是 TypeScript 專案的一部份", + "typescript.noJavaScriptProjectConfig": "檔案不是 JavaScript 專案的一部份", + "typescript.configureTsconfigQuickPick": "設定 tsconfig.json", + "typescript.configureJsconfigQuickPick": "設定 jsconfig.json", + "typescript.projectConfigLearnMore": "深入了解" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/cht/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/base/node/ps.i18n.json b/i18n/cht/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/cht/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json index 71be40322db..e45ee33a693 100644 --- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "行號以絕對值顯示。", "lineNumbers.relative": "行號以目前游標的相對值顯示。", "lineNumbers.interval": "每 10 行顯示行號。", - "lineNumbers": "控制行號顯示方式。允許設定值包含 'on'、'off' 及 'relative'。", + "lineNumbers": "控制行號的顯示方式。允許的設定值為 'on'、 'off'、'relative' 及 'interval'", "rulers": "在特定的等寬字元數之後轉譯垂直尺規。有多個尺規就使用多個值。若陣列為空，則不繪製任何尺規。", "wordSeparators": "執行文字相關導覽或作業時將作為文字分隔符號的字元", "tabSize": "與 Tab 相等的空格數量。當 `editor.detectIndentation` 已開啟時，會根據檔案內容覆寫此設定。", 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 85ff9ee951e..4513171b5a0 100644 --- a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "目前游標位置行的反白顯示背景色彩。", "lineHighlightBorderBox": "目前游標位置行之周圍框線的背景色彩。", - "rangeHighlight": "反白顯示範圍的背景色彩，例如快速開啟與尋找功能。", "caret": "編輯器游標的色彩。", "editorCursorBackground": "編輯器游標的背景色彩。允許自訂區塊游標重疊的字元色彩。", "editorWhitespaces": "編輯器中空白字元的色彩。", 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 9fbf329131b..c569d86bd1a 100644 --- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "移至下一個錯誤或警告", - "markerAction.previous.label": "移至上一個錯誤或警告", "editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。", "editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。", "editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩", 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 97c113d82f0..6dedbdd9c96 100644 --- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "讀取存取期間 (例如讀取變數時) 符號的背景色彩。", - "wordHighlightStrong": "寫入存取期間 (例如寫入變數時) 符號的背景色彩。", "overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。", "overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。", "wordHighlight.next.label": "移至下一個反白符號", diff --git a/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 3484e0af5e7..f1ab5b8686a 100644 --- a/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/cht/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}` 不是有效的功能表識別碼", "missing.command": "功能表項目參考了 'commands' 區段中未定義的命令 `{0}`。", "missing.altCommand": "功能表項目參考了 'commands' 區段中未定義的替代命令 `{0}`。", - "dupe.command": "功能表項目參考了與預設相同的命令和替代命令", - "nosupport.altCommand": "很抱歉，目前只有 [編輯器/標題] 功能表的 [導覽] 群組支援替代命令" + "dupe.command": "功能表項目參考了與預設相同的命令和替代命令" } \ No newline at end of file diff --git a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json index 0874564b4c9..b57662f507d 100644 --- a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,34 @@ "diff": "互相比較兩個檔案。", "add": "將資料夾新增至上一個使用中的視窗。", "goto": "在路徑上的指定行與字元位置開啟檔案。", - "locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。", "newWindow": "強制執行 Code 的新執行個體。", - "performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。", - "prof-startup": "啟動時執行 CPU 分析工具", - "inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。", - "inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。", "reuseWindow": "強制在最近使用的視窗中開啟檔案或資料夾。", - "userDataDir": "指定保留使用者資料的目錄，這在以根目錄身分執行時有用。", - "log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。", - "verbose": "列印詳細資訊輸出 (表示 --wait)。", "wait": "等候檔案在傳回前關閉。", + "locale": "要使用的地區設定 (例如 en-US 或 zh-TW)。", + "userDataDir": "指定保留使用者資料的目錄，這在以根目錄身分執行時有用。", + "version": "列印版本。", + "help": "列印使用方式。", "extensionHomePath": "設定擴充功能的根路徑。", "listExtensions": "列出已安裝的擴充功能。", "showVersions": "使用 --list-extension 時，顯示安裝的擴充功能版本。", "installExtension": "安裝擴充功能。", "uninstallExtension": "解除安裝擴充功能。", "experimentalApis": "為延伸模組啟用建議的 API 功能。", - "disableExtensions": "停用所有已安裝的擴充功能。", - "disableGPU": "停用 GPU 硬體加速。", + "verbose": "列印詳細資訊輸出 (表示 --wait)。", + "log": "使用的日誌級別。預設為\"訊息\"。允許的值是 \"關鍵\"、\"錯誤\"、\"警告\"、\"訊息\"、\"偵錯\"、\"追蹤\"、\"關閉\"。", "status": "列印進程使用方式和診斷資訊。", - "version": "列印版本。", - "help": "列印使用方式。", + "performance": "在已啟用 'Developer: Startup Performance' 命令的情況下開始。", + "prof-startup": "啟動時執行 CPU 分析工具", + "disableExtensions": "停用所有已安裝的擴充功能。", + "inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。", + "inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。", + "disableGPU": "停用 GPU 硬體加速。", "usage": "使用方式", "options": "選項", "paths": "路徑", - "optionsUpperCase": "選項" + "stdinWindows": "從其他程式讀取輸出並附加 '-' (例: 'echo Hello World | {0} -')", + "stdinUnix": "從 stdin 讀取並附加 '-' (例: 'ps aux | grep code | {0} -')", + "optionsUpperCase": "選項", + "extensionsManagement": "擴充功能管理", + "troubleshooting": "疑難排解" } \ 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 bdd6cf53312..29b7e86d734 100644 --- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,14 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "擴充功能無效: package.json 不是 JSON 檔案。", - "restartCodeLocal": "請先重新啟動 Code，再重新安裝 {0}。", + "restartCode": "請先重新啟動 Code，再重新安裝 {0}。", "installingOutdatedExtension": "已安裝此擴充功能的較新版本。是否要使用舊版本覆蓋此項？", "override": "覆寫", "cancel": "取消", - "notFoundCompatible": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的擴充功能 '{0}'。", - "quitCode": "無法安裝因為有過時的擴充功能仍在運行。請在重新安裝前退出並啟動 VS Code。", - "exitCode": "無法安裝因為有過時的擴充功能仍在運行。請在重新安裝前退出並啟動 VS Code。", + "notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。", "notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。", + "quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。", + "exitCode": "無法安裝擴充功能。重新安裝以前請離開並再次啟動 VS Code。", "uninstallDependeciesConfirmation": "只要將 '{0}' 解除安裝，或要包含其相依性?", "uninstallOnly": "只有", "uninstallAll": "全部", diff --git a/i18n/cht/src/vs/platform/message/common/message.i18n.json b/i18n/cht/src/vs/platform/message/common/message.i18n.json index 7a9cbb1bf06..f23fb38d418 100644 --- a/i18n/cht/src/vs/platform/message/common/message.i18n.json +++ b/i18n/cht/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "關閉", "later": "稍後", - "cancel": "取消" + "cancel": "取消", + "moreFile": "...另外 1 個檔案未顯示", + "moreFiles": "...另外 {0} 個檔案未顯示" } \ 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 4868c4bbc6c..03e619b672c 100644 --- a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "編輯器小工具的邊界色彩。小工具選擇擁有邊界或色彩未被小工具覆寫時，才會使用色彩。", "editorSelectionBackground": "編輯器選取範圍的色彩。", "editorSelectionForeground": "為選取的文字顏色高對比化", - "editorInactiveSelection": "非使用中之編輯器選取範圍的色彩。", - "editorSelectionHighlight": "選取時，內容相同之區域的色彩。", "editorFindMatch": "符合目前搜尋的色彩。", - "findMatchHighlight": "符合其他搜尋的色彩。", - "findRangeHighlight": "限制搜尋之範圍的色彩。", - "hoverHighlight": "在顯示了動態顯示的單字下方醒目提示。", "hoverBackground": "編輯器動態顯示的背景色彩。", "hoverBorder": "編輯器動態顯示的框線色彩。", "activeLinkForeground": "使用中之連結的色彩。", @@ -76,12 +71,6 @@ "diffEditorRemoved": "移除文字的背景色彩。", "diffEditorInsertedOutline": "插入的文字外框色彩。", "diffEditorRemovedOutline": "移除的文字外框色彩。", - "mergeCurrentHeaderBackground": "目前內嵌合併衝突中的深色標題背景。", - "mergeCurrentContentBackground": "目前內嵌合併衝突中的內容背景。", - "mergeIncomingHeaderBackground": "傳入內嵌合併衝突中的深色標題背景。", - "mergeIncomingContentBackground": "傳入內嵌合併衝突中的內容背景。", - "mergeCommonHeaderBackground": "內嵌合併衝突中的共同始祖標題背景", - "mergeCommonContentBackground": "內嵌合併衝突中的共同始祖內容背景。", "mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。", "overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。", "overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。", diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json index edc32bace6e..2df7e9c33f5 100644 --- a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。", - "treeItem.notFound": "找不到識別碼為 '{0}' 的樹狀檢視。", - "treeView.duplicateElement": "元件{0}已被註冊" + "treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json index abe1e77c797..f5c23870560 100644 --- a/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "開啟檔案...", "openFolder": "開啟資料夾...", "openFileFolder": "開啟...", - "addFolderToWorkspace": "將資料夾新增到工作區...", - "add": "新增", - "addFolderToWorkspaceTitle": "將資料夾新增到工作區", "globalRemoveFolderFromWorkspace": "將資料夾從工作區移除...", - "removeFolderFromWorkspace": "將資料夾從工作區移除", - "openFolderSettings": "開啟資料夾設定", "saveWorkspaceAsAction": "另存工作區為...", "save": "儲存(&&S)", "saveWorkspace": "儲存工作區", "openWorkspaceAction": "開啟工作區...", "openWorkspaceConfigFile": "開啟工作區組態檔", - "openFolderAsWorkspaceInNewWindow": "在新視窗中開啟資料夾作為工作區", - "workspaceFolderPickerPlaceholder": "選取工作區資料夾" + "openFolderAsWorkspaceInNewWindow": "在新視窗中開啟資料夾作為工作區" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..19777945aa7 --- /dev/null +++ b/i18n/cht/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "將資料夾新增到工作區...", + "add": "新增", + "addFolderToWorkspaceTitle": "將資料夾新增到工作區", + "workspaceFolderPickerPlaceholder": "選取工作區資料夾" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index fc25ce13ad0..9dbae940daf 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "在第三個群組顯示編輯器", "allEditorsPicker": "顯示所有開啟的編輯器", "view": "檢視", - "file": "檔案" + "file": "檔案", + "close": "關閉", + "closeOthers": "關閉其他", + "closeRight": "關到右側", + "closeAllUnmodified": "關閉未變更的檔案", + "closeAll": "全部關閉", + "keepOpen": "保持開啟", + "showOpenedEditors": "顯示開啟的編輯器", + "keepEditor": "保留編輯器", + "closeEditorsInGroup": "關閉群組中的所有編輯器", + "closeUnmodifiedEditors": "在群組中關閉未修改的編輯器", + "closeOtherEditors": "關閉其他編輯器", + "closeRightEditors": "將編輯器關到右側" } \ 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 6f4e3589f00..b0ae21a8fc3 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,18 +17,13 @@ "closeEditor": "關閉編輯器", "revertAndCloseActiveEditor": "還原並關閉編輯器", "closeEditorsToTheLeft": "將編輯器關到左側", - "closeEditorsToTheRight": "將編輯器關到右側", "closeAllEditors": "關閉所有編輯器", - "closeUnmodifiedEditors": "在群組中關閉未修改的編輯器", "closeEditorsInOtherGroups": "關閉其他群組中的編輯器", - "closeOtherEditorsInGroup": "關閉其他編輯器", - "closeEditorsInGroup": "關閉群組中的所有編輯器", "moveActiveGroupLeft": "將編輯器群組向左移", "moveActiveGroupRight": "將編輯器群組向右移", "minimizeOtherEditorGroups": "將其他編輯器群組最小化", "evenEditorGroups": "均分編輯器群組寬度", "maximizeEditor": "將編輯器群組最大化並隱藏側邊欄", - "keepEditor": "保留編輯器", "openNextEditor": "開啟下一個編輯器", "openPreviousEditor": "開啟上一個編輯器", "nextEditorInGroup": "開啟群組中下一個編輯器", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "在第一個群組顯示編輯器", "showEditorsInSecondGroup": "在第二個群組顯示編輯器", "showEditorsInThirdGroup": "在第三個群組顯示編輯器", - "showEditorsInGroup": "在群組顯示編輯器", "showAllEditors": "顯示所有編輯器", "openPreviousRecentlyUsedEditorInGroup": "開啟群組中上一個最近使用的編輯器", "openNextRecentlyUsedEditorInGroup": "開啟群組中下一個最近使用的編輯器", diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index f93bcde4036..043d904547f 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "以 tab 或群組為單位移動使用中的編輯器", "editorCommand.activeEditorMove.arg.name": "使用中編輯器的移動引數", - "editorCommand.activeEditorMove.arg.description": "引數屬性:\n\t* 'to': 提供移動目標位置的字串值。\n\t* 'by': 提供移動單位的字串值。\n\t* 'value': 提供移動單位的字串值。可依索引標籤或群組作為單位。", - "commandDeprecated": "已移除命令 **{0}**。您可以改用 **{1}**", - "openKeybindings": "設定鍵盤快速鍵" + "editorCommand.activeEditorMove.arg.description": "引數屬性:\n\t* 'to': 提供移動目標位置的字串值。\n\t* 'by': 提供移動單位的字串值。\n\t* 'value': 提供移動單位的字串值。可依索引標籤或群組作為單位。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 7071905be9d..71cfbf73585 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}。文字檔案比較編輯器。", "editableEditorAriaLabel": "文字檔比較編輯器。", "navigate.next.label": "下一個變更", - "navigate.prev.label": "上一個變更", - "inlineDiffLabel": "切換至內嵌檢視", - "sideBySideDiffLabel": "切換至並排檢視" + "navigate.prev.label": "上一個變更" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index bfffed93b02..b9bd84d7409 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "關閉", - "closeOthers": "關閉其他", - "closeRight": "關到右側", - "closeAll": "全部關閉", - "closeAllUnmodified": "關閉未變更的檔案", - "keepOpen": "保持開啟", - "showOpenedEditors": "顯示開啟的編輯器", "araLabelEditorActions": "編輯器動作" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/common/theme.i18n.json b/i18n/cht/src/vs/workbench/common/theme.i18n.json index 6be57ab281c..0ca701a7da9 100644 --- a/i18n/cht/src/vs/workbench/common/theme.i18n.json +++ b/i18n/cht/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,6 @@ "editorGroupBackground": "編輯器群組的背景色彩。編輯器群組是編輯器的容器。當拖曳編輯器群組時會顯示背景色彩。", "tabsContainerBackground": "當索引標籤啟用的時候編輯器群組標題的背景色彩。編輯器群組是編輯器的容器。", "tabsContainerBorder": "當索引標籤啟用時，編輯器群組標題的框線色彩。編輯器群組是編輯器的容器。", - "editorGroupHeaderBackground": "當索引標籤禁用的時候編輯器群組標題的背景顏色。編輯器群組是編輯器的容器。", "editorGroupBorder": "用以分隔多個編輯器群組彼此的色彩。編輯器群組是編輯器的容器。", "editorDragAndDropBackground": "拖拉編輯器時的背景顏色,可設置透明度讓內容穿透顯示.", "panelBackground": "面板的前景色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。", @@ -33,8 +32,6 @@ "statusBarNoFolderBorder": "未開啟資料夾時，用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 ", "statusBarItemActiveBackground": "按下滑鼠按鈕時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。", "statusBarItemHoverBackground": "動態顯示時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。", - "statusBarProminentItemBackground": "狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。狀態列會顯示在視窗的底部。", - "statusBarProminentItemHoverBackground": "狀態列突出項目暫留時的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。狀態列會顯示在視窗的底部。", "activityBarBackground": "活動列背景的色彩。活動列會顯示在最左側或最右側，並可切換不同的提要欄位檢視。", "activityBarForeground": "活動列的前背景色彩(例如用於圖示)。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。", "activityBarBorder": "用以分隔提要欄位的活動列框線色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。", diff --git a/i18n/cht/src/vs/workbench/common/views.i18n.json b/i18n/cht/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..b6fbcb12ae3 --- /dev/null +++ b/i18n/cht/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "識別碼為 '{0}' 的檢視已在位置 '{1}' 註冊" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json index daf7e22d21e..c6e5b092bd1 100644 --- a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "關閉編輯器", "closeWindow": "關閉視窗", "closeWorkspace": "關閉工作區", "noWorkspaceOpened": "此執行個體中目前沒有開啟的工作區可以關閉。", @@ -52,21 +51,5 @@ "displayLanguage": "定義 VSCode 的顯示語言。", "doc": "如需支援的語言清單，請參閱 {0}。", "restart": "改變設定值後需要重新啟動 VSCode.", - "fail.createSettings": "無法建立 '{0}' ({1})。", - "openLogsFolder": "開啟紀錄資料夾", - "showLogs": "顯示紀錄...。", - "mainProcess": "主要", - "sharedProcess": "共用", - "rendererProcess": "轉譯器", - "extensionHost": "延伸主機", - "selectProcess": "選取程序", - "setLogLevel": "設定記錄層級", - "trace": "追蹤", - "debug": "偵錯", - "info": "資訊", - "warn": "警告", - "err": "錯誤", - "critical": "關鍵", - "off": "關閉", - "selectLogLevel": "選擇日誌級別" + "fail.createSettings": "無法建立 '{0}' ({1})。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/main.contribution.i18n.json index 33e2c22230a..c719faa3f8f 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 @@ -7,8 +7,9 @@ "view": "檢視", "help": "說明", "file": "檔案", - "developer": "開發人員", "workspaces": "工作區", + "developer": "開發人員", + "workbenchConfigurationTitle": "工作台", "showEditorTabs": "控制已開啟的編輯器是否應顯示在索引標籤中。", "workbench.editor.labelFormat.default": "顯示檔案名稱。當啟用索引標籤，且同一個群組中有兩個檔案同名時，就會新增各個檔案路徑具有識別度的的區段。當停用索引標籤時，若編輯器在使用中，就會顯示與工作區資料夾相關的路徑。", "workbench.editor.labelFormat.short": "顯示檔案的名稱，並在名稱後接著該檔案的目錄名稱。", @@ -20,8 +21,10 @@ "showIcons": "控制開啟的編輯器是否搭配圖示顯示。這需要同時啟用圖示佈景主題。", "enablePreview": "控制已開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 並以斜體字型樣式顯示為止。", "enablePreviewFromQuickOpen": "控制透過 Quick Open 所開啟的編輯器是否顯示為預覽。預覽編輯器會重複使用到被保留 (例如按兩下或進行編輯) 為止。", + "closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。", "editorOpenPositioning": "控制編輯器的開啟位置。選取 [左] 或 [右] 可在目前使用中的編輯器左方或右方加以開啟。選取 [第一個] 或 [最後一個] 則可從目前使用中的編輯器另外加以開啟。", "revealIfOpen": "控制編輯器是否要在任何顯示的群組開啟時，在其中顯示。若啟用此選項，已經開啟的編輯器將會繼續顯示，而不會在目前使用中的編輯器群組中再開啟一次。請注意，有一些情況會忽略此設定，例如當強制編輯器在特定群組中開啟，或強制編輯器在目前使用中的群組旁開啟等情況。", + "swipeToNavigate": "利用三指水平撥動在開啟的檔案間瀏覽。", "commandHistory": "控制最近使用之命令的數量，以保留命令選擇區的記錄。設為 0 可停用命令列記錄。", "preserveInput": "控制下次開啟命令選擇區時，最後鍵入的輸入是否應該還原。", "closeOnFocusLost": "控制是否在 Quick Open 失去焦點時自動關閉。", @@ -29,14 +32,11 @@ "sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。", "statusBarVisibility": "控制 Workbench 底端狀態列的可視性。", "activityBarVisibility": "控制活動列在 workbench 中的可見度。", - "closeOnFileDelete": "控制顯示檔案的編輯器是否應在其他處理序刪除或重新命名該檔案時自動關閉。若停用此選項，當發生前述狀況時，編輯器會保持開啟，並呈現已變更的狀態。請注意，從應用程式內刪除一律會關閉編輯器，但已變更的檔案在資料未儲存前一律不會關閉。", - "enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。", "fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ", "workbench.fontAliasing.default": "子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字。", "workbench.fontAliasing.antialiased": "相對於子像素，根據像素層級平滑字型。可以讓字型整體顯得較細。", "workbench.fontAliasing.none": "禁用字體平滑.文字將會顯示鋸齒狀與鋒利的邊緣.", - "swipeToNavigate": "利用三指水平撥動在開啟的檔案間瀏覽。", - "workbenchConfigurationTitle": "工作台", + "enableNaturalLanguageSettingsSearch": "控制是否啟用自然語言搜尋模式。", "windowConfigurationTitle": "視窗", "window.openFilesInNewWindow.on": "檔案會在新視窗中開啟", "window.openFilesInNewWindow.off": "檔案會在開啟了檔案資料夾的視窗，或在上一個使用中的視窗中開啟", diff --git a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json index 8bd875c749d..33b7f3d4467 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugToolBarBackground": "偵錯工具列背景色彩。" + "debugToolBarBackground": "偵錯工具列背景色彩。", + "debugToolBarBorder": "偵錯工具列的邊框色彩" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index c16e8f409d6..c127cd12e93 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "偵錯項目", - "debug.terminal.not.available.error": "整合式終端機無法使用" + "debug.terminal.title": "偵錯項目" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index cebab2d329a..370fe5dd948 100644 --- a/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "開啟新的命令提示字元", "globalConsoleActionMacLinux": "開啟新的終端機", "scopedConsoleActionWin": "在命令提示字元中開啟", - "scopedConsoleActionMacLinux": "在終端機中開啟", - "openFolderInIntegratedTerminal": "在終端機中開啟" + "scopedConsoleActionMacLinux": "在終端機中開啟" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 89b01309fa3..0f331df92b8 100644 --- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。", "workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。", + "fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。", "exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。", "reallyRecommended2": "建議對此檔案類型使用 '{0}' 延伸模組。", "reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。", diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..37b9d5384a5 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "工作台" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..e8a6eb4e02c --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "hide": "隱藏" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 8edf8023225..0203e579bac 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "檔案", "revealInSideBar": "在提要欄位中顯示", "acceptLocalChanges": "使用您的變更並覆寫磁碟內容 ", - "revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容" + "revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容", + "copyPathOfActive": "複製使用中檔案的路徑", + "saveAllInGroup": "全部儲存在群組中", + "revert": "還原檔案", + "compareActiveWithSaved": "比較使用中的檔案和已儲存的檔案", + "closeEditor": "關閉編輯器", + "view": "檢視", + "openToSide": "開至側邊", + "revealInWindows": "在檔案總管中顯示", + "revealInMac": "在 Finder 中顯示", + "openContainer": "開啟收納資料夾", + "copyPath": "複製路徑", + "saveAll": "全部儲存", + "compareWithSaved": "與已儲存的檔案比較", + "compareSource": "選取用以比較", + "close": "關閉", + "closeOthers": "關閉其他", + "closeUnmodified": "關閉未變更的檔案", + "closeAll": "全部關閉", + "deleteFile": "永久刪除" } \ No newline at end of file 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 c32641ccebc..033e57751ec 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "重試", - "rename": "重新命名", "newFile": "新增檔案", "newFolder": "新增資料夾", + "rename": "重新命名", + "delete": "刪除", + "copyFile": "複製", + "pasteFile": "貼上", + "retry": "重試", "openFolderFirst": "先開啟資料夾，以在其中建立檔案或資料夾。", "newUntitledFile": "新增未命名檔案", "createNewFile": "新增檔案", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?", "irreversible": "此動作無法回復!", "permDelete": "永久刪除", - "delete": "刪除", "importFiles": "匯入檔案", "confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?", "replaceButtonLabel": "取代(&&R)", - "copyFile": "複製", - "pasteFile": "貼上", "duplicateFile": "複製", - "openToSide": "開至側邊", - "compareSource": "選取用以比較", "globalCompareFile": "使用中檔案的比較對象...", "openFileToCompare": "先開啟檔案以與其他檔案進行比較", - "compareWith": "比較 '{0}' 與 '{1}'", - "compareFiles": "比較檔案", "refresh": "重新整理", - "save": "儲存", - "saveAs": "另存新檔...", - "saveAll": "全部儲存", "saveAllInGroup": "全部儲存在群組中", - "saveFiles": "儲存所有檔案", - "revert": "還原檔案", "focusOpenEditors": "聚焦在 [開放式編輯器] 檢視", "focusFilesExplorer": "將焦點設在檔案總管上", "showInExplorer": "在提要欄位中顯示使用中的檔案", @@ -56,20 +47,11 @@ "refreshExplorer": "重新整理 Explorer", "openFileInNewWindow": "在新視窗中開啟使用中的檔案", "openFileToShowInNewWindow": "先開啟檔案以在新視窗中開啟", - "revealInWindows": "在檔案總管中顯示", - "revealInMac": "在 Finder 中顯示", - "openContainer": "開啟收納資料夾", - "revealActiveFileInWindows": "在 Windows 檔案總管中顯示使用中的檔案", - "revealActiveFileInMac": "在 Finder 中顯示使用中的檔案", - "openActiveFileContainer": "開啟使用中檔案的收納資料夾", "copyPath": "複製路徑", - "copyPathOfActive": "複製使用中檔案的路徑", "emptyFileNameError": "必須提供檔案或資料夾名稱。", "fileNameExistsError": "這個位置已存在檔案或資料夾 **{0}**。請選擇不同的名稱。", "invalidFileNameError": "名稱 **{0}** 不能作為檔案或資料夾名稱。請選擇不同的名稱。", "filePathTooLongError": "名稱 **{0}** 導致路徑太長。請選擇較短的名稱。", - "compareWithSaved": "比較使用中的檔案和已儲存的檔案", - "modifiedLabel": "{0} (在磁碟上) ↔ {1}", "compareWithClipboard": "比較使用中的檔案和剪貼簿的檔案", "clipboardComparisonLabel": "剪貼簿 ↔ {0}" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index 75bdd951541..4a3f606e9a7 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "先開啟檔案以複製其路徑", - "openFileToReveal": "先開啟檔案以顯示" + "revealInWindows": "在檔案總管中顯示", + "revealInMac": "在 Finder 中顯示", + "openContainer": "開啟收納資料夾", + "saveAs": "另存新檔...", + "save": "儲存", + "saveAll": "全部儲存", + "saveFiles": "儲存所有檔案", + "removeFolderFromWorkspace": "將資料夾從工作區移除", + "genericRevertError": "無法還原 '{0}': {1}", + "modifiedLabel": "{0} (在磁碟上) ↔ {1}", + "openFileToReveal": "先開啟檔案以顯示", + "openFileToCopy": "先開啟檔案以複製其路徑" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 867d603ca56..28e38af66ab 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "編輯器", "formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。", "explorerConfigurationTitle": "檔案總管", - "openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。將其設定為 0 以隱藏窗格。", - "dynamicHeight": "控制 [開放式編輯器] 區段的高度是否應依元素數目動態調整。", "autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。", "enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。", "confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。", diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 7a6f0b075f7..6f482834b34 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,11 @@ // Do not edit this file. It is machine generated. { "userGuide": "在右方使用編輯器工具列中的動作來 **復原** 您的變更，或以您的變更 **覆寫** 磁碟上的內容", - "discard": "捨棄", + "overwriteElevated": "以系統管理者身分覆寫...", + "saveElevated": "以系統管理者身分重試", "overwrite": "覆寫", "retry": "重試", - "readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以移除保護。", + "discard": "捨棄", "genericSaveError": "無法儲存 '{0}': {1}", "staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。", "compareChanges": "比較", diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index b48ed12d518..bc39c809e3d 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "已開啟的編輯器", "openEditosrSection": "開放式編輯器區段", - "dirtyCounter": "{0} 未儲存", - "saveAll": "全部儲存", - "closeAllUnmodified": "關閉未變更的檔案", - "closeAll": "全部關閉", - "compareWithSaved": "與已儲存的檔案比較", - "close": "關閉", - "closeOthers": "關閉其他" + "dirtyCounter": "{0} 未儲存" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..801a62c062a --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "開發人員" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..ddfff57509f --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "開啟紀錄資料夾", + "showLogs": "顯示紀錄...。", + "rendererProcess": "視窗", + "extensionHost": "延伸主機", + "selectProcess": "選取程序", + "setLogLevel": "設定記錄層級", + "trace": "追蹤", + "debug": "偵錯", + "info": "資訊", + "warn": "警告", + "err": "錯誤", + "off": "關閉", + "selectLogLevel": "選擇紀錄層級" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json index 7fd5ffaf852..c754d02f873 100644 --- a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // 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": "問題", diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..223611af94e --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "輸出", + "viewCategory": "檢視", + "clearOutput.label": "清除輸出" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 480c3d2dbc2..5c3acf7c7d6 100644 --- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "試試自然語言搜尋！", "defaultSettings": "將您的設定放置於右方編輯器中以覆寫。", "noSettingsFound": "找不到任何設定。", "settingsSwitcherBarAriaLabel": "設定切換器", "userSettings": "使用者設定", "workspaceSettings": "工作區設定", - "folderSettings": "資料夾設定", - "enableFuzzySearch": "啟用自然語言搜尋" + "folderSettings": "資料夾設定" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 3aed5852085..4a5625894bd 100644 --- a/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "經常使用的", - "mostRelevant": "最相關的", "defaultKeybindingsHeader": "將按鍵組合放入您的按鍵組合檔案中加以覆寫。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 238b60d7007..6a7eae1ed19 100644 --- a/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "檢視", "commandsHandlerDescriptionDefault": "顯示並執行命令", "gotoLineDescriptionMac": "移至行", "gotoLineDescriptionWin": "移至行", diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index c0bccd6864c..813fb7021bf 100644 --- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,7 @@ "toggleGitViewlet": "顯示 Git", "source control": "原始檔控制", "toggleSCMViewlet": "顯示 SCM", - "view": "檢視" + "view": "檢視", + "alwaysShowProviders": "是否總是顯示原始檔控制提供者區段", + "inputCounter": "控制何時顯示輸入計數器" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index 72f9807aa29..29439ddb2cf 100644 --- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,7 @@ { "scm providers": "原始檔控制提供者", "hideRepository": "隱藏", + "commitMessageInfo": "在目前行數有 {0} 個字元", "installAdditionalSCMProviders": "安裝額外SCM提供者...", "no open repo": "沒有使用中的原始檔控制提供者。", "source control": "原始檔控制", 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 551008efc78..e52a383a212 100644 --- a/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "顯示上一個搜尋字詞", "showSearchViewlet": "顯示搜尋", "findInFiles": "在檔案中尋找", - "findInFilesWithSelectedText": "在檔案中尋找選取的文字 ", "replaceInFiles": "檔案中取代", - "replaceInFilesWithSelectedText": "在檔案中取代為選取的文字", "RefreshAction.label": "重新整理", "CollapseDeepestExpandedLevelAction.label": "全部摺疊", "ClearSearchResultsAction.label": "清除", diff --git a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 2737e83ab4e..1244f50ad8c 100644 --- a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "在資料夾中尋找...", + "findInWorkspace": "在工作區中尋找...", "showTriggerActions": "前往工作區中的符號...", "name": "搜尋", "search": "搜尋", + "showSearchViewlet": "顯示搜尋", "view": "檢視", + "findInFiles": "在檔案中尋找", "openAnythingHandlerDescription": "前往檔案", "openSymbolDescriptionNormal": "前往工作區中的符號", "searchOutputChannelTitle": "搜尋", diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..70a8a6e6943 --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "喜好設定" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 10abf9bdd4d..115f5980d39 100644 --- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "為程式碼片段選取語言", - "openSnippet.errorOnCreate": "無法建立 {0}", - "openSnippet.label": "開啟使用者程式碼片段", - "preferences": "喜好設定", "snippetSchema.json.default": "空白程式碼片段", "snippetSchema.json": "使用者程式碼片段組態", "snippetSchema.json.prefix": "在 Intellisense 中選取程式碼片段時要使用的前置詞", diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..4a43b9b0daf --- /dev/null +++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "使用者程式碼片段" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index e7261d392fd..bcbd784bf1c 100644 --- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}", "invalid.path.0": "'contributes.{0}.path' 中應有字串。提供的值: {1}", + "invalid.language": "`contributes.{0}.language` 中的不明語言。提供的值: {1}", "invalid.path.1": "擴充功能資料夾 ({2}) 應包含 'contributes.{0}.path' ({1})。這可能會導致擴充功能無法移植。", "vscode.extension.contributes.snippets": "提供程式碼片段。", "vscode.extension.contributes.snippets-language": "要予以提供此程式碼片段的語言識別碼。", "vscode.extension.contributes.snippets-path": "程式碼片段檔案的路徑。此路徑是擴充功能資料夾的相對路徑，而且一般會以 './snippets/' 開頭。", "badVariableUse": "來自延伸模組 '{0}' 的一或多個程式碼片段很可能會混淆程式碼片段變數和程式碼片段預留位置 (如需更多詳細資料，請參閱 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)", "badFile": "無法讀取程式碼片段檔案 \"{0}\"。", - "source.snippet": "使用者程式碼片段", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}，{1}" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 80abe8bb59c..d824ac236e9 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -14,6 +14,7 @@ "terminal.integrated.shell.windows": "終端機在 Windows 上使用的殼層路徑。使用隨附於 Windows 的殼層 (cmd、PowerShell 或 Bash on Ubuntu) 時。", "terminal.integrated.shellArgs.windows": "在 Windows 終端機上時要使用的命令列引數。", "terminal.integrated.rightClickCopyPaste": "如有設定，這會防止在終端機內按滑鼠右鍵時顯示操作功能表，而是在有選取項目時複製、沒有選取項目時貼上。", + "terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿", "terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。", "terminal.integrated.fontSize": "控制終端機的字型大小 (以像素為單位)。", "terminal.integrated.lineHeight": "控制終端機的行高，此數字會乘上終端機字型大小，以取得以像素為單位的實際行高。", diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index 40342458179..5adfeb27fed 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -14,6 +14,7 @@ "workbench.action.terminal.deleteWordRight": "刪除右方文字", "workbench.action.terminal.new": "建立新的整合式終端機", "workbench.action.terminal.new.short": "新增終端機", + "workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄", "workbench.action.terminal.focus": "聚焦終端機", "workbench.action.terminal.focusNext": "聚焦下一個終端機", "workbench.action.terminal.focusPrevious": "聚焦上一個終端機", diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 3c4cccada80..3effe14e672 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "終端機的前景色彩。", "terminalCursor.foreground": "終端機游標的前景色彩。", "terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。", - "terminal.selectionBackground": "終端機的選取項目背景色彩。", - "terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。" + "terminal.selectionBackground": "終端機的選取項目背景色彩。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index fc6b0624a08..331a28ddaf2 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "您可以選取 [自訂] 按鈕變更預設的終端機殼層。", "customize": "自訂", "cancel": "取消", - "never again": "確定，不要再顯示", "terminal.integrated.chooseWindowsShell": "請選取所需的終端機殼層。您之後可以在設定中變更此選擇", "terminalService.terminalCloseConfirmationSingular": "仍有一個使用中的終端機工作階段。要予以終止嗎?", "terminalService.terminalCloseConfirmationPlural": "目前共有 {0} 個使用中的終端機工作階段。要予以終止嗎?" 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 e043af15328..0090723f9a2 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 @@ -23,6 +23,7 @@ "commandPalette": "命令選擇區...", "settings": "設定", "keyboardShortcuts": "鍵盤快速鍵(&&K)", + "userSnippets": "使用者程式碼片段", "selectTheme.label": "色彩佈景主題", "themes.selectIconTheme.label": "檔案圖示佈景主題", "not available": "無可用更新", diff --git a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 067f2923a48..106253b1f0c 100644 --- a/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/cht/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "檔案是目錄", + "fileNotModifiedError": "未修改檔案的時間", "fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 5fb9fd9998b..fe4c04e35cd 100644 --- a/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/cht/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "要儲存對 {0} 所做的變更嗎?", "saveChangesMessages": "要儲存對下列 {0} 個檔案所做的變更嗎?", - "moreFile": "...另外 1 個檔案未顯示", - "moreFiles": "...另外 {0} 個檔案未顯示", "saveAll": "全部儲存(&&S)", "save": "儲存(&&S)", "dontSave": "不要儲存(&&N)", diff --git a/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 939ead9df9c..8096baf2953 100644 --- a/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/cht/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "依目前選擇的彩色佈景主題覆寫顏色", - "editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。", "editorColors.comments": "設定註解的色彩與樣式", "editorColors.strings": "設定字串常值的色彩與樣式。", "editorColors.keywords": "設定關鍵字的色彩與樣式。", @@ -19,5 +18,6 @@ "editorColors.types": "設定型別宣告與參考的色彩與樣式。", "editorColors.functions": "設定函式宣告與參考的色彩與樣式。", "editorColors.variables": "設定變數宣告與參考的色彩與樣式。", - "editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。" + "editorColors.textMateRules": "使用 TextMate 佈景主題規則設定色彩與樣式 (進階)。", + "editorColors": "依目前選取的色彩佈景主題覆寫編輯器色彩與字型樣式。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 283d3809ddb..e0710f14e3f 100644 --- a/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/cht/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "無法寫入工作區組態檔。請開啟檔案更正其中的錯誤/警告，然後再試一次。 ", "errorWorkspaceConfigurationFileDirty": "因為檔案已變更，所以無法寫入工作區組態檔。請將其儲存，然後再試一次。", "openWorkspaceConfigurationFile": "開啟工作區組態檔", - "close": "關閉", - "enterWorkspace.close": "關閉", - "enterWorkspace.dontShowAgain": "不要再顯示", - "enterWorkspace.moreInfo": "詳細資訊", - "enterWorkspace.prompt": "深入了解在 VS Code 中使用多個資料夾。" + "close": "關閉" } \ No newline at end of file diff --git a/i18n/deu/extensions/git/out/autofetch.i18n.json b/i18n/deu/extensions/git/out/autofetch.i18n.json index e1242008fcf..5a1bb589fb2 100644 --- a/i18n/deu/extensions/git/out/autofetch.i18n.json +++ b/i18n/deu/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "Ja", + "read more": "Weitere Informationen", "no": "Nein", - "not now": "Nicht jetzt", - "suggest auto fetch": "Möchten Sie das automatische Abrufen von Git-Repositorys aktivieren?" + "not now": "Erneut nachfragen", + "suggest auto fetch": "Möchten Sie Code regelmäßig `git fetch` ausführen lassen?" } \ 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 27787e3b3d4..e26a7235e02 100644 --- a/i18n/deu/extensions/git/out/commands.i18n.json +++ b/i18n/deu/extensions/git/out/commands.i18n.json @@ -41,6 +41,9 @@ "confirm discard all 2": "{0}\n\nDies kann NICHT rückgängig gemacht werden, und Ihr aktueller Arbeitssatz geht DAUERHAFT verloren.", "yes discard tracked": "1 verfolgte Datei verwerfen", "yes discard tracked multiple": "{0} verfolgte Dateien verwerfen", + "unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?", + "unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?", + "commit": "Trotzdem committen", "no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?", "always": "Immer", "no changes": "Keine Änderungen zum Speichern vorhanden.", @@ -64,12 +67,11 @@ "no remotes to pull": "In Ihrem Repository wurden keine Remoteelemente für den Pull konfiguriert.", "pick remote pull repo": "Remoteelement zum Pullen des Branch auswählen", "no remotes to push": "In Ihrem Repository wurden keine Remoteelemente für den Push konfiguriert.", - "push with tags success": "Push mit Tags erfolgreich ausgeführt.", "nobranch": "Wählen Sie ein Branch für den Push zu einem Remoteelement aus.", + "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.", - "ok": "OK", - "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.", "provide stash message": "Geben Sie optional eine Stash-Nachricht ein.", diff --git a/i18n/deu/extensions/git/out/repository.i18n.json b/i18n/deu/extensions/git/out/repository.i18n.json index 9c6af561332..cb3c5c9809f 100644 --- a/i18n/deu/extensions/git/out/repository.i18n.json +++ b/i18n/deu/extensions/git/out/repository.i18n.json @@ -27,6 +27,6 @@ "staged changes": "Bereitgestellte Änderungen", "changes": "Änderungen", "ok": "OK", - "neveragain": "Nie wieder anzeigen", + "neveragain": "Nicht mehr anzeigen", "huge": "Das Git-Repository unter {0} umfasst zu viele aktive Änderungen. Nur ein Teil der Git-Features wird aktiviert." } \ No newline at end of file diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json index de4d841dd21..f2ecf957937 100644 --- a/i18n/deu/extensions/git/package.i18n.json +++ b/i18n/deu/extensions/git/package.i18n.json @@ -72,5 +72,6 @@ "colors.deleted": "Farbe für gelöschten Ressourcen.", "colors.untracked": "Farbe für nicht verfolgte Ressourcen.", "colors.ignored": "Farbe für ignorierte Ressourcen.", - "colors.conflict": "Farbe für Ressourcen mit Konflikten." + "colors.conflict": "Farbe für Ressourcen mit Konflikten.", + "colors.submodule": "Farbe für Submodul-Ressourcen." } \ No newline at end of file diff --git a/i18n/deu/extensions/typescript/out/commands.i18n.json b/i18n/deu/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..abb5c164718 --- /dev/null +++ b/i18n/deu/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Öffnen Sie einen Ordner in VS Code, um ein TypeScript- oder JavaScript-Projekt zu verwenden.", + "typescript.projectConfigUnsupportedFile": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden. Nicht unterstützter Dateityp.", + "typescript.projectConfigCouldNotGetInfo": "TypeScript- oder JavaScript-Projekt konnte nicht ermittelt werden.", + "typescript.noTypeScriptProjectConfig": "Datei ist nicht Teil eines TypeScript-Projekts.", + "typescript.noJavaScriptProjectConfig": "Datei ist nicht Teil eines JavaScript-Projekts.", + "typescript.configureTsconfigQuickPick": "tsconfig.json konfigurieren", + "typescript.configureJsconfigQuickPick": "jsconfig.json konfigurieren", + "typescript.projectConfigLearnMore": "Weitere Informationen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/deu/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/base/node/ps.i18n.json b/i18n/deu/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json index 42d65e250ff..3bd907833f1 100644 --- a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "Zeilennummern werden als absolute Zahl dargestellt.", "lineNumbers.relative": "Zeilennummern werden als Abstand in Zeilen an Cursorposition dargestellt.", "lineNumbers.interval": "Zeilennummern werden alle 10 Zeilen dargestellt.", - "lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"Ein\", \"Aus\" und \"Relativ\".", + "lineNumbers": "Steuert die Anzeige von Zeilennummern. Mögliche Werte sind \"on\", \"off\", \"relative\" und \"interval\".", "rulers": "Vertikale Linien nach einer bestimmten Anzahl von Monospace Zeichen zeichnen. Verwenden Sie mehrere Werte für mehrere Linien. Keine Linie wird gezeichnet, wenn das Array leer ist.", "wordSeparators": "Zeichen, die als Worttrennzeichen verwendet werden, wenn wortbezogene Navigationen oder Vorgänge ausgeführt werden.", "tabSize": "Die Anzahl der Leerzeichen, denen ein Tabstopp entspricht. Diese Einstellung wird basierend auf dem Inhalt der Datei überschrieben, wenn \"editor.detectIndentation\" aktiviert ist.", 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 fa37f670425..512b6893918 100644 --- a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Hintergrundfarbe zur Hervorhebung der Zeile an der Cursorposition.", "lineHighlightBorderBox": "Hintergrundfarbe für den Rahmen um die Zeile an der Cursorposition.", - "rangeHighlight": "Hintergrundfarbe hervorgehobener Bereiche (beispielsweise durch Features wie Quick Open und Suche).", "caret": "Farbe des Cursors im Editor.", "editorCursorBackground": "Hintergrundfarbe vom Editor-Cursor. Erlaubt die Anpassung der Farbe von einem Zeichen, welches von einem Block-Cursor überdeckt wird.", "editorWhitespaces": "Farbe der Leerzeichen im Editor.", 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 02553773e89..cc799cdb63a 100644 --- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Gehe zum nächsten Fehler oder zur nächsten Warnung", - "markerAction.previous.label": "Gehe zum vorherigen Fehler oder zur vorherigen Warnung", "editorMarkerNavigationError": "Editormarkierung: Farbe bei Fehler des Navigationswidgets.", "editorMarkerNavigationWarning": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.", "editorMarkerNavigationInfo": "Editormarkierung: Farbe bei Warnung des Navigationswidgets.", 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 d706ff2e9b2..f6176a5826f 100644 --- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Hintergrundfarbe eines Symbols beim Lesezugriff (beispielsweise beim Lesen einer Variablen).", - "wordHighlightStrong": "Hintergrundfarbe eines Symbols beim Schreibzugriff (beispielsweise beim Schreiben in eine Variable).", "overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.", "overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.", "wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen", diff --git a/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 5cd50df300a..30e3fed7ba6 100644 --- a/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/deu/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "\"{0}\" ist kein gültiger Menübezeichner.", "missing.command": "Das Menüelement verweist auf einen Befehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.", "missing.altCommand": "Das Menüelement verweist auf einen Alternativbefehl \"{0}\", der im Abschnitt \"commands\" nicht definiert ist.", - "dupe.command": "Das Menüelement verweist auf den gleichen Befehl wie der Standard- und der Alternativbefehl.", - "nosupport.altCommand": "Leider unterstützt zurzeit nur die Gruppe \"navigation\" des Menüs \"editor/title\" Alternativbefehle." + "dupe.command": "Das Menüelement verweist auf den gleichen Befehl wie der Standard- und der Alternativbefehl." } \ No newline at end of file diff --git a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json index e990ea9bf1e..973f6daca81 100644 --- a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,34 @@ "diff": "Vergleicht zwei Dateien.", "add": "Fügt einen oder mehrere Ordner zum letzten aktiven Fenster hinzu.", "goto": "Öffnet eine Datei im Pfad in der angegebenen Zeile und an der Zeichenposition.", - "locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).", "newWindow": "Erzwingt eine neue Instanz des Codes.", - "performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".", - "prof-startup": "CPU-Profiler beim Start ausführen", - "inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.", - "inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.", "reuseWindow": "Erzwingt das Öffnen einer Datei oder eines Ordners im letzten aktiven Fenster.", - "userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Nützlich, wenn die Ausführung als \"root\" erfolgt.", - "log": "Log-Level zu verwenden. Standardwert ist \"Info\". Zulässige Werte sind \"kritisch\", \"Fehler\", \"warnen\", \"Info\", \"debug\", \"verfolgen\", \"aus\".", - "verbose": "Ausführliche Ausgabe (impliziert \"-wait\").", "wait": "Warten Sie, bis die Dateien geschlossen sind, bevor Sie zurück gehen können.", + "locale": "Das zu verwendende Gebietsschema (z. B. en-US oder zh-TW).", + "userDataDir": "Gibt das Verzeichnis an, in dem Benutzerdaten gespeichert werden. Nützlich, wenn die Ausführung als \"root\" erfolgt.", + "version": "Gibt die Version aus.", + "help": "Gibt die Syntax aus.", "extensionHomePath": "Legen Sie den Stammpfad für Extensions fest.", "listExtensions": "Listet die installierten Extensions auf.", "showVersions": "Zeigt Versionen der installierten Erweiterungen an, wenn \"--list-extension\" verwendet wird.", "installExtension": "Installiert eine Extension.", "uninstallExtension": "Deinstalliert eine Extension.", "experimentalApis": "Aktiviert vorgeschlagene API-Features für eine Erweiterung.", - "disableExtensions": "Deaktiviert alle installierten Extensions.", - "disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.", + "verbose": "Ausführliche Ausgabe (impliziert \"-wait\").", + "log": "Log-Level zu verwenden. Standardwert ist \"Info\". Zulässige Werte sind \"kritisch\", \"Fehler\", \"warnen\", \"Info\", \"debug\", \"verfolgen\", \"aus\".", "status": "Prozessnutzungs- und Diagnose-Informationen ausgeben.", - "version": "Gibt die Version aus.", - "help": "Gibt die Syntax aus.", + "performance": "Startet mit aktiviertem Befehl \"Developer: Startup Performance\".", + "prof-startup": "CPU-Profiler beim Start ausführen", + "disableExtensions": "Deaktiviert alle installierten Extensions.", + "inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.", + "inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.", + "disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.", "usage": "Verwendung", "options": "Optionen", "paths": "Pfade", - "optionsUpperCase": "Optionen" + "stdinWindows": "Zum Einlesen von Ausgaben eines anderen Programms hängen Sie '-' an (z.B. 'echo Hello World | {0} -')", + "stdinUnix": "Zum Einlesen von stdin hängen Sie '-' an (z.B. 'ps aux | grep code | {0} -')", + "optionsUpperCase": "Optionen", + "extensionsManagement": "Erweiterungsverwaltung", + "troubleshooting": "Problembehandlung" } \ 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 256756a3fdd..503ec4aa8a3 100644 --- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,14 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Die Erweiterung ist ungültig: \"package.json\" ist keine JSON-Datei.", - "restartCodeLocal": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.", + "restartCode": "Bitte starten Sie Code vor der Neuinstallation von {0} neu.", "installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?", "override": "Überschreiben", "cancel": "Abbrechen", - "notFoundCompatible": "Kann nicht installiert werden, da die Erweiterung '{0}', die mit der aktuellen Version '{1}' von VS Code kompatibel ist, nicht gefunden werden kann.", - "quitCode": "Kann nicht installiert werden, da noch eine veraltete Instanz der Erweiterung ausgeführt wird. Bitte beenden und VS Code neu starten vor der Neuinstallation.", - "exitCode": "Kann nicht installiert werden, da noch eine veraltete Instanz der Erweiterung ausgeführt wird. Bitte beenden und VS Code neu starten vor der Neuinstallation.", + "notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.", "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", diff --git a/i18n/deu/src/vs/platform/message/common/message.i18n.json b/i18n/deu/src/vs/platform/message/common/message.i18n.json index f4286f9eb78..774ad662835 100644 --- a/i18n/deu/src/vs/platform/message/common/message.i18n.json +++ b/i18n/deu/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Schließen", "later": "Später", - "cancel": "Abbrechen" + "cancel": "Abbrechen", + "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/theme/common/colorRegistry.i18n.json b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json index 93785571085..38654cc7985 100644 --- a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Rahmenfarbe von Editorwigdets. Die Farbe wird nur verwendet, wenn für das Widget ein Rahmen verwendet wird und die Farbe nicht von einem Widget überschrieben wird.", "editorSelectionBackground": "Farbe der Editor-Auswahl.", "editorSelectionForeground": "Farbe des gewählten Text für einen hohen Kontrast", - "editorInactiveSelection": "Farbe der Auswahl in einem inaktiven Editor.", - "editorSelectionHighlight": "Farbe für Bereiche, deren Inhalt der Auswahl entspricht.", "editorFindMatch": "Farbe des aktuellen Suchergebnisses.", - "findMatchHighlight": "Farbe der anderen Suchtreffer.", - "findRangeHighlight": "Farbe des Bereichs zur Einschränkung der Suche.", - "hoverHighlight": "Hervorhebung eines Worts, unter dem ein Mauszeiger angezeigt wird.", "hoverBackground": "Background color of the editor hover.", "hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.", "activeLinkForeground": "Farbe der aktiven Links.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Hintergrundfarbe für entfernten Text.", "diffEditorInsertedOutline": "Konturfarbe für eingefügten Text.", "diffEditorRemovedOutline": "Konturfarbe für entfernten Text.", - "mergeCurrentHeaderBackground": "Aktueller Kopfzeilenhintergrund in Inline-Mergingkonflikten.", - "mergeCurrentContentBackground": "Aktueller Inhaltshintergrund in Inline-Mergingkonflikten.", - "mergeIncomingHeaderBackground": "Eingehender Kopfzeilenhintergrund in Inline-Mergingkonflikten. ", - "mergeIncomingContentBackground": "Eingehender Inhaltshintergrund in Inline-Mergingkonflikten.", - "mergeCommonHeaderBackground": "Kopfzeilenhintergrund des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten. ", - "mergeCommonContentBackground": "Inhaltshintergrund des gemeinsamen übergeordneten Elements bei Inlinezusammenführungskonflikten.", "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. ", diff --git a/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 76a36688913..d76ac6f1642 100644 --- a/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/deu/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert.", - "treeItem.notFound": "Kein Tree-Eintrag mit der id '{0}' gefunden.", - "treeView.duplicateElement": "Element {0} ist bereit registriert." + "treeView.notRegistered": "Kein Treeviw mit der id '{0}' registriert." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 174408464b6..79911f9a8b9 100644 --- a/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Datei öffnen...", "openFolder": "Ordner öffnen...", "openFileFolder": "Öffnen...", - "addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...", - "add": "&&Hinzufügen", - "addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen", "globalRemoveFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen...", - "removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen", - "openFolderSettings": "Ordnereinstellungen öffnen", "saveWorkspaceAsAction": "Arbeitsbereich speichern unter...", "save": "&&Speichern", "saveWorkspace": "Arbeitsbereich speichern", "openWorkspaceAction": "Arbeitsbereich öffnen...", "openWorkspaceConfigFile": "Konfigurationsdatei des Arbeitsbereichs öffnen", - "openFolderAsWorkspaceInNewWindow": "Ordner als Arbeitsbereich in neuem Fenster öffnen", - "workspaceFolderPickerPlaceholder": "Arbeitsbereichsordner auswählen" + "openFolderAsWorkspaceInNewWindow": "Ordner als Arbeitsbereich in neuem Fenster öffnen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..60a543c8bba --- /dev/null +++ b/i18n/deu/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "Ordner zum Arbeitsbereich hinzufügen...", + "add": "&&Hinzufügen", + "addFolderToWorkspaceTitle": "Ordner zum Arbeitsbereich hinzufügen", + "workspaceFolderPickerPlaceholder": "Arbeitsbereichsordner auswählen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 0812b9299a4..95de712113e 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Editoren in dritter Gruppe anzeigen", "allEditorsPicker": "Alle geöffneten Editoren anzeigen", "view": "Anzeigen", - "file": "Datei" + "file": "Datei", + "close": "Schließen", + "closeOthers": "Andere schließen", + "closeRight": "Rechts schließen", + "closeAllUnmodified": "Nicht geänderte schließen", + "closeAll": "Alle schließen", + "keepOpen": "Geöffnet lassen", + "showOpenedEditors": "Geöffnete Editoren anzeigen", + "keepEditor": "Editor beibehalten", + "closeEditorsInGroup": "Alle Editoren in der Gruppe schließen", + "closeUnmodifiedEditors": "Nicht geänderte Editoren in der Gruppe schließen", + "closeOtherEditors": "Andere Editoren schließen", + "closeRightEditors": "Editoren rechts schließen" } \ 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 eea7eefe298..f94ad3ec09a 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,18 +17,13 @@ "closeEditor": "Editor schließen", "revertAndCloseActiveEditor": "Wiederherstellen und Editor schließen", "closeEditorsToTheLeft": "Editoren links schließen", - "closeEditorsToTheRight": "Editoren rechts schließen", "closeAllEditors": "Alle Editoren schließen", - "closeUnmodifiedEditors": "Nicht geänderte Editoren in der Gruppe schließen", "closeEditorsInOtherGroups": "Editoren in anderen Gruppen schließen", - "closeOtherEditorsInGroup": "Andere Editoren schließen", - "closeEditorsInGroup": "Alle Editoren in der Gruppe schließen", "moveActiveGroupLeft": "Editor-Gruppe nach links verschieben", "moveActiveGroupRight": "Editor-Gruppe nach rechts verschieben", "minimizeOtherEditorGroups": "Andere Editor-Gruppen minimieren", "evenEditorGroups": "Gleichmäßige Breite der Editor-Gruppe", "maximizeEditor": "Editor-Gruppe maximieren und Randleiste ausblenden", - "keepEditor": "Editor beibehalten", "openNextEditor": "Nächsten Editor öffnen", "openPreviousEditor": "Vorherigen Editor öffnen", "nextEditorInGroup": "Nächsten Editor in der Gruppe öffnen", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Editoren in erster Gruppe anzeigen", "showEditorsInSecondGroup": "Editoren in zweiter Gruppe anzeigen", "showEditorsInThirdGroup": "Editoren in dritter Gruppe anzeigen", - "showEditorsInGroup": "Editoren in der Gruppe anzeigen", "showAllEditors": "Alle Editoren anzeigen", "openPreviousRecentlyUsedEditorInGroup": "Vorherigen zuletzt verwendeten Editor in der Gruppe öffnen", "openNextRecentlyUsedEditorInGroup": "Nächsten zuletzt verwendeten Editor in der Gruppe öffnen", diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 2b4ef55801b..9080d3ad0fb 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Aktiven Editor nach Tabstopps oder Gruppen verschieben", "editorCommand.activeEditorMove.arg.name": "Argument zum Verschieben des aktiven Editors", - "editorCommand.activeEditorMove.arg.description": "Argumenteigenschaften:\n\t* \"to\": Ein Zeichenfolgenwert, der das Ziel des Verschiebungsvorgangs angibt.\n\t* \"by\": Ein Zeichenfolgenwert, der die Einheit für die Verschiebung angibt (nach Registerkarte oder nach Gruppe).\n\t* \"value\": Ein Zahlenwert, der angibt, um wie viele Positionen verschoben wird. Es kann auch die absolute Position für die Verschiebung angegeben werden.\n", - "commandDeprecated": "Der Befehl **{0}** wurde entfernt. Sie können stattdessen **{1}** verwenden.", - "openKeybindings": "Tastenkombinationen konfigurieren" + "editorCommand.activeEditorMove.arg.description": "Argumenteigenschaften:\n\t* \"to\": Ein Zeichenfolgenwert, der das Ziel des Verschiebungsvorgangs angibt.\n\t* \"by\": Ein Zeichenfolgenwert, der die Einheit für die Verschiebung angibt (nach Registerkarte oder nach Gruppe).\n\t* \"value\": Ein Zahlenwert, der angibt, um wie viele Positionen verschoben wird. Es kann auch die absolute Position für die Verschiebung angegeben werden.\n" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index f5bb0f97396..c46090d7419 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "Textdateivergleichs-Editor", "navigate.next.label": "Nächste Änderung", "navigate.prev.label": "Vorherige Änderung", - "inlineDiffLabel": "Zur Inlineansicht wechseln", - "sideBySideDiffLabel": "Zur Parallelansicht wechseln" + "toggleIgnoreTrimWhitespace.label": "Keine Leerzeichen entfernen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 33a0388a647..4b868884b77 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Schließen", - "closeOthers": "Andere schließen", - "closeRight": "Rechts schließen", - "closeAll": "Alle schließen", - "closeAllUnmodified": "Nicht geänderte schließen", - "keepOpen": "Geöffnet lassen", - "showOpenedEditors": "Geöffnete Editoren anzeigen", "araLabelEditorActions": "Editor-Aktionen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index 5618ae8213a..4697a7de886 100644 --- a/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/deu/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[Nicht unterstützt]", + "userIsAdmin": "[Administrator]", + "userIsSudo": "[Superuser]", "devExtensionWindowTitlePrefix": "[Erweiterungsentwicklungshost]" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/common/theme.i18n.json b/i18n/deu/src/vs/workbench/common/theme.i18n.json index 4336f732bee..56819e7b1df 100644 --- a/i18n/deu/src/vs/workbench/common/theme.i18n.json +++ b/i18n/deu/src/vs/workbench/common/theme.i18n.json @@ -6,9 +6,13 @@ { "tabActiveBackground": "Hintergrundfarbe der aktiven Registerkarte. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.", "tabInactiveBackground": "Hintergrundfarbe der inaktiven Registerkarte. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.", + "tabHoverBackground": "Hintergrundfarbe der Registerkarte beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.", + "tabUnfocusedHoverBackground": "Hintergrundfarbe für Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", "tabBorder": "Rahmen zum Trennen von Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", "tabActiveBorder": "Rahmen zum Hervorheben aktiver Registerkarten. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", "tabActiveUnfocusedBorder": "Rahmen zum Hervorheben aktiver Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", + "tabHoverBorder": "Rahmen zum Hervorheben von Registerkarten beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", + "tabUnfocusedHoverBorder": "Rahmen zum Hervorheben von Registerkarten in einer unfokussierten Gruppe beim Daraufzeigen. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", "tabActiveForeground": "Vordergrundfarbe der aktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.", "tabInactiveForeground": "Vordergrundfarbe der inaktiven Registerkarte in einer aktiven Gruppe. Registerkarten sind die Container für Editors im Editorbereich. In einer Editorgruppe können mehrere Registerkarten geöffnet werden. Mehrere Editorgruppen können vorhanden sein.", "tabUnfocusedActiveForeground": "Vordergrundfarbe für aktive Registerkarten in einer unfokussierten Gruppe. Registerkarten sind die Container für Editoren im Editor-Bereich. In einer Editor-Gruppe können mehrere Registerkarten geöffnet werden. Mehrere Editor-Gruppen sind möglich.", @@ -16,7 +20,7 @@ "editorGroupBackground": "Hintergrundfarbe einer Editor-Gruppe. Editor-Gruppen sind die Container der Editoren. Die Hintergrundfarbe wird beim Ziehen von Editoren angezeigt.", "tabsContainerBackground": "Hintergrundfarbe der Titelüberschrift der Editor-Gruppe, wenn die Registerkarten deaktiviert sind. Editor-Gruppen sind die Container der Editoren.", "tabsContainerBorder": "Rahmenfarbe der Titelüberschrift der Editor-Gruppe, wenn die Registerkarten deaktiviert sind. Editor-Gruppen sind die Container der Editoren.", - "editorGroupHeaderBackground": "Hintergrundfarbe der Titelüberschrift des Editors, wenn die Registerkarten deaktiviert sind. Editor-Gruppen sind die Container der Editoren.", + "editorGroupHeaderBackground": "Hintergrundfarbe der Editorgruppen-Titelüberschrift, wenn Registerkarten deaktiviert sind (`\"workbench.editor.showTabs\": false`). Editor-Gruppen sind die Container für Editoren.", "editorGroupBorder": "Farbe zum Trennen mehrerer Editor-Gruppen. Editor-Gruppen sind die Container der Editoren.", "editorDragAndDropBackground": " Hintergrundfarbe beim Ziehen von Editoren. Die Farbe muss transparent sein, damit der Editor-Inhalt noch sichtbar sind.", "panelBackground": "Hintergrundfarbe des Panels. Panels werden unter dem Editorbereich angezeigt und enthalten Ansichten wie die Ausgabe und das integrierte Terminal.", @@ -33,8 +37,6 @@ "statusBarNoFolderBorder": "Rahmenfarbe der Statusleiste zur Abtrennung von der Randleiste und dem Editor, wenn kein Ordner geöffnet ist. Die Statusleiste wird unten im Fenster angezeigt.", "statusBarItemActiveBackground": "Hintergrundfarbe für Statusleistenelemente beim Klicken. Die Statusleiste wird am unteren Rand des Fensters angezeigt.", "statusBarItemHoverBackground": "Hintergrundfarbe der Statusleistenelemente beim Daraufzeigen. Die Statusleiste wird am unteren Seitenrand angezeigt.", - "statusBarProminentItemBackground": "Hintergrundfarbe für markante Elemente der Statusleiste. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Die Statusleiste wird unten im Fenster angezeigt.", - "statusBarProminentItemHoverBackground": "Hintergrundfarbe für markante Elemente der Statusleiste, wenn auf diese gezeigt wird. Markante Elemente sind im Vergleich zu anderen Statusleisteneinträgen hervorgehoben, um auf ihre Bedeutung hinzuweisen. Die Statusleiste wird unten im Fenster angezeigt.", "activityBarBackground": "Hintergrundfarbe der Aktivitätsleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.", "activityBarForeground": "Vordergrundfarbe der Aktivitätsleiste (z. B. für Symbole). Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.", "activityBarBorder": "Rahmenfarbe der Aktivitätsleiste für die Abtrennung von der Seitenleiste. Die Aktivitätsleiste wird ganz links oder rechts angezeigt und ermöglicht das Wechseln zwischen verschiedenen Ansichten der Seitenleiste.", diff --git a/i18n/deu/src/vs/workbench/common/views.i18n.json b/i18n/deu/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..a36d97eb0e0 --- /dev/null +++ b/i18n/deu/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Eine Ansicht mit der ID \"{0}\" ist am Speicherort \"{1}\" bereits registriert." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json index 7331216a594..4f7255a9d91 100644 --- a/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/deu/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Editor schließen", "closeWindow": "Fenster schließen", "closeWorkspace": "Arbeitsbereich schließen", "noWorkspaceOpened": "Zurzeit ist kein Arbeitsbereich in dieser Instanz geöffnet, der geschlossen werden kann.", @@ -52,21 +51,5 @@ "displayLanguage": "Definiert die Anzeigesprache von VSCode.", "doc": "Unter {0} finden Sie eine Liste der unterstützten Sprachen.", "restart": "Das Ändern dieses Wertes erfordert einen Neustart von VSCode.", - "fail.createSettings": "{0} ({1}) kann nicht erstellt werden.", - "openLogsFolder": "Protokollordner öffnen", - "showLogs": "Protokolle anzeigen...", - "mainProcess": "Main", - "sharedProcess": "Geteilt", - "rendererProcess": "Renderer", - "extensionHost": "Erweiterungshost", - "selectProcess": "Prozess auswählen", - "setLogLevel": "Protokollstufe festlegen", - "trace": "Spur", - "debug": "Debuggen", - "info": "Info", - "warn": "Warnung", - "err": "Fehler", - "critical": "Kritisch", - "off": "Aus", - "selectLogLevel": "Protokollstufe auswählen" + "fail.createSettings": "{0} ({1}) kann nicht erstellt werden." } \ 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 2a2af0f320b..aba53ab9214 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 @@ -7,8 +7,9 @@ "view": "Anzeigen", "help": "Hilfe", "file": "Datei", - "developer": "Entwickler", "workspaces": "Arbeitsbereiche", + "developer": "Entwickler", + "workbenchConfigurationTitle": "Workbench", "showEditorTabs": "Steuert, ob geöffnete Editoren auf Registerkarten angezeigt werden sollen.", "workbench.editor.labelFormat.default": "Zeigt den Namen der Datei. Wenn Registerkarten aktiviert sind und zwei Dateien in einer Gruppe den gleichen Namen haben, werden die unterscheidenden Abschnitte der Pfade jeder Datei hinzugefügt. Wenn die Registerkarten deaktiviert sind, wird der Pfad relativ zum Arbeitsbereich-Ordner angezeigt, wenn der Editor aktiv ist. ", "workbench.editor.labelFormat.short": "Den Namen der Datei anzeigen, gefolgt von dessen Verzeichnisnamen.", @@ -20,23 +21,23 @@ "showIcons": "Steuert, ob geöffnete Editoren mit einem Symbol angezeigt werden sollen. Hierzu muss auch ein Symboldesign aktiviert werden.", "enablePreview": "Steuert, ob geöffnete Editoren als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten), und sie werden mit kursivem Schriftschnitt angezeigt.", "enablePreviewFromQuickOpen": "Steuert, ob geöffnete Editoren aus Quick Open als Vorschau angezeigt werden. Vorschau-Editoren werden wiederverwendet, bis sie gespeichert werden (z. B. über Doppelklicken oder Bearbeiten).", + "closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.", "editorOpenPositioning": "Steuert, wo Editoren geöffnet werden. Wählen Sie \"links\" oder \"rechts\", um Editoren links oder rechts neben dem derzeit aktiven Editor zu öffnen. Wählen Sie \"erster\" oder \"letzter\", um Editoren unabhängig vom derzeit aktiven Editor zu öffnen.", "revealIfOpen": "Steuert, ob ein geöffneter Editor in einer der sichtbaren Gruppen angezeigt wird. Ist diese Option deaktiviert, wird ein Editor vorzugsweise in der aktuell aktiven Editorgruppe geöffnet. Ist diese Option aktiviert, wird ein bereits geöffneter Editor angezeigt und nicht in der aktuell aktiven Editorgruppe erneut geöffnet. In einigen Fällen wird diese Einstellung ignoriert, z. B. wenn das Öffnen eines Editors in einer bestimmten Gruppe oder neben der aktuell aktiven Gruppe erzwungen wird.", + "swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.", "commandHistory": "Steuert, ob die Anzahl zuletzt verwendeter Befehle im Verlauf für die Befehlspalette gespeichert wird. Legen Sie diese Option auf 0 fest, um den Befehlsverlauf zu deaktivieren.", "preserveInput": "Steuert, ob die letzte typisierte Eingabe in die Befehlspalette beim nächsten Öffnen wiederhergestellt wird.", "closeOnFocusLost": "Steuert, ob Quick Open automatisch geschlossen werden soll, sobald das Feature den Fokus verliert.", "openDefaultSettings": "Steuert, ob beim Öffnen der Einstellungen auch ein Editor geöffnet wird, der alle Standardeinstellungen anzeigt.", "sideBarLocation": "Steuert die Position der Seitenleiste. Diese kann entweder links oder rechts von der Workbench angezeigt werden.", + "panelDefaultLocation": "Steuert die Standardposition des Panels. Dieses kann entweder unterhalb oder rechts von der Workbench angezeigt werden.", "statusBarVisibility": "Steuert die Sichtbarkeit der Statusleiste im unteren Bereich der Workbench.", "activityBarVisibility": "Steuert die Sichtbarkeit der Aktivitätsleiste in der Workbench.", - "closeOnFileDelete": "Steuert, ob Editoren, die eine Datei anzeigen, automatisch geschlossen werden sollen, wenn die Datei von einem anderen Prozess umbenannt oder gelöscht wird. Wenn Sie diese Option deaktivieren, bleibt der Editor bei einem solchen Ereignis als geändert offen. Bei Löschvorgängen innerhalb der Anwendung wird der Editor immer geschlossen, und geänderte Dateien werden nie geschlossen, damit Ihre Daten nicht verloren gehen.", - "enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.", "fontAliasing": "Steuert die Schriftartaliasingmethode in der Workbench.\n- default: Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.\n- antialiased: Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.\n- none: Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.\n", "workbench.fontAliasing.default": "Subpixel-Schriftartglättung. Auf den meisten Nicht-Retina-Displays wird Text bei dieser Einstellung am schärfsten dargestellt.", "workbench.fontAliasing.antialiased": "Glättet die Schriftart auf der Pixelebene (im Gegensatz zur Subpixelebene). Bei dieser Einstellung kann die Schriftart insgesamt heller wirken.", "workbench.fontAliasing.none": "Deaktiviert die Schriftartglättung. Text wird mit gezackten scharfen Kanten dargestellt.", - "swipeToNavigate": "Hiermit navigieren Sie per waagrechtem Wischen mit drei Fingen zwischen geöffneten Dateien.", - "workbenchConfigurationTitle": "Workbench", + "enableNaturalLanguageSettingsSearch": "Steuert, ob der Suchmodus mit natürlicher Sprache für die Einstellungen aktiviert werden soll.", "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.", diff --git a/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json b/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json index dac54eb81af..ea9b198df1d 100644 --- a/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/deu/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "Ausschneiden", "copy": "Kopieren", "paste": "Einfügen", - "selectAll": "Alles auswählen" + "selectAll": "Alles auswählen", + "runningAsRoot": "Es wird nicht empfohlen, {0} als Root-Benutzer auszuführen." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json index e3b17702d86..adbe0beedd6 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugToolBarBackground": "Hintergrundfarbe der Debug-Symbolleiste." + "debugToolBarBackground": "Hintergrundfarbe der Debug-Symbolleiste.", + "debugToolBarBorder": "Rahmenfarbe der Debug-Symbolleiste." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 3352485c42b..23af77e5fa7 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "Zu debuggende Komponente", - "debug.terminal.not.available.error": "Integriertes Terminal nicht verfügbar" + "debug.terminal.title": "Zu debuggende Komponente" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 0b10a031064..6e06fdbca61 100644 --- a/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Neue Eingabeaufforderung öffnen", "globalConsoleActionMacLinux": "Neues Terminal öffnen", "scopedConsoleActionWin": "In Eingabeaufforderung öffnen", - "scopedConsoleActionMacLinux": "In Terminal öffnen", - "openFolderInIntegratedTerminal": "In Terminal öffnen" + "scopedConsoleActionMacLinux": "In Terminal öffnen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 9cde3634e76..5da27da0751 100644 --- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.", "workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.", + "fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.", "exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.", "reallyRecommended2": "Für diesen Dateityp wird die Erweiterung \"{0}\" empfohlen.", "reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.", diff --git a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..b9d7e353c74 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Workbench" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 46de1e8541a..e8abcac28b7 100644 --- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "Datei", "revealInSideBar": "In Seitenleiste anzeigen", "acceptLocalChanges": "Änderungen verwenden und Datenträgerinhalte überschreiben", - "revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen" + "revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen", + "copyPathOfActive": "Pfad der aktiven Datei kopieren", + "saveAllInGroup": "Alle in der Gruppe speichern", + "revert": "Datei wiederherstellen", + "compareActiveWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen", + "closeEditor": "Editor schließen", + "view": "Anzeigen", + "openToSide": "Zur Seite öffnen", + "revealInWindows": "Im Explorer anzeigen", + "revealInMac": "Im Finder anzeigen", + "openContainer": "Enthaltenden Ordner öffnen", + "copyPath": "Pfad kopieren", + "saveAll": "Alle speichern", + "compareWithSaved": "Mit gespeicherter Datei vergleichen", + "compareSource": "Für Vergleich auswählen", + "close": "Schließen", + "closeOthers": "Andere schließen", + "closeUnmodified": "Nicht geänderte schließen", + "closeAll": "Alle schließen", + "deleteFile": "Endgültig löschen" } \ No newline at end of file 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 4d300a15634..3e34e541dce 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Wiederholen", - "rename": "Umbenennen", "newFile": "Neue Datei", "newFolder": "Neuer Ordner", + "rename": "Umbenennen", + "delete": "Löschen", + "copyFile": "Kopieren", + "pasteFile": "Einfügen", + "retry": "Wiederholen", "openFolderFirst": "Öffnet zuerst einen Ordner, in dem Dateien oder Ordner erstellt werden.", "newUntitledFile": "Neue unbenannte Datei", "createNewFile": "Neue Datei", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "Möchten Sie \"{0}\" wirklich endgültig löschen?", "irreversible": "Diese Aktion kann nicht rückgängig gemacht werden.", "permDelete": "Endgültig löschen", - "delete": "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", - "copyFile": "Kopieren", - "pasteFile": "Einfügen", "duplicateFile": "Duplikat", - "openToSide": "Zur Seite öffnen", - "compareSource": "Für Vergleich auswählen", "globalCompareFile": "Aktive Datei vergleichen mit...", "openFileToCompare": "Zuerst eine Datei öffnen, um diese mit einer anderen Datei zu vergleichen", - "compareWith": "'{0}' mit '{1}' vergleichen", - "compareFiles": "Dateien vergleichen", "refresh": "Aktualisieren", - "save": "Speichern", - "saveAs": "Speichern unter...", - "saveAll": "Alle speichern", "saveAllInGroup": "Alle in der Gruppe speichern", - "saveFiles": "Alle Dateien speichern", - "revert": "Datei wiederherstellen", "focusOpenEditors": "Fokus auf Ansicht \"Geöffnete Editoren\"", "focusFilesExplorer": "Fokus auf Datei-Explorer", "showInExplorer": "Aktive Datei in Seitenleiste anzeigen", @@ -56,20 +47,11 @@ "refreshExplorer": "Explorer aktualisieren", "openFileInNewWindow": "Aktive Datei in neuem Fenster öffnen", "openFileToShowInNewWindow": "Datei zuerst öffnen, um sie in einem neuen Fenster zu öffnen", - "revealInWindows": "Im Explorer anzeigen", - "revealInMac": "Im Finder anzeigen", - "openContainer": "Enthaltenden Ordner öffnen", - "revealActiveFileInWindows": "Aktive Datei im Windows-Explorer anzeigen", - "revealActiveFileInMac": "Aktive Datei im Finder anzeigen", - "openActiveFileContainer": "Enthaltenden Ordner der aktiven Datei öffnen", "copyPath": "Pfad kopieren", - "copyPathOfActive": "Pfad der aktiven Datei kopieren", "emptyFileNameError": "Es muss ein Datei- oder Ordnername angegeben werden.", "fileNameExistsError": "Eine Datei oder ein Ordner **{0}** ist an diesem Ort bereits vorhanden. Wählen Sie einen anderen Namen.", "invalidFileNameError": "Der Name **{0}** ist als Datei- oder Ordnername ungültig. Bitte wählen Sie einen anderen Namen aus.", "filePathTooLongError": "Der Name **{0}** führt zu einem Pfad, der zu lang ist. Wählen Sie einen kürzeren Namen.", - "compareWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen", - "modifiedLabel": "{0} (auf Datenträger) ↔ {1}", "compareWithClipboard": "Aktive Datei mit Zwischenablage vergleichen", "clipboardComparisonLabel": "Zwischenablage ↔ {0}" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index c248ffc5682..216d652c91a 100644 --- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Datei zuerst öffnen, um ihren Pfad zu kopieren", - "openFileToReveal": "Datei zuerst öffnen, um sie anzuzeigen" + "revealInWindows": "Im Explorer anzeigen", + "revealInMac": "Im Finder anzeigen", + "openContainer": "Enthaltenden Ordner öffnen", + "saveAs": "Speichern unter...", + "save": "Speichern", + "saveAll": "Alle speichern", + "saveFiles": "Alle Dateien speichern", + "removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen", + "genericRevertError": "Fehler beim Zurücksetzen von '{0}': {1}", + "modifiedLabel": "{0} (auf Datenträger) ↔ {1}", + "openFileToReveal": "Datei zuerst öffnen, um sie anzuzeigen", + "openFileToCopy": "Datei zuerst öffnen, um ihren Pfad zu kopieren" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 00a2164ceaa..2ddf50e3ffc 100644 --- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Editor", "formatOnSave": "Hiermit wird eine Datei beim Speichern formatiert. Es muss ein Formatierer vorhanden sein, die Datei darf nicht automatisch gespeichert werden, und der Editor darf nicht geschlossen werden.", "explorerConfigurationTitle": "Datei-Explorer", - "openEditorsVisible": "Die Anzahl der Editoren, die im Bereich \"Geöffnete Editoren\" angezeigt werden. Legen Sie diesen Wert auf 0 fest, um den Bereich auszublenden.", - "dynamicHeight": "Steuert, ob sich die Höhe des Abschnitts \"Geöffnete Editoren\" dynamisch an die Anzahl der Elemente anpassen soll.", "autoReveal": "Steuert, ob der Explorer Dateien beim Öffnen automatisch anzeigen und auswählen soll.", "enableDragAndDrop": "Steuert, ob der Explorer das Verschieben von Dateien und Ordnern mithilfe von Drag Drop zulassen soll.", "confirmDragAndDrop": "Steuert, ob der Explorer um Bestätigung bittet, um Dateien und Ordner per Drag & Drop zu verschieben.", diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 55ed6344bee..25a34e50d39 100644 --- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "Verwenden Sie die Aktionen auf der Editor-Symbolleiste auf der rechten Seite, um Ihre Änderungen **rückgängig zu machen** oder den Inhalt auf dem Datenträger mit Ihren Änderungen zu **überschreiben**.", - "discard": "Verwerfen", + "overwriteElevated": "Als Admin überschreiben...", + "saveElevated": "Als Admin wiederholen...", "overwrite": "Überschreiben", "retry": "Wiederholen", - "readonlySaveError": "Fehler beim Speichern von \"{0}\": Die Datei ist schreibgeschützt. Wählen Sie 'Überschreiben' aus, um den Schutz aufzuheben.", + "discard": "Verwerfen", + "readonlySaveErrorAdmin": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. 'Als Admin überschreiben' auswählen, um den Vorgang als Administrator zu wiederholen. ", + "readonlySaveError": "Fehler beim Speichern von '{0}': Datei ist schreibgeschützt. Wählen Sie 'Überschreiben' aus, um den Schutz aufzuheben.", + "permissionDeniedSaveError": "Fehler beim Speichern von '{0}': Unzureichende Zugriffsrechte. Wählen Sie 'Als Admin wiederholen' aus, um den Vorgang als Admin zu wiederholen.", "genericSaveError": "Fehler beim Speichern von \"{0}\": {1}.", "staleSaveError": "Fehler beim Speichern von \"{0}\": Der Inhalt auf dem Datenträger ist neuer. Klicken Sie auf **Vergleichen**, um Ihre Version mit der Version auf dem Datenträger zu vergleichen.", "compareChanges": "Vergleichen", diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index a5003c84539..41368e44e5a 100644 --- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Geöffnete Editoren", "openEditosrSection": "Abschnitt \"Geöffnete Editoren\"", - "dirtyCounter": "{0} nicht gespeichert", - "saveAll": "Alle speichern", - "closeAllUnmodified": "Nicht geänderte schließen", - "closeAll": "Alle schließen", - "compareWithSaved": "Mit gespeicherter Datei vergleichen", - "close": "Schließen", - "closeOthers": "Andere schließen" + "dirtyCounter": "{0} nicht gespeichert" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..9ef6f12276a --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Entwickler" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..2a19c259b0d --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "Protokollordner öffnen", + "showLogs": "Protokolle anzeigen...", + "rendererProcess": "Fenster", + "extensionHost": "Erweiterungshost", + "setLogLevel": "Protokollstufe festlegen", + "debug": "Debuggen", + "info": "Info", + "warn": "Warnung", + "err": "Fehler", + "critical": "Kritisch", + "off": "Aus", + "selectLogLevel": "Protokollstufe auswählen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json index f9df98f6f17..4fe33d4fdf6 100644 --- a/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Anzeigen", - "problems.view.toggle.label": "Probleme umschalten", - "problems.view.focus.label": "Probleme fokussieren", "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", diff --git a/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..a49f4a37242 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Ausgabe", + "viewCategory": "Anzeigen", + "clearOutput.label": "Ausgabe löschen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..95b7cc617b7 --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/output/electron-browser/outputServices.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. +{ + "output": "{0} - Ausgabe", + "channel": "Ausgabekanal für '{0}'" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 26e5d28d658..fb9b2bd366a 100644 --- a/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Testen Sie das Suchen mit natürlicher Sprache!", "defaultSettings": "Platzieren Sie Ihre Einstellungen zum Überschreiben im Editor auf der rechten Seite.", "noSettingsFound": "Keine Einstellungen gefunden.", "settingsSwitcherBarAriaLabel": "Einstellungsumschaltung", "userSettings": "Benutzereinstellungen", "workspaceSettings": "Arbeitsbereichseinstellungen", - "folderSettings": "Ordnereinstellungen", - "enableFuzzySearch": "Suchen mit natürlicher Sprache aktivieren" + "folderSettings": "Ordnereinstellungen" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 74ffcdff9a1..f93cea2858c 100644 --- a/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Am häufigsten verwendet", - "mostRelevant": "Relevantesten", "defaultKeybindingsHeader": "Überschreiben Sie Tastenzuordnungen, indem Sie sie in die Tastenzuordnungsdatei einfügen." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index f5e2daabe29..2ca5c08b0a9 100644 --- a/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Anzeigen", "commandsHandlerDescriptionDefault": "Befehle anzeigen und ausführen", "gotoLineDescriptionMac": "Gehe zu Zeile", "gotoLineDescriptionWin": "Gehe zu Zeile", diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index cfb59dde790..114466fcfbf 100644 --- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,8 @@ "toggleGitViewlet": "Git anzeigen", "source control": "Quellcodeverwaltung", "toggleSCMViewlet": "SCM anzeigen", - "view": "Anzeigen" + "view": "Anzeigen", + "scmConfigurationTitle": "SCM", + "alwaysShowProviders": "Ob der Quellcodeverwaltungsanbieter-Abschnitt immer angezeigt wird.", + "inputCounter": "Steuert die Anzeige des Eingabezählers." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index 6119d2359c6..faa904ce1ab 100644 --- a/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,8 @@ { "scm providers": "Quellcodeanbieter", "hideRepository": "Ausblenden", + "commitMessageInfo": "{0} Zeichen in aktueller Zeile", + "commitMessageCountdown": "{0} Zeichen in der aktuellen Zeile verbleibend", "installAdditionalSCMProviders": "Installiere weiter SCM Provider...", "no open repo": "Es gibt keine aktiven Quellcodeanbieter.", "source control": "Quellcodeverwaltung", 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 f4671bfc3a8..365328f0126 100644 --- a/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Vorherigen Suchbegriff anzeigen", "showSearchViewlet": "Suche anzeigen", "findInFiles": "In Dateien suchen", - "findInFilesWithSelectedText": "In Dateien mit ausgewähltem Text suchen", "replaceInFiles": "In Dateien ersetzen", - "replaceInFilesWithSelectedText": "In Dateien mit ausgewähltem Text ersetzen", "RefreshAction.label": "Aktualisieren", "CollapseDeepestExpandedLevelAction.label": "Alle zuklappen", "ClearSearchResultsAction.label": "Löschen", diff --git a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index a765a1ac06f..e32b687f050 100644 --- a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "In Ordner suchen...", + "findInWorkspace": "In Arbeitsbereich suchen...", "showTriggerActions": "Zu Symbol im Arbeitsbereich wechseln...", "name": "Suchen", "search": "Suchen", + "showSearchViewlet": "Suche anzeigen", "view": "Anzeigen", + "findInFiles": "In Dateien suchen", "openAnythingHandlerDescription": "Zu Datei wechseln", "openSymbolDescriptionNormal": "Zu Symbol im Arbeitsbereich wechseln", "searchOutputChannelTitle": "Suchen", diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..fa89fddbd1a --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Einstellungen" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 7a1c949566e..6d4c86fa94f 100644 --- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Sprache für Codeausschnitt auswählen", - "openSnippet.errorOnCreate": "\"{0}\" kann nicht erstellt werden.", - "openSnippet.label": "Benutzercodeausschnitte öffnen", - "preferences": "Einstellungen", "snippetSchema.json.default": "Leerer Codeausschnitt", "snippetSchema.json": "Benutzerkonfiguration des Codeausschnitts", "snippetSchema.json.prefix": "Das Präfix, das beim Auswählen des Codeausschnitts in IntelliSense verwendet werden soll.", diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..3daae2bbcbd --- /dev/null +++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Benutzercodeausschnitt" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index e67d5f89a93..f989f6698dc 100644 --- a/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}", "invalid.path.0": "Expected string in `contributes.{0}.path`. Provided value: {1}", + "invalid.language": "Unbekannte Sprache in \"contributes.{0}.language\". Bereitgestellter Wert: {1}", "invalid.path.1": "Es wurde erwartet, dass \"contributes.{0}.path\" ({1}) im Ordner ({2}) der Erweiterung enthalten ist. Dies führt ggf. dazu, dass die Erweiterung nicht portierbar ist.", "vscode.extension.contributes.snippets": "Trägt Codeausschnitte bei.", "vscode.extension.contributes.snippets-language": "Der Sprachbezeichner, für den dieser Codeausschnitt beigetragen wird.", "vscode.extension.contributes.snippets-path": "Der Pfad der Codeausschnittdatei. Der Pfad ist relativ zum Erweiterungsordner und beginnt normalerweise mit \". /snippets/\".", "badVariableUse": "Bei mindestens einem Ausschnitt von der Erweiterung \"{0}\" sind Ausschnittsvariablen und Ausschnittsplatzhalter vertauscht (weitere Informationen finden Sie unter https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax).", "badFile": "Die Ausschnittsdatei \"{0}\" konnte nicht gelesen werden.", - "source.snippet": "Benutzercodeausschnitt", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index bc6dee18ad0..e6464f3ff18 100644 --- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -14,6 +14,7 @@ "terminal.integrated.shell.windows": "Der Pfad der Shell, den das Terminal unter Windows verwendet, wenn in Windows enthaltene Terminals verwendet werden (cmd, PowerShell oder Bash unter Ubuntu).", "terminal.integrated.shellArgs.windows": "Die Befehlszeilenargumente, die im Windows-Terminal verwendet werden sollen.", "terminal.integrated.rightClickCopyPaste": "Wenn dies festgelegt ist, erscheint das Kontextmenü bei einem Rechtsklick im Terminal nicht mehr. Stattdessen erfolgen die Vorgänge Kopieren, wenn eine Auswahl vorgenommen wurde, sowie Einfügen, wenn keine Auswahl vorgenommen wurde.", + "terminal.integrated.copyOnSelection": "Wenn gesetzt, wird der im Terminal ausgewählte Text in die Zwischenablage kopiert.", "terminal.integrated.fontFamily": "Steuert die Schriftartfamilie des Terminals. Der Standardwert ist \"editor.fontFamily\".", "terminal.integrated.fontSize": "Steuert den Schriftgrad des Terminals in Pixeln.", "terminal.integrated.lineHeight": "Steuert die Zeilenhöhe für das Terminal. Dieser Wert wird mit dem Schriftgrad des Terminals multipliziert, um die tatsächliche Zeilenhöhe in Pixeln zu erhalten.", diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index 93a8b04286a..edacb0183b5 100644 --- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -14,6 +14,8 @@ "workbench.action.terminal.deleteWordRight": "Wort rechts löschen", "workbench.action.terminal.new": "Neues integriertes Terminal erstellen", "workbench.action.terminal.new.short": "Neues Terminal", + "workbench.action.terminal.newWorkspacePlaceholder": "Aktuelles Arbeitsverzeichnis für neues Terminal auswählen", + "workbench.action.terminal.newInActiveWorkspace": "Neues integriertes Terminal erstellen (in aktivem Arbeitsbereich)", "workbench.action.terminal.focus": "Fokus im Terminal", "workbench.action.terminal.focusNext": "Fokus im nächsten Terminal", "workbench.action.terminal.focusPrevious": "Fokus im vorherigen Terminal", diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 76d17079ae8..35f0add77c1 100644 --- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "Die Vordergrundfarbe des Terminal.", "terminalCursor.foreground": "Die Vordergrundfarbe des Terminalcursors.", "terminalCursor.background": "Die Hintergrundfarbe des Terminalcursors. Ermöglicht das Anpassen der Farbe eines Zeichens, das von einem Blockcursor überdeckt wird.", - "terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals.", - "terminal.ansiColor": "\"{0}\": ANSI-Farbe im Terminal" + "terminal.selectionBackground": "Die Auswahlvordergrundfarbe des Terminals." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index ac6f1dfc78c..a768c43ba81 100644 --- a/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Sie können die Standardterminalshell über die Schaltfläche \"Anpassen\" ändern.", "customize": "Anpassen", "cancel": "Abbrechen", - "never again": "OK, nicht mehr anzeigen", "terminal.integrated.chooseWindowsShell": "Wählen Sie Ihre bevorzugte Terminalshell. Sie können diese später in Ihren Einstellungen ändern.", "terminalService.terminalCloseConfirmationSingular": "Eine aktive Terminalsitzung ist vorhanden. Möchten Sie sie beenden?", "terminalService.terminalCloseConfirmationPlural": "{0} aktive Terminalsitzungen sind vorhanden. Möchten Sie sie beenden?" 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 7c24ef226ba..58c22d0ae12 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 @@ -13,7 +13,7 @@ "read the release notes": "Willkommen bei {0} v{1}! Möchten Sie die Hinweise zu dieser Version lesen?", "licenseChanged": "Unsere Lizenzbedingungen haben sich geändert. Bitte lesen Sie die neuen Bedingungen.", "license": "Lizenz lesen", - "neveragain": "Nie wieder anzeigen", + "neveragain": "Nicht mehr anzeigen", "64bitisavailable": "{0} für 64-Bit-Windows ist jetzt verfügbar!", "learn more": "Weitere Informationen", "updateIsReady": "Neues {0}-Update verfügbar.", @@ -23,6 +23,7 @@ "commandPalette": "Befehlspalette...", "settings": "Einstellungen", "keyboardShortcuts": "Tastenkombinationen", + "userSnippets": "Benutzercodeausschnitte", "selectTheme.label": "Farbdesign", "themes.selectIconTheme.label": "Dateisymboldesign", "not available": "Aktualisierungen nicht verfügbar", diff --git a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index ed6cda9de2a..bf366f305f3 100644 --- a/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/deu/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "Die Datei ist ein Verzeichnis", + "fileNotModifiedError": "Datei nicht geändert seit", "fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden." } \ 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 c16b29bce92..7f863867abd 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 @@ -10,6 +10,7 @@ "fileTooLargeError": "Die Datei ist zu groß, um sie zu öffnen.", "fileNotFoundError": "Die Datei wurde nicht gefunden ({0}).", "fileBinaryError": "Die Datei scheint eine Binärdatei zu sein und kann nicht als Text geöffnet werden.", + "filePermission": "Schreibzugriff auf Datei ({0}) verweigert", "fileExists": "Die zu erstellende Datei ist bereits vorhanden ({0}). ", "fileMoveConflict": "Verschieben/Kopieren kann nicht ausgeführt werden. Die Datei ist am Ziel bereits vorhanden.", "unableToMoveCopyError": "Der Verschiebe-/Kopiervorgang kann nicht ausgeführt werden. Die Datei würde den Ordner ersetzen, in dem sie enthalten ist.", diff --git a/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json index 32304e03cea..2fb3a8af237 100644 --- a/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json +++ b/i18n/deu/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json @@ -22,5 +22,6 @@ "keybindings.json.when": "Die Bedingung, wann der Schlüssel aktiv ist.", "keybindings.json.args": "Argumente, die an den auszuführenden Befehl übergeben werden sollen.", "keyboardConfigurationTitle": "Tastatur", - "dispatch": "Steuert die Abgangslogik, sodass bei einem Tastendruck entweder \"code\" (empfohlen) oder \"keyCode\" verwendet wird." + "dispatch": "Steuert die Abgangslogik, sodass bei einem Tastendruck entweder \"code\" (empfohlen) oder \"keyCode\" verwendet wird.", + "touchbar.enabled": "Aktiviert die macOS-Touchbar-Schaltflächen der Tastatur, sofern verfügbar." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 1e2d38883dc..f953949ef00 100644 --- a/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/deu/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Möchten Sie die Änderungen speichern, die Sie an \"{0}\" vorgenommen haben?", "saveChangesMessages": "Möchten Sie die an den folgenden {0}-Dateien vorgenommenen Änderungen speichern?", - "moreFile": "...1 weitere Datei wird nicht angezeigt", - "moreFiles": "...{0} weitere Dateien werden nicht angezeigt", "saveAll": "&&Alle speichern", "save": "&&Speichern", "dontSave": "&&Nicht speichern", diff --git a/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 7d1b7fccbe0..957e2448664 100644 --- a/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/deu/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "Überschreibt Farben aus dem derzeit ausgewählte Farbdesign.", - "editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign.", "editorColors.comments": "Legt die Farben und Stile für Kommentare fest.", "editorColors.strings": "Legt die Farben und Stile für Zeichenfolgenliterale fest.", "editorColors.keywords": "Legt die Farben und Stile für Schlüsselwörter fest.", @@ -19,5 +18,6 @@ "editorColors.types": "Legt die Farben und Stile für Typdeklarationen und Verweise fest.", "editorColors.functions": "Legt die Farben und Stile für Funktionsdeklarationen und Verweise fest.", "editorColors.variables": "Legt die Farben und Stile für Variablendeklarationen und Verweise fest.", - "editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert)." + "editorColors.textMateRules": "Legt Farben und Stile mithilfe von Textmate-Designregeln fest (erweitert).", + "editorColors": "Überschreibt Editorfarben und den Schriftschnitt aus dem momentan ausgewählten Farbdesign." } \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 67d01f0f0d4..ded36282a85 100644 --- a/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/deu/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden. Öffnen Sie die Datei, um Fehler/Warnungen darin zu beheben, und versuchen Sie es noch mal.", "errorWorkspaceConfigurationFileDirty": "In die Konfigurationsdatei des Arbeitsbereichs kann nicht geschrieben werden, weil sie geändert wurde. Speichern Sie die Datei, und versuchen Sie es noch mal.", "openWorkspaceConfigurationFile": "Konfigurationsdatei des Arbeitsbereichs öffnen", - "close": "Schließen", - "enterWorkspace.close": "Schließen", - "enterWorkspace.dontShowAgain": "Nicht mehr anzeigen", - "enterWorkspace.moreInfo": "Weitere Informationen", - "enterWorkspace.prompt": "Weitere Informationen zum Arbeiten mit mehreren Ordnern in VS Code." + "close": "Schließen" } \ No newline at end of file diff --git a/i18n/esn/extensions/git/out/autofetch.i18n.json b/i18n/esn/extensions/git/out/autofetch.i18n.json index 270030fe345..98972c6f0a2 100644 --- a/i18n/esn/extensions/git/out/autofetch.i18n.json +++ b/i18n/esn/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,6 @@ // Do not edit this file. It is machine generated. { "yes": "Sí", - "no": "No", - "not now": "Ahora No", - "suggest auto fetch": "¿Desea habilitar la búsqueda automática de repositorios de Git?" + "read more": "Leer más", + "no": "No" } \ 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 2258e175547..3be82274dd3 100644 --- a/i18n/esn/extensions/git/out/commands.i18n.json +++ b/i18n/esn/extensions/git/out/commands.i18n.json @@ -64,12 +64,11 @@ "no remotes to pull": "El repositorio no tiene remotos configurados de los que extraer.", "pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama", "no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.", - "push with tags success": "Insertado con etiquetas correctamente.", "nobranch": "Extraiga del repositorio una rama para insertar un remoto.", + "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}'.", - "ok": "Aceptar", - "never again": "De acuerdo, no volver a mostrar este mensaje.", "no remotes to publish": "El repositorio no tiene remotos configurados en los que publicar.", "no changes stash": "No existen cambios para el guardado provisional.", "provide stash message": "Opcionalmente, proporcionar un mensaje para el guardado provisional", diff --git a/i18n/esn/extensions/typescript/out/commands.i18n.json b/i18n/esn/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..cfccf2b7bf9 --- /dev/null +++ b/i18n/esn/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Abra una carpeta en VS Code para usar un proyecto de TypeScript o JavaScript", + "typescript.projectConfigUnsupportedFile": "No se pudo determinar el proyecto de TypeScript o JavaScript. Tipo de archivo no compatible", + "typescript.projectConfigCouldNotGetInfo": "No se pudo determinar el proyecto de TypeScript o JavaScript", + "typescript.noTypeScriptProjectConfig": "El archivo no forma parte de un proyecto de TypeScript", + "typescript.noJavaScriptProjectConfig": "El archivo no forma parte de un proyecto de JavaScript", + "typescript.configureTsconfigQuickPick": "Configurar tsconfig.json", + "typescript.configureJsconfigQuickPick": "Configurar jsconfig.json", + "typescript.projectConfigLearnMore": "Más información" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/base/node/ps.i18n.json b/i18n/esn/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json index 582dfe7c78f..b156efc4162 100644 --- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,6 @@ "lineNumbers.on": "Los números de línea se muestran como un número absoluto.", "lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.", "lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.", - "lineNumbers": "Controla la visualización de números de línea. Los valores posibles son 'on', 'off' y 'relative'.", "rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.", "wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.", "tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.", 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 9cd43302e16..e60652a0dd4 100644 --- a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Color de fondo del resaltado de línea 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 intervalos resaltados; por ejemplo, para Apertura Rápida y Buscar.", "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.", "editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.", 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 a46ce2aad76..3320bca40f6 100644 --- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Ir al error o la advertencia siguiente", - "markerAction.previous.label": "Ir al error o la advertencia anterior", "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.", 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 ce1db0c57f2..22f02c80487 100644 --- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Color de fondo de un símbolo durante el acceso de lectura; por ejemplo, cuando se lee una variable.", - "wordHighlightStrong": "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", diff --git a/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index fc4e80ef3e4..660d6b834cb 100644 --- a/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/esn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}` no es un identificador de menú válido", "missing.command": "El elemento de menú hace referencia a un comando `{0}` que no está definido en la sección 'commands'.", "missing.altCommand": "El elemento de menú hace referencia a un comando alternativo `{0}` que no está definido en la sección 'commands'.", - "dupe.command": "El elemento de menú hace referencia al mismo comando que el comando predeterminado y el comando alternativo", - "nosupport.altCommand": "Actualmente, solo el grupo 'navigation' del menú 'editor/title' es compatible con los comandos alternativos" + "dupe.command": "El elemento de menú hace referencia al mismo comando que el comando predeterminado y el comando alternativo" } \ No newline at end of file diff --git a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json index 37027504432..7e6ced9e2f1 100644 --- a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json @@ -8,28 +8,28 @@ "diff": "Comparar dos archivos entre sí.", "add": "Agregar carpetas a la última ventana activa.", "goto": "Abrir un archivo en la ruta de acceso de la línea y posición de carácter especificadas.", - "locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).", "newWindow": "Fuerce una nueva instancia de Code.", - "performance": "Comience con el comando 'Developer: Startup Performance' habilitado.", - "prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio", - "inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.", - "inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.", "reuseWindow": "Fuerce la apertura de un archivo o carpeta en la última ventana activa.", - "userDataDir": "Especifica el directorio en que se conservan los datos de usuario; es útil cuando se ejecuta como raíz.", - "log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", - "verbose": "Imprima salidas detalladas (implica --wait).", "wait": "Espere a que los archivos sean cerrados antes de volver.", + "locale": "La configuración regional que se usará (por ejemplo, en-US o zh-TW).", + "userDataDir": "Especifica el directorio en que se conservan los datos de usuario; es útil cuando se ejecuta como raíz.", + "version": "Versión de impresión.", + "help": "Imprima el uso.", "extensionHomePath": "Establezca la ruta de acceso raíz para las extensiones.", "listExtensions": "Enumere las extensiones instaladas.", "showVersions": "Muestra las versiones de las extensiones instaladas cuando se usa --list-extension.", "installExtension": "Instala una extensión.", "uninstallExtension": "Desinstala una extensión.", "experimentalApis": "Habilita características de API propuestas para una extensión.", - "disableExtensions": "Deshabilite todas las extensiones instaladas.", - "disableGPU": "Deshabilita la aceleración de hardware de GPU.", + "verbose": "Imprima salidas detalladas (implica --wait).", + "log": "Nivel de registro a utilizar. Por defecto es 'info'. Los valores permitidos son 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", "status": "Imprimir el uso del proceso y la información de diagnóstico.", - "version": "Versión de impresión.", - "help": "Imprima el uso.", + "performance": "Comience con el comando 'Developer: Startup Performance' habilitado.", + "prof-startup": "Ejecutar generador de perfiles de CPU durante el inicio", + "disableExtensions": "Deshabilite todas las extensiones instaladas.", + "inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.", + "inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.", + "disableGPU": "Deshabilita la aceleración de hardware de GPU.", "usage": "Uso", "options": "opciones", "paths": "rutas de acceso", 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 645d8566a96..d1ce3f10c5f 100644 --- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,13 +5,10 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Extensión no válida: package.json no es un archivo JSON.", - "restartCodeLocal": "Reinicie Code antes de volver a instalar {0}.", + "restartCode": "Reinicie Code antes de volver a instalar {0}.", "installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?", "override": "Anular", "cancel": "Cancelar", - "notFoundCompatible": "No se puede instalar porque no se encuentra la extensión '{0}' compatible con la versión actual '{1}' del VS Code.", - "quitCode": "No se puede instalar porque todavía se está ejecutando una instancia obsoleta de la extensión. Por favor, salga e inicie el VS Code antes de volver a instalarlo.\n", - "exitCode": "No se puede instalar porque todavía se está ejecutando una instancia obsoleta de la extensión. Por favor, salga e inicie VS Code antes de volver a instalarlo.", "notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.", "uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?", "uninstallOnly": "Solo", diff --git a/i18n/esn/src/vs/platform/message/common/message.i18n.json b/i18n/esn/src/vs/platform/message/common/message.i18n.json index 9058cce900d..8e3765bff6e 100644 --- a/i18n/esn/src/vs/platform/message/common/message.i18n.json +++ b/i18n/esn/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Cerrar", "later": "Más tarde", - "cancel": "Cancelar" + "cancel": "Cancelar", + "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/theme/common/colorRegistry.i18n.json b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json index 9f8669717f0..d2e9d5e7292 100644 --- a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Color de borde de los widgets del editor. El color solo se usa si el widget elige tener un borde y no invalida el color.", "editorSelectionBackground": "Color de la selección del editor.", "editorSelectionForeground": "Color del texto seleccionado para alto contraste.", - "editorInactiveSelection": "Color de la selección en un editor inactivo.", - "editorSelectionHighlight": "Color de las regiones con el mismo contenido que la selección.", "editorFindMatch": "Color de la coincidencia de búsqueda actual.", - "findMatchHighlight": "Color de las demás coincidencias de búsqueda.", - "findRangeHighlight": "Color del intervalo que limita la búsqueda.", - "hoverHighlight": "Resaltado debajo de la palabra para la que se muestra un recuadro al mantener el puntero.", "hoverBackground": "Color de fondo al mantener el puntero en el editor.", "hoverBorder": "Color del borde al mantener el puntero en el editor.", "activeLinkForeground": "Color de los vínculos activos.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Color de fondo para el texto quitado.", "diffEditorInsertedOutline": "Color de contorno para el texto insertado.", "diffEditorRemovedOutline": "Color de contorno para el texto quitado.", - "mergeCurrentHeaderBackground": "Fondo del encabezado actual en conflictos de combinación alineados.", - "mergeCurrentContentBackground": "Fondo del contenido actual en conflictos de combinación alineados.", - "mergeIncomingHeaderBackground": "Fondo del encabezado de entrada en conflictos de combinación alineados.", - "mergeIncomingContentBackground": "Fondo del contenido de entrada en conflcitos de combinación alineados.", - "mergeCommonHeaderBackground": "Fondo del encabezado de ancestros comunes en conflictos de combinación alineados.", - "mergeCommonContentBackground": "Fondo del contenido de ancestros comunes en conflictos de combinación alineados.", "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.", diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 1127a4ec4f8..e897d06ac34 100644 --- a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'.", - "treeItem.notFound": "No se encontró ningún item del árbol con id '{0}'.", - "treeView.duplicateElement": "El elemento '{0}' ya está registrado" + "treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 1e2b99a1870..9f92beb9392 100644 --- a/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Abrir archivo...", "openFolder": "Abrir carpeta...", "openFileFolder": "Abrir...", - "addFolderToWorkspace": "Agregar carpeta al área de trabajo...", - "add": "&& Agregar", - "addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo", "globalRemoveFolderFromWorkspace": "Quitar carpeta del Área de trabajo...", - "removeFolderFromWorkspace": "Quitar carpeta del área de trabajo", - "openFolderSettings": "Abrir Configuración de carpeta", "saveWorkspaceAsAction": "Guardar área de trabajo como...", "save": "&&Guardar", "saveWorkspace": "Guardar área de trabajo", "openWorkspaceAction": "Abrir área de trabajo...", "openWorkspaceConfigFile": "Abrir archivo de configuración del área de trabajo", - "openFolderAsWorkspaceInNewWindow": "Abrir carpeta como Área de trabajo en una Nueva Ventana", - "workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo" + "openFolderAsWorkspaceInNewWindow": "Abrir carpeta como Área de trabajo en una Nueva Ventana" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..832cb0abb68 --- /dev/null +++ b/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "addFolderToWorkspace": "Agregar carpeta al área de trabajo...", + "addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo", + "workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index ae6d0079e4c..0e9cbb0a9e2 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Mostrar editores del tercer grupo", "allEditorsPicker": "Mostrar todos los editores abiertos", "view": "Ver", - "file": "Archivo" + "file": "Archivo", + "close": "Cerrar", + "closeOthers": "Cerrar otros", + "closeRight": "Cerrar a la derecha", + "closeAllUnmodified": "Cerrar los que no se han modificado", + "closeAll": "Cerrar todo", + "keepOpen": "Mantener abierto", + "showOpenedEditors": "Mostrar editores abiertos", + "keepEditor": "Mantener editor", + "closeEditorsInGroup": "Cerrar todos los editores del grupo", + "closeUnmodifiedEditors": "Cerrar los editores en el grupo sin modificar", + "closeOtherEditors": "Cerrar otros editores", + "closeRightEditors": "Cerrar los editores a la derecha" } \ 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 f88c82cd9df..93badc7f42a 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,18 +17,13 @@ "closeEditor": "Cerrar editor", "revertAndCloseActiveEditor": "Revertir y cerrar el editor", "closeEditorsToTheLeft": "Cerrar los editores a la izquierda", - "closeEditorsToTheRight": "Cerrar los editores a la derecha", "closeAllEditors": "Cerrar todos los editores", - "closeUnmodifiedEditors": "Cerrar los editores en el grupo sin modificar", "closeEditorsInOtherGroups": "Cerrar los editores de otros grupos", - "closeOtherEditorsInGroup": "Cerrar otros editores", - "closeEditorsInGroup": "Cerrar todos los editores del grupo", "moveActiveGroupLeft": "Mover el grupo de editores a la izquierda", "moveActiveGroupRight": "Mover el grupo de editores a la derecha", "minimizeOtherEditorGroups": "Minimizar otros grupos de editores", "evenEditorGroups": "Uniformar anchos del grupo de editores", "maximizeEditor": "Maximizar el grupo de editores y ocultar la barra lateral", - "keepEditor": "Mantener editor", "openNextEditor": "Abrir el editor siguiente", "openPreviousEditor": "Abrir el editor anterior", "nextEditorInGroup": "Abrir el siguiente editor del grupo", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Mostrar editores del primer grupo", "showEditorsInSecondGroup": "Mostrar editores del segundo grupo", "showEditorsInThirdGroup": "Mostrar editores del tercer grupo", - "showEditorsInGroup": "Mostrar los editores del grupo", "showAllEditors": "Mostrar todos los editores", "openPreviousRecentlyUsedEditorInGroup": "Abrir el editor recientemente usado anterior en el grupo", "openNextRecentlyUsedEditorInGroup": "Abrir el siguiente editor recientemente usado en el grupo", diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index a44acd1dea7..441fc68d0e6 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Mover el editor activo por tabulaciones o grupos", "editorCommand.activeEditorMove.arg.name": "Argumento para mover el editor activo", - "editorCommand.activeEditorMove.arg.description": "Propiedades del argumento:\n * 'to': cadena de valor que proporciona dónde moverse.\n\t* 'by': cadena de valor que proporciona la unidad de medida para moverse. Por pestaña o por grupo.\n\t* 'value': valor numérico que proporciona cuantas posiciones o una posición absoluta para mover.", - "commandDeprecated": "El comando **{0}** se ha quitado. Puede usar en su lugar **{1}**", - "openKeybindings": "Configurar métodos abreviados de teclado" + "editorCommand.activeEditorMove.arg.description": "Propiedades del argumento:\n * 'to': cadena de valor que proporciona dónde moverse.\n\t* 'by': cadena de valor que proporciona la unidad de medida para moverse. Por pestaña o por grupo.\n\t* 'value': valor numérico que proporciona cuantas posiciones o una posición absoluta para mover." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index d1ec23e2db6..8fda6300549 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}. Editor de comparación de archivos de texto.", "editableEditorAriaLabel": "Editor de comparación de archivos de texto.", "navigate.next.label": "Cambio siguiente", - "navigate.prev.label": "Cambio anterior", - "inlineDiffLabel": "Cambiar a vista alineada", - "sideBySideDiffLabel": "Cambiar a vista en paralelo" + "navigate.prev.label": "Cambio anterior" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 49c85dbc052..d7236689da9 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Cerrar", - "closeOthers": "Cerrar otros", - "closeRight": "Cerrar a la derecha", - "closeAll": "Cerrar todo", - "closeAllUnmodified": "Cerrar los no modificados", - "keepOpen": "Mantener abierto", - "showOpenedEditors": "Mostrar editores abiertos", "araLabelEditorActions": "Acciones del editor" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/common/theme.i18n.json b/i18n/esn/src/vs/workbench/common/theme.i18n.json index 323cb6d934f..1f48fa2867d 100644 --- a/i18n/esn/src/vs/workbench/common/theme.i18n.json +++ b/i18n/esn/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,6 @@ "editorGroupBackground": "Color de fondo de un grupo de editores. Los grupos de editores son los contenedores de los editores. El color de fondo se ve cuando se mueven arrastrando los grupos de editores.", "tabsContainerBackground": "Color de fondo del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.", "tabsContainerBorder": "Color de borde del encabezado del título del grupo de editores cuando las fichas están habilitadas. Los grupos de editores son contenedores de editores.", - "editorGroupHeaderBackground": "Color de fondo del encabezado del título del grupo de editores cuando las fichas están deshabilitadas. Los grupos de editores son contenedores de editores.", "editorGroupBorder": "Color para separar varios grupos de editores entre sí. Los grupos de editores son los contenedores de los editores.", "editorDragAndDropBackground": "Color de fondo cuando se arrastran los editores. El color debería tener transparencia para que el contenido del editor pueda brillar a su través.", "panelBackground": "Color de fondo del panel. Los paneles se muestran debajo del área de editores y contienen vistas, como Salida y Terminal integrado.", @@ -33,8 +32,6 @@ "statusBarNoFolderBorder": "Color de borde de la barra de estado que separa la barra lateral y el editor cuando no hay ninguna carpeta abierta. La barra de estado se muestra en la parte inferior de la ventana.", "statusBarItemActiveBackground": "Color de fondo de un elemento de la barra de estado al hacer clic. La barra de estado se muestra en la parte inferior de la ventana.", "statusBarItemHoverBackground": "Color de fondo de un elemento de la barra de estado al mantener el puntero. La barra de estado se muestra en la parte inferior de la ventana.", - "statusBarProminentItemBackground": "Color de fondo de los elementos destacados en la barra de estado. Estos elementos sobresalen para indicar importancia. La barra de estado está ubicada en la parte inferior de la ventana.", - "statusBarProminentItemHoverBackground": "Color de fondo de los elementos destacados en la barra de estado cuando se mantiene el mouse sobre estos elementos. Estos elementos sobresalen para indicar importancia. La barra de estado está ubicada en la parte inferior de la ventana.", "activityBarBackground": "Color de fondo de la barra de actividad, que se muestra en el lado izquierdo o derecho y que permite cambiar entre diferentes vistas de la barra lateral.", "activityBarForeground": "Color de fondo de la barra de actividad (por ejemplo utilizado por los iconos). La barra de actividad muestra en el lado izquierdo o derecho y permite cambiar entre diferentes vistas de la barra lateral.", "activityBarBorder": "Color de borde de la barra de actividad que separa la barra lateral. La barra de actividad se muestra en el extremo derecho o izquierdo y permite cambiar entre las vistas de la barra lateral.", diff --git a/i18n/esn/src/vs/workbench/common/views.i18n.json b/i18n/esn/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..f22e31a7e45 --- /dev/null +++ b/i18n/esn/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Ya existe una vista registrada con el identificador '{0}' en la ubicación '{1}'" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json index 81432663720..c875a388e03 100644 --- a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Cerrar editor", "closeWindow": "Cerrar ventana", "closeWorkspace": "Cerrar área de trabajo", "noWorkspaceOpened": "No hay ninguna área de trabajo abierta en esta instancia para cerrarla.", @@ -52,21 +51,5 @@ "displayLanguage": "Define el lenguaje para mostrar de VSCode.", "doc": "Consulte {0} para obtener una lista de idiomas compatibles.", "restart": "Al cambiar el valor se requiere reiniciar VSCode.", - "fail.createSettings": "No se puede crear '{0}' ({1}).", - "openLogsFolder": "Abrir carpeta de registros", - "showLogs": "Mostrar registros...", - "mainProcess": "Principal", - "sharedProcess": "Compartido", - "rendererProcess": "Renderizador", - "extensionHost": "Host de extensión", - "selectProcess": "Seleccionar proceso", - "setLogLevel": "Establecer nivel de registro", - "trace": "Seguimiento", - "debug": "Depurar", - "info": "Información", - "warn": "Advertencia", - "err": "Error", - "critical": "Crítico", - "off": "Apagado", - "selectLogLevel": "Seleccione el nivel de registro" + "fail.createSettings": "No se puede crear '{0}' ({1})." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/main.contribution.i18n.json index f2abdd8deaf..dd5456c4e0f 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 @@ -7,8 +7,9 @@ "view": "Ver", "help": "Ayuda", "file": "Archivo", - "developer": "Desarrollador", "workspaces": "Áreas de trabajo", + "developer": "Desarrollador", + "workbenchConfigurationTitle": "Área de trabajo", "showEditorTabs": "Controla si los editores abiertos se deben mostrar o no en pestañas.", "workbench.editor.labelFormat.default": "Mostrar el nombre del archivo. Cuando están habilitadas las pestañas y dos archivos tienen el mismo nombre en un grupo se agregan las secciones de distinguinshing de ruta de cada archivo. Cuando se desactivan las pestañas, se muestra la ruta de acceso relativa a la carpeta de trabajo si el editor está activo.", "workbench.editor.labelFormat.short": "Mostrar el nombre del archivo seguido de su nombre de directorio.", @@ -20,8 +21,10 @@ "showIcons": "Controla si los editores abiertos deben mostrarse o no con un icono. Requiere que también se habilite un tema de icono.", "enablePreview": "Controla si los editores abiertos se muestran en vista previa. Los editores en vista previa se reutilizan hasta que se guardan (por ejemplo, mediante doble clic o editándolos) y se muestran en cursiva.", "enablePreviewFromQuickOpen": "Controla si los editores abiertos mediante Quick Open se muestran en modo de vista previa. Los editores en modo de vista previa se reutilizan hasta que se conservan (por ejemplo, mediante doble clic o editándolos).", + "closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.", "editorOpenPositioning": "Controla dónde se abren los editores. Seleccione 'izquierda' o 'derecha' para abrir los editores situados a la izquierda o la derecha del que está actualmente activo. Seleccione 'primero' o 'último' para abrir los editores con independencia del que esté actualmente activo. ", "revealIfOpen": "Controla si un editor se muestra en alguno de los grupos visibles cuando se abre. Si se deshabilita esta opción, un editor preferirá abrirse en el grupo de editores activo en ese momento. Si se habilita, un editor ya abierto se mostrará en lugar de volver a abrirse en el grupo de editores activo. Tenga en cuenta que hay casos en los que esta opción se omite; por ejemplo, cuando se fuerza la apertura de un editor en un grupo específico o junto al grupo activo actual.", + "swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.", "commandHistory": "Controla el número de comandos utilizados recientemente que se mantendrán en el historial de la paleta de comandos. Establezca el valor a 0 para desactivar el historial de comandos.", "preserveInput": "Controla si la última entrada introducida en la paleta de comandos debería ser restaurada cuando sea abierta la próxima vez.", "closeOnFocusLost": "Controla si Quick Open debe cerrarse automáticamente cuando pierde el foco.", @@ -29,14 +32,11 @@ "sideBarLocation": "Controla la ubicación de la barra lateral. Puede mostrarse a la izquierda o a la derecha del área de trabajo.", "statusBarVisibility": "Controla la visibilidad de la barra de estado en la parte inferior del área de trabajo.", "activityBarVisibility": "Controla la visibilidad de la barra de actividades en el área de trabajo.", - "closeOnFileDelete": "Controla si los editores que muestran un archivo deben cerrarse automáticamente cuando otro proceso elimina el archivo o le cambia el nombre. Si se deshabilita esta opción y se da alguna de estas circunstancias, se mantiene el editor abierto con modificaciones. Tenga en cuenta que, cuando se eliminan archivos desde la aplicación, siempre se cierra el editor y que los archivos con modificaciones no se cierran nunca para preservar los datos.", - "enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.", "fontAliasing": "Controla el método de suavizado de fuentes en el área de trabajo.\n- default: suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.\n- antialiased: suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general\n- none: deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.", "workbench.fontAliasing.default": "Suavizado de fuentes en subpíxeles. En la mayoría de las pantallas que no son Retina, esta opción muestra el texto más nítido.", "workbench.fontAliasing.antialiased": "Suaviza las fuentes en píxeles, en lugar de subpíxeles. Puede hacer que las fuentes se vean más claras en general.", "workbench.fontAliasing.none": "Deshabilita el suavizado de fuentes. El texto se muestra con bordes nítidos irregulares.", - "swipeToNavigate": "Navegar entre achivos abiertos utlizando la pulsación de tres dedos para deslizar horizontalmante.", - "workbenchConfigurationTitle": "Área de trabajo", + "enableNaturalLanguageSettingsSearch": "Controla si habilita el modo de búsqueda de lenguaje natural para la configuración.", "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", diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 0f8291c0572..68ea94e5a20 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "depurado", - "debug.terminal.not.available.error": "Terminal integrado no disponible" + "debug.terminal.title": "depurado" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 1ba4ecd59bf..c01e0004e65 100644 --- a/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Abrir nuevo símbolo del sistema", "globalConsoleActionMacLinux": "Abrir nuevo terminal", "scopedConsoleActionWin": "Abrir en símbolo del sistema", - "scopedConsoleActionMacLinux": "Abrir en terminal", - "openFolderInIntegratedTerminal": "Abrir en terminal" + "scopedConsoleActionMacLinux": "Abrir en terminal" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 3335907cc3e..a0c3a72ce3f 100644 --- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.", "workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.", + "fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.", "exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ", "reallyRecommended2": "La extension recomendada para este tipo de archivo es {0}", "reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.", diff --git a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..eff0be207f1 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Área de trabajo" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 5b4f1d9a867..619e931bff1 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "Archivo", "revealInSideBar": "Mostrar en barra lateral", "acceptLocalChanges": "Usar los cambios y sobrescribir el contenido del disco", - "revertLocalChanges": "Descartar los cambios y volver al contenido del disco" + "revertLocalChanges": "Descartar los cambios y volver al contenido del disco", + "copyPathOfActive": "Copiar ruta del archivo activo", + "saveAllInGroup": "Guardar todo en el grupo", + "revert": "Revertir archivo", + "compareActiveWithSaved": "Comparar el archivo activo con el guardado", + "closeEditor": "Cerrar editor", + "view": "Ver", + "openToSide": "Abrir en el lateral", + "revealInWindows": "Mostrar en el Explorador", + "revealInMac": "Mostrar en Finder", + "openContainer": "Abrir carpeta contenedora", + "copyPath": "Copiar ruta de acceso", + "saveAll": "Guardar todos", + "compareWithSaved": "Comparar con el guardado", + "compareSource": "Seleccionar para comparar", + "close": "Cerrar", + "closeOthers": "Cerrar otros", + "closeUnmodified": "Cerrar los que no se han modificado", + "closeAll": "Cerrar todo", + "deleteFile": "Eliminar permanentemente" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json index 849c94fa0c7..a96cb97676f 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Reintentar", - "rename": "Cambiar nombre", "newFile": "Nuevo archivo", "newFolder": "Nueva carpeta", + "rename": "Cambiar nombre", + "delete": "Eliminar", + "copyFile": "Copiar", + "pasteFile": "Pegar", + "retry": "Reintentar", "openFolderFirst": "Abra primero una carpeta para crear archivos o carpetas en ella.", "newUntitledFile": "Nuevo archivo sin título", "createNewFile": "Nuevo archivo", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "¿Está seguro de que desea eliminar '{0}' de forma permanente?", "irreversible": "Esta acción es irreversible.", "permDelete": "Eliminar permanentemente", - "delete": "Eliminar", "importFiles": "Importar archivos", "confirmOverwrite": "Ya existe un archivo o carpeta con el mismo nombre en la carpeta de destino. ¿Quiere reemplazarlo?", "replaceButtonLabel": "&&Reemplazar", - "copyFile": "Copiar", - "pasteFile": "Pegar", "duplicateFile": "Duplicado", - "openToSide": "Abrir en el lateral", - "compareSource": "Seleccionar para comparar", "globalCompareFile": "Comparar archivo activo con...", "openFileToCompare": "Abrir un archivo antes para compararlo con otro archivo.", - "compareWith": "Comparar \"{0}\" con \"{1}\"", - "compareFiles": "Comparar archivos", "refresh": "Actualizar", - "save": "Guardar", - "saveAs": "Guardar como...", - "saveAll": "Guardar todos", "saveAllInGroup": "Guardar todo en el grupo", - "saveFiles": "Guardar todos los archivos", - "revert": "Revertir archivo", "focusOpenEditors": "Foco sobre la vista de editores abiertos", "focusFilesExplorer": "Enfocar Explorador de archivos", "showInExplorer": "Mostrar el archivo activo en la barra lateral", @@ -56,20 +47,11 @@ "refreshExplorer": "Actualizar Explorador", "openFileInNewWindow": "Abrir archivo activo en nueva ventana", "openFileToShowInNewWindow": "Abrir un archivo antes para abrirlo en una nueva ventana", - "revealInWindows": "Mostrar en el Explorador", - "revealInMac": "Mostrar en Finder", - "openContainer": "Abrir carpeta contenedora", - "revealActiveFileInWindows": "Mostrar archivo activo en el Explorador de Windows", - "revealActiveFileInMac": "Mostrar archivo activo en Finder", - "openActiveFileContainer": "Abrir carpeta contenedora del archivo activo", "copyPath": "Copiar ruta de acceso", - "copyPathOfActive": "Copiar ruta del archivo activo", "emptyFileNameError": "Debe especificarse un nombre de archivo o carpeta.", "fileNameExistsError": "Ya existe el archivo o carpeta **{0}** en esta ubicación. Elija un nombre diferente.", "invalidFileNameError": "El nombre **{0}** no es válido para el archivo o la carpeta. Elija un nombre diferente.", "filePathTooLongError": "El nombre **{0}** da como resultado una ruta de acceso demasiado larga. Elija un nombre más corto.", - "compareWithSaved": "Comparar el archivo activo con el guardado", - "modifiedLabel": "{0} (en el disco) ↔ {1}", "compareWithClipboard": "Comparar archivo activo con portapapeles", "clipboardComparisonLabel": "Clipboard ↔ {0}" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index f417c4b11aa..41e7bc8dcaf 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso", - "openFileToReveal": "Abrir un archivo antes para mostrarlo" + "revealInWindows": "Mostrar en el Explorador", + "revealInMac": "Mostrar en Finder", + "openContainer": "Abrir carpeta contenedora", + "saveAs": "Guardar como...", + "save": "Guardar", + "saveAll": "Guardar todos", + "saveFiles": "Guardar todos los archivos", + "removeFolderFromWorkspace": "Quitar carpeta del área de trabajo", + "modifiedLabel": "{0} (en el disco) ↔ {1}", + "openFileToReveal": "Abrir un archivo antes para mostrarlo", + "openFileToCopy": "Abrir un archivo antes para copiar su ruta de acceso" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 6b7926d2bf7..34df999607b 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Editor", "formatOnSave": "Formatea un archivo al guardarlo. Debe haber un formateador disponible, el archivo no debe guardarse automáticamente y el editor no debe estar cerrándose.", "explorerConfigurationTitle": "Explorador de archivos", - "openEditorsVisible": "Número de editores mostrados en el panel Editores abiertos. Establezca este valor en 0 para ocultar el panel.", - "dynamicHeight": "Controla si la altura de la sección de editores abiertos debería adaptarse o no de forma dinámica al número de elementos.", "autoReveal": "Controla si el explorador debe mostrar y seleccionar automáticamente los archivos al abrirlos.", "enableDragAndDrop": "Controla si el explorador debe permitir mover archivos y carpetas mediante la función arrastrar y colocar.", "confirmDragAndDrop": "Controla si el explorador debe pedir la confirmación al reubicar archivos o carpetas a través de arrastrar y soltar.", diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 186f5cdaa42..85b5734142e 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,9 @@ // Do not edit this file. It is machine generated. { "userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios", - "discard": "Descartar", "overwrite": "Sobrescribir", "retry": "Reintentar", - "readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione \"Sobrescribir\" para quitar la protección.", + "discard": "Descartar", "genericSaveError": "No se pudo guardar '{0}': {1}", "staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.", "compareChanges": "Comparar", diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index b4bad361098..f5060aef05b 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Editores abiertos", "openEditosrSection": "Sección Editores abiertos", - "dirtyCounter": "{0} sin guardar", - "saveAll": "Guardar todos", - "closeAllUnmodified": "Cerrar los que no se han modificado", - "closeAll": "Cerrar todo", - "compareWithSaved": "Comparar con el guardado", - "close": "Cerrar", - "closeOthers": "Cerrar otros" + "dirtyCounter": "{0} sin guardar" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..68e35e56b16 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Desarrollador" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..80e723dfda2 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -0,0 +1,22 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "openLogsFolder": "Abrir carpeta de registros", + "showLogs": "Mostrar registros...", + "mainProcess": "Principal", + "sharedProcess": "Compartido", + "rendererProcess": "Ventana", + "extensionHost": "Host de extensión", + "selectProcess": "Seleccionar proceso", + "setLogLevel": "Establecer nivel de registro", + "trace": "Seguimiento", + "debug": "Depurar", + "info": "Información", + "warn": "Advertencia", + "err": "Error", + "critical": "Crítico", + "off": "Apagado" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json index a028050eafb..b28c9ca3342 100644 --- a/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Ver", - "problems.view.toggle.label": "Alternar Problemas ", - "problems.view.focus.label": "Problemas de enfoque", "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", diff --git a/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..c75638715f9 --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Salida", + "viewCategory": "Ver", + "clearOutput.label": "Borrar salida" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index b720c2b8a57..7f4ed8494b7 100644 --- a/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "¡Intentar la búsqueda del lenguaje natural!", "defaultSettings": "Colocar la configuración en el editor de lado de mano derecha para anular.", "noSettingsFound": "No se encontró ninguna configuración.", "settingsSwitcherBarAriaLabel": "Conmutador de configuración", "userSettings": "Configuración de usuario", "workspaceSettings": "Configuración de área de trabajo", - "folderSettings": "Configuración de Carpeta", - "enableFuzzySearch": "Habilitar búsqueda en lenguaje natural" + "folderSettings": "Configuración de Carpeta" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 575bc61fdb4..2ae85dc2ac1 100644 --- a/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Más utilizada", - "mostRelevant": "Más relevante", "defaultKeybindingsHeader": "Coloque los enlaces de teclado en el archivo de enlaces de teclado para sobrescribirlos." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 3a50ec52260..6e19797b529 100644 --- a/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Ver", "commandsHandlerDescriptionDefault": "Mostrar y ejecutar comandos", "gotoLineDescriptionMac": "Ir a la línea", "gotoLineDescriptionWin": "Ir a la línea", diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 2d44f58d514..c5061e853b0 100644 --- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Mostrar GIT", "source control": "Control de código fuente", "toggleSCMViewlet": "Mostrar SCM", - "view": "Ver" + "view": "Ver", + "scmConfigurationTitle": "SCM" } \ 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 bcfc62d1906..5357b8b610a 100644 --- a/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Mostrar anterior término de búsqueda", "showSearchViewlet": "Mostrar búsqueda", "findInFiles": "Buscar en archivos", - "findInFilesWithSelectedText": "Buscar en ficheros de texto seleccionado", "replaceInFiles": "Reemplazar en archivos", - "replaceInFilesWithSelectedText": "Reemplazar en archivos con el texto seleccionado", "RefreshAction.label": "Actualizar", "CollapseDeepestExpandedLevelAction.label": "Contraer todo", "ClearSearchResultsAction.label": "Borrar", diff --git a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index fe7e74dbe33..a0aba2b8419 100644 --- a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Buscar en carpeta...", + "findInWorkspace": "Buscar en área de trabajo...", "showTriggerActions": "Ir al símbolo en el área de trabajo...", "name": "Buscar", "search": "Buscar", + "showSearchViewlet": "Mostrar búsqueda", "view": "Ver", + "findInFiles": "Buscar en archivos", "openAnythingHandlerDescription": "Ir al archivo", "openSymbolDescriptionNormal": "Ir al símbolo en el área de trabajo", "searchOutputChannelTitle": "Buscar", diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..9675a4f182c --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Preferencias" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index c49e1beb60b..5fb6638f35b 100644 --- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Seleccione lenguaje para el fragmento", - "openSnippet.errorOnCreate": "No se puede crear {0}", - "openSnippet.label": "Abrir fragmentos de código del usuario", - "preferences": "Preferencias", "snippetSchema.json.default": "Fragmento de código vacío", "snippetSchema.json": "Configuración de fragmento de código del usuario", "snippetSchema.json.prefix": "El prefijo que se debe usar al seleccionar el fragmento de código en Intellisense", diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..8c806f2935a --- /dev/null +++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Fragmento de código del usuario" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index ecf3b81fb81..34d3cff577c 100644 --- a/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}", "invalid.path.0": "Se esperaba una cadena en \"contributes.{0}.path\". Valor proporcionado: {1}", + "invalid.language": "Lenguaje desconocido en \"contributes.{0}.language\". Valor proporcionado: {1}", "invalid.path.1": "Se esperaba que \"contributes.{0}.path\" ({1}) se incluyera en la carpeta de la extensión ({2}). Esto puede hacer que la extensión no sea portátil.", "vscode.extension.contributes.snippets": "Aporta fragmentos de código.", "vscode.extension.contributes.snippets-language": "Identificador del lenguaje al que se aporta este fragmento de código.", "vscode.extension.contributes.snippets-path": "Ruta de acceso del archivo de fragmentos de código. La ruta es relativa a la carpeta de extensión y normalmente empieza por \"./snippets/\".", "badVariableUse": "Uno o más fragmentos de la extensión '{0}' muy probable confunden variables de fragmento y fragmento-marcadores de posición (véase https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para más detalles)", "badFile": "No se pudo leer el archivo del fragmento \"{0}\".", - "source.snippet": "Fragmento de código del usuario", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index b41adfc8dd9..f8bbe6f41b9 100644 --- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "El color de primer plano del terminal.", "terminalCursor.foreground": "Color de primer plano del cursor del terminal.", "terminalCursor.background": "Color de fondo del cursor del terminal. Permite personalizar el color de un carácter solapado por un cursor de bloque.", - "terminal.selectionBackground": "Color de fondo de selección del terminal.", - "terminal.ansiColor": "Color ANSI \"{0}\" en el terminal." + "terminal.selectionBackground": "Color de fondo de selección del terminal." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 1a5374df014..d5f5c068b5f 100644 --- a/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Para cambiar el shell de terminal predeterminado, seleccione el botón Personalizar.", "customize": "Personalizar", "cancel": "Cancelar", - "never again": "De acuerdo, no volver a mostrar este mensaje", "terminal.integrated.chooseWindowsShell": "Seleccione el shell de terminal que desee, puede cambiarlo más adelante en la configuración", "terminalService.terminalCloseConfirmationSingular": "Hay una sesión de terminal activa, ¿quiere terminarla?", "terminalService.terminalCloseConfirmationPlural": "Hay {0} sesiones de terminal activas, ¿quiere terminarlas?" diff --git a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 1d8632efe35..45b01f69897 100644 --- a/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/esn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileNotModifiedError": "Archivo no modificado desde", "fileBinaryError": "El archivo parece ser binario y no se puede abrir como texto" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index e49927e3bdf..caa8ce6bf00 100644 --- a/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/esn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "¿Quiere guardar los cambios efectuados en {0}?", "saveChangesMessages": "¿Desea guardar los cambios en los siguientes {0} archivos?", - "moreFile": "...1 archivo más que no se muestra", - "moreFiles": "...{0} archivos más que no se muestran", "saveAll": "&&Guardar todo", "save": "Guardar", "dontSave": "&&No guardar", diff --git a/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 302c7ed170b..410c2efcbcb 100644 --- a/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/esn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "Reemplaza los colores del tema de color actual", - "editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado.", "editorColors.comments": "Establece los colores y estilos para los comentarios", "editorColors.strings": "Establece los colores y estilos para los literales de cadena.", "editorColors.keywords": "Establece los colores y estilos para las palabras clave.", @@ -19,5 +18,6 @@ "editorColors.types": "Establece los colores y estilos para las declaraciones y referencias de tipos.", "editorColors.functions": "Establece los colores y estilos para las declaraciones y referencias de funciones.", "editorColors.variables": "Establece los colores y estilos para las declaraciones y referencias de variables.", - "editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas)." + "editorColors.textMateRules": "Establece colores y estilos utilizando las reglas de la tematización de textmate (avanzadas).", + "editorColors": "Reemplaza los colores y el estilo de fuente del editor del tema de color seleccionado." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 83604230ec4..e7f9d116f01 100644 --- a/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/esn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "No se puede escribir en el archivo de configuración del espacio de trabajo. Por favor, abra el archivo para corregir sus errores/advertencias e inténtelo de nuevo.", "errorWorkspaceConfigurationFileDirty": "No se puede escribir en el archivo de configuración de espacio de trabajo porque el archivo ha sido modificado. Por favor, guárdelo y vuelva a intentarlo.", "openWorkspaceConfigurationFile": "Abrir archivo de configuración del área de trabajo", - "close": "Cerrar", - "enterWorkspace.close": "Cerrar", - "enterWorkspace.dontShowAgain": "No volver a mostrar", - "enterWorkspace.moreInfo": "Más información", - "enterWorkspace.prompt": "Obtenga más información acerca de cómo trabajar con varias carpetas en VS Code. " + "close": "Cerrar" } \ No newline at end of file diff --git a/i18n/fra/extensions/git/out/autofetch.i18n.json b/i18n/fra/extensions/git/out/autofetch.i18n.json index c7e1b61f3ec..54fcbb321ef 100644 --- a/i18n/fra/extensions/git/out/autofetch.i18n.json +++ b/i18n/fra/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,6 @@ // Do not edit this file. It is machine generated. { "yes": "Oui", - "no": "Non", - "not now": "Pas maintenant", - "suggest auto fetch": "Voulez-vous activer la rappatriement automatique des dépôts Git ?" + "read more": "Lire la suite", + "no": "Non" } \ 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 ec8efb3f0d7..cc941a646ad 100644 --- a/i18n/fra/extensions/git/out/commands.i18n.json +++ b/i18n/fra/extensions/git/out/commands.i18n.json @@ -64,12 +64,11 @@ "no remotes to pull": "Votre dépôt n'a aucun dépôt distant configuré pour un Pull.", "pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche", "no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.", - "push with tags success": "Envoyé (push) avec des balises.", "nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.", + "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}'.", - "ok": "OK", - "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).", "provide stash message": "Spécifier éventuellement un message pour la remise (stash)", diff --git a/i18n/fra/extensions/typescript/out/commands.i18n.json b/i18n/fra/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..6c1e268636a --- /dev/null +++ b/i18n/fra/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Ouvrez un dossier dans VS Code pour utiliser un projet TypeScript ou JavaScript", + "typescript.projectConfigUnsupportedFile": "Impossible de déterminer le projet TypeScript ou JavaScript. Type de fichier non pris en charge", + "typescript.projectConfigCouldNotGetInfo": "Impossible de déterminer le projet TypeScript ou JavaScript", + "typescript.noTypeScriptProjectConfig": "Le fichier ne fait pas partie d'un projet TypeScript", + "typescript.noJavaScriptProjectConfig": "Le fichier ne fait pas partie d'un projet JavaScript", + "typescript.configureTsconfigQuickPick": "Configurer tsconfig.json", + "typescript.configureJsconfigQuickPick": "Configurer jsconfig.json", + "typescript.projectConfigLearnMore": "En savoir plus" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/base/node/ps.i18n.json b/i18n/fra/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json index dd19016cb45..406f474987e 100644 --- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,6 @@ "lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.", "lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.", "lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.", - "lineNumbers": "Contrôle l’affichage des numéros de ligne. Les valeurs possibles sont 'on', 'off', et 'relative'.", "rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide", "wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots", "tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.", 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 4bea17a181e..f2cc0b4325a 100644 --- a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Couleur d'arrière-plan de la mise en surbrillance de la ligne à la position du curseur.", "lineHighlightBorderBox": "Couleur d'arrière-plan de la bordure autour de la ligne à la position du curseur.", - "rangeHighlight": "Couleur d'arrière-plan des plages mises en surbrillance, par exemple par les fonctionnalités de recherche et Quick Open.", "caret": "Couleur du curseur de l'éditeur.", "editorCursorBackground": "La couleur de fond du curseur de l'éditeur. Permet de personnaliser la couleur d'un caractère survolé par un curseur de bloc.", "editorWhitespaces": "Couleur des espaces blancs dans l'éditeur.", 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 2e7dbc5e1ee..e09d1ef1ebe 100644 --- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Accéder à l'erreur ou l'avertissement suivant", - "markerAction.previous.label": "Accéder à l'erreur ou l'avertissement précédent", "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.", 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 45974daea0a..9b718f92008 100644 --- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Couleur d'arrière-plan d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable.", - "wordHighlightStrong": "Couleur d'arrière-plan 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.", "wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole", diff --git a/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index ed0024d2710..f13a4bbc9e9 100644 --- a/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/fra/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "'{0}' est un identificateur de menu non valide", "missing.command": "L'élément de menu fait référence à une commande '{0}' qui n'est pas définie dans la section 'commands'.", "missing.altCommand": "L'élément de menu fait référence à une commande alt '{0}' qui n'est pas définie dans la section 'commands'.", - "dupe.command": "L'élément de menu fait référence à la même commande que la commande par défaut et la commande alt", - "nosupport.altCommand": "Actuellement, seul le groupe 'navigation' du menu 'editor/title' prend en charge les commandes alt" + "dupe.command": "L'élément de menu fait référence à la même commande que la commande par défaut et la commande alt" } \ No newline at end of file diff --git a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json index f676e6c787f..7b909d1fca4 100644 --- a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json @@ -8,28 +8,28 @@ "diff": "Comparez deux fichiers entre eux.", "add": "Ajoutez un ou plusieurs dossiers à la dernière fenêtre active.", "goto": "Ouvrez un fichier dans le chemin, à la ligne et la position de caractère spécifiées.", - "locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).", "newWindow": "Forcez l'utilisation d'une nouvelle instance de Code.", - "performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.", - "prof-startup": "Exécuter le profileur d'UC au démarrage", - "inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.", - "inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.", "reuseWindow": "Forcez l'ouverture d'un fichier ou dossier dans la dernière fenêtre active.", - "userDataDir": "Spécifie le répertoire où sont conservées les données des utilisateurs. S'avère utile pour une exécution en tant que root.", - "log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.", - "verbose": "Affichez la sortie détaillée (implique --wait).", "wait": "Attendre que les fichiers soient fermés avant de retourner.", + "locale": "Paramètres régionaux à utiliser (exemple : fr-FR ou en-US).", + "userDataDir": "Spécifie le répertoire où sont conservées les données des utilisateurs. S'avère utile pour une exécution en tant que root.", + "version": "Affichez la version.", + "help": "Affichez le mode d'utilisation.", "extensionHomePath": "Définissez le chemin racine des extensions.", "listExtensions": "Listez les extensions installées.", "showVersions": "Affichez les versions des extensions installées, quand --list-extension est utilisé.", "installExtension": "Installe une extension.", "uninstallExtension": "Désinstalle une extension.", "experimentalApis": "Active les fonctionnalités d'API proposées pour une extension.", - "disableExtensions": "Désactivez toutes les extensions installées.", - "disableGPU": "Désactivez l'accélération matérielle du GPU.", + "verbose": "Affichez la sortie détaillée (implique --wait).", + "log": "Niveau de journalisation à utiliser. La valeur par défaut est 'info'. Les valeurs autorisées sont 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off.", "status": "Imprimer l'utilisation de processus et l'information des diagnostics.", - "version": "Affichez la version.", - "help": "Affichez le mode d'utilisation.", + "performance": "Démarrez avec la commande 'Développeur : performance de démarrage' activée.", + "prof-startup": "Exécuter le profileur d'UC au démarrage", + "disableExtensions": "Désactivez toutes les extensions installées.", + "inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.", + "inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.", + "disableGPU": "Désactivez l'accélération matérielle du GPU.", "usage": "Utilisation", "options": "options", "paths": "chemins", 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 620e2694e2a..40c901eec8f 100644 --- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,13 +5,10 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Extension non valide : package.json n'est pas un fichier JSON.", - "restartCodeLocal": "Redémarrez Code avant de réinstaller {0}.", + "restartCode": "Redémarrez Code avant de réinstaller {0}.", "installingOutdatedExtension": "Une version plus récente de cette extension est déjà installée. Voulez-vous remplacer celle-ci avec l'ancienne version ?", "override": "Remplacer", "cancel": "Annuler", - "notFoundCompatible": "Installation impossible car l'extension '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.", - "quitCode": "Installation impossible car une instance obsolète de l'extension est en cours d'exécution. Veuillez quitter et redémarrer VS Code avant de réinstaller.", - "exitCode": "Installation impossible car une instance obsolète de l'extension est en cours d'exécution. Veuillez sortir et redémarrer VS Code avant de réinstaller.", "notFoundCompatibleDependency": "Installation impossible car l'extension dépendante '{0}' compatible avec la version actuelle '{1}' de VS Code est introuvable.", "uninstallDependeciesConfirmation": "Voulez-vous désinstaller uniquement '{0}' ou également ses dépendances ?", "uninstallOnly": "Uniquement", diff --git a/i18n/fra/src/vs/platform/message/common/message.i18n.json b/i18n/fra/src/vs/platform/message/common/message.i18n.json index 93ee2acf35b..227d6123d7a 100644 --- a/i18n/fra/src/vs/platform/message/common/message.i18n.json +++ b/i18n/fra/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Fermer", "later": "Plus tard", - "cancel": "Annuler" + "cancel": "Annuler", + "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/theme/common/colorRegistry.i18n.json b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json index 64fc37335ec..2d46ac2791e 100644 --- a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Couleur de bordure des widgets de l'éditeur. La couleur est utilisée uniquement si le widget choisit d'avoir une bordure et si la couleur n'est pas remplacée par un widget.", "editorSelectionBackground": "Couleur de la sélection de l'éditeur.", "editorSelectionForeground": "Couleur du texte sélectionné pour le contraste élevé.", - "editorInactiveSelection": "Couleur de la sélection dans un éditeur inactif.", - "editorSelectionHighlight": "Couleur des régions dont le contenu est identique à la sélection.", "editorFindMatch": "Couleur du résultat de recherche actif.", - "findMatchHighlight": "Couleur des autres résultats de recherche.", - "findRangeHighlight": "Couleur de la plage limitant la recherche.", - "hoverHighlight": "Mettez en surbrillance ci-dessous le mot pour lequel un pointage s'affiche.", "hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.", "hoverBorder": "Couleur de bordure du pointage de l'éditeur.", "activeLinkForeground": "Couleur des liens actifs.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Couleur d'arrière-plan du texte supprimé.", "diffEditorInsertedOutline": "Couleur de contour du texte inséré.", "diffEditorRemovedOutline": "Couleur de contour du texte supprimé.", - "mergeCurrentHeaderBackground": "Arrière-plan de l'en-tête actuel dans les conflits de fusion inline.", - "mergeCurrentContentBackground": "Arrière-plan du contenu actuel dans les conflits de fusion inline.", - "mergeIncomingHeaderBackground": "Arrière-plan de l'en-tête entrant dans les conflits de fusion inline.", - "mergeIncomingContentBackground": "Arrière-plan du contenu entrant dans les conflits de fusion inline.", - "mergeCommonHeaderBackground": "Arrière-plan de l'en-tête de l'ancêtre commun dans les conflits de fusion inline.", - "mergeCommonContentBackground": "Arrière-plan du contenu de l'ancêtre commun dans les conflits de fusion inline.", "mergeBorder": "Couleur de bordure des en-têtes et du séparateur dans les conflits de fusion inline.", "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.", diff --git a/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 2c25d01eeb1..42b1301caed 100644 --- a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite.", - "treeItem.notFound": "L'élément d'arborescence avec l'ID '{0}' est introuvable.", - "treeView.duplicateElement": "L'élément '{0}' est déjà inscrit" + "treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 6158fd5950f..3bffd603d63 100644 --- a/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Ouvrir un fichier...", "openFolder": "Ouvrir un dossier...", "openFileFolder": "Ouvrir...", - "addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...", - "add": "&&Ajouter", - "addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail", "globalRemoveFolderFromWorkspace": "Supprimer le dossier d’espace de travail...", - "removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail", - "openFolderSettings": "Ouvrir le dossier Paramètres", "saveWorkspaceAsAction": "Enregistrer l’espace de travail sous...", "save": "&&Enregistrer", "saveWorkspace": "Enregistrer l’espace de travail", "openWorkspaceAction": "Ouvrir un espace de travail...", "openWorkspaceConfigFile": "Ouvrir le Fichier de Configuration d’espace de travail", - "openFolderAsWorkspaceInNewWindow": "Ouvrir le dossier en tant qu'espace de travail dans une nouvelle fenêtre", - "workspaceFolderPickerPlaceholder": "Sélectionner le dossier de l’espace de travail" + "openFolderAsWorkspaceInNewWindow": "Ouvrir le dossier en tant qu'espace de travail dans une nouvelle fenêtre" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..b644d1c9572 --- /dev/null +++ b/i18n/fra/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "Ajouter un dossier à l'espace de travail...", + "add": "&&Ajouter", + "addFolderToWorkspaceTitle": "Ajouter un dossier à l'espace de travail", + "workspaceFolderPickerPlaceholder": "Sélectionner le dossier de l’espace de travail" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 4326e29e9e4..0db82346ee1 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Afficher les éditeurs du troisième groupe", "allEditorsPicker": "Afficher tous les éditeurs ouverts", "view": "Affichage", - "file": "Fichier" + "file": "Fichier", + "close": "Fermer", + "closeOthers": "Fermer les autres", + "closeRight": "Fermer à droite", + "closeAllUnmodified": "Fermer les éléments non modifiés", + "closeAll": "Tout fermer", + "keepOpen": "Garder ouvert", + "showOpenedEditors": "Afficher les éditeurs ouverts", + "keepEditor": "Conserver l'éditeur", + "closeEditorsInGroup": "Fermer tous les éditeurs du groupe", + "closeUnmodifiedEditors": "Fermer les éditeurs non modifiés du groupe", + "closeOtherEditors": "Fermer les autres éditeurs", + "closeRightEditors": "Fermer les éditeurs situés à droite" } \ 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 19586632ac8..e7febec4eda 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,18 +17,13 @@ "closeEditor": "Fermer l'éditeur", "revertAndCloseActiveEditor": "Restaurer et fermer l'éditeur", "closeEditorsToTheLeft": "Fermer les éditeurs situés à gauche", - "closeEditorsToTheRight": "Fermer les éditeurs situés à droite", "closeAllEditors": "Fermer tous les éditeurs", - "closeUnmodifiedEditors": "Fermer les éditeurs non modifiés du groupe", "closeEditorsInOtherGroups": "Fermer les éditeurs des autres groupes", - "closeOtherEditorsInGroup": "Fermer les autres éditeurs", - "closeEditorsInGroup": "Fermer tous les éditeurs du groupe", "moveActiveGroupLeft": "Déplacer le groupe d'éditeurs vers la gauche", "moveActiveGroupRight": "Déplacer le groupe d'éditeurs vers la droite", "minimizeOtherEditorGroups": "Réduire les autres groupes d'éditeurs", "evenEditorGroups": "Même largeur pour le groupe d'éditeurs", "maximizeEditor": "Agrandir le groupe d'éditeurs et masquer la barre latérale", - "keepEditor": "Conserver l'éditeur", "openNextEditor": "Ouvrir l'éditeur suivant", "openPreviousEditor": "Ouvrir l'éditeur précédent", "nextEditorInGroup": "Ouvrir l'éditeur suivant du groupe", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Afficher les éditeurs du premier groupe", "showEditorsInSecondGroup": "Afficher les éditeurs du deuxième groupe", "showEditorsInThirdGroup": "Afficher les éditeurs du troisième groupe", - "showEditorsInGroup": "Afficher les éditeurs du groupe", "showAllEditors": "Afficher tous les éditeurs", "openPreviousRecentlyUsedEditorInGroup": "Ouvrir l'éditeur précédent du groupe", "openNextRecentlyUsedEditorInGroup": "Ouvrir l'éditeur suivant du groupe", diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index be96f08df0d..5dc335cf48b 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Déplacer l'éditeur actif par onglets ou par groupes", "editorCommand.activeEditorMove.arg.name": "Argument de déplacement de l'éditeur actif", - "editorCommand.activeEditorMove.arg.description": "Propriétés d’argument : * 'to' : Valeur de chaîne spécifiant où aller.\n\t* 'by' : Valeur de chaîne spécifiant l'unité à déplacer. Par tabulation ou par groupe.\n\t* 'value' : Valeur numérique spécifiant combien de positions ou une position absolue à déplacer.", - "commandDeprecated": "La commande **{0}** a été supprimée. Vous pouvez utiliser **{1}** à la place", - "openKeybindings": "Configurer les raccourcis clavier" + "editorCommand.activeEditorMove.arg.description": "Propriétés d’argument : * 'to' : Valeur de chaîne spécifiant où aller.\n\t* 'by' : Valeur de chaîne spécifiant l'unité à déplacer. Par tabulation ou par groupe.\n\t* 'value' : Valeur numérique spécifiant combien de positions ou une position absolue à déplacer." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 92e9eaf8779..c8b5ce11fb1 100644 --- a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de fichier texte.", "editableEditorAriaLabel": "Éditeur de comparaison de fichier texte.", "navigate.next.label": "Modification suivante", - "navigate.prev.label": "Modification précédente", - "inlineDiffLabel": "Passer au mode inline", - "sideBySideDiffLabel": "Passer au mode Côte à côte" + "navigate.prev.label": "Modification précédente" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 99c0ec41f61..a0384c94b7a 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Fermer", - "closeOthers": "Fermer les autres", - "closeRight": "Fermer à droite", - "closeAll": "Tout fermer", - "closeAllUnmodified": "Fermer les éléments non modifiés", - "keepOpen": "Garder ouvert", - "showOpenedEditors": "Afficher les éditeurs ouverts", "araLabelEditorActions": "Actions de l'éditeur" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/common/theme.i18n.json b/i18n/fra/src/vs/workbench/common/theme.i18n.json index 0082e6d4ec1..d89c104a156 100644 --- a/i18n/fra/src/vs/workbench/common/theme.i18n.json +++ b/i18n/fra/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,6 @@ "editorGroupBackground": "Couleur d'arrière-plan d'un groupe d'éditeurs. Les groupes d'éditeurs sont les conteneurs des éditeurs. La couleur d'arrière-plan s'affiche pendant le glissement de groupes d'éditeurs.", "tabsContainerBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.", "tabsContainerBorder": "Couleur de bordure de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.", - "editorGroupHeaderBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont désactivés. Les groupes d'éditeurs sont les conteneurs des éditeurs.", "editorGroupBorder": "Couleur séparant plusieurs groupes d'éditeurs les uns des autres. Les groupes d'éditeurs sont les conteneurs des éditeurs.", "editorDragAndDropBackground": "Couleur d'arrière-plan lors du déplacement des éditeurs par glissement. La couleur doit avoir une transparence pour que le contenu de l'éditeur soit visible à travers.", "panelBackground": "Couleur d'arrière-plan du panneau. Les panneaux s'affichent sous la zone d'éditeurs et contiennent des affichages tels que la sortie et le terminal intégré.", @@ -33,8 +32,6 @@ "statusBarNoFolderBorder": "Couleur de la bordure qui sépare la barre latérale et l’éditeur lorsque aucun dossier ne s’ouvre la barre d’état. La barre d’état s’affiche en bas de la fenêtre.", "statusBarItemActiveBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un clic. La barre d'état est affichée en bas de la fenêtre.", "statusBarItemHoverBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un pointage. La barre d'état est affichée en bas de la fenêtre.", - "statusBarProminentItemBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. La barre d'état est affichée en bas de la fenêtre.", - "statusBarProminentItemHoverBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état pendant le pointage. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. La barre d'état est affichée en bas de la fenêtre.", "activityBarBackground": "Couleur d'arrière-plan de la barre d'activités. La barre d'activités s'affiche complètement à gauche ou à droite, et permet de naviguer entre les affichages de la barre latérale.", "activityBarForeground": "Couleur de premier plan de la barre d'activités (par ex., utilisée pour les icônes). La barre d'activités s'affiche complètement à gauche ou à droite, et permet de parcourir les vues de la barre latérale.", "activityBarBorder": "Couleur de bordure de la barre d'activités faisant la séparation avec la barre latérale. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.", diff --git a/i18n/fra/src/vs/workbench/common/views.i18n.json b/i18n/fra/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..e7ba8e9e54b --- /dev/null +++ b/i18n/fra/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Une vue avec l’id `{0}` est déjà enregistrée à l’emplacement `{1}`" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json index 541429a5408..93919d9a851 100644 --- a/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/fra/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Fermer l'éditeur", "closeWindow": "Fermer la fenêtre", "closeWorkspace": "Fermer l’espace de travail", "noWorkspaceOpened": "Il n’y a actuellement aucun espace de travail ouvert dans cette instance à fermer.", @@ -52,21 +51,5 @@ "displayLanguage": "Définit le langage affiché par VSCode.", "doc": "Consultez {0} pour connaître la liste des langues prises en charge.", "restart": "Le changement de la valeur nécessite le redémarrage de VS Code.", - "fail.createSettings": "Impossible de créer '{0}' ({1}).", - "openLogsFolder": "Ouvrir le dossier des journaux", - "showLogs": "Afficher les journaux...", - "mainProcess": "Principal", - "sharedProcess": "Partagé", - "rendererProcess": "Renderer", - "extensionHost": "Hôte de l’extension", - "selectProcess": "Sélectionner le processus", - "setLogLevel": "Définir le niveau de journalisation (log)", - "trace": "Trace", - "debug": "Déboguer", - "info": "Informations", - "warn": "Avertissement", - "err": "Erreur", - "critical": "Critique", - "off": "Désactivé", - "selectLogLevel": "Sélectionner le niveau de journalisation (log)" + "fail.createSettings": "Impossible de créer '{0}' ({1})." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/main.contribution.i18n.json index 7c7573087ca..ad524f220e9 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 @@ -7,8 +7,9 @@ "view": "Affichage", "help": "Aide", "file": "Fichier", - "developer": "Développeur", "workspaces": "Espaces de travail", + "developer": "Développeur", + "workbenchConfigurationTitle": "Banc d'essai", "showEditorTabs": "Contrôle si les éditeurs ouverts doivent s'afficher ou non sous des onglets.", "workbench.editor.labelFormat.default": "Afficher le nom du fichier. Lorsque les onglets sont activés et que deux fichiers portent le même nom dans un groupe, les sections distinctes du chemin de chaque fichier sont ajoutées. Lorsque les onglets sont désactivées, le chemin d’accès relatif au dossier de l'espace de travail est affiché si l’éditeur est actif.", "workbench.editor.labelFormat.short": "Indiquer le nom du fichier suivi de son nom de répertoire.", @@ -20,8 +21,10 @@ "showIcons": "Contrôle si les éditeurs ouverts doivent s'afficher ou non avec une icône. Cela implique notamment l'activation d'un thème d'icône.", "enablePreview": "Contrôle si les éditeurs ouverts s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification) et apparaissent avec un style de police en italique.", "enablePreviewFromQuickOpen": "Contrôle si les éditeurs de Quick Open s'affichent en mode aperçu. Les éditeurs en mode aperçu sont réutilisés jusqu'à ce qu'ils soient conservés (par exemple, après un double-clic ou une modification).", + "closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.", "editorOpenPositioning": "Permet de définir à quel endroit les éditeurs s'ouvrent. Sélectionnez 'left' ou 'right' pour ouvrir les éditeurs à gauche ou à droite de celui actuellement actif. Sélectionnez 'first' ou 'last' pour ouvrir les éditeurs indépendamment de celui actuellement actif.", "revealIfOpen": "Contrôle si un éditeur est affiché dans l'un des groupes visibles, s'il est ouvert. Si cette option est désactivée, l'éditeur s'ouvre de préférence dans le groupe d'éditeurs actif. Si cette option est activée, tout éditeur déjà ouvert est affiché au lieu d'être rouvert dans le groupe d'éditeurs actif. Notez que dans certains cas, ce paramètre est ignoré, par exemple quand vous forcez un éditeur à s'ouvrir dans un groupe spécifique ou à côté du groupe actif.", + "swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ", "commandHistory": "Contrôle le nombre de commandes récemment utilisées à retenir dans l’historique de la palette de commande. Spécifier la valeur 0 pour désactiver l’historique des commandes.", "preserveInput": "Contrôle si la dernière entrée tapée dans la palette de commandes doit être restaurée à la prochaine ouverture.", "closeOnFocusLost": "Contrôle si Quick Open doit se fermer automatiquement, une fois qu'il a perdu le focus.", @@ -29,14 +32,11 @@ "sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.", "statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.", "activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.", - "closeOnFileDelete": "Contrôle si les éditeurs qui affichent un fichier doivent se fermer automatiquement quand ce fichier est supprimé ou renommé par un autre processus. Si vous désactivez cette option, l'éditeur reste ouvert dans un état indiquant une intégrité compromise. Notez que la suppression de fichiers à partir de l'application entraîne toujours la fermeture de l'éditeur, et que les fichiers à l'intégrité compromise ne sont jamais fermés pour permettre la conservation de vos données.", - "enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.", "fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées", "workbench.fontAliasing.default": "Lissage de sous-pixel des polices. Sur la plupart des affichages non-retina, cela vous donnera le texte le plus vif.", "workbench.fontAliasing.antialiased": "Lisser les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble.", "workbench.fontAliasing.none": "Désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées.", - "swipeToNavigate": "Parcourez les fichiers ouverts en faisant glisser trois doigts horizontalement. ", - "workbenchConfigurationTitle": "Banc d'essai", + "enableNaturalLanguageSettingsSearch": "Contrôle s’il faut activer le mode de recherche en langage naturel pour les paramètres.", "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", diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 6740cff8f8e..c08a897c7ff 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "élément débogué", - "debug.terminal.not.available.error": "Terminal intégré non disponible" + "debug.terminal.title": "élément débogué" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 8fadf8b958b..f5bf621cde9 100644 --- a/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Ouvrir une nouvelle invite de commandes", "globalConsoleActionMacLinux": "Ouvrir un nouveau Terminal", "scopedConsoleActionWin": "Ouvrir dans l'invite de commandes", - "scopedConsoleActionMacLinux": "Ouvrir dans Terminal", - "openFolderInIntegratedTerminal": "Ouvrir dans Terminal" + "scopedConsoleActionMacLinux": "Ouvrir dans Terminal" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 32c0006fd67..deaa7b6f422 100644 --- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.", "workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.", + "fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.", "exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.", "reallyRecommended2": "L'extension '{0}' est recommandée pour ce type de fichier.", "reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.", diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..92f8f5bfde6 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Banc d'essai" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 54a25f75ec0..6b95908d9ab 100644 --- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "Fichier", "revealInSideBar": "Afficher dans la barre latérale", "acceptLocalChanges": "Utiliser vos modifications et écraser les contenus du disque", - "revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque" + "revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque", + "copyPathOfActive": "Copier le chemin du fichier actif", + "saveAllInGroup": "Enregistrer tout dans le groupe", + "revert": "Rétablir le fichier", + "compareActiveWithSaved": "Compare le fichier actif avec celui enregistré", + "closeEditor": "Fermer l'éditeur", + "view": "Affichage", + "openToSide": "Ouvrir sur le côté", + "revealInWindows": "Révéler dans l'Explorateur", + "revealInMac": "Révéler dans le Finder", + "openContainer": "Ouvrir le dossier contenant", + "copyPath": "Copier le chemin", + "saveAll": "Enregistrer tout", + "compareWithSaved": "Comparer avec celui enregistré", + "compareSource": "Sélectionner pour comparer", + "close": "Fermer", + "closeOthers": "Fermer les autres", + "closeUnmodified": "Fermer les éléments non modifiés", + "closeAll": "Tout fermer", + "deleteFile": "Supprimer définitivement" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.i18n.json index 002c86e7daa..c54a8d0847c 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Réessayer", - "rename": "Renommer", "newFile": "Nouveau fichier", "newFolder": "Nouveau dossier", + "rename": "Renommer", + "delete": "Supprimer", + "copyFile": "Copier", + "pasteFile": "Coller", + "retry": "Réessayer", "openFolderFirst": "Ouvrez d'abord un dossier pour y créer des fichiers ou des dossiers.", "newUntitledFile": "Nouveau fichier sans titre", "createNewFile": "Nouveau fichier", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "Voulez-vous vraiment supprimer définitivement '{0}' ?", "irreversible": "Cette action est irréversible !", "permDelete": "Supprimer définitivement", - "delete": "Supprimer", "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", - "copyFile": "Copier", - "pasteFile": "Coller", "duplicateFile": "Doublon", - "openToSide": "Ouvrir sur le côté", - "compareSource": "Sélectionner pour comparer", "globalCompareFile": "Comparer le fichier actif à...", "openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.", - "compareWith": "Comparer '{0}' à '{1}'", - "compareFiles": "Comparer des fichiers", "refresh": "Actualiser", - "save": "Enregistrer", - "saveAs": "Enregistrer sous...", - "saveAll": "Enregistrer tout", "saveAllInGroup": "Enregistrer tout dans le groupe", - "saveFiles": "Enregistrer tous les fichiers", - "revert": "Rétablir le fichier", "focusOpenEditors": "Mettre le focus sur la vue des éditeurs ouverts", "focusFilesExplorer": "Focus sur l'Explorateur de fichiers", "showInExplorer": "Révéler le fichier actif dans la barre latérale", @@ -56,20 +47,11 @@ "refreshExplorer": "Actualiser l'explorateur", "openFileInNewWindow": "Ouvrir le fichier actif dans une nouvelle fenêtre", "openFileToShowInNewWindow": "Ouvrir d'abord un fichier à ouvrir dans une nouvelle fenêtre", - "revealInWindows": "Révéler dans l'Explorateur", - "revealInMac": "Révéler dans le Finder", - "openContainer": "Ouvrir le dossier contenant", - "revealActiveFileInWindows": "Révéler le fichier actif dans l'Explorateur Windows", - "revealActiveFileInMac": "Révéler le fichier actif dans le Finder", - "openActiveFileContainer": "Ouvrir le dossier contenant le fichier actif", "copyPath": "Copier le chemin", - "copyPathOfActive": "Copier le chemin du fichier actif", "emptyFileNameError": "Un nom de fichier ou de dossier doit être fourni.", "fileNameExistsError": "Un fichier ou dossier **{0}** existe déjà à cet emplacement. Choisissez un autre nom.", "invalidFileNameError": "Le nom **{0}** est non valide en tant que nom de fichier ou de dossier. Choisissez un autre nom.", "filePathTooLongError": "Le nom **{0}** correspond à un chemin d'accès trop long. Choisissez un nom plus court.", - "compareWithSaved": "Compare le fichier actif avec celui enregistré", - "modifiedLabel": "{0} (sur le disque) ↔ {1}", "compareWithClipboard": "Compare le fichier actif avec le presse-papiers", "clipboardComparisonLabel": "Presse-papier ↔ {0}" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index ee5d441071a..01118df61d2 100644 --- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin", - "openFileToReveal": "Ouvrir d'abord un fichier à révéler" + "revealInWindows": "Révéler dans l'Explorateur", + "revealInMac": "Révéler dans le Finder", + "openContainer": "Ouvrir le dossier contenant", + "saveAs": "Enregistrer sous...", + "save": "Enregistrer", + "saveAll": "Enregistrer tout", + "saveFiles": "Enregistrer tous les fichiers", + "removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail", + "modifiedLabel": "{0} (sur le disque) ↔ {1}", + "openFileToReveal": "Ouvrir d'abord un fichier à révéler", + "openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 9693ca31c50..906663f100a 100644 --- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Éditeur", "formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.", "explorerConfigurationTitle": "Explorateur de fichiers", - "openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts. Définissez la valeur 0 pour masquer le volet.", - "dynamicHeight": "Contrôle si la hauteur de la section des éditeurs ouverts doit s'adapter dynamiquement ou non au nombre d'éléments.", "autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.", "enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.", "confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.", diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index f944e7fc14f..e1888e6d1c2 100644 --- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,9 @@ // Do not edit this file. It is machine generated. { "userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications", - "discard": "Abandonner", "overwrite": "Remplacer", "retry": "Réessayer", - "readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour supprimer la protection.", + "discard": "Abandonner", "genericSaveError": "Échec d'enregistrement de '{0}' ({1}).", "staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.", "compareChanges": "Comparer", diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index c536ea46a5d..620260dc73a 100644 --- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Éditeurs ouverts", "openEditosrSection": "Section des éditeurs ouverts", - "dirtyCounter": "{0} non enregistré(s)", - "saveAll": "Enregistrer tout", - "closeAllUnmodified": "Fermer les éléments non modifiés", - "closeAll": "Tout fermer", - "compareWithSaved": "Comparer avec celui enregistré", - "close": "Fermer", - "closeOthers": "Fermer les autres" + "dirtyCounter": "{0} non enregistré(s)" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..9af3f02e1b1 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Développeur" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..53a40630054 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "Ouvrir le dossier des journaux", + "rendererProcess": "Fenêtre", + "selectProcess": "Sélectionner le processus", + "setLogLevel": "Définir le niveau de journalisation (log)", + "debug": "Déboguer", + "info": "Informations", + "warn": "Avertissement", + "err": "Erreur", + "off": "Désactivé", + "selectLogLevel": "Sélectionner le niveau de journalisation (log)" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json index de7f944af49..2b60a006c26 100644 --- a/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Affichage", - "problems.view.toggle.label": "Activer/désactiver les problèmes", - "problems.view.focus.label": "Problèmes de focus", "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", diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..1298d315d6c --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Sortie", + "viewCategory": "Affichage", + "clearOutput.label": "Effacer la sortie" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 89aaca94b7b..d5cd0fe71d7 100644 --- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Essayez la recherche en langage naturel !", "defaultSettings": "Placez vos paramètres dans l’éditeur du côté droit pour substituer.", "noSettingsFound": "Aucun paramètre.", "settingsSwitcherBarAriaLabel": "Sélecteur de paramètres", "userSettings": "Paramètres utilisateur", "workspaceSettings": "Paramètres de l'espace de travail", - "folderSettings": "Paramètres de dossier", - "enableFuzzySearch": "Activer la recherche en langage naturel" + "folderSettings": "Paramètres de dossier" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 42c1698dcd3..5800126a777 100644 --- a/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Utilisés le plus souvent", - "mostRelevant": "Plus pertinent", "defaultKeybindingsHeader": "Remplacez les combinaisons de touches dans votre fichier de combinaisons de touches." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 923695e6fb4..561c8b8fcd3 100644 --- a/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Affichage", "commandsHandlerDescriptionDefault": "Commandes d'affichage et d'exécution", "gotoLineDescriptionMac": "Atteindre la ligne", "gotoLineDescriptionWin": "Atteindre la ligne", diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 015c5898f64..48bc93f989d 100644 --- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Afficher Git", "source control": "Contrôle de code source", "toggleSCMViewlet": "Afficher SCM", - "view": "Afficher" + "view": "Afficher", + "scmConfigurationTitle": "SCM" } \ 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 72ef3e89f83..c87f37c878c 100644 --- a/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Afficher le terme de recherche précédent", "showSearchViewlet": "Afficher la zone de recherche", "findInFiles": "Chercher dans les fichiers", - "findInFilesWithSelectedText": "Rechercher dans les fichiers avec le texte sélectionné", "replaceInFiles": "Remplacer dans les fichiers", - "replaceInFilesWithSelectedText": "Remplacer dans les fichiers avec le texte sélectionné", "RefreshAction.label": "Actualiser", "CollapseDeepestExpandedLevelAction.label": "Réduire tout", "ClearSearchResultsAction.label": "Effacer", diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 727436ac8ed..578f575ae02 100644 --- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Rechercher dans le dossier...", + "findInWorkspace": "Trouver dans l’espace de travail...", "showTriggerActions": "Atteindre le symbole dans l'espace de travail...", "name": "Rechercher", "search": "Rechercher", + "showSearchViewlet": "Afficher la zone de recherche", "view": "Affichage", + "findInFiles": "Chercher dans les fichiers", "openAnythingHandlerDescription": "Accéder au fichier", "openSymbolDescriptionNormal": "Atteindre le symbole dans l'espace de travail", "searchOutputChannelTitle": "Rechercher", diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..7b7ad15376c --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Préférences" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 96366bc3eb5..b30a97f875d 100644 --- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Sélectionner le langage de l'extrait de code", - "openSnippet.errorOnCreate": "Impossible de créer {0}", - "openSnippet.label": "Ouvrir les extraits de code utilisateur", - "preferences": "Préférences", "snippetSchema.json.default": "Extrait de code vide", "snippetSchema.json": "Configuration de l'extrait de code utilisateur", "snippetSchema.json.prefix": "Préfixe à utiliser durant la sélection de l'extrait de code dans IntelliSense", diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..c12c73b0de8 --- /dev/null +++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Extrait de code utilisateur" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index 0c67783e02a..a5340df3092 100644 --- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}", "invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}", + "invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}", "invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.", "vscode.extension.contributes.snippets": "Ajoute des extraits de code.", "vscode.extension.contributes.snippets-language": "Identificateur de langage pour lequel cet extrait de code est ajouté.", "vscode.extension.contributes.snippets-path": "Chemin du fichier d'extraits de code. Le chemin est relatif au dossier d'extensions et commence généralement par './snippets/'.", "badVariableUse": "Un ou plusieurs extraits de l’extension '{0}' confondent très probablement des snippet-variables et des snippet-placeholders (Voir https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax pour plus de détails)", "badFile": "Le fichier d’extrait \"{0}\" n’a pas pu être lu.", - "source.snippet": "Extrait de code utilisateur", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 89f1b826995..4908dd97c81 100644 --- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "Couleur de premier plan du terminal.", "terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.", "terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.", - "terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.", - "terminal.ansiColor": "Couleur ansi '{0}' dans le terminal." + "terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index d636f6886f8..531697fe3da 100644 --- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Vous pouvez changer l'interpréteur de commandes par défaut du terminal en sélectionnant le bouton Personnaliser.", "customize": "Personnaliser", "cancel": "Annuler", - "never again": "OK, ne plus afficher", "terminal.integrated.chooseWindowsShell": "Sélectionnez votre interpréteur de commandes de terminal favori. Vous pouvez le changer plus tard dans vos paramètres", "terminalService.terminalCloseConfirmationSingular": "Il existe une session de terminal active. Voulez-vous la tuer ?", "terminalService.terminalCloseConfirmationPlural": "Il existe {0} sessions de terminal actives. Voulez-vous les tuer ?" 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 12b4156b835..1e7c69d38aa 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 @@ -23,6 +23,7 @@ "commandPalette": "Palette de commandes...", "settings": "Paramètres", "keyboardShortcuts": "Raccourcis clavier", + "userSnippets": "Extraits de code de l'utilisateur", "selectTheme.label": "Thème de couleur", "themes.selectIconTheme.label": "Thème d'icône de fichier", "not available": "Mises à jour non disponibles", diff --git a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 8ca568a2f40..865514aec03 100644 --- a/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/fra/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "Le fichier est un répertoire", + "fileNotModifiedError": "Fichier non modifié depuis", "fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte" } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 4d90040dd20..a5d794a742e 100644 --- a/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/fra/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Voulez-vous enregistrer les modifications apportées à {0} ?", "saveChangesMessages": "Voulez-vous enregistrer les modifications apportées aux {0} fichiers suivants ?", - "moreFile": "...1 fichier supplémentaire non affiché", - "moreFiles": "...{0} fichiers supplémentaires non affichés", "saveAll": "&&Enregistrer tout", "save": "&&Enregistrer", "dontSave": "&&Ne pas enregistrer", diff --git a/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 46a345fad2d..e40e5326149 100644 --- a/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/fra/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "Remplace les couleurs du thème de couleur sélectionné.", - "editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée.", "editorColors.comments": "Définit les couleurs et les styles des commentaires", "editorColors.strings": "Définit les couleurs et les styles des littéraux de chaînes.", "editorColors.keywords": "Définit les couleurs et les styles des mots clés.", @@ -19,5 +18,6 @@ "editorColors.types": "Définit les couleurs et les styles des déclarations et références de type.", "editorColors.functions": "Définit les couleurs et les styles des déclarations et références de fonctions.", "editorColors.variables": "Définit les couleurs et les styles des déclarations et références de variables.", - "editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé)." + "editorColors.textMateRules": "Définit les couleurs et les styles à l’aide de règles de thème textmate (avancé).", + "editorColors": "Remplace les couleurs et le style de la police de l’éditeur du thème par la couleur actuellement sélectionnée." } \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 079d530ab03..f4f2e499154 100644 --- a/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/fra/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Impossible d’écrire dans le fichier de configuration de l’espace de travail. Veuillez ouvrir le fichier pour y corriger les erreurs/avertissements et essayez à nouveau.", "errorWorkspaceConfigurationFileDirty": "Impossible d’écrire dans le fichier de configuration de l’espace de travail, car le fichier a été modifié. Veuillez, s’il vous plaît, l'enregistrez et réessayez.", "openWorkspaceConfigurationFile": "Ouvrir le Fichier de Configuration d’espace de travail", - "close": "Fermer", - "enterWorkspace.close": "Fermer", - "enterWorkspace.dontShowAgain": "Ne plus afficher", - "enterWorkspace.moreInfo": "Informations", - "enterWorkspace.prompt": "En savoir plus sur l’utilisation de dossiers multiples dans VS Code." + "close": "Fermer" } \ No newline at end of file diff --git a/i18n/hun/extensions/git/out/autofetch.i18n.json b/i18n/hun/extensions/git/out/autofetch.i18n.json index fe69406ef37..83092572a2a 100644 --- a/i18n/hun/extensions/git/out/autofetch.i18n.json +++ b/i18n/hun/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "Igen", + "read more": "További információk", "no": "Nem", - "not now": "Most nem", - "suggest auto fetch": "Szeretné engedélyezni a Git-forráskódtárhelyek automatikus lekérését (fetch)?" + "not now": "Kérdezzen rá később", + "suggest auto fetch": "Szeretné, hogy a Code időszakosan futtasson `git fetch`-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 d2dfa251e5d..712e3b40563 100644 --- a/i18n/hun/extensions/git/out/commands.i18n.json +++ b/i18n/hun/extensions/git/out/commands.i18n.json @@ -41,6 +41,10 @@ "confirm discard all 2": "{0}\n\nA művelet NEM VONHATÓ VISSZA, az aktuális munka ÖRÖKRE EL FOG VESZNI.", "yes discard tracked": "Egy követett fájl elvetése", "yes discard tracked multiple": "{0} követett fájl elvetése", + "unsaved files single": "A következő fájl nincs elmentve: {0}.\n\nSzeretné menteni a beadás előtt?", + "unsaved files": "{0} nem mentett fájl található.\n\nSzeretné menteni őket a beadás előtt?", + "save and commit": "Összes mentése és beadás", + "commit": "Beadás mindenképp", "no staged changes": "Nincs beadáshoz (commithoz) előjegyzett módosítás. Szeretné automatikusan előjegyeztetni a módosításokat és közvetlenül beadni őket?", "always": "Mindig", "no changes": "Nincs beadandó módosítás.", @@ -64,12 +68,12 @@ "no remotes to pull": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahonnan pullozni lehetne.", "pick remote pull repo": "Válassza ki a távoli szervert, ahonnan pullozni szeretné az ágat", "no remotes to push": "A forráskódtárhoz nincsenek távoli szerverek konfigurálva, ahová pusholni lehetne.", - "push with tags success": "A címkékkel együtt történő pusholás sikeresen befejeződött.", "nobranch": "Válasszon egy ágat a távoli szerverre való pusholáshot!", + "confirm publish branch": "A(z) '{0}' ág nem létezik a távoli szerveren. Szeretné publikálni ezt az ágat?", + "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}'.", - "ok": "OK", - "never again": "Rendben, ne jelenítse 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.", "provide stash message": "Adja meg a stash-hez tartozó üzenet (nem kötelező)", diff --git a/i18n/hun/extensions/git/out/main.i18n.json b/i18n/hun/extensions/git/out/main.i18n.json index ab59b50cfc7..19742ee7152 100644 --- a/i18n/hun/extensions/git/out/main.i18n.json +++ b/i18n/hun/extensions/git/out/main.i18n.json @@ -7,7 +7,7 @@ "looking": "Git keresése a következő helyen: {0}", "using git": "Git {0} használata a következő helyről: {1}", "downloadgit": "Git letöltése", - "neverShowAgain": "Ne jelenjen meg újra", + "neverShowAgain": "Ne jelenítse meg újra", "notfound": "A Git nem található. Telepítse vagy állítsa be az elérési útját a 'git.path' beállítással.", "updateGit": "Git frissítése", "git20": "Úgy tűnik, hogy a git {0} van telepítve. A Code a git >= 2 verzióival működik együtt a legjobban." diff --git a/i18n/hun/extensions/git/out/repository.i18n.json b/i18n/hun/extensions/git/out/repository.i18n.json index 234abfc4470..b2654e062b7 100644 --- a/i18n/hun/extensions/git/out/repository.i18n.json +++ b/i18n/hun/extensions/git/out/repository.i18n.json @@ -27,6 +27,6 @@ "staged changes": "Beadásra előjegyzett módosítások", "changes": "Módosítások", "ok": "OK", - "neveragain": "Soha ne jelenítse meg újra", + "neveragain": "Ne jelenítse meg újra", "huge": "A(z) '{0}' forráskódtárban túl sok aktív módosítás van. A Git-funkciók csak egy része lesz engedélyezve." } \ No newline at end of file diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json index 150ac02318b..87388db14f4 100644 --- a/i18n/hun/extensions/git/package.i18n.json +++ b/i18n/hun/extensions/git/package.i18n.json @@ -54,6 +54,7 @@ "command.stashPopLatest": "Legutóbbi stash visszaállítása", "config.enabled": "Meghatározza, hogy a git engedélyezve van-e", "config.path": "A git végrehajtható fájl elérési útja", + "config.autoRepositoryDetection": "Meghatározza, hogy a forráskódtárak automatikusan fel legyenek-e derítve", "config.autorefresh": "Meghatározza, hogy engedélyezve van-e az automatikus frissítés", "config.autofetch": "Meghatározza, hogy engedélyezve van-e az automatikus lekérés", "config.enableLongCommitWarning": "Figyelmeztessen-e az alkalmazás hosszú beadási üzenet esetén", @@ -72,5 +73,6 @@ "colors.deleted": "A törölt erőforrások színe.", "colors.untracked": "A nem követett erőforrások színe.", "colors.ignored": "A figyelmen kívül hagyott erőforrások színe.", - "colors.conflict": "A konfliktusos erőforrások színe." + "colors.conflict": "A konfliktusos erőforrások színe.", + "colors.submodule": "Az almodulokhoz tartozó erőforrások színe" } \ No newline at end of file diff --git a/i18n/hun/extensions/typescript/out/commands.i18n.json b/i18n/hun/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..c521fb331a6 --- /dev/null +++ b/i18n/hun/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Nyisson meg egy mappát a VS Code-ban typescriptes vagy javascriptes projekt használatához!", + "typescript.projectConfigUnsupportedFile": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet. Nem támogatott fájltípus", + "typescript.projectConfigCouldNotGetInfo": "Nem sikerült meghatározni a TypeScript- vagy JavaScript-projektet", + "typescript.noTypeScriptProjectConfig": "A fájl nem része egy TypeScript-projektnek", + "typescript.noJavaScriptProjectConfig": "A fájl nem része egy JavaScript-projektnek", + "typescript.configureTsconfigQuickPick": "tsconfig.json konfigurálása", + "typescript.configureJsconfigQuickPick": "jsconfig.json konfigurálása", + "typescript.projectConfigLearnMore": "További információ" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/hun/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/base/node/ps.i18n.json b/i18n/hun/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..688e86b7228 --- /dev/null +++ b/i18n/hun/src/vs/base/node/ps.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "collecting": "Processzor- és memóriahasználattal kapcsolatos információk gyűjtése. A folyamat eltarthat néhány másodpercig." +} \ No newline at end of file diff --git a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json index 48b15939e90..7f137c6fbff 100644 --- a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "A sorszámok abszolút értékként jelennek meg.", "lineNumbers.relative": "A sorszámok a kurzortól való távolságuk alapján jelennek meg.", "lineNumbers.interval": "A sorszámok minden 10. sorban jelennek meg.", - "lineNumbers": "Meghatározza a sorszámok megjelenését. A lehetséges értékek: 'on', 'off' és 'relative'.", + "lineNumbers": "Meghatározza a sorszámok megjelenését. A lehetséges értékek: 'on', 'off', 'relative' és 'interval'.", "rulers": "Függőleges vonalzók kirajzolása bizonyos számú fix szélességű karakter után. Több vonalzó használatához adjon meg több értéket. Nincs kirajzolva semmi, ha a tömb üres.", "wordSeparators": "Azon karakterek listája, amelyek szóelválasztónak vannak tekintve szavakkal kapcsolatos navigáció vagy műveletek során.", "tabSize": "Egy tabulátor hány szóköznek felel meg. Ez a beállítás felülírásra kerül a fájl tartalma alapján, ha az `editor.detectIndentation` beállítás aktív.", @@ -72,6 +72,7 @@ "cursorBlinking": "Meghatározza a kurzor animációjának stílusát. Lehetséges értékek: 'blink', 'smooth', 'phase', 'expand' vagy 'solid'", "mouseWheelZoom": "A szerkesztőablak betűtípusának nagyítása vagy kicsinyítése az egérgörgő Ctrl lenyomása mellett történő használata esetén", "cursorStyle": "Meghatározza a kurzor stílusát. Lehetséges értékek: 'block', 'block-outline', 'line', 'line-thin', 'underline' vagy 'underline-thin'", + "lineCursorWidth": "Meghatározza a kurzor szélességét, ha az editor.cursorStyle értéke 'line'.", "fontLigatures": "Engedélyezi a betűtípusban található ligatúrák használatát", "hideCursorInOverviewRuler": "Meghatározza, hogy a kurzor pozíciója el legyen-e rejtve az áttekintő sávon.", "renderWhitespace": "Meghatározza, hogy a szerkesztőablakban hogyan legyenek kirajzolva a szóköz karakterek. Lehetséges értékek: 'none', 'boundary', vagy 'all'. A 'boundary' beállítás esetén, ha szavak között egyetlen szóköz található, akkor az nem lesz kirajzolva.", 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 ca5c75eaa93..5238b0d9399 100644 --- a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "A kurzor pozícióján található sor kiemelési háttérszíne.", "lineHighlightBorderBox": "A kurzor pozícióján található sor keretszíne.", - "rangeHighlight": "A kiemelt területek háttérszíne, pl. a gyors megnyitás és keresés funkcióknál.", "caret": "A szerkesztőablak kurzorának színe.", "editorCursorBackground": "A szerkesztőablak kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.", "editorWhitespaces": "A szerkesztőablakban található szóköz karakterek színe.", 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 e3ec625549e..6689a8e1f95 100644 --- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Következő hiba vagy figyelmeztetés", - "markerAction.previous.label": "Előző hiba vagy figyelmeztetés", "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.", diff --git a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json index dc4360652cb..96f61fa990d 100644 --- a/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json +++ b/i18n/hun/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "toggle.tabMovesFocus": "Tab billentyűvel mozgatott fókusz ki- és bekapcsolása" + "toggle.tabMovesFocus": "Tabulátor billentyűvel mozgatott fókusz ki- és bekapcsolása" } \ 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 fa7c3359075..92c1811fa1e 100644 --- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Szimbólumok háttérszíne olvasási hozzáférés, páldául változó olvasása esetén.", - "wordHighlightStrong": "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.", "wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz", diff --git a/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 27181140f4b..9ef8de88790 100644 --- a/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/hun/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "A(z) `{0}` nem érvényes menüazonosító", "missing.command": "A menüpont a(z) `{0}` parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.", "missing.altCommand": "A menüpont a(z) `{0}` alternatív parancsra hivatkozik, ami nincs deklarálva a 'commands'-szakaszban.", - "dupe.command": "A menüpont ugyanazt a parancsot hivatkozza alapértelmezett és alternatív parancsként", - "nosupport.altCommand": "Jelenleg csak az 'editor/title' menü 'navigation' csoportja támogatja az alternatív parancsokat" + "dupe.command": "A menüpont ugyanazt a parancsot hivatkozza alapértelmezett és alternatív parancsként" } \ No newline at end of file diff --git a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json index acbe400a835..400ec23c073 100644 --- a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,34 @@ "diff": "Két fájl összehasonlítása egymással.", "add": "Mappá(k) hozzáadása a legutolsó aktív ablakhoz.", "goto": "Megnyitja a megadott elérési úton található fájlt a megadott sornál és oszlopnál.", - "locale": "A használt lokalizáció (pl. en-US vagy zh-TW)", "newWindow": "Mindenképp induljon új példány a Code-ból.", - "performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.", - "prof-startup": "Processzorhasználat profilozása induláskor", - "inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.", - "inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ", "reuseWindow": "Fájl vagy mappa megnyitása a legutoljára aktív ablakban.", - "userDataDir": "Meghatározza a könyvtárat, ahol a felhasználói adatok vannak tárolva. Hasznás, ha rootként van futtatva.", - "log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", - "verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)", "wait": "Várjon a fájlok bezárására a visszatérés előtt.", + "locale": "A használt lokalizáció (pl. en-US vagy zh-TW)", + "userDataDir": "Meghatározza a könyvtárat, ahol a felhasználói adatok vannak tárolva. Hasznás, ha rootként van futtatva.", + "version": "Verzió kiírása.", + "help": "Használati útmutató kiírása.", "extensionHomePath": "A kiegészítők gyökérkönyvtárának beállítása.", "listExtensions": "Telepített kiegészítők listázása.", "showVersions": "Telepített kiegészítők verziójának megjelenítése a --list-extension kapcsoló használata esetén.", "installExtension": "Kiegészítő telepítése.", "uninstallExtension": "Kiegészítő eltávolítása.", "experimentalApis": "Tervezett API-funkciók engedélyezése egy kiegészítő számára.", - "disableExtensions": "Összes telepített kiegészítő letiltása.", - "disableGPU": "Hardveres gyorsítás letiltása.", + "verbose": "Részletes kimenet kiírása (magába foglalja a --wait kapcsolót)", + "log": "A naplózott események szintje.Az 'info' az alapértelmezett értéke. Lehetséges értékek: 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", "status": "Folyamatok erőforrás-használati és diagnosztikai adatinak kiíratása.", - "version": "Verzió kiírása.", - "help": "Használati útmutató kiírása.", + "performance": "Indítás a 'Developer: Startup Performance' parancs engedélyezésével.", + "prof-startup": "Processzorhasználat profilozása induláskor", + "disableExtensions": "Összes telepített kiegészítő letiltása.", + "inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.", + "inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ", + "disableGPU": "Hardveres gyorsítás letiltása.", "usage": "Használat", "options": "beállítások", "paths": "elérési utak", - "optionsUpperCase": "Beálítások" + "stdinWindows": "Más program bemenetének olvasásához fűzze a '-' karaktert a parancshoz (pl.: 'echo Hello World | {0} -')", + "stdinUnix": "Az stdin-ről történő olvasásához fűzze a '-' karaktert a parancshoz (pl.: 'ps aux | grep code | {0} -')", + "optionsUpperCase": "Beálítások", + "extensionsManagement": "Kiegészítők kezelése", + "troubleshooting": "Hibaelhárítás" } \ 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 8788d40a469..b5c8c712977 100644 --- a/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/hun/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,15 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "A kiegészítő érvénytelen: a package.json nem egy JSON-fájl.", - "restartCodeLocal": "Indítsa újra a Code-ot a(z) {0} újratelepítése előtt.", + "restartCode": "Indítsa újra a Code-ot a(z) {0} újratelepítése előtt.", "installingOutdatedExtension": "A kiegészítő egy újabb verziója már telepítve van. Szeretné felülírni a régebbi verzióval?", "override": "Felülírás", "cancel": "Mégse", - "notFoundCompatible": "A telepítés nem sikerült, mert a(z) '{0}' kiegészítő VS Code '{1}' verziójával kompatibilis változata nem található.", - "quitCode": "A telepítés nem sikerült, mert a kiegészítő elavult példánya még mindig fut. Lépjen ki a VS Code-ból, és indítsa újra az újratelepítés előtt.", - "exitCode": "A telepítés nem sikerült, mert a kiegészítő elavult példánya még mindig fut. Lépjen ki a VS Code-ból, és indítsa újra az újratelepítés előtt.", + "errorInstallingDependencies": "Hiba a függőségek telepítése közben. {0}", + "notFoundCompatible": "A(z) '{0}' nem telepíthető: nincs a VS Code '{1}' verziójával kompatibilis változat.", "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", diff --git a/i18n/hun/src/vs/platform/message/common/message.i18n.json b/i18n/hun/src/vs/platform/message/common/message.i18n.json index a4f556eb01c..ee6d194b8dd 100644 --- a/i18n/hun/src/vs/platform/message/common/message.i18n.json +++ b/i18n/hun/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Bezárás", "later": "Később", - "cancel": "Mégse" + "cancel": "Mégse", + "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/theme/common/colorRegistry.i18n.json b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json index a024837c583..dce5fb0ac3d 100644 --- a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "A szerkesztőablak-modulok keretszíne. A szín csak akkor van használva, ha a modul beállítása alapján rendelkezik kerettel, és a színt nem írja felül a modul.", "editorSelectionBackground": "A szerkesztőablak-szakasz színe.", "editorSelectionForeground": "A kijelölt szöveg színe nagy kontrasztú téma esetén.", - "editorInactiveSelection": "Az inaktív szerkesztőablakban található kijelölések színe.", - "editorSelectionHighlight": "A kijelöléssel megegyező tartalmú területek színe.", "editorFindMatch": "A keresés jelenlegi találatának színe.", - "findMatchHighlight": "A keresés további találatainak színe.", - "findRangeHighlight": "A keresést korlátozó terület színe.", - "hoverHighlight": "Kiemelés azon szó alatt, amely fölött lebegő elem jelenik meg.", "hoverBackground": "A szerkesztőablakban lebegő elemek háttérszíne.", "hoverBorder": "A szerkesztőablakban lebegő elemek keretszíne.", "activeLinkForeground": "Az aktív hivatkozások háttérszíne.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Az eltávolított szövegek háttérszíne.", "diffEditorInsertedOutline": "A beillesztett szövegek körvonalának színe.", "diffEditorRemovedOutline": "Az eltávolított szövegek körvonalának színe.", - "mergeCurrentHeaderBackground": "A helyi tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén.", - "mergeCurrentContentBackground": "A helyi tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén.", - "mergeIncomingHeaderBackground": "A beérkező tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén.", - "mergeIncomingContentBackground": "A beérkező tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén.", - "mergeCommonHeaderBackground": "A közös ős tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. ", - "mergeCommonContentBackground": "A közös ős tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. ", "mergeBorder": "A fejlécek és az elválasztó sáv keretszíne a sorok között megjelenített összeolvasztási konfliktusok esetén.", "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.", 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 new file mode 100644 index 00000000000..753cc84e856 --- /dev/null +++ b/i18n/hun/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "saveParticipants": "Mentési események futtatása..." +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json index ad630367cba..adbae4c28f4 100644 --- a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet.", - "treeItem.notFound": "Nincs '{0}' azonosítójú elem a fában.", - "treeView.duplicateElement": "A(z) {0} elem már regisztrálva van" + "treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 586bbb9d5a1..5b05c77fb5d 100644 --- a/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/hun/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Fájl megnyitása...", "openFolder": "Mappa megnyitása...", "openFileFolder": "Megnyitás...", - "addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...", - "add": "&&Hozzáadás", - "addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez", "globalRemoveFolderFromWorkspace": "Mappa eltávolítása a munkaterületről...", - "removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről", - "openFolderSettings": "Mappa beállításainak megnyitása", "saveWorkspaceAsAction": "Munkaterület mentése másként...", "save": "Menté&&s", "saveWorkspace": "Munkaterület mentése", "openWorkspaceAction": "Munkaterület megnyitása...", "openWorkspaceConfigFile": "Munkaterület konfigurációs fájljának megnyitása", - "openFolderAsWorkspaceInNewWindow": "Mappa megnyitása munkaterületként egy új ablakban", - "workspaceFolderPickerPlaceholder": "Válasszon munkaterület-mappát!" + "openFolderAsWorkspaceInNewWindow": "Mappa megnyitása munkaterületként egy új ablakban" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..080898a7ed6 --- /dev/null +++ b/i18n/hun/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "Mappa hozzáadása a munkaterülethez...", + "add": "&&Hozzáadás", + "addFolderToWorkspaceTitle": "Mappa hozzáadása a munkaterülethez", + "workspaceFolderPickerPlaceholder": "Válasszon munkaterület-mappát!" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 05a3be82161..5d48accc6b6 100644 --- a/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,18 @@ "groupThreePicker": "A harmadik csoportban található szerkesztőablakok megjelenítése", "allEditorsPicker": "Összes megnyitott szerkesztőablak megjelenítése", "view": "Nézet", - "file": "Fájl" + "file": "Fájl", + "close": "Bezárás", + "closeOthers": "Többi bezárása", + "closeRight": "Jobbra lévők bezárása", + "closeAllUnmodified": "Nem módosultak bezárása", + "closeAll": "Összes bezárása", + "keepOpen": "Maradjon nyitva", + "toggleInlineView": "Sorok közötti nézet be- és kikapcsolása", + "showOpenedEditors": "Megnyitott szerkesztőablak megjelenítése", + "keepEditor": "Szerkesztőablak nyitva tartása", + "closeEditorsInGroup": "A csoportban lévő összes szerkesztőablak bezárása", + "closeUnmodifiedEditors": "Nem módosult szerkesztőablakok bezárása a csoportban", + "closeOtherEditors": "Többi szerkesztőablak bezárása", + "closeRightEditors": "Jobbra lévő szerkesztőablakok bezárása" } \ 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 c82ab6ff2a2..52fa76d91e7 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,18 +17,13 @@ "closeEditor": "Szerkesztőablak bezárása", "revertAndCloseActiveEditor": "Visszaállítás és szerkesztőablak bezárása", "closeEditorsToTheLeft": "Balra lévő szerkesztőablakok bezárása", - "closeEditorsToTheRight": "Jobbra lévő szerkesztőablakok bezárása", "closeAllEditors": "Összes szerkesztőablak bezárása", - "closeUnmodifiedEditors": "Nem módosult szerkesztőablakok bezárása a csoportban", "closeEditorsInOtherGroups": "A többi csoport szerkesztőablakainak bezárása", - "closeOtherEditorsInGroup": "Többi szerkesztőablak bezárása", - "closeEditorsInGroup": "A csoportban lévő összes szerkesztőablak bezárása", "moveActiveGroupLeft": "Szerkesztőablak-csoport mozgatása balra", "moveActiveGroupRight": "Szerkesztőablak-csoport mozgatása jobbra", "minimizeOtherEditorGroups": "Többi szerkesztőablak-csoport kis méretűvé tétele", "evenEditorGroups": "Szerkesztőablak-csoportok egyenlő méretűvé tétele", "maximizeEditor": "Szerkesztőablak-csoport nagy méretűvé tétele és oldalsáv elrejtése", - "keepEditor": "Szerkesztőablak nyitva tartása", "openNextEditor": "Következő szerkesztőablak megnyitása", "openPreviousEditor": "Előző szerkesztőablak megnyitása", "nextEditorInGroup": "A csoport következő szerkesztőablakának megnyitása", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Az első csoportban található szerkesztőablakok megjelenítése", "showEditorsInSecondGroup": "A második csoportban található szerkesztőablakok megjelenítése", "showEditorsInThirdGroup": "A harmadik csoportban található szerkesztőablakok megjelenítése", - "showEditorsInGroup": "A csoportban található szerkesztőablakok megjelenítése", "showAllEditors": "Összes szerkesztőablak megjelenítése", "openPreviousRecentlyUsedEditorInGroup": "A csoportban előző legutoljára használt szerksztőablak megnyitása", "openNextRecentlyUsedEditorInGroup": "A csoportban következő legutoljára használt szerksztőablak megnyitása", @@ -54,5 +48,8 @@ "moveEditorLeft": "Szerkesztőablak mozgatása balra", "moveEditorRight": "Szerkesztőablak mozgatása jobbra", "moveEditorToPreviousGroup": "Szerkesztőablak mozgatása az előző csoportba", - "moveEditorToNextGroup": "Szerkesztőablak mozgatása a következő csoportba" + "moveEditorToNextGroup": "Szerkesztőablak mozgatása a következő csoportba", + "moveEditorToFirstGroup": "Szerkesztőablak mozgatása az első csoportba", + "moveEditorToSecondGroup": "Szerkesztőablak mozgatása a második csoportba", + "moveEditorToThirdGroup": "Szerkesztőablak mozgatása a harmadik csoportba" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index b15ee093f22..37f4933240b 100644 --- a/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/hun/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Aktív szerkesztőablak mozgatása fülek vagy csoportok között", "editorCommand.activeEditorMove.arg.name": "Aktív szerkesztőablak mozgatási argumentum", - "editorCommand.activeEditorMove.arg.description": "Argumentumtulajdonságok:\n\t* 'to': karakterlánc, a mozgatás célpontja.\n\t* 'by': karakterlánc, a mozgatás egysége. Fülek (tab) vagy csoportok (group) alapján.\n\t* 'value': szám, ami meghatározza, hogy hány pozíciót kell mozgatni, vagy egy abszolút pozíciót, ahová mozgatni kell.", - "commandDeprecated": "A(z) **{0}** parancs el lett távolítva. A(z) **{1}** használható helyette", - "openKeybindings": "Billentyűparancsok beállítása" + "editorCommand.activeEditorMove.arg.description": "Argumentumtulajdonságok:\n\t* 'to': karakterlánc, a mozgatás célpontja.\n\t* 'by': karakterlánc, a mozgatás egysége. Fülek (tab) vagy csoportok (group) alapján.\n\t* 'value': szám, ami meghatározza, hogy hány pozíciót kell mozgatni, vagy egy abszolút pozíciót, ahová mozgatni kell." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 0cb7c46cb05..5d020bd339d 100644 --- a/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/hun/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "Szövegfájl-összehasonlító.", "navigate.next.label": "Következő módosítás", "navigate.prev.label": "Előző módosítás", - "inlineDiffLabel": "Váltás inline nézetre", - "sideBySideDiffLabel": "Váltás párhuzamos nézetre" + "toggleIgnoreTrimWhitespace.label": "Térközlevágás mellőzése" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 0ef6405cab2..11d4a655ad1 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Bezárás", - "closeOthers": "Többi bezárása", - "closeRight": "Jobbra lévők bezárása", - "closeAll": "Összes bezárása", - "closeAllUnmodified": "Nem módosultak bezárása", - "keepOpen": "Maradjon nyitva", - "showOpenedEditors": "Megnyitott szerkesztőablak megjelenítése", "araLabelEditorActions": "Szerkesztőablak-műveletek" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index 6ed546539cf..9fd111df3c0 100644 --- a/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/hun/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[Nem támogatott]", + "userIsAdmin": "(Rendszergazda)", + "userIsSudo": "(Superuser)", "devExtensionWindowTitlePrefix": "[Kiegészítő fejlesztői példány]" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/common/theme.i18n.json b/i18n/hun/src/vs/workbench/common/theme.i18n.json index b30bec0d245..634a2ddeccc 100644 --- a/i18n/hun/src/vs/workbench/common/theme.i18n.json +++ b/i18n/hun/src/vs/workbench/common/theme.i18n.json @@ -6,17 +6,21 @@ { "tabActiveBackground": "Az aktív fül háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", "tabInactiveBackground": "Az inaktív fülek háttérszíne. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabActiveBorder": "Az aktív fülek kiemelésére használt keretszín. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabActiveUnfocusedBorder": "Az aktív fülek kiemelésére használt keretszín egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni. ", - "tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabInactiveForeground": "Az inaktív fülek előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabUnfocusedActiveForeground": "Az aktív fül előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", - "tabUnfocusedInactiveForeground": "Az inaktív fülek előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőablakokat a szerkesztőterületen. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabHoverBackground": "A fülek háttérszíne amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabUnfocusedHoverBackground": "A fülek háttérszíne egy fókusz nélküli csoportban, amikor az egérkurzor fölötte van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabBorder": "A füleket egymástól elválasztó keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabActiveBorder": "Az aktív fülek kiemelésére használt keret színe. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabActiveUnfocusedBorder": "Az aktív fülek kiemelésére használt keret színe egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabHoverBorder": "A fülek kiemelésére használt keret színe amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabUnfocusedHoverBorder": "A fülek kiemelésére használt keret színe egy fókusz nélküli csoportban, amikor az egérkurzor fölöttük van. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabActiveForeground": "Az aktív fül előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabInactiveForeground": "Az inaktív fülek előtérszíne az aktív csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabUnfocusedActiveForeground": "Az aktív fül előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", + "tabUnfocusedInactiveForeground": "Az inaktív fülek előtérszíne egy fókusz nélküli csoportban. A fülek tartalmazzák a szerkesztőterületen lévő szerkesztőablakokat. Egy szerkesztőablak-csoportban több fül is megnyitható. Több szerkesztőablak-csoportot is létre lehet hozni.", "editorGroupBackground": "A szerkesztőcsoportok háttérszíne. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak. A háttérszín akkor jelenik meg, ha a szerkesztőcsoportok mozgatva vannak.", "tabsContainerBackground": "A szerkesztőcsoport címsorának háttérszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.", "tabsContainerBorder": "A szerkesztőcsoport címsorának keretszíne, ha a fülek engedélyezve vannak. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.", - "editorGroupHeaderBackground": "A szerkesztőcsoport címsorának keretszíne, ha a fülek le vannak tiltva. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.", + "editorGroupHeaderBackground": "A szerkesztőcsoportok címsorának keretszíne, ha a fülek le vannak tiltva (`\"workbench.editor.showTabs\": false`). A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.", "editorGroupBorder": "A szerkesztőcsoportokat elválasztó vonal színe. A szerkesztőcsoportok szerkesztőablakokat tartalmaznak.", "editorDragAndDropBackground": "A szerkesztőablakok mozgatásánál használt háttérszín. Érdemes átlátszó színt választani, hogy a szerkesztőablak tartalma továbbra is látszódjon.", "panelBackground": "A panelek háttérszíne. A panelek a szerkesztőterület alatt jelennek meg, és pl. itt található a kimenet és az integrált terminál.", @@ -33,8 +37,8 @@ "statusBarNoFolderBorder": "Az állapotsort az oldalsávtól és a szerkesztőablakoktól elválasztó keret színe, ha nincs mappa megnyitva. Az állapotsor az ablak alján jelenik meg. ", "statusBarItemActiveBackground": "Az állapotsor elemének háttérszíne kattintás esetén. Az állapotsor az ablak alján jelenik meg.", "statusBarItemHoverBackground": "Az állapotsor elemének háttérszíne, ha az egérkurzor fölötte van. Az állapotsor az ablak alján jelenik meg.", - "statusBarProminentItemBackground": "Az állapotsor kiemelt elemeinek háttérszíne. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Az állapotsor az ablak alján jelenik meg.", - "statusBarProminentItemHoverBackground": "Az állapotsor kiemelt elemeinek háttérszíne, ha az egérkurzor fölöttük van. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Az állapotsor az ablak alján jelenik meg.", + "statusBarProminentItemBackground": "Az állapotsor kiemelt elemeinek háttérszíne. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Kapcsolja be a `Tabulátor billentyűvel mozgatott fókusz` módot a parancskatalógusban egy példa megtekintéséhez! Az állapotsor az ablak alján jelenik meg.", + "statusBarProminentItemHoverBackground": "Az állapotsor kiemelt elemeinek háttérszíne, ha az egérkurzor fölöttük van. A kiemelt elemek kitűnnek az állapotsor többi eleme közül, így jelezve a fontosságukat. Kapcsolja be a `Tabulátor billentyűvel mozgatott fókusz` módot a parancskatalógusban egy példa megtekintéséhez! Az állapotsor az ablak alján jelenik meg.", "activityBarBackground": "A tevékenységsáv háttérszíne. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.", "activityBarForeground": "A tevékenységsáv előtérszíne (pl. az ikonok színe). A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.", "activityBarBorder": "A tevékenyésgsáv keretszíne, ami elválasztja az oldalsávtól. A tevékenységsáv az ablak legszélén jelenik meg bal vagy jobb oldalon, segítségével lehet váltani az oldalsáv nézetei között.", diff --git a/i18n/hun/src/vs/workbench/common/views.i18n.json b/i18n/hun/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..52cc050953f --- /dev/null +++ b/i18n/hun/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Már van `{0}` azonosítójú nézet regisztrálva a következő helyen: `{1}`" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json index 8fa88c8859b..2e7a5636a3d 100644 --- a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Szerkesztőablak bezárása", "closeWindow": "Ablak bezárása", "closeWorkspace": "Munkaterület bezárása", "noWorkspaceOpened": "Az aktuális példányban nincs egyetlen munkaterület sem nyitva, amit be lehetne zárni.", @@ -52,21 +51,5 @@ "displayLanguage": "Meghatározza a VSCode felületének nyelvét.", "doc": "Az elérhető nyelvek listája a következő címen tekinthető meg: {0}", "restart": "Az érték módosítása után újra kell indítani a VSCode-ot.", - "fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1}).", - "openLogsFolder": "Naplómappa megnyitása", - "showLogs": "Naplók megjelenítése...", - "mainProcess": "Fő", - "sharedProcess": "Megosztott", - "rendererProcess": "Megjelenítő", - "extensionHost": "Kiegészítő gazdafolyamata", - "selectProcess": "Válasszon folyamatot!", - "setLogLevel": "Naplózási szint beállítása", - "trace": "Nyomkövetés", - "debug": "Hibakeresés", - "info": "Információ", - "warn": "Figyelmeztetés", - "err": "Hiba", - "critical": "Kritikus", - "off": "Kikapcsolva", - "selectLogLevel": "Naplózási szint beállítása" + "fail.createSettings": "Nem sikerült a(z) '{0}' létrehozás ({1})." } \ No newline at end of file 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 ffdce8089b5..e6f6299231e 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 @@ -7,8 +7,9 @@ "view": "Nézet", "help": "Súgó", "file": "Fájl", - "developer": "Fejlesztői", "workspaces": "Munkaterületek", + "developer": "Fejlesztői", + "workbenchConfigurationTitle": "Munkaterület", "showEditorTabs": "Meghatározza, hogy a megnyitott szerkesztőablakok telején megjelenjenek-e a fülek", "workbench.editor.labelFormat.default": "Fájl nevének megjelenítése. Ha a fülek engedélyezve vannak, és két egyező nevű fájl van egy csoportban, az elérési útjuk eltérő része lesz hozzáfűzve a névhez. Ha a fülek le vannak tiltva, a fájl munkaterület könyvtárához képest relatív elérési útja jelenik meg, ha a szerkesztőablak aktív.", "workbench.editor.labelFormat.short": "A fájl nevének megjelenítése a könyvtár nevével együtt.", @@ -20,23 +21,23 @@ "showIcons": "Meghatározza, hogy a megnyitott szerkesztőablakok ikonnal együtt jelenjenek-e meg. A működéshez szükséges egy ikontéma engedélyezése is.", "enablePreview": "Meghatározza, hogy a megnyitott szerkesztőablakok előnézetként jelenjenek-e meg. Az előnézetként használt szerkesztőablakok újra vannak hasznosítva, amíg meg nem tartja őket a felhasználó (pl. dupla kattintás vagy szerkesztés esetén), és dőlt betűvel jelenik meg a címsoruk.", "enablePreviewFromQuickOpen": "Meghatározza, hogy a gyors megnyitás során megnyitott szerkesztőablakok előnézetként jelenjenek-e meg. Az előnézetként használt szerkesztőablakok újra vannak hasznosítva, amíg meg nem tartja őket a felhasználó (pl. dupla kattintás vagy szerkesztés esetén).", + "closeOnFileDelete": "Meghatározza, hogy bezáródjanak-e azok a szerkesztőablakok, melyekben olyan fájl van megnyitva, amelyet töröl vagy átnevez egy másik folyamat. A beállítás letiltása esetén a szerkesztőablak nyitva marad módosított állapotban ilyen esemény után. Megjegyzés: az alkalmazáson belüli törlések esetén mindig bezáródik a szerkesztőablakok, a módosított fájlok pedig soha nem záródnak be, hogy az adatok megmaradjanak.", "editorOpenPositioning": "Meghatározza, hogy hol nyíljanak meg a szerkesztőablakok. A 'left' vagy 'right' használata esetén az aktív szerkesztőablaktól jobbra vagy balra nyílnak meg az újak. 'first' vagy 'last' esetén a szerkesztőablakok a jelenleg aktív ablaktól függetlenül nyílnak meg.", "revealIfOpen": "Meghatározza, hogy egy szerkesztőablak fel legyen-e fedve, ha már meg van nyitva a látható csoportok bármelyiképben. Ha le van tiltva, akkor egy új szerkesztőablak nyílik az aktív szerkesztőablak-csoportban. Ha engedélyezve van, akkor a már megnyitott szerkesztőablak lesz felfedve egy új megnyitása helyett. Megjegyzés: vannak esetek, amikor ez a beállítás figyelmen kívül van hagyva, pl. ha egy adott szerkesztőablak egy konkrét csoportban vagy a jelenleg aktív csoport mellett van menyitva.", + "swipeToNavigate": "Navigálás a nyitott fájlok között háromujjas, vízszintes húzással.", "commandHistory": "Meghatározza, hogy hány legutóbb használt parancs jelenjen meg a parancskatalógus előzményeinek listájában. Az előzmények kikapcsolásához állítsa az értéket nullára.", "preserveInput": "Meghatározza, hogy a legutóbb beírt parancs automatikusan helyre legyen-e állítva a parancskatalógus következő megnyitása során.", "closeOnFocusLost": "Meghatározza, hogy a gyors megnyitás automatikusan bezáródjon-e amint elveszíti a fókuszt.", "openDefaultSettings": "Meghatározza, hogy a beállítások megnyitásakor megnyíljon-e egy szerkesztő az összes alapértelmezett beállítással.", "sideBarLocation": "Meghatározza az oldalsáv helyét. Az oldalsáv megjelenhet a munkaterület bal vagy jobb oldalán.", + "panelDefaultLocation": "Meghatározza a panel alapértelmezett pozícióját. A panel a munkaterület alján vagy jobb oldalán jelenhet meg.", "statusBarVisibility": "Meghatározza, hogy megjelenjen-e az állapotsor a munkaterület alján.", "activityBarVisibility": "Meghatározza, hogy megjelenjen-e a tevékenységsáv a munkaterületen.", - "closeOnFileDelete": "Meghatározza, hogy bezáródjanak-e azok a szerkesztőablakok, melyekben olyan fájl van megnyitva, amelyet töröl vagy átnevez egy másik folyamat. A beállítás letiltása esetén a szerkesztőablak nyitva marad módosított állapotban ilyen esemény után. Megjegyzés: az alkalmazáson belüli törlések esetén mindig bezáródik a szerkesztőablakok, a módosított fájlok pedig soha nem záródnak be, hogy az adatok megmaradjanak.", - "enableNaturalLanguageSettingsSearch": "Meghatározza, hogy engedélyezve van-e a természetes nyelvi keresési mód a beállításoknál.", "fontAliasing": "Meghatározza a munkaterületen megjelenő betűtípusok élsimítási módszerét.\n- default: Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.\n- antialiased: A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.\n- none: Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.", "workbench.fontAliasing.default": "Szubpixeles betűsimítás. A legtöbb nem-retina típusú kijelzőn ez adja a legélesebb szöveget.", "workbench.fontAliasing.antialiased": "A betűket pixelek, és nem szubpixelek szintjén simítja. A betűtípus vékonyabbnak tűnhet összességében.", "workbench.fontAliasing.none": "Letiltja a betűtípusok élsimítését. A szövegek egyenetlen, éles szélekkel jelennek meg.", - "swipeToNavigate": "Navigálás a nyitott fájlok között háromujjas, vízszintes húzással.", - "workbenchConfigurationTitle": "Munkaterület", + "enableNaturalLanguageSettingsSearch": "Meghatározza, hogy engedélyezve van-e a természetes nyelvi keresési mód a beállításoknál.", "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", diff --git a/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json index 3f8ae5cf9dd..59e05312870 100644 --- a/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/hun/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "Kivágás", "copy": "Másolás", "paste": "Beillesztés", - "selectAll": "Összes kijelölése" + "selectAll": "Összes kijelölése", + "runningAsRoot": "Nem ajánlott a {0} 'root'-két futtatása." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json index 1631851aee5..ef8b1ac13eb 100644 --- a/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "wordWrapMigration.ok": "OK", - "wordWrapMigration.dontShowAgain": "Ne jelenjen meg újra", + "wordWrapMigration.dontShowAgain": "Ne jelenítse meg újra", "wordWrapMigration.openSettings": "Beállítások megnyitása", "wordWrapMigration.prompt": "Az `editor.wrappingColumn` beállítás elavult az `editor.wordWrap` bevezetése miatt." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json index fa1bc4e164b..c02cc939c66 100644 --- a/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugToolBarBackground": "A hibakeresési eszköztár háttérszíne." + "debugToolBarBackground": "A hibakeresési eszköztár háttérszíne.", + "debugToolBarBorder": "A hibakeresési eszköztár keretszíne." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 8e82d560ff0..9708ac70e9b 100644 --- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "hibakereső", - "debug.terminal.not.available.error": "Az integrált terminál nem elérhető" + "debug.terminal.title": "hibakereső" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index a33718b8e73..b8ed67afeb5 100644 --- a/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Új parancssor megnyitása", "globalConsoleActionMacLinux": "Új terminál megnyitása", "scopedConsoleActionWin": "Megnyitás a parancssorban", - "scopedConsoleActionMacLinux": "Megnyitás a terminálban", - "openFolderInIntegratedTerminal": "Megnyitás a terminálban" + "scopedConsoleActionMacLinux": "Megnyitás a terminálban" } \ 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 a03a32613a6..bc83f527961 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 @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.", "workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.", + "fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.", "exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.", "reallyRecommended2": "Ehhez a fájltípushoz a(z) '{0}' kiegészítő ajánlott.", "reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.", diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..652267823c8 --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.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. +{ + "workbenchConfigurationTitle": "Munkaterület", + "feedbackVisibility": "Meghatározza az állapotsoron megjelenő, visszajelzés tweetelése (mosoly) gomb láthatóságát." +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json index d2b7c3c88fa..5bf2f90ef1e 100644 --- a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json @@ -16,6 +16,7 @@ "request a missing feature": "Hiányzó funkció kérése", "tell us why?": "Mondja el, hogy miért", "commentsHeader": "Visszajelzés", + "showFeedback": "Visszajelzésre szolgáló mosoly gomb megjelenítése az állapotsoron", "tweet": "Tweer", "character left": "karakter maradt", "characters left": "karakter maradt", diff --git a/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..d2ae286b72e --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "hide": "Elrejtés" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index d032a29e684..f08e18c1fc1 100644 --- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,25 @@ "filesCategory": "Fájl", "revealInSideBar": "Megjelenítés az oldalsávon", "acceptLocalChanges": "A lemezen lévő tartalom felülírása a saját módosításokkal", - "revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása" + "revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása", + "copyPathOfActive": "Aktív fájl elérési útjának másolása", + "saveAllInGroup": "Összes mentése a csoportban", + "revert": "Fájl visszaállítása", + "compareActiveWithSaved": "Aktív fájl összehasonlítása a mentett változattal", + "closeEditor": "Szerkesztőablak bezárása", + "view": "Nézet", + "openToSide": "Megnyitás oldalt", + "revealInWindows": "Megjelenítés a fájlkezelőben", + "revealInMac": "Megjelenítés a Finderben", + "openContainer": "Tartalmazó mappa megnyitása", + "copyPath": "Elérési út másolása", + "saveAll": "Összes mentése", + "compareWithSaved": "Összehasonlítás a mentett változattal", + "compareWithSelected": "Összehasonlítás a kiválasztottal", + "compareSource": "Kijelölés összehasonlításhoz", + "close": "Bezárás", + "closeOthers": "Többi bezárása", + "closeUnmodified": "Nem módosultak bezárása", + "closeAll": "Összes bezárása", + "deleteFile": "Végleges törlés" } \ 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 559fe056a7d..c9d588b8217 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Újrapróbálkozás", - "rename": "Átnevezés", "newFile": "Új fájl", "newFolder": "Új mappa", + "rename": "Átnevezés", + "delete": "Törlés", + "copyFile": "Másolás", + "pasteFile": "Beillesztés", + "retry": "Újrapróbálkozás", "openFolderFirst": "Mappák vagy fájlok létrehozásához először nyisson meg egy mappát!", "newUntitledFile": "Új, névtelen fájl", "createNewFile": "Új fájl", @@ -28,26 +31,16 @@ "confirmDeleteMessageFile": "Véglegesen törli a következőt: {0}?", "irreversible": "A művelet nem vonható vissza!", "permDelete": "Végleges törlés", - "delete": "Törlé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", - "copyFile": "Másolás", - "pasteFile": "Beillesztés", + "fileDeleted": "A fájl időközben törölve lett vagy át lett helyezve", + "fileIsAncestor": "A másolandó fájl a célmappa szülője", "duplicateFile": "Duplikálás", - "openToSide": "Megnyitás oldalt", - "compareSource": "Kijelölés összehasonlításhoz", "globalCompareFile": "Aktív fájl összehasonlítása...", "openFileToCompare": "Fájlok összehasonlításához elősször nyisson meg egy fájlt.", - "compareWith": "'{0}' összehasonlítása a következővel: '{1}'", - "compareFiles": "Fájlok összehasonlítása", "refresh": "Frissítés", - "save": "Mentés", - "saveAs": "Mentés másként...", - "saveAll": "Összes mentése", "saveAllInGroup": "Összes mentése a csoportban", - "saveFiles": "Összes fájl mentése", - "revert": "Fájl visszaállítása", "focusOpenEditors": "Váltás a megnyitott szerkesztőablakok nézetre", "focusFilesExplorer": "Váltás a fájlkezelőre", "showInExplorer": "Aktív fájl megjelenítése az oldalsávon", @@ -56,20 +49,11 @@ "refreshExplorer": "Fájlkezelő frissítése", "openFileInNewWindow": "Aktív fájl megnyitása új ablakban", "openFileToShowInNewWindow": "Fájl új ablakban történő megnyitásához először nyisson meg egy fájlt", - "revealInWindows": "Megjelenítés a fájlkezelőben", - "revealInMac": "Megjelenítés a Finderben", - "openContainer": "Tartalmazó mappa megnyitása", - "revealActiveFileInWindows": "Aktív fájl megjelenítése a Windows Intézőben", - "revealActiveFileInMac": "Aktív fájl megjelenítése a Finderben", - "openActiveFileContainer": "Aktív fájlt tartalmazó mappa megnyitása", "copyPath": "Elérési út másolása", - "copyPathOfActive": "Aktív fájl elérési útjának másolása", "emptyFileNameError": "Meg kell adni egy fájl vagy mappa nevét.", "fileNameExistsError": "Már létezik **{0}** nevű fájl vagy mappa ezen a helyszínen. Adjon meg egy másik nevet!", "invalidFileNameError": "A(z) **{0}** név nem érvényes fájl- vagy mappanév. Adjon meg egy másik nevet!", "filePathTooLongError": "A(z) **{0}** név egy olyan elérési utat eredményez, ami túl hosszú. Adjon meg egy másik nevet!", - "compareWithSaved": "Aktív fájl összehasonlítása a mentett változattal", - "modifiedLabel": "{0} (a lemezen) ↔ {1}", "compareWithClipboard": "Aktív fájl összehasonlítása a vágólap tartalmával", "clipboardComparisonLabel": "Vágólap ↔ {0}" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index dd9057b1fa4..7c49a5eefb2 100644 --- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Fájlok elérési útjának másolásához elősször nyisson meg egy fájlt", - "openFileToReveal": "Fájlok felfedéséhez elősször nyisson meg egy fájlt" + "revealInWindows": "Megjelenítés a fájlkezelőben", + "revealInMac": "Megjelenítés a Finderben", + "openContainer": "Tartalmazó mappa megnyitása", + "saveAs": "Mentés másként...", + "save": "Mentés", + "saveAll": "Összes mentése", + "saveFiles": "Összes fájl mentése", + "removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről", + "genericRevertError": "Nem sikerült a(z) '{0}' visszaállítása: {1}", + "modifiedLabel": "{0} (a lemezen) ↔ {1}", + "openFileToReveal": "Fájlok felfedéséhez elősször nyisson meg egy fájlt", + "openFileToCopy": "Fájlok elérési útjának másolásához elősször nyisson meg egy fájlt" } \ No newline at end of file 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 22341f239a2..6cd44ae8d9b 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 @@ -36,8 +36,6 @@ "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é.", "explorerConfigurationTitle": "Fájlkezelő", - "openEditorsVisible": "A megnyitott szerkesztőablakok panelen megjelenített szerkesztőablakok száma. Állítsa 0-ra, ha el szeretné rejteni a panelt.", - "dynamicHeight": "Meghatározza, hogy a megnyitott szerkesztőablakok szakasz magassága automatikusan illeszkedjen a megnyitott elemek számához vagy sem.", "autoReveal": "Meghatározza, hogy a fájlkezelőben automatikusan fel legyenek fedve és ki legyenek jelölve a fájlok, amikor megnyitják őket.", "enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.", "confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.", diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 0bb33fdc628..da61a7106fd 100644 --- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "Használja a jobbra lévő szerkesztői eszköztáron található műveleteket a saját módosítások **visszavonására** vagy **írja felül** a lemezen lévő tartalmat a változtatásokkal", - "discard": "Elvetés", + "overwriteElevated": "Felülírás rendszergazdaként...", + "saveElevated": "Újrapróbálkozás rendszergazdaként...", "overwrite": "Felülírás", "retry": "Újrapróbálkozás", - "readonlySaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás' lehetőséget a védelem eltávolításához.", + "discard": "Elvetés", + "readonlySaveErrorAdmin": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás rendszergazdaként' lehetőséget a védelem eltávolításához!", + "readonlySaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a fájl írásvédett. Válassza a 'Felülírás' lehetőséget a védelem eltávolításának megkísérléséhez!", + "permissionDeniedSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: nincs megfelelő jogosultság. Válassza az 'Újrapróbálkozás rendszergazdaként' lehetőséget az újrapróbálkozáshoz adminisztrátorként!", "genericSaveError": "Hiba a(z) '{0}' mentése közben: {1}", "staleSaveError": "Nem sikerült menteni a(z) '{0}' fájlt: a lemezen lévő tartalom újabb. Kattintson az **Összehasonlítás*** gombra a helyi és a lemezen lévő változat összehasonlításához.", "compareChanges": "Összehasonlítás", diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index 99cf9cb13e7..4e9c224f2c9 100644 --- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Megnyitott szerkesztőablakok", "openEditosrSection": "Megnyitott szerkesztőablakok szakasz", - "dirtyCounter": "{0} nincs mentve", - "saveAll": "Összes mentése", - "closeAllUnmodified": "Nem módosultak bezárása", - "closeAll": "Összes bezárása", - "compareWithSaved": "Összehasonlítás a mentett változattal", - "close": "Bezárás", - "closeOthers": "Többi bezárása" + "dirtyCounter": "{0} nincs mentve" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..a647b02e9cb --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logs.contribution.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. +{ + "mainLog": "Napló (elsődleges)", + "sharedLog": "Napló (megosztott)", + "rendererLog": "Napló (ablak)", + "extensionsLog": "Napló (kiegészítő gazdafolyamata)", + "developer": "Fejlesztői" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..fde9c01e66f --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "openLogsFolder": "Naplómappa megnyitása", + "showLogs": "Naplók megjelenítése...", + "mainProcess": "Elsődleges", + "sharedProcess": "Megosztott", + "rendererProcess": "Ablak", + "extensionHost": "Kiegészítő gazdafolyamata", + "selectProcess": "Válasszon folyamatot!", + "openLogFile": "Naplófájl megnyitása...", + "setLogLevel": "Naplózási szint beállítása", + "trace": "Nyomkövetés", + "debug": "Hibakeresés", + "info": "Információ", + "warn": "Figyelmeztetés", + "err": "Hiba", + "critical": "Kritikus", + "off": "Kikapcsolva", + "selectLogLevel": "Naplózási szint beállítása" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json index 1ecd95e356c..efb38ebffa8 100644 --- a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Nézet", - "problems.view.toggle.label": "Problémák be- és kikapcsolása", - "problems.view.focus.label": "Váltás a problémákra", "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", 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 new file mode 100644 index 00000000000..5cbaa37bf16 --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Kimenet", + "logViewer": "Naplófájl-megjelenítő", + "viewCategory": "Nézet", + "clearOutput.label": "Kimenet törlése" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..c164d86f883 --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/output/electron-browser/outputServices.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. +{ + "output": "{0} – Kimenet", + "channel": "A(z) '{0}' kimeneti csatornája" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index ef9a96afe7b..3a1caa89fed 100644 --- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Próbálja ki a természetes nyelvi keresést!", "defaultSettings": "A jobb oldalon lévő szerkesztőablakban elhelyezett beállítások felülírják az alapértelmezett beállításokat.", "noSettingsFound": "Beállítás nem található.", "settingsSwitcherBarAriaLabel": "Beállításkapcsoló", "userSettings": "Felhasználói beállítások", "workspaceSettings": "Munkaterület-beállítások", - "folderSettings": "Mappabeálíltások", - "enableFuzzySearch": "Természetes nyelvi keresés engedélyezése" + "folderSettings": "Mappabeálíltások" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 1fd4f23c9d2..35cc39622d0 100644 --- a/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Gyakran használt", - "mostRelevant": "Legfontosabb", "defaultKeybindingsHeader": "A billentyűparancsok fájlban elhelyezett billentyűparancsok felülírják az alapértelmezett beállításokat" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 7e61210cdf7..cd538504f47 100644 --- a/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Nézet", "commandsHandlerDescriptionDefault": "Parancsok megjelenítése és futtatása", "gotoLineDescriptionMac": "Sor megkeresése", "gotoLineDescriptionWin": "Sor megkeresése", diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 4f8b481dc00..39ce0536498 100644 --- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,9 @@ "toggleGitViewlet": "Git megjelenítése", "source control": "Verziókezelő rendszer", "toggleSCMViewlet": "Verziókezelő megjelenítése", - "view": "Nézet" + "view": "Nézet", + "scmConfigurationTitle": "VKR (SCM)", + "alwaysShowProviders": "Mindig megjelenjen-e a verziókezelő rendszerek szakasz.", + "diffDecorations": "Vezérli a szerkesztőablakban megjelenő, változásokat jelölő dekorátorokat.", + "inputCounter": "Meghatározza, hogy mikor jelenjen meg a bemeneti karakterszámláló." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index 821a91e9b57..aa865d6ba59 100644 --- a/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,9 @@ { "scm providers": "Verziókezelő rendszerek", "hideRepository": "Elrejtés", + "commitMessageInfo": "{0} karakter a jelenlegi sorban", + "commitMessageCountdown": "{0} karakter maradt az aktuális sorban", + "commitMessageWarning": " {0} karakterrel több, mint {1} az aktuális sorban", "installAdditionalSCMProviders": "További verziókezelő rendszerek telepítése...", "no open repo": "Nincs aktív verziókezelő rendszer.", "source control": "Verziókezelő rendszer", 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 9f5f0bf4d8b..ce4480e2eb9 100644 --- a/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Előző keresőkifejezés megjelenítése", "showSearchViewlet": "Keresés megjelenítése", "findInFiles": "Keresés a fájlokban", - "findInFilesWithSelectedText": "Keresés a fájlokban a kijelölt szöveg alapján", "replaceInFiles": "Csere a fájlokban", - "replaceInFilesWithSelectedText": "Csere a fájlokban a kijelölt szöveg alapján", "RefreshAction.label": "Frissítés", "CollapseDeepestExpandedLevelAction.label": "Összes bezárása", "ClearSearchResultsAction.label": "Törlés", diff --git a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index e1fb57e6aa6..9cd24f4c872 100644 --- a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Keresés mappában...", + "findInWorkspace": "Keresés a munkaterületen...", "showTriggerActions": "Szimbólum megkeresése a munkaterületen...", "name": "Keresés", "search": "Keresés", + "showSearchViewlet": "Keresés megjelenítése", "view": "Nézet", + "findInFiles": "Keresés a fájlokban", "openAnythingHandlerDescription": "Fájl megkeresése", "openSymbolDescriptionNormal": "Szimbólum megkeresése a munkaterületen", "searchOutputChannelTitle": "Keresés", @@ -18,5 +22,6 @@ "useRipgrep": "Meghatározza, hogy a szövegben és fájlokban való kereséshez a ripgrep van-e használva.", "useIgnoreFiles": "Meghatározza, hogy a .gitignore és .ignore fájlok használva legyenek-e a kereséshez.", "search.quickOpen.includeSymbols": "Meghatározza, hogy a fájlok gyors megnyitásánál megjelenjenek-e a globális szimbólumkereső találatai.", - "search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek." + "search.followSymlinks": "Meghatározza, hogy keresés során követve legyenek-e a szimbolikus linkek.", + "search.smartCase": "Figyelmen kívül hagyja a kis- és nagybetűket, ha a minta csak kisbetűkből áll, ellenkező esetben kis- és nagybetűérzékenyen keres" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..4d54491cc1e --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.scope": "(globális)", + "global.1": "(({0})", + "new.global": "Új globális kódrészlet-fájl...", + "group.global": "Létező kódrészletek", + "new.global.sep": "Új kódrészletek", + "openSnippet.pickLanguage": "Válasszon hozzon létre egy kódrészlet-fájlt!", + "openSnippet.label": "Felhasználói kódrészletek konfigurálása", + "preferences": "Beállítások" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 12f3a6365e8..61cbea48eca 100644 --- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,13 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Kódrészlet nyelvének kiválasztása", - "openSnippet.errorOnCreate": "A(z) {0} nem hozható létre", - "openSnippet.label": "Felhasználói kódrészletek megnyitása", - "preferences": "Beállítások", "snippetSchema.json.default": "Üres kódrészlet", "snippetSchema.json": "Felhasználói kódrészlet-konfiguráció", "snippetSchema.json.prefix": "A kódrészlet IntelliSense-ben történő kiválasztásánál használt előtag", "snippetSchema.json.body": "A kódrészlet tartalma. Kurzorpozíciók definiálásához használja a '$1' és '${1:defaultText}' jelölőket, a '$0' pedig a végső kurzorpozíció. Változónevek a '${varName}' és '${varName:defaultText}' formában definiálhatók, pl.: 'Ez a fájl: $TM_FILENAME'.", - "snippetSchema.json.description": "A kódrészlet leírása" + "snippetSchema.json.description": "A kódrészlet leírása", + "snippetSchema.json.scope": "Azok nyelvek nevei, amelyekhez a kódrészlet tartozik, pl. 'typescript,javascript'." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..ac8bcd025bd --- /dev/null +++ b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Felhasználói kódrészlet" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index b86aeaf6994..ef351110a21 100644 --- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. A megadott érték: {1}", "invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}", + "invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. 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ó.", "vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.", "vscode.extension.contributes.snippets-language": "Azon nyelv azonosítója, amely számára szolgáltatva van ez a kódrészlet.", "vscode.extension.contributes.snippets-path": "A kódrészlet-fájl elérési útja. Az elérési út relatív a kiegészítő mappájához, és általában a következővel kezdődik: './snippets/',", "badVariableUse": "A(z) '{0}' kiegészítőben egy vagy több kódrészlet nagy valószínűséggel keveri a kódrészletváltozók és a kódrészlet-helyjelölők fogalmát (további információ a következő oldalon található: https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax)", "badFile": "A(z) \"{0}\" kódrészletet tartalmazó fájlt nem sikerült beolvasni.", - "source.snippet": "Felhasználói kódrészlet", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 4d4b7d5d7cf..525d9caef57 100644 --- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -13,7 +13,8 @@ "terminal.integrated.shellArgs.osx": "OS X-terminál esetén használt parancssori argumentumok.", "terminal.integrated.shell.windows": "A terminál által használt shell elérési útja Windowson. A Windows beépített shelljei (cmd, PowerShell vagy Bash on Ubuntu) használata esetén kell megadni.", "terminal.integrated.shellArgs.windows": "Windows-terminál esetén használt parancssori argumentumok.", - "terminal.integrated.rightClickCopyPaste": "Ha be van állítva, megakadályozza a helyi menü megjelenését a terminálon történő jobb kattintás esetén. Helyette másol, ha van kijelölés, és beilleszt, ha nincs.", + "terminal.integrated.rightClickCopyPaste": "Ha be van kapcsolva, megakadályozza, hogy megjelenjen a helyi menü a terminálon történő jobb kattintás esetén. Ehelyett másol, ha van kijelölés, és beilleszt, ha nincs.", + "terminal.integrated.copyOnSelection": "Ha be van kapcsolva, a terminálban kijelölt szöveg a vágólapra lesz másolva.", "terminal.integrated.fontFamily": "Meghatározza a terminál betűtípusát. Alapértelmezett értéke az editor.fontFamily értéke.", "terminal.integrated.fontSize": "Meghatározza a terminálban használt betű méretét, pixelekben.", "terminal.integrated.lineHeight": "Meghatározza a terminál sormagasságát. A tényleges méret a megadott szám és a terminál betűméretének szorzatából jön ki.", @@ -24,10 +25,12 @@ "terminal.integrated.setLocaleVariables": "Meghatározza, hogy a lokálváltozók be vannak-e állítva a terminál indításánál. Alapértelmezett értéke igaz OS X-en, hamis más platformokon.", "terminal.integrated.cwd": "Explicit elérési út, ahol a terminál indítva lesz. Ez a shellfolyamat munkakönyvtára (cwd) lesz. Ez a beállítás nagyon hasznos olyan munkaterületeken, ahol a gyökérkönyvtár nem felel meg munkakönyvtárnak.", "terminal.integrated.confirmOnExit": "Meghatározza, hogy megerősítést kér-e az alkalamzás, ha van aktív terminál-munkafolyamat.", + "terminal.integrated.enableBell": "Meghatározza, hogy engedélyezve van-e a csengő a terminálba.", "terminal.integrated.commandsToSkipShell": "Olyan parancsazonosítók listája, melyek nem lesznek elküldve a shellnek, és ehelyett mindig a Code kezeli le őket. Ez lehetővé teszi, hogy az olyan billentyűparancsok, melyeket normál esetben a shell dolgozna fel, ugyanúgy működjenek, mint mikor a terminálon nincs fókusz. Például ilyen a gyorsmegnyitás indításához használt Ctrl+P.", "terminal.integrated.env.osx": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit az OS X-es terminál használ.", "terminal.integrated.env.linux": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a linuxos terminál használ.", "terminal.integrated.env.windows": "A VS Code folyamatához hozzáadott környezeti változókat tartalmazó objektum, amit a windowsos terminál használ.", + "terminal.integrated.showExitAlert": "A `A terminálfolyamat a következő kilépési kóddal állt le` üzenet megjelenítése, ha a kilépési kód nem nulla.", "terminalCategory": "Terminál", "viewCategory": "Nézet" } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index c671a91c989..8f1350c0d3c 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 @@ -14,6 +14,8 @@ "workbench.action.terminal.deleteWordRight": "Jobbra lévő szó törlése", "workbench.action.terminal.new": "Új integrált terminál létrehozása", "workbench.action.terminal.new.short": "Új terminál", + "workbench.action.terminal.newWorkspacePlaceholder": "Az aktuális munkakönyvtár kiválasztása az új terminálhoz", + "workbench.action.terminal.newInActiveWorkspace": "Új integrált terminál létrehozása (az aktív munkaterületen)", "workbench.action.terminal.focus": "Váltás a terminálra", "workbench.action.terminal.focusNext": "Váltás a következő terminálra", "workbench.action.terminal.focusPrevious": "Váltás az előző terminálra", diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 3471cfec5dc..ff1983f42c6 100644 --- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -9,5 +9,5 @@ "terminalCursor.foreground": "A terminál kurzorának előtérszíne.", "terminalCursor.background": "A terminál kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.", "terminal.selectionBackground": "A terminálban kijelölt tartalom háttérszíne.", - "terminal.ansiColor": "A(z) '{0}' ANSI-szín a terminálban." + "terminal.ansiColor": "'{0}' ANSI-szín a terminálban." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 45f5c16180a..ea617c7168d 100644 --- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Megváltoztathatja az alapértelmezett terminált a testreszabás gomb választásával.", "customize": "Testreszabás", "cancel": "Mégse", - "never again": "Rendben, ne jelenítse meg újra", "terminal.integrated.chooseWindowsShell": "Válassza ki a preferált terminál shellt! Ez később módosítható a beállításokban.", "terminalService.terminalCloseConfirmationSingular": "Van egy aktív terminálmunkamenet. Szeretné megszakítani?", "terminalService.terminalCloseConfirmationPlural": "{0} aktív terminálmunkamenet van. Szeretné megszakítani?" 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 79c64944348..6315a5d17bd 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 @@ -13,7 +13,7 @@ "read the release notes": "Üdvözöljük a {0} v{1} verziójában. Szeretné megtekinteni a kiadási jegyzéket?", "licenseChanged": "A licencfeltételek változtak. Olvassa végig!", "license": "Licenc elolvasása", - "neveragain": "Soha ne jelenítse meg újra", + "neveragain": "Ne jelenítse meg újra", "64bitisavailable": "Elérhető a {0} 64-bites Windowsra készült változata!", "learn more": "További információ", "updateIsReady": "Új {0}-frissítés érhető el.", @@ -23,6 +23,7 @@ "commandPalette": "Parancskatalógus...", "settings": "Beállítások", "keyboardShortcuts": "Billentyűparancsok", + "userSnippets": "Felhasználói kódrészletek", "selectTheme.label": "Színtéma", "themes.selectIconTheme.label": "Fájlikontéma", "not available": "A frissítések nem érhetők el", diff --git a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index f77948f5276..e2deab2db4e 100644 --- a/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/hun/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "A fájl egy könyvtár", + "fileNotModifiedError": "A fájl azóta nem módosult", "fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként" } \ 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 91ce4d8f750..fcbe399cbac 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 @@ -10,6 +10,7 @@ "fileTooLargeError": "A fájl túl nagy a megnyitáshoz", "fileNotFoundError": "Fájl nem található ({0})", "fileBinaryError": "A fájl binárisnak tűnik és nem nyitható meg szövegként", + "filePermission": "Engedély megtagadva a fájl írására ({0})", "fileExists": "A létrehozandó fájl már létezik ({0})", "fileMoveConflict": "Nem lehet áthelyezni vagy másolni. A fájl már létezik a célhelyen.", "unableToMoveCopyError": "Nem lehet áthelyezni vagy másolni. A fájl felülírná a mappát, amiben található.", diff --git a/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json index 6928f2f1935..38b057d0682 100644 --- a/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json +++ b/i18n/hun/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json @@ -22,5 +22,6 @@ "keybindings.json.when": "A billentyűparancs aktiválási feltétele.", "keybindings.json.args": "A végrehajtandó parancs számára átadott argumentumok", "keyboardConfigurationTitle": "Billentyűzet", - "dispatch": "Meghatározza, hogy a billentyűleütések észleléséhez a `code` (ajánlott) vagy `keyCode` esemény legyen használva." + "dispatch": "Meghatározza, hogy a billentyűleütések észleléséhez a `code` (ajánlott) vagy `keyCode` esemény legyen használva.", + "touchbar.enabled": "Ha elérhető, engedélyezi a macOS érintősávgombokat a billentyűzeten." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index a411a51ba59..5a0ddc8c042 100644 --- a/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/hun/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Szeretné menteni a(z) {0} fájlban elvégzett módosításokat?", "saveChangesMessages": "Szeretné menteni a következő {0} fájlban elvégzett módosításokat?", - "moreFile": "...1 további fájl nincs megjelenítve", - "moreFiles": "...{0} további fájl nincs megjelenítve", "saveAll": "Ö&&sszes mentése", "save": "Menté&&s", "dontSave": "&&Ne mentse", diff --git a/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index d67776bc433..afe4cf7833a 100644 --- a/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/hun/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "Nincsenek fájlikonok", "iconThemeError": "A fájlikontéma ismeretlen vagy nincs telepítve.", "workbenchColors": "Felülírja az aktuális színtémában definiált színeket.", - "editorColors": "Felülírja az aktuális színtémában definiált, szerkesztőablakhoz kapcsolódó színeket és betűstílusokat.", "editorColors.comments": "Meghatározza a megjegyzések színét és stílusát.", "editorColors.strings": "Meghatározza a sztringliterálok színét és stílusát.", "editorColors.keywords": "Meghatározza a kulcsszavak színét és stílusát.", @@ -19,5 +18,6 @@ "editorColors.types": "Meghatározza a típusdeklarációk és -referenciák színét és stílusát.", "editorColors.functions": "Meghatározza a függvénydeklarációk és -referenciák színét és stílusát.", "editorColors.variables": "Meghatározza a változódeklarációk és -referenciák színét és stílusát.", - "editorColors.textMateRules": "Színek és stílusok beállítása textmate témázási szabályok alapján (haladó)." + "editorColors.textMateRules": "Színek és stílusok beállítása textmate témázási szabályok alapján (haladó).", + "editorColors": "Felülírja az aktuális színtémában definiált, szerkesztőablakhoz kapcsolódó színeket és betűstílusokat." } \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 068445ae82b..3c7eb68f49e 100644 --- a/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/hun/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Nem sikerült írni a munkaterület konfigurációs fájljába. Nyissa meg a fájlt, javítsa a benne található hibákat és figyelmeztetéseket, majd próbálja újra!", "errorWorkspaceConfigurationFileDirty": "Nem sikerült írni a munkaterület konfigurációs fájljába, mert módosítva lett. Mentse, majd próbálja újra!", "openWorkspaceConfigurationFile": "Munkaterület konfigurációs fájljának megnyitása", - "close": "Bezárás", - "enterWorkspace.close": "Bezárás", - "enterWorkspace.dontShowAgain": "Ne jelenítse meg újra", - "enterWorkspace.moreInfo": "További információ", - "enterWorkspace.prompt": "Tudjon meg többet arról, hogyan dolgozhat egyszerre több mappával a VS Code-ban!" + "close": "Bezárás" } \ No newline at end of file diff --git a/i18n/ita/extensions/git/out/autofetch.i18n.json b/i18n/ita/extensions/git/out/autofetch.i18n.json index b51df7e140d..ffe7f9d6f24 100644 --- a/i18n/ita/extensions/git/out/autofetch.i18n.json +++ b/i18n/ita/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,6 @@ // Do not edit this file. It is machine generated. { "yes": "Sì", - "no": "No", - "not now": "Non ora", - "suggest auto fetch": "Vorresti attivare il fetching automatico di repository Git?" + "read more": "Altre informazioni", + "no": "No" } \ 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 b544cb5ca24..d7970a8aad2 100644 --- a/i18n/ita/extensions/git/out/commands.i18n.json +++ b/i18n/ita/extensions/git/out/commands.i18n.json @@ -64,12 +64,11 @@ "no remotes to pull": "Il repository non contiene elementi remoti configurati come origini del pull.", "pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo", "no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.", - "push with tags success": "Il push con tag è riuscito.", "nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.", + "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}'.", - "ok": "OK", - "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.", "provide stash message": "Specificare un messaggio di accantonamento (facoltativo)", diff --git a/i18n/ita/extensions/typescript/out/commands.i18n.json b/i18n/ita/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..e771e7a4a9e --- /dev/null +++ b/i18n/ita/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Aprire una cartella in Visual Studio Code per usare un progetto TypeScript o JavaScript", + "typescript.projectConfigUnsupportedFile": "Non è stato possibile determinare il progetto TypeScript o JavaScript. Il tipo di file non è supportato", + "typescript.projectConfigCouldNotGetInfo": "Non è stato possibile determinare il progetto TypeScript o JavaScript", + "typescript.noTypeScriptProjectConfig": "Il file non fa parte di un progetto TypeScript", + "typescript.noJavaScriptProjectConfig": "Il file non fa parte di un progetto JavaScript", + "typescript.configureTsconfigQuickPick": "Configura tsconfig.json", + "typescript.configureJsconfigQuickPick": "Configura jsconfig.json", + "typescript.projectConfigLearnMore": "Altre informazioni" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json b/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json index 6e295ef1e2c..8baf1308a26 100644 --- a/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json +++ b/i18n/ita/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json @@ -6,7 +6,7 @@ { "imgMeta": "{0}x{1} {2}", "largeImageError": "L'immagine è troppo grande per essere visualizzata nell'editor", - "resourceOpenExternalButton": "Aprire immagine utilizzando un programma esterno?", + "resourceOpenExternalButton": "Aprire l'immagine utilizzando un programma esterno?", "nativeBinaryError": "Il file non verrà visualizzato nell'editor perché è binario, è molto grande o usa una codifica testo non supportata.", "sizeB": "{0} B", "sizeKB": "{0} KB", diff --git a/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/base/node/ps.i18n.json b/i18n/ita/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json index 99d10858e07..8d193dcadbd 100644 --- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,6 @@ "lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.", "lineNumbers.relative": "I numeri di riga vengono visualizzati come distanza in linee alla posizione del cursore.", "lineNumbers.interval": "I numeri di riga vengono visualizzati ogni 10 righe.", - "lineNumbers": "Controlla la visualizzazione dei numeri di riga. I valori possibili sono 'on', 'off' e 'relativi'.", "rulers": "Mostra righelli verticali dopo un certo numero di caratteri a spaziatura fissa. Utilizza più valori per più righelli. Nessun righello viene disegnati se la matrice è vuota", "wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole", "tabSize": "Il numero di spazi corrispondenti ad un carattere Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando 'editor.detectIndentation' è 'on'.", 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 bd8958bdf97..81909087f69 100644 --- a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Colore di sfondo per l'evidenziazione della riga alla posizione del cursore.", "lineHighlightBorderBox": "Colore di sfondo per il bordo intorno alla riga alla posizione del cursore.", - "rangeHighlight": "Colore di sfondo degli intervalli evidenziati, ad esempio dalle funzionalità Quick Open e Trova.", "caret": "Colore del cursore dell'editor.", "editorCursorBackground": "Colore di sfondo del cursore editor. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.", "editorWhitespaces": "Colore dei caratteri di spazio vuoto nell'editor.", 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 2d24c4f96ea..505e8cba014 100644 --- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Vai a errore o avviso successivo", - "markerAction.previous.label": "Vai a errore o avviso precedente", "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.", 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 d57627a559a..b355190a13b 100644 --- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Colore di sfondo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile.", - "wordHighlightStrong": "Colore di sfondo 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", diff --git a/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 32a58ae4a61..f8e28e396b6 100644 --- a/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/ita/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}` non è un identificatore di menu valido", "missing.command": "La voce di menu fa riferimento a un comando `{0}` che non è definito nella sezione 'commands'.", "missing.altCommand": "La voce di menu fa riferimento a un comando alternativo `{0}` che non è definito nella sezione 'commands'.", - "dupe.command": "La voce di menu fa riferimento allo stesso comando come comando predefinito e come comando alternativo", - "nosupport.altCommand": "I comandi alternativi sono attualmente supportati solo nel gruppo 'navigation' del menu 'editor/title'" + "dupe.command": "La voce di menu fa riferimento allo stesso comando come comando predefinito e come comando alternativo" } \ No newline at end of file diff --git a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json index 194dc9d937c..bf517983deb 100644 --- a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json @@ -8,28 +8,28 @@ "diff": "Confronta due file tra loro.", "add": "Aggiunge la cartella o le cartelle all'ultima finestra attiva.", "goto": "Apre un file nel percorso alla posizione specificata di riga e carattere.", - "locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.", "newWindow": "Forza una nuova istanza di Code.", - "performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.", - "prof-startup": "Esegui il profiler della CPU durante l'avvio", - "inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.", - "inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.", "reuseWindow": "Forza l'apertura di un file o di una cartella nell'ultima finestra attiva.", - "userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Utile quando viene eseguito come root.", - "log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.", - "verbose": "Visualizza l'output dettagliato (implica --wait).", "wait": "Attendere la chiusura dei file prima della restituzione.", + "locale": "Impostazioni locali da usare, ad esempio en-US o it-IT.", + "userDataDir": "Consente di specificare la directory in cui si trovano i dati utente. Utile quando viene eseguito come root.", + "version": "Visualizza la versione.", + "help": "Visualizza la sintassi.", "extensionHomePath": "Impostare il percorso radice per le estensioni.", "listExtensions": "Elenca le estensioni installate.", "showVersions": "Mostra le versioni delle estensioni installate, quando si usa --list-extension.", "installExtension": "Installa un'estensione.", "uninstallExtension": "Disinstalla un'estensione.", "experimentalApis": "Abilita funzionalità di API proposte per un'estensione specifica.", - "disableExtensions": "Disabilita tutte le estensioni installate.", - "disableGPU": "Disabilita l'accelerazione hardware della GPU.", + "verbose": "Visualizza l'output dettagliato (implica --wait).", + "log": "Livello di logging da utilizzare. Il valore predefinito è 'info'. I valori consentiti sono 'critical, 'error', 'warn', 'info', 'debug', 'trace', 'off'.", "status": "Stampare le informazioni di utilizzo e diagnostica di processo.", - "version": "Visualizza la versione.", - "help": "Visualizza la sintassi.", + "performance": "Eseguire l'avvio con il comando 'Developer: Startup Performance' abilitato.", + "prof-startup": "Esegui il profiler della CPU durante l'avvio", + "disableExtensions": "Disabilita tutte le estensioni installate.", + "inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.", + "inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.", + "disableGPU": "Disabilita l'accelerazione hardware della GPU.", "usage": "Utilizzo", "options": "opzioni", "paths": "percorsi", 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 f8230336461..d95dd9e9e67 100644 --- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,13 +5,10 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Estensione non valida: package.json non è un file JSON.", - "restartCodeLocal": "Riavviare Code prima di reinstallare {0}.", + "restartCode": "Riavviare Code prima di reinstallare {0}.", "installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?", "override": "Eseguire l'override", "cancel": "Annulla", - "notFoundCompatible": "Impossibile installare perché non è stata trovata l'estensione '{0}' compatibile con la versione corrente '{1}' di VS Code.", - "quitCode": "Impossibile installare perché un'istanza obsoleta dell'estensione è ancora in esecuzione. Si prega di uscire e riavviare VS Code prima di reinstallare.", - "exitCode": "Impossibile installare perché un'istanza obsoleta dell'estensione è ancora in esecuzione. Si prega di uscire e riavviare VS Code prima di reinstallare.", "notFoundCompatibleDependency": "Impossibile installare perché non è stata trovata l'estensione dipendente '{0}' compatibile con la versione corrente '{1}' di VS Code.", "uninstallDependeciesConfirmation": "Disinstallare solo '{0}' o anche le relative dipendenze?", "uninstallOnly": "Solo", diff --git a/i18n/ita/src/vs/platform/message/common/message.i18n.json b/i18n/ita/src/vs/platform/message/common/message.i18n.json index c623cd2a9bb..2822182506c 100644 --- a/i18n/ita/src/vs/platform/message/common/message.i18n.json +++ b/i18n/ita/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Chiudi", "later": "In seguito", - "cancel": "Annulla" + "cancel": "Annulla", + "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/theme/common/colorRegistry.i18n.json b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json index 6505e976a25..5375e34f3cb 100644 --- a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Colore bordo dei widget dell'editor. Il colore viene utilizzato solo se il widget sceglie di avere un bordo e se il colore non è sottoposto a override da un widget.", "editorSelectionBackground": "Colore della selezione dell'editor.", "editorSelectionForeground": "Colore del testo selezionato per il contrasto elevato.", - "editorInactiveSelection": "Colore della selezione in un editor inattivo.", - "editorSelectionHighlight": "Colore delle aree con lo stesso contenuto della selezione.", "editorFindMatch": "Colore della corrispondenza di ricerca corrente.", - "findMatchHighlight": "Colore delle altre corrispondenze di ricerca.", - "findRangeHighlight": "Colore dell'intervallo di ricerca.", - "hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse.", "hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.", "hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.", "activeLinkForeground": "Colore dei collegamenti attivi.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Colore di sfondo del testo che è stato rimosso.", "diffEditorInsertedOutline": "Colore del contorno del testo che è stato inserito.", "diffEditorRemovedOutline": "Colore del contorno del testo che è stato rimosso.", - "mergeCurrentHeaderBackground": "Sfondo intestazione corrente in conflitti di merge in linea.", - "mergeCurrentContentBackground": "Sfondo contenuto corrente in conflitti di merge in linea.", - "mergeIncomingHeaderBackground": "Sfondo intestazione modifica in ingresso in conflitti di merge in linea.", - "mergeIncomingContentBackground": "Sfondo contenuto modifica in ingresso in conflitti di merge in linea.", - "mergeCommonHeaderBackground": "Sfondo dell'intestazione dell'antenato comune nei conflitti di merge in linea.", - "mergeCommonContentBackground": "Sfondo del contenuto dell'antenato comune nei conflitti di merge in linea.", "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.", diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 04c4b11db8c..aac2c8ae46e 100644 --- a/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/ita/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata.", - "treeItem.notFound": "Nessun elemento di struttura ad albero con id '{0}' trovato.", - "treeView.duplicateElement": "L'elemento {0} è già registrato" + "treeView.notRegistered": "Nessuna visualizzazione di struttura ad albero con ID '{0}' registrata." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 0a58dca9eaa..b30eb5b862d 100644 --- a/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Apri file...", "openFolder": "Apri cartella...", "openFileFolder": "Apri...", - "addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...", - "add": "&&Aggiungi", - "addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro", "globalRemoveFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro...", - "removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro", - "openFolderSettings": "Apri impostazioni cartella", "saveWorkspaceAsAction": "Salva area di lavoro come...", "save": "&&Salva", "saveWorkspace": "Salva area di lavoro", "openWorkspaceAction": "Apri area di lavoro...", "openWorkspaceConfigFile": "Apri file di configurazione dell'area di lavoro", - "openFolderAsWorkspaceInNewWindow": "Apre la cartella come area di lavoro in una nuova finestra", - "workspaceFolderPickerPlaceholder": "Selezionare la cartella dell'area di lavoro" + "openFolderAsWorkspaceInNewWindow": "Apre la cartella come area di lavoro in una nuova finestra" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..e07a448e23d --- /dev/null +++ b/i18n/ita/src/vs/workbench/browser/actions/workspaceCommands.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "addFolderToWorkspace": "Aggiungi cartella all'area di lavoro...", + "add": "&&Aggiungi", + "addFolderToWorkspaceTitle": "Aggiungi cartella all'area di lavoro" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index aa914d12c1d..8430880ec80 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Mostra editor nel terzo gruppo", "allEditorsPicker": "Mostra tutti gli editor aperti", "view": "Visualizza", - "file": "File" + "file": "File", + "close": "Chiudi", + "closeOthers": "Chiudi altri", + "closeRight": "Chiudi a destra", + "closeAllUnmodified": "Chiudi non modificati", + "closeAll": "Chiudi tutto", + "keepOpen": "Mantieni aperto", + "showOpenedEditors": "Mostra editor aperti", + "keepEditor": "Mantieni editor", + "closeEditorsInGroup": "Chiudi tutti gli editor del gruppo", + "closeUnmodifiedEditors": "Chiudi editor non modificati del gruppo", + "closeOtherEditors": "Chiudi gli altri editor", + "closeRightEditors": "Chiudi editor a destra" } \ 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 00de0aab7d6..5ff06b5baf6 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,18 +17,13 @@ "closeEditor": "Chiudi editor", "revertAndCloseActiveEditor": "Ripristina e chiudi editor", "closeEditorsToTheLeft": "Chiudi editor a sinistra", - "closeEditorsToTheRight": "Chiudi editor a destra", "closeAllEditors": "Chiudi tutti gli editor", - "closeUnmodifiedEditors": "Chiudi editor non modificati del gruppo", "closeEditorsInOtherGroups": "Chiudi editor in altri gruppi", - "closeOtherEditorsInGroup": "Chiudi gli altri editor", - "closeEditorsInGroup": "Chiudi tutti gli editor del gruppo", "moveActiveGroupLeft": "Sposta gruppo di editor a sinistra", "moveActiveGroupRight": "Sposta gruppo di editor a destra", "minimizeOtherEditorGroups": "Riduci a icona gli altri gruppi di editor", "evenEditorGroups": "Imposta stessa larghezza per gruppo di editor", "maximizeEditor": "Ingrandisci gruppo di editor e nascondi barra laterale", - "keepEditor": "Mantieni editor", "openNextEditor": "Apri editor successivo", "openPreviousEditor": "Apri editor precedente", "nextEditorInGroup": "Apri editor successivo del gruppo", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Mostra editor nel primo gruppo", "showEditorsInSecondGroup": "Mostra editor nel secondo gruppo", "showEditorsInThirdGroup": "Mostra editor nel terzo gruppo", - "showEditorsInGroup": "Mostra editor nel gruppo", "showAllEditors": "Mostra tutti gli editor", "openPreviousRecentlyUsedEditorInGroup": "Apri editor precedente usato di recente nel gruppo", "openNextRecentlyUsedEditorInGroup": "Apri editor successivo usato di recente nel gruppo", diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 0e49511fa54..023619e8620 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Consente di spostare l'editor attivo per schede o gruppi", "editorCommand.activeEditorMove.arg.name": "Argomento per spostamento editor attivo", - "editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento.", - "commandDeprecated": "Il comando **{0}** è stato rimosso. In alternativa, usare **{1}**", - "openKeybindings": "Configura tasti di scelta rapida" + "editorCommand.activeEditorMove.arg.description": "Proprietà degli argomenti:\n\t* 'to': valore stringa che specifica dove eseguire lo spostamento.\n\t* 'by': valore stringa che specifica l'unità per lo spostamento, ovvero per scheda o per gruppo.\n\t* 'value': valore numerico che specifica il numero di posizioni o una posizione assoluta per lo spostamento." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 1efc298b02c..4476182db18 100644 --- a/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/ita/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}. Editor di confronto file di testo", "editableEditorAriaLabel": "Editor di confronto file di testo.", "navigate.next.label": "Revisione successiva", - "navigate.prev.label": "Revisione precedente", - "inlineDiffLabel": "Passa alla visualizzazione inline", - "sideBySideDiffLabel": "Passa alla visualizzazione affiancata" + "navigate.prev.label": "Revisione precedente" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index db72fb32688..12d1b76075f 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Chiudi", - "closeOthers": "Chiudi altri", - "closeRight": "Chiudi a destra", - "closeAll": "Chiudi tutto", - "closeAllUnmodified": "Chiudi non modificati", - "keepOpen": "Mantieni aperto", - "showOpenedEditors": "Mostra editor aperti", "araLabelEditorActions": "Azioni editor" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/common/theme.i18n.json b/i18n/ita/src/vs/workbench/common/theme.i18n.json index c2344ccce6a..f33262a82e2 100644 --- a/i18n/ita/src/vs/workbench/common/theme.i18n.json +++ b/i18n/ita/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,6 @@ "editorGroupBackground": "Colore di sfondo di un gruppo di editor. I gruppi di editor sono contenitori di editor. Il colore di sfondo viene visualizzato quando si trascinano i gruppi di editor in un'altra posizione.", "tabsContainerBackground": "Colore di sfondo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.", "tabsContainerBorder": "Colore del bordo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.", - "editorGroupHeaderBackground": "Colore di sfondo dell'intestazione del titolo dell'editor quando le schede sono disabilitate. I gruppi di editor sono contenitori di editor.", "editorGroupBorder": "Colore per separare più gruppi di editor l'uno dall'altro. I gruppi di editor sono i contenitori degli editor.", "editorDragAndDropBackground": "Colore di sfondo quando si trascinano gli editor. Il colore dovrebbe avere una trasparenza impostata in modo che il contenuto dell'editor sia ancora visibile.", "panelBackground": "Colore di sfondo dei pannelli. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.", @@ -33,8 +32,6 @@ "statusBarNoFolderBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.", "statusBarItemActiveBackground": "Colore di sfondo degli elementi della barra di stato quando si fa clic. La barra di stato è visualizzata nella parte inferiore della finestra.", "statusBarItemHoverBackground": "Colore di sfondo degli elementi della barra di stato al passaggio del mouse. La barra di stato è visualizzata nella parte inferiore della finestra.", - "statusBarProminentItemBackground": "Colore di sfondo degli elementi rilevanti della barra di stato. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. La barra di stato è visualizzata nella parte inferiore della finestra.", - "statusBarProminentItemHoverBackground": "Colore di sfondo degli elementi rilevanti della barra di stato al passaggio del mouse. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. La barra di stato è visualizzata nella parte inferiore della finestra.", "activityBarBackground": "Colore di sfondo della barra attività. La barra attività viene visualizzata nella parte inferiore sinistra/destra e consente il passaggio tra diverse visualizzazioni della barra laterale", "activityBarForeground": "Colore primo piano della barra attività (ad es. quello utilizzato per le icone). La barra attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.", "activityBarBorder": "Colore del bordo della barra attività che la separa dalla barra laterale. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.", diff --git a/i18n/ita/src/vs/workbench/common/views.i18n.json b/i18n/ita/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..ed1c7bde950 --- /dev/null +++ b/i18n/ita/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Nel percorso `{1}` è già registrata una visualizzazione con ID `{0}` " +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json index ac85b55822e..9ae1266d1f0 100644 --- a/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/ita/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Chiudi editor", "closeWindow": "Chiudi finestra", "closeWorkspace": "Chiudi area di lavoro", "noWorkspaceOpened": "In questa istanza non ci sono attualmente aree di lavoro aperte da chiudere.", @@ -52,21 +51,5 @@ "displayLanguage": "Definisce la lingua visualizzata di VSCode.", "doc": "Per un elenco delle lingue supportate, vedere {0}.", "restart": "Se si modifica il valore, è necessario riavviare VSCode.", - "fail.createSettings": "Non è possibile creare '{0}' ({1}).", - "openLogsFolder": "Apri cartella dei log", - "showLogs": "Mostra log...", - "mainProcess": "Principale", - "sharedProcess": "Condiviso", - "rendererProcess": "Renderer", - "extensionHost": "Host dell'estensione", - "selectProcess": "Seleziona il processo", - "setLogLevel": "Imposta livello log", - "trace": "Analisi", - "debug": "Debug", - "info": "Informazioni", - "warn": "Avviso", - "err": "Errore", - "critical": "Errori critici", - "off": "Disattivato", - "selectLogLevel": "Seleziona il livello log" + "fail.createSettings": "Non è possibile creare '{0}' ({1})." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/main.contribution.i18n.json index 14e407b8a5d..103d383af16 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 @@ -7,8 +7,9 @@ "view": "Visualizza", "help": "Guida", "file": "File", - "developer": "Sviluppatore", "workspaces": "Aree di lavoro", + "developer": "Sviluppatore", + "workbenchConfigurationTitle": "Area di lavoro", "showEditorTabs": "Controlla se visualizzare o meno gli editor aperti in schede.", "workbench.editor.labelFormat.default": "Visualizza il nome del file. Quando le schede sono abilitate e due file hanno lo stesso nome in un unico gruppo, vengono aggiunte le sezioni distintive del percorso di ciascun file. Quando le schede sono disabilitate, se l'editor è attivo, viene visualizzato il percorso relativo alla radice dell'area di lavoro.", "workbench.editor.labelFormat.short": "Visualizza il nome del file seguito dal relativo nome di directory.", @@ -20,8 +21,10 @@ "showIcons": "Controlla se visualizzare o meno un'icona per gli editor aperti. Richiede l'abilitazione anche di un tema dell'icona.", "enablePreview": "Controlla se gli editor aperti vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute (ad esempio tramite doppio clic o modifica) e vengono visualizzate in corsivo.", "enablePreviewFromQuickOpen": "Controlla se gli editor aperti da Quick Open vengono visualizzati come anteprima. Le anteprime editor vengono riutilizzate finché vengono mantenute, ad esempio tramite doppio clic o modifica.", + "closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.", "editorOpenPositioning": "Controlla la posizione in cui vengono aperti gli editor. Selezionare 'sinistra' o 'destra' per aprire gli editor a sinistra o a destra di quello attualmente attivo. Selezionare 'primo' o 'ultimo' per aprire gli editor indipendentemente da quello attualmente attivo.", "revealIfOpen": "Controlla se un editor viene visualizzato in uno qualsiasi dei gruppi visibili se viene aperto. Se l'opzione è disabilitata, un editor verrà aperto preferibilmente nel gruppo di editor attualmente attivo. Se è abilitata, un editor già aperto verrà visualizzato e non aperto di nuovo nel gruppo di editor attualmente attivo. Nota: in alcuni casi questa impostazione viene ignorata, ad esempio quando si forza l'apertura di un editor in un gruppo specifico oppure a lato del gruppo attualmente attivo.", + "swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.", "commandHistory": "Controlla il numero di comandi utilizzati di recente da mantenere nella cronologia. Impostare a 0 per disabilitare la cronologia dei comandi.", "preserveInput": "Controlla se l'ultimo input digitato nel riquadro comandi deve essere ripristinato alla successiva riapertura del riquadro.", "closeOnFocusLost": "Controlla se Quick Open deve essere chiuso automaticamente quando perde lo stato attivo.", @@ -29,14 +32,11 @@ "sideBarLocation": "Controlla la posizione della barra laterale. Può essere visualizzata a sinistra o a destra del workbench.", "statusBarVisibility": "Controlla la visibilità della barra di stato nella parte inferiore del workbench.", "activityBarVisibility": "Controlla la visibilità della barra attività nel workbench.", - "closeOnFileDelete": "Controlla se gli editor che visualizzano un file devono chiudersi automaticamente quando il file viene eliminato o rinominato da un altro processo. Se si disabilita questa opzione, in una simile circostanza l'editor verrà aperto e i file risulteranno modificati ma non salvati. Nota: se si elimina il file dall'interno dell'applicazione, l'editor verrà sempre chiuso e i file modificati ma non salvati non verranno mai chiusi allo scopo di salvaguardare i dati.", - "enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.", "fontAliasing": "Controlla il metodo di aliasing dei caratteri nell'area di lavoro.\n- impostazione predefinita: anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.\n- anti-aliasing: anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.\n- nessuno: disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari.", "workbench.fontAliasing.default": "Anti-aliasing dei caratteri a livello di sub-pixel. Nella maggior parte delle visualizzazioni non retina consentirà di ottenere un testo con il massimo contrasto.", "workbench.fontAliasing.antialiased": "Anti-aliasing dei caratteri a livello di pixel, invece che a livello di sub-pixel. Consente di visualizzare i caratteri più chiari.", "workbench.fontAliasing.none": "Disabilita l'anti-aliasing dei caratteri. Il testo verrà visualizzato con contorni irregolari. ", - "swipeToNavigate": "Scorrere orizzontalmente con tre dita per spostarsi tra i file aperti.", - "workbenchConfigurationTitle": "Area di lavoro", + "enableNaturalLanguageSettingsSearch": "Controlla se abilitare la modalità di ricerca in linguaggio naturale per le impostazioni.", "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", diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 7e90f64d82a..94d7c45f7eb 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "oggetto del debug", - "debug.terminal.not.available.error": "Il terminale integrato non è disponibile" + "debug.terminal.title": "oggetto del debug" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 1b150a45b5f..5f819964e72 100644 --- a/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Apri nuovo prompt dei comandi", "globalConsoleActionMacLinux": "Apri nuovo terminale", "scopedConsoleActionWin": "Apri nel prompt dei comandi", - "scopedConsoleActionMacLinux": "Apri nel terminale", - "openFolderInIntegratedTerminal": "Apri nel terminale" + "scopedConsoleActionMacLinux": "Apri nel terminale" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index ec5fd33a3b1..2623cd6b56b 100644 --- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.", "workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.", + "fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.", "exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.", "reallyRecommended2": "Per questo tipo di file è consigliabile utilizzare l'estensione '{0}'.", "reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.", diff --git a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..1866903b33e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Area di lavoro" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 979ee1896bb..4a78ba42023 100644 --- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "File", "revealInSideBar": "Visualizza nella barra laterale", "acceptLocalChanges": "Utilizzare le modifiche e sovrascrivere il contenuto del disco", - "revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco" + "revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco", + "copyPathOfActive": "Copia percorso del file attivo", + "saveAllInGroup": "Salva tutto nel gruppo", + "revert": "Ripristina file", + "compareActiveWithSaved": "Confronta file attivo con file salvato", + "closeEditor": "Chiudi editor", + "view": "Visualizza", + "openToSide": "Apri lateralmente", + "revealInWindows": "Visualizza in Esplora risorse", + "revealInMac": "Visualizza in Finder", + "openContainer": "Apri cartella superiore", + "copyPath": "Copia percorso", + "saveAll": "Salva tutto", + "compareWithSaved": "Confronta con file salvato", + "compareSource": "Seleziona per il confronto", + "close": "Chiudi", + "closeOthers": "Chiudi altri", + "closeUnmodified": "Chiudi non modificati", + "closeAll": "Chiudi tutto", + "deleteFile": "Elimina definitivamente" } \ No newline at end of file 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 7d23a38e703..14358d0abb2 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Riprova", - "rename": "Rinomina", "newFile": "Nuovo file", "newFolder": "Nuova cartella", + "rename": "Rinomina", + "delete": "Elimina", + "copyFile": "Copia", + "pasteFile": "Incolla", + "retry": "Riprova", "openFolderFirst": "Aprire prima di tutto una cartella per creare file o cartelle al suo interno.", "newUntitledFile": "Nuovo file senza nome", "createNewFile": "Nuovo file", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "Eliminare definitivamente '{0}'?", "irreversible": "Questa azione è irreversibile.", "permDelete": "Elimina definitivamente", - "delete": "Elimina", "importFiles": "Importa file", "confirmOverwrite": "Nella cartella di destinazione esiste già un file o una cartella con lo stesso nome. Sovrascrivere?", "replaceButtonLabel": "&&Sostituisci", - "copyFile": "Copia", - "pasteFile": "Incolla", "duplicateFile": "Duplicato", - "openToSide": "Apri lateralmente", - "compareSource": "Seleziona per il confronto", "globalCompareFile": "Confronta file attivo con...", "openFileToCompare": "Aprire prima un file per confrontarlo con un altro file.", - "compareWith": "Confronta '{0}' con '{1}'", - "compareFiles": "Confronta file", "refresh": "Aggiorna", - "save": "Salva", - "saveAs": "Salva con nome...", - "saveAll": "Salva tutto", "saveAllInGroup": "Salva tutto nel gruppo", - "saveFiles": "Salva tutti i file", - "revert": "Ripristina file", "focusOpenEditors": "Stato attivo su visualizzazione editor aperti", "focusFilesExplorer": "Stato attivo su Esplora file", "showInExplorer": "Visualizza file attivo nella barra laterale", @@ -56,20 +47,11 @@ "refreshExplorer": "Aggiorna Explorer", "openFileInNewWindow": "Apri file attivo in un'altra finestra", "openFileToShowInNewWindow": "Aprire prima un file per visualizzarlo in un'altra finestra", - "revealInWindows": "Visualizza in Esplora risorse", - "revealInMac": "Visualizza in Finder", - "openContainer": "Apri cartella superiore", - "revealActiveFileInWindows": "Visualizza file attivo in Esplora risorse", - "revealActiveFileInMac": "Visualizza file attivo in Finder", - "openActiveFileContainer": "Apri cartella che contiene il file attivo", "copyPath": "Copia percorso", - "copyPathOfActive": "Copia percorso del file attivo", "emptyFileNameError": "È necessario specificare un nome file o un nome di cartella.", "fileNameExistsError": "In questo percorso esiste già un file o una cartella **{0}**. Scegliere un nome diverso.", "invalidFileNameError": "Il nome **{0}** non è valido per un nome file o un nome di cartella. Scegliere un nome diverso.", "filePathTooLongError": "Con il nome **{0}** il percorso diventa troppo lungo. Scegliere un nome più breve.", - "compareWithSaved": "Confronta file attivo con file salvato", - "modifiedLabel": "{0} (su disco) ↔ {1}", "compareWithClipboard": "Confronta il file attivo con gli appunti", "clipboardComparisonLabel": "Appunti ↔ {0}" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index a02c62cce4f..34188204b43 100644 --- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Aprire prima un file per copiarne il percorso", - "openFileToReveal": "Aprire prima un file per visualizzarlo" + "revealInWindows": "Visualizza in Esplora risorse", + "revealInMac": "Visualizza in Finder", + "openContainer": "Apri cartella superiore", + "saveAs": "Salva con nome...", + "save": "Salva", + "saveAll": "Salva tutto", + "saveFiles": "Salva tutti i file", + "removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro", + "openFileToReveal": "Aprire prima un file per visualizzarlo", + "openFileToCopy": "Aprire prima un file per copiarne il percorso" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 6fb07e8966e..bf53e0bc960 100644 --- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Editor", "formatOnSave": "Formatta un file durante il salvataggio. Deve essere disponibile un formattatore, il file non deve essere salvato automaticamente e l'editor non deve essere in fase di chiusura.", "explorerConfigurationTitle": "Esplora file", - "openEditorsVisible": "Numero di editor visualizzati nel riquadro degli editor aperti. Impostarlo su 0 per nascondere il riquadro.", - "dynamicHeight": "Controlla se l'altezza della sezione degli editor aperti deve essere adattata o meno dinamicamente al numero di elementi.", "autoReveal": "Controlla se Esplora risorse deve rivelare automaticamente e selezionare i file durante l'apertura.", "enableDragAndDrop": "Controlla se Esplora risorse deve consentire lo spostamento di file e cartelle tramite trascinamento della selezione.", "confirmDragAndDrop": "Controlla se Esplora risorse deve chiedere conferma prima di spostare file e cartelle tramite trascinamento della selezione.", diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 49ebceb9611..8052e44e9f3 100644 --- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,9 @@ // Do not edit this file. It is machine generated. { "userGuide": "Usare le azioni della barra degli strumenti dell'editor a destra per **annullare** le modifiche o per **sovrascrivere** il contenuto su disco con le modifiche", - "discard": "Rimuovi", "overwrite": "Sovrascrivi", "retry": "Riprova", - "readonlySaveError": "Non è stato possibile salvare '{0}': il file è protetto da scrittura. Selezionare 'Sovrascrivi' per rimuovere la protezione.", + "discard": "Rimuovi", "genericSaveError": "Non è stato possibile salvare '{0}': {1}", "staleSaveError": "Non è stato possibile salvare '{0}': il contenuto sul disco è più recente. Fare clic su **Confronta** per confrontare la versione corrente con quella sul disco.", "compareChanges": "Confronta", diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index 5627c56823f..f7d56641c92 100644 --- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Editor aperti", "openEditosrSection": "Sezione Editor aperti", - "dirtyCounter": "{0} non salvati", - "saveAll": "Salva tutto", - "closeAllUnmodified": "Chiudi non modificati", - "closeAll": "Chiudi tutto", - "compareWithSaved": "Confronta con file salvato", - "close": "Chiudi", - "closeOthers": "Chiudi altri" + "dirtyCounter": "{0} non salvati" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..458e7226595 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Sviluppatore" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..88a2d7b7487 --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -0,0 +1,23 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "openLogsFolder": "Apri cartella dei log", + "showLogs": "Mostra log...", + "mainProcess": "Principale", + "sharedProcess": "Condiviso", + "rendererProcess": "Finestra", + "extensionHost": "Host dell'estensione", + "selectProcess": "Seleziona il processo", + "setLogLevel": "Imposta livello log", + "trace": "Analisi", + "debug": "Debug", + "info": "Informazioni", + "warn": "Avviso", + "err": "Errore", + "critical": "Errori critici", + "off": "Disattivato", + "selectLogLevel": "Seleziona il livello log" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json index 5e585c6ea40..0337b4edbb1 100644 --- a/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Visualizza", - "problems.view.toggle.label": "Attiva/disattiva problemi", - "problems.view.focus.label": "Problemi di Focus", "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", diff --git a/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..99ba0e6815c --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Output", + "viewCategory": "Visualizza", + "clearOutput.label": "Cancella output" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 7c1a3a7d309..4669fa3cd56 100644 --- a/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Prova la ricerca in linguaggio naturale.", "defaultSettings": "Inserire le impostazioni nell'editor di lato destro per eseguire l'override.", "noSettingsFound": "Non sono state trovate impostazioni.", "settingsSwitcherBarAriaLabel": "Selezione impostazioni", "userSettings": "Impostazioni utente", "workspaceSettings": "Impostazioni area di lavoro", - "folderSettings": "Impostazioni cartella", - "enableFuzzySearch": "Abilita la ricerca in linguaggio naturale" + "folderSettings": "Impostazioni cartella" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index c4cdd4ead33..7149b64d24f 100644 --- a/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Più usate", - "mostRelevant": "Più rilevanti", "defaultKeybindingsHeader": "Per sovrascrivere i tasti di scelta rapida, inserirli nel file dei tasti di scelta rapida." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 13929c1fa4b..9d39d9c9b41 100644 --- a/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Visualizza", "commandsHandlerDescriptionDefault": "Mostra ed esegui comandi", "gotoLineDescriptionMac": "Vai alla riga", "gotoLineDescriptionWin": "Vai alla riga", diff --git a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 44389863a65..7bc3bea7022 100644 --- a/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Mostra GIT", "source control": "Controllo del codice sorgente", "toggleSCMViewlet": "Mostra Gestione controllo servizi", - "view": "Visualizza" + "view": "Visualizza", + "scmConfigurationTitle": "Gestione controllo servizi" } \ 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 ebff6e3002a..406201bbecb 100644 --- a/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Mostra il termine di ricerca precedente", "showSearchViewlet": "Mostra Cerca", "findInFiles": "Cerca nei file", - "findInFilesWithSelectedText": "Cerca nei file con il testo selezionato", "replaceInFiles": "Sostituisci nei file", - "replaceInFilesWithSelectedText": "Sostituisci nei file con il testo selezionato", "RefreshAction.label": "Aggiorna", "CollapseDeepestExpandedLevelAction.label": "Comprimi tutto", "ClearSearchResultsAction.label": "Cancella", diff --git a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 25315a7f99e..b29d6b897b6 100644 --- a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Trova nella cartella...", + "findInWorkspace": "Trova nell'area di lavoro...", "showTriggerActions": "Vai al simbolo nell'area di lavoro...", "name": "Cerca", "search": "Cerca", + "showSearchViewlet": "Mostra Cerca", "view": "Visualizza", + "findInFiles": "Cerca nei file", "openAnythingHandlerDescription": "Vai al file", "openSymbolDescriptionNormal": "Vai al simbolo nell'area di lavoro", "searchOutputChannelTitle": "Cerca", diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..32dc45ab7fd --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Preferenze" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 7cea9caafc3..356ac5c6fe2 100644 --- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Seleziona il linguaggio per il frammento", - "openSnippet.errorOnCreate": "Non è possibile creare {0}", - "openSnippet.label": "Apri frammenti di codice utente", - "preferences": "Preferenze", "snippetSchema.json.default": "Frammento vuoto", "snippetSchema.json": "Configurazione del frammento utente", "snippetSchema.json.prefix": "Prefisso da usare quando si seleziona il frammento in IntelliSense", diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..fee95f06a2c --- /dev/null +++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Frammento utente" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index d130ea84c16..02cfa9b88ab 100644 --- a/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}", "invalid.path.0": "È previsto un valore stringa in `contributes.{0}.path`. Valore specificato: {1}", + "invalid.language": "Il linguaggio in `contributes.{0}.language` è sconosciuto. Valore specificato: {1}", "invalid.path.1": "Valore previsto di `contributes.{0}.path` ({1}) da includere nella cartella dell'estensione ({2}). L'estensione potrebbe non essere più portatile.", "vscode.extension.contributes.snippets": "Frammenti per contributes.", "vscode.extension.contributes.snippets-language": "Identificatore di linguaggio per cui si aggiunge come contributo questo frammento.", "vscode.extension.contributes.snippets-path": "Percorso del file snippets. È relativo alla cartella delle estensioni e in genere inizia con './snippets/'.", "badVariableUse": "Uno o più frammenti dall'estensione '{0}' confondono molto probabilmente variabili-frammento e segnaposto-frammento (Vedere https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax per maggiori dettagli)", "badFile": "Non è stato possibile leggere il file di frammento \"{0}\".", - "source.snippet": "Frammento utente", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 6d85a595027..2d53dad9156 100644 --- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "Il colore di primo piano del terminale.", "terminalCursor.foreground": "Colore di primo piano del cursore del terminale.", "terminalCursor.background": "Colore di sfondo del cursore del terminale. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.", - "terminal.selectionBackground": "Colore di sfondo di selezione del terminale.", - "terminal.ansiColor": "Colore ANSI '{0}' nel terminale." + "terminal.selectionBackground": "Colore di sfondo di selezione del terminale." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 6055f7da096..f695d8b57b2 100644 --- a/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "È possibile modificare la shell di terminale di default selezionando il pulsante Personalizza.", "customize": "Personalizza", "cancel": "Annulla", - "never again": "OK, non visualizzare più", "terminal.integrated.chooseWindowsShell": "Seleziona la shell di terminale preferita - è possibile modificare questa impostazione dopo", "terminalService.terminalCloseConfirmationSingular": "C'è una sessione di terminale attiva. Terminarla?", "terminalService.terminalCloseConfirmationPlural": "Ci sono {0} sessioni di terminale attive. Terminarle?" 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 46c966a637e..7d586fdfcf4 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 @@ -23,6 +23,7 @@ "commandPalette": "Riquadro comandi...", "settings": "Impostazioni", "keyboardShortcuts": "Scelte rapide da tastiera", + "userSnippets": "Frammenti utente", "selectTheme.label": "Tema colori", "themes.selectIconTheme.label": "Tema icona file", "not available": "Aggiornamenti non disponibili", diff --git a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 6952c245dd7..fb6e0553811 100644 --- a/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/ita/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "Il File è una Directory", + "fileNotModifiedError": "File non modificato dal giorno", "fileBinaryError": "Il file sembra essere binario e non può essere aperto come file di testo" } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index c6f9ca63862..11826e9bcfb 100644 --- a/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/ita/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Salvare le modifiche apportate a {0}?", "saveChangesMessages": "Salvare le modifiche apportate ai file seguenti di {0}?", - "moreFile": "...1 altro file non visualizzato", - "moreFiles": "...{0} altri file non visualizzati", "saveAll": "&&Salva tutto", "save": "&&Salva", "dontSave": "&&Non salvare", diff --git a/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index c8e3f4e44d8..7ff89ea80bd 100644 --- a/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/ita/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "Sostituisce i colori del tema colori attualmente selezionato.", - "editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato.", "editorColors.comments": "Imposta i colori e gli stili per i commenti", "editorColors.strings": "Imposta i colori e gli stili per i valori letterali stringa.", "editorColors.keywords": "Imposta i colori e gli stili per le parole chiave.", @@ -19,5 +18,6 @@ "editorColors.types": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di tipo.", "editorColors.functions": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di funzioni.", "editorColors.variables": "Imposta i colori e gli stili per i riferimenti e le dichiarazioni di variabili.", - "editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata)." + "editorColors.textMateRules": "Imposta i colori e gli stili usando le regole di creazione temi di TextMate (impostazione avanzata).", + "editorColors": "Sostituisce i colori dell'editor e lo stile dei font nel tema colori attualmente selezionato." } \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 83c0f4d81a8..af0e885e44b 100644 --- a/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/ita/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Impossibile scrivere nel file di configurazione dell'area di lavoro. Si prega di aprire il file per correggere eventuali errori/avvisi e riprovare.", "errorWorkspaceConfigurationFileDirty": "Impossibile scrivere nel file di configurazione dell'area di lavoro, perché il file è sporco. Si prega di salvarlo e riprovare.", "openWorkspaceConfigurationFile": "Apri file di configurazione dell'area di lavoro", - "close": "Chiudi", - "enterWorkspace.close": "Chiudi", - "enterWorkspace.dontShowAgain": "Non visualizzare più questo messaggio", - "enterWorkspace.moreInfo": "Altre informazioni", - "enterWorkspace.prompt": "Ulteriori informazioni su come lavorare con più cartelle in VS Code." + "close": "Chiudi" } \ No newline at end of file diff --git a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json b/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json index f8b65e69685..905556c139c 100644 --- a/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json +++ b/i18n/jpn/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json @@ -22,7 +22,7 @@ "fileDescription": "特定のファイル拡張子を持つすべてのファイルと一致します。", "filesLabel": "複数の拡張子のファイル", "filesDescription": "いずれかのファイル拡張子を持つすべてのファイルと一致します。", - "derivedLabel": "同じ名前の兄弟があるファイル", + "derivedLabel": "同じ名前の同種のファイル", "derivedDescription": "名前が同じで拡張子が異なる兄弟を持つファイルと一致します。", "topFolderLabel": "特定の名前のフォルダー (最上位)", "topFolderDescription": "特定の名前の最上位にあるフォルダーと一致します。", @@ -32,7 +32,7 @@ "folderDescription": "任意の場所にある特定の名前のフォルダーと一致します。", "falseDescription": "パターンを無効にします。", "trueDescription": "パターンを有効にします。", - "siblingsDescription": "名前が同じで拡張子が異なる兄弟を持つファイルと一致します。", + "siblingsDescription": "名前が同じで異なる拡張子を持つ同種のファイルと一致します。", "languageSpecificEditorSettings": "言語固有のエディター設定", "languageSpecificEditorSettingsDescription": "言語に対するエディター設定を上書きします" } \ 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 5ff9ba2550a..4716b3c9ee1 100644 --- a/i18n/jpn/extensions/css/package.i18n.json +++ b/i18n/jpn/extensions/css/package.i18n.json @@ -5,24 +5,24 @@ // Do not edit this file. It is machine generated. { "css.title": "CSS", - "css.lint.argumentsInColorFunction.desc": "正しくないパラメーターの数", - "css.lint.boxModel.desc": "パディングまたは枠線を使用する場合は幅または高さを使用しないでください", - "css.lint.compatibleVendorPrefixes.desc": "ベンダー固有のプレフィックスを使用する場合は、他のすべてのベンダー固有のプロパティも必ず含めてください", + "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.lint.float.desc": "'float' の使用を避けてください。float は脆弱な CSS につながり、レイアウトの一部が変更されたときに CSS が破損しやすくなります。", "css.lint.fontFaceProperties.desc": "@font-face 規則で 'src' プロパティと 'font-family' プロパティを定義する必要があります", - "css.lint.hexColorLength.desc": "16 進数の色には、3 つまたは 6 つの 16 進数が含まれる必要があります", + "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: inline' の場合、width、height、margin-top、margin-bottom、および float のプロパティには効果がありません", + "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.lint.zeroUnits.desc": "0 に単位は必要ありません", "css.trace.server.desc": "VS Code と CSS 言語サーバー間の通信をトレースします。", "css.validate.title": "CSS の検証と問題の重大度を制御します。", "css.validate.desc": "すべての検証を有効または無効にします", diff --git a/i18n/jpn/extensions/git/out/autofetch.i18n.json b/i18n/jpn/extensions/git/out/autofetch.i18n.json index a4b33109cea..4dcee36f0c2 100644 --- a/i18n/jpn/extensions/git/out/autofetch.i18n.json +++ b/i18n/jpn/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "はい", + "read more": "詳細を参照", "no": "いいえ", - "not now": "あとで", - "suggest auto fetch": "Git リポジトリの自動フェッチを有効にしますか?" + "not now": "後で通知する", + "suggest auto fetch": "Code が定期的に `git fetch` を実行してもよろしいですか?" } \ 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 e73b6d879f2..2dfc5f400ac 100644 --- a/i18n/jpn/extensions/git/out/commands.i18n.json +++ b/i18n/jpn/extensions/git/out/commands.i18n.json @@ -13,7 +13,7 @@ "cancel tooltip": "クローンのキャンセル", "cloning": "Git リポジトリを複製しています...", "openrepo": "リポジトリを開く", - "proposeopen": "複製したリポジトリを開きますか?", + "proposeopen": "クローンしたリポジトリを開きますか?", "init": "Git リポジトリを初期化するワークスペース フォルダーを選択してください", "init repo": "リポジトリの初期化", "create repo": "リポジトリの初期化", @@ -41,6 +41,10 @@ "confirm discard all 2": "{0}\n\nこの変更は元に戻すことはできません。現在のワーキング セットは永久に失われます。", "yes discard tracked": "1 つの追跡ファイルを破棄", "yes discard tracked multiple": "{0} 個の追跡ファイルを破棄", + "unsaved files single": "次のファイルが保存されていません: {0}。\n\nコミット前に保存しますか?", + "unsaved files": "{0} 個の保存されていないファイルがあります。\n\nコミット前に保存しますか?", + "save and commit": "すべて保存してコミットする", + "commit": "とにかくコミットする", "no staged changes": "コミットするステージされた変更がありません。\n\nすべての変更を自動的にステージして、直接コミットしますか?", "always": "常に行う", "no changes": "コミットする必要のある変更はありません。", @@ -64,12 +68,12 @@ "no remotes to pull": "リポジトリには、プル元として構成されているリモートがありません。", "pick remote pull repo": "リモートを選んで、ブランチを次からプルします:", "no remotes to push": "リポジトリには、プッシュ先として構成されているリモートがありません。", - "push with tags success": "タグが正常にプッシュされました。", "nobranch": "リモートにプッシュするブランチをチェックアウトしてください。", + "confirm publish branch": "'{0}' ブランチに上流ブランチはありません。このブランチを公開しますか?", + "ok": "OK", + "push with tags success": "タグが正常にプッシュされました。", "pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:", "sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。", - "ok": "OK", - "never again": "OK、今後は表示しない", "no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。", "no changes stash": "スタッシュする変更がありません。", "provide stash message": "必要に応じてスタッシュ メッセージを入力してください", diff --git a/i18n/jpn/extensions/git/package.i18n.json b/i18n/jpn/extensions/git/package.i18n.json index 1574014e89e..bdc7a5612ed 100644 --- a/i18n/jpn/extensions/git/package.i18n.json +++ b/i18n/jpn/extensions/git/package.i18n.json @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "command.clone": "複製", + "command.clone": "クローン", "command.init": "リポジトリの初期化", "command.close": "リポジトリを閉じる", "command.refresh": "最新の情報に更新", @@ -52,8 +52,9 @@ "command.stash": "スタッシュ", "command.stashPop": "スタッシュを適用して削除...", "command.stashPopLatest": "最新のスタッシュを適用して削除", - "config.enabled": "Git が有効になっているかどうか", + "config.enabled": "Git を有効にするかどうか", "config.path": "Git 実行可能ファイルのパス", + "config.autoRepositoryDetection": "レポジトリを自動的に検出するかどうか", "config.autorefresh": "自動更新が有効かどうか", "config.autofetch": "自動フェッチが有効かどうか", "config.enableLongCommitWarning": "長いコミット メッセージについて警告するかどうか", @@ -72,5 +73,6 @@ "colors.deleted": "リソースを検出した場合の配色", "colors.untracked": "リソースを追跡しない場合の配色", "colors.ignored": "リソースを無視する場合の配色", - "colors.conflict": "リソースが競合する場合の配色" + "colors.conflict": "リソースが競合する場合の配色", + "colors.submodule": "サブモジュールの配色。" } \ No newline at end of file diff --git a/i18n/jpn/extensions/markdown/package.i18n.json b/i18n/jpn/extensions/markdown/package.i18n.json index 9c09de2d69a..5f1c24f35e0 100644 --- a/i18n/jpn/extensions/markdown/package.i18n.json +++ b/i18n/jpn/extensions/markdown/package.i18n.json @@ -19,6 +19,6 @@ "markdown.showSource.title": "ソースの表示", "markdown.styles.dec": "マークダウン プレビューから使用する CSS スタイル シートの URL またはローカル パスの一覧。相対パスは、エクスプローラーで開かれているフォルダーへの絶対パスと解釈されます。開かれているフォルダーがない場合、マークダウン ファイルの場所を基準としていると解釈されます。'\\' はすべて '\\\\' と入力する必要があります。", "markdown.showPreviewSecuritySelector.title": "プレビュー のセキュリティ設定を変更", - "markdown.trace.desc": "マークダウン拡張機能のデバッグログを有効にします。", + "markdown.trace.desc": "マークダウン拡張機能のデバッグ ログを有効にします。", "markdown.refreshPreview.title": "プレビューを更新" } \ 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 1e7a986fcec..77aae3a85d1 100644 --- a/i18n/jpn/extensions/php/package.i18n.json +++ b/i18n/jpn/extensions/php/package.i18n.json @@ -6,7 +6,7 @@ { "configuration.suggest.basic": "組み込みの PHP 言語候補機能を有効にするかどうかを設定します。このサポートによって、PHP グローバルと変数の候補が示されます。", "configuration.validate.enable": "組み込みの PHP 検証を有効/無効にします。", - "configuration.validate.executablePath": "PHP 実行可能ファイルを指します。", + "configuration.validate.executablePath": "PHP 実行可能ファイルを指定します。", "configuration.validate.run": "リンターを保存時に実行するか、入力時に実行するか。", "configuration.title": "PHP", "commands.categroy.php": "PHP", diff --git a/i18n/jpn/extensions/typescript/out/commands.i18n.json b/i18n/jpn/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..e996cf2c1a9 --- /dev/null +++ b/i18n/jpn/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "TypeScript または JavaScript プロジェクトを使用するには、VS Code でフォルダーを開いてください", + "typescript.projectConfigUnsupportedFile": "TypeScript または JavaScript のプロジェクトを判別できませんでした。サポートされていないファイルの種類です", + "typescript.projectConfigCouldNotGetInfo": "TypeScript または JavaScript のプロジェクトを判別できませんでした", + "typescript.noTypeScriptProjectConfig": "ファイルは TypeScript プロジェクトの一部ではない", + "typescript.noJavaScriptProjectConfig": "ファイルは JavaScript プロジェクトの一部ではない", + "typescript.configureTsconfigQuickPick": "tsconfig.json を構成する", + "typescript.configureJsconfigQuickPick": "jsconfig.json を構成する", + "typescript.projectConfigLearnMore": "詳細情報" +} \ No newline at end of file diff --git a/i18n/jpn/extensions/typescript/package.i18n.json b/i18n/jpn/extensions/typescript/package.i18n.json index 837e11b2972..0b964b94699 100644 --- a/i18n/jpn/extensions/typescript/package.i18n.json +++ b/i18n/jpn/extensions/typescript/package.i18n.json @@ -37,7 +37,7 @@ "typescript.referencesCodeLens.enabled": "TypeScript ファイル内で CodeLens の参照を有効/無効にします。TypeScript 2.0.6 以上が必要です。", "typescript.implementationsCodeLens.enabled": "CodeLens の実装を有効/無効にします。TypeScript 2.2.0 以上が必要です。", "typescript.openTsServerLog.title": "TS サーバーのログを開く", - "typescript.restartTsServer": "TS サーバーを再起動する", + "typescript.restartTsServer": "TS サーバーを再起動", "typescript.selectTypeScriptVersion.title": "TypeScript のバージョンの選択", "typescript.reportStyleChecksAsWarnings": "スタイルチェックレポートを警告扱いとする", "jsDocCompletion.enabled": " 自動 JSDoc コメントを有効/無効にします", diff --git a/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/jpn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/base/node/ps.i18n.json b/i18n/jpn/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..94b9be48727 --- /dev/null +++ b/i18n/jpn/src/vs/base/node/ps.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "collecting": "CPU とメモリーの情報を収集しています。これには数秒かかる場合があります。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json index 8a7dad6df22..3de2dd195d0 100644 --- a/i18n/jpn/src/vs/code/electron-main/menus.i18n.json +++ b/i18n/jpn/src/vs/code/electron-main/menus.i18n.json @@ -97,7 +97,7 @@ "miMoveSidebarRight": "サイド バーを右へ移動(&&M)", "miMoveSidebarLeft": "サイド バーを左へ移動(&&M)", "miTogglePanel": "パネルの切り替え(&&P)", - "miHideStatusbar": "ステータス バーを非表示にする(&&H)", + "miHideStatusbar": "ステータス バーを非表示(&&H)", "miShowStatusbar": "ステータス バーの表示(&&S)", "miHideActivityBar": "アクティビティ バーを非表示にする(&&A)", "miShowActivityBar": "アクティビティ バーを表示する(&&A)", @@ -146,7 +146,7 @@ "miEnableAllBreakpoints": "すべてのブレークポイントを有効にする", "miDisableAllBreakpoints": "すべてのブレークポイントを無効にする(&&L)", "miRemoveAllBreakpoints": "すべてのブレークポイントを削除する(&&R)", - "miInstallAdditionalDebuggers": "その他のデバッガーをインストールします(&&I)...", + "miInstallAdditionalDebuggers": "追加のデバッガーをインストール(&&I)...", "mMinimize": "最小化", "mZoom": "ズーム", "mBringToFront": "すべてを前面に配置", diff --git a/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json b/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json index 17e8239c8b5..36f86e4b3e5 100644 --- a/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json +++ b/i18n/jpn/src/vs/code/node/cliProcessMain.i18n.json @@ -10,7 +10,7 @@ "successVsixInstall": "拡張機能 '{0}' が正常にインストールされました。", "cancelVsixInstall": "拡張機能 '{0}' のインストールをキャンセルしました。", "alreadyInstalled": "拡張機能 '{0}' は既にインストールされています。", - "foundExtension": "マーケットプレースで '{0}' が見つかりました。", + "foundExtension": "Marketplace で '{0}' が見つかりました。", "installing": "インストールしています...", "successInstall": "拡張機能 '{0}' v{1} が正常にインストールされました!", "uninstalling": "{0} をアンインストールしています...", diff --git a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json index ccf74d0af32..6d5f2ea1582 100644 --- a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "行番号は、絶対数として表示されます。", "lineNumbers.relative": "行番号は、カーソル位置までの行数として表示されます。", "lineNumbers.interval": "行番号は 10 行ごとに表示されます。", - "lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、および 'relative' です。", + "lineNumbers": "行番号の表示を制御します。使用可能な値は、'on'、'off'、'relative'、'interval' です。", "rulers": "等幅フォントの特定番号の後ろに垂直ルーラーを表示します。複数のルーラーには複数の値を使用します。配列が空の場合はルーラーを表示しません。", "wordSeparators": "単語に関連したナビゲーションまたは操作を実行するときに、単語の区切り文字として使用される文字", "tabSize": "1 つのタブに相当するスペースの数。`editor.detectIndentation` がオンの場合、この設定はファイル コンテンツに基づいて上書きされます。", @@ -72,6 +72,7 @@ "cursorBlinking": "カーソルのアニメーション スタイルを制御します。指定できる値は 'blink'、'smooth'、'phase'、'expand'、'solid' です", "mouseWheelZoom": "Ctrl キーを押しながらマウス ホイールを使用してエディターのフォントをズームします", "cursorStyle": "カーソルのスタイルを制御します。指定できる値は 'block'、'block-outline'、'line'、'line-thin'、'underline'、'underline-thin' です", + "lineCursorWidth": "editor.cursorStyle が 'line' に設定されている場合、カーソルの幅を制御する", "fontLigatures": "フォントの合字を使用します", "hideCursorInOverviewRuler": "概要ルーラーでカーソルを非表示にするかどうかを制御します。", "renderWhitespace": "エディターで空白文字を表示する方法を制御します。'none'、'boundary' および 'all' が使用可能です。'boundary' オプションでは、単語間の単一スペースは表示されません。", 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 ccbe80f4d39..89993cc3618 100644 --- a/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/jpn/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,7 @@ { "lineHighlight": "カーソル位置の行を強調表示する背景色。", "lineHighlightBorderBox": "カーソル位置の行の境界線を強調表示する背景色。", - "rangeHighlight": "Quick Open 機能や検索機能などによって強調表示された範囲の背景色。", + "rangeHighlight": "Quick Open 機能や検索機能などによって強調表示された範囲の背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", "caret": "エディターのカーソルの色。", "editorCursorBackground": "選択された文字列の背景色です。選択された文字列の背景色をカスタマイズ出来ます。", "editorWhitespaces": "エディターのスペース文字の色。", diff --git a/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json b/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json index c6a310be421..1c780e8f0a3 100644 --- a/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/folding/folding.i18n.json @@ -13,5 +13,5 @@ "unfoldAllMarkerRegions.label": "すべての領域を展開", "foldAllAction.label": "すべて折りたたみ", "unfoldAllAction.label": "すべて展開", - "foldLevelAction.label": "折りたたみレベル {0}" + "foldLevelAction.label": "レベル {0} で折りたたむ" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json index 53ea71a9d4e..37cec91d1cd 100644 --- a/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,8 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "次のエラーまたは警告へ移動", - "markerAction.previous.label": "前のエラーまたは警告へ移動", + "markerAction.next.label": "次の問題 (エラー、警告、情報) へ移動", + "markerAction.previous.label": "前の問題 (エラー、警告、情報) へ移動", "editorMarkerNavigationError": "エディターのマーカー ナビゲーション ウィジェットのエラーの色。", "editorMarkerNavigationWarning": "エディターのマーカー ナビゲーション ウィジェットの警告の色。", "editorMarkerNavigationInfo": "エディターのマーカー ナビゲーション ウィジェットの情報の色。", diff --git a/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json b/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json index 0df6dca88c6..22250151607 100644 --- a/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/multicursor/multicursor.i18n.json @@ -7,10 +7,10 @@ "mutlicursor.insertAbove": "カーソルを上に挿入", "mutlicursor.insertBelow": "カーソルを下に挿入", "mutlicursor.insertAtEndOfEachLineSelected": "カーソルを行末に挿入", - "addSelectionToNextFindMatch": "選択した項目を次の一致項目に追加", - "addSelectionToPreviousFindMatch": "選んだ項目を前の一致項目に追加する", + "addSelectionToNextFindMatch": "選択項目を次の一致項目に追加", + "addSelectionToPreviousFindMatch": "選択項目を次の一致項目に追加", "moveSelectionToNextFindMatch": "最後に選択した項目を次の一致項目に移動", - "moveSelectionToPreviousFindMatch": "最後に選んだ項目を前の一致項目に移動する", - "selectAllOccurrencesOfFindMatch": "一致するすべての出現箇所を選択します", + "moveSelectionToPreviousFindMatch": "最後に選択した項目を前の一致項目に移動", + "selectAllOccurrencesOfFindMatch": "一致するすべての出現箇所を選択", "changeAll.label": "すべての出現箇所を変更" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json b/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json index 63cb6013496..6b75d7b1bbe 100644 --- a/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/toggleTabFocusMode/toggleTabFocusMode.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "toggle.tabMovesFocus": "Tab キーを切り替えるとフォーカスが移動します" + "toggle.tabMovesFocus": "TAB キーのフォーカス移動を切り替え" } \ 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 8eac21c6979..9ecf4479aa8 100644 --- a/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/jpn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。", - "wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。", + "wordHighlight": "変数の読み取りなど読み取りアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "wordHighlightStrong": "変数への書き込みなど書き込みアクセス中のシンボルの背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", "overviewRulerWordHighlightForeground": "シンボルを強調表示するときの概要ルーラーのマーカー色。", "overviewRulerWordHighlightStrongForeground": "書き込みアクセス シンボルを強調表示するときの概要ルーラーのマーカー色。", "wordHighlight.next.label": "次のシンボル ハイライトに移動", diff --git a/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 981e3bb87da..2a2b18aa6b8 100644 --- a/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/jpn/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}` は有効なメニュー識別子ではありません", "missing.command": "メニュー項目が、'commands' セクションで定義されていないコマンド `{0}` を参照しています。", "missing.altCommand": "メニュー項目が、'commands' セクションで定義されていない alt コマンド `{0}` を参照しています。", - "dupe.command": "メニュー項目において、既定と alt コマンドが同じコマンドを参照しています", - "nosupport.altCommand": "申し訳ございません。現在、alt コマンドをサポートしているのは 'editor/title' メニューの 'navigation' グループのみです" + "dupe.command": "メニュー項目において、既定と alt コマンドが同じコマンドを参照しています" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json index e5dd71eb7e2..41c3e146387 100644 --- a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,35 @@ "diff": "2 つのファイルを比較します。", "add": "最後にアクティブだったウィンドウにフォルダーを追加します。", "goto": "指定した行と文字の位置にあるパスでファイルを開きます。", - "locale": "使用する国と地域 (例:en-US や zh-TW など)。", "newWindow": "新しい Code のインスタンスを強制します。", - "performance": "'Developer: Startup Performance' コマンドを有効にして開始します。", - "prof-startup": "起動中に CPU プロファイラーを実行する", - "inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。", - "inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。", "reuseWindow": "最後のアクティブ ウィンドウにファイルまたはフォルダーを強制的に開きます。", - "userDataDir": "ユーザー データを保持するディレクトリを指定します。ルートで実行している場合に役立ちます。", - "log": "使用するログレベル。既定値は 'info' です。利用可能な値は 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' です。", - "verbose": "詳細出力を表示します (--wait を含みます)。", "wait": "現在のファイルが閉じられるまで待機します。", + "locale": "使用する国と地域 (例:en-US や zh-TW など)。", + "userDataDir": "ユーザー データを保持するディレクトリを指定します。ルートで実行している場合に役立ちます。", + "version": "バージョンを表示します。", + "help": "使用法を表示します。", "extensionHomePath": "拡張機能のルート パスを設定します。", "listExtensions": "インストールされている拡張機能を一覧表示します。", "showVersions": "--list-extension と使用するとき、インストールされている拡張機能のバージョンを表示します。", "installExtension": "拡張機能をインストールします。", "uninstallExtension": "拡張機能をアンインストールします。", "experimentalApis": "拡張機能に対して Proposed API 機能を有効にします。", - "disableExtensions": "インストールされたすべての拡張機能を無効にします。", - "disableGPU": "GPU ハードウェア アクセラレータを無効にします。", + "verbose": "詳細出力を表示します (--wait を含みます)。", + "log": "使用するログレベル。既定値は 'info' です。利用可能な値は 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' です。", "status": "プロセスの使用状況や診断情報を印刷します。", - "version": "バージョンを表示します。", - "help": "使用法を表示します。", + "performance": "'Developer: Startup Performance' コマンドを有効にして開始します。", + "prof-startup": "起動中に CPU プロファイラーを実行する", + "disableExtensions": "インストールされたすべての拡張機能を無効にします。", + "inspect-extensions": "拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。", + "inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。", + "disableGPU": "GPU ハードウェア アクセラレータを無効にします。", + "uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。", "usage": "使用法", "options": "オプション", "paths": "パス", - "optionsUpperCase": "オプション" + "stdinWindows": "別のプログラムから出力を読み取るには、'-' を付け足してください (例: 'echo Hello World | {0} -')", + "stdinUnix": "stdin から読み取るには、'-' を付け足してください (例: 'ps aux | grep code | {0} -')", + "optionsUpperCase": "オプション", + "extensionsManagement": "拡張機能の管理", + "troubleshooting": "トラブルシューティング" } \ 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 9901a3c82e4..9b169d44885 100644 --- a/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/jpn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,15 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "正しくない拡張機能: package.json は JSON ファイルではありません。", - "restartCodeLocal": "{0} を再インストールする前に、Code を再起動してください。", + "restartCode": "{0} を再インストールする前に、Code を再起動してください。", "installingOutdatedExtension": "この拡張機能の新しいバージョンが既にインストールされています。古いバージョンでこれを上書きしますか?", "override": "上書き", "cancel": "キャンセル", - "notFoundCompatible": "VS Code の現在のバージョン '{1}' と互換性を持つ拡張機能 '{0}' が見つからないため、インストールできません。", - "quitCode": "拡張機能の古いインスタンスがまだ実行中であるため、インストールできません。再インストール前に VS Code の終了と起動を実施してください。", - "exitCode": "拡張機能の古いインスタンスがまだ実行中であるため、インストールできません。再インストール前に VS Code の終了と起動を実施してください。", + "errorInstallingDependencies": "依存関係のインストール中にエラーが発生しました。{0}", + "notFoundCompatible": "'{0}' をインストールできません。VS Code '{1}' と互換性がある利用可能なバージョンがありません。", "notFoundCompatibleDependency": "VS Code の現在のバージョン '{1}' と互換性を持つ、依存関係がある拡張機能 '{0}' が見つからないため、インストールできません。", + "quitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。", + "exitCode": "拡張機能をインストールできません。再インストールの前に VS Code の終了と起動を実施してください。", "uninstallDependeciesConfirmation": "'{0}' のみをアンインストールしますか、または依存関係もアンインストールしますか?", "uninstallOnly": "限定", "uninstallAll": "すべて", diff --git a/i18n/jpn/src/vs/platform/message/common/message.i18n.json b/i18n/jpn/src/vs/platform/message/common/message.i18n.json index 85415e2c95f..15eee72cd0d 100644 --- a/i18n/jpn/src/vs/platform/message/common/message.i18n.json +++ b/i18n/jpn/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "閉じる", "later": "後続", - "cancel": "キャンセル" + "cancel": "キャンセル", + "moreFile": "...1 つの追加ファイルが表示されていません", + "moreFiles": "...{0} 個の追加ファイルが表示されていません" } \ 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 24c492550e3..46bb9caa152 100644 --- a/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/jpn/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,12 @@ "editorWidgetBorder": "エディター ウィジェットの境界線色。ウィジェットに境界線があり、ウィジェットによって配色を上書きされていない場合でのみこの配色は使用されます。", "editorSelectionBackground": "エディターの選択範囲の色。", "editorSelectionForeground": "ハイ コントラストの選択済みテキストの色。", - "editorInactiveSelection": "非アクティブなエディターの選択範囲の色。", - "editorSelectionHighlight": "選択範囲と同じコンテンツの領域の色。", + "editorInactiveSelection": "非アクティブなエディターの選択範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "editorSelectionHighlight": "選択範囲と同じコンテンツの領域の色。下にある装飾を隠さないために、色は不透過であってはなりません。", "editorFindMatch": "現在の検索一致項目の色。", - "findMatchHighlight": "他の検索一致項目の色。", - "findRangeHighlight": "検索を制限する範囲の色。", - "hoverHighlight": "ホバーが表示されているワードの下を強調表示します。", + "findMatchHighlight": "他の検索一致項目の色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "findRangeHighlight": "検索を制限する範囲の色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "hoverHighlight": "ホバーが表示されているワードの下を強調表示します。下にある装飾を隠さないために、色は不透過であってはなりません。", "hoverBackground": "エディター ホバーの背景色。", "hoverBorder": "エディター ホバーの境界線の色。", "activeLinkForeground": "アクティブなリンクの色。", @@ -76,12 +76,12 @@ "diffEditorRemoved": "削除されたテキストの背景色。", "diffEditorInsertedOutline": "挿入されたテキストの輪郭の色。", "diffEditorRemovedOutline": "削除されたテキストの輪郭の色。", - "mergeCurrentHeaderBackground": "行内マージ競合の現在のヘッダー背景色。", - "mergeCurrentContentBackground": "行内マージ競合の現在のコンテンツ背景色。", - "mergeIncomingHeaderBackground": "行内マージ競合の入力側ヘッダー背景色。", - "mergeIncomingContentBackground": "行内マージ競合の入力側コンテンツ背景色。", - "mergeCommonHeaderBackground": "行内マージ競合の共通の祖先ヘッダー背景色。", - "mergeCommonContentBackground": "行内マージ競合の共通の祖先コンテンツ背景色。", + "mergeCurrentHeaderBackground": "行内マージ競合の現在のヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "mergeCurrentContentBackground": "行内マージ競合の現在のコンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "mergeIncomingHeaderBackground": "行内マージ競合の入力側ヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "mergeIncomingContentBackground": "行内マージ競合の入力側コンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "mergeCommonHeaderBackground": "行内マージ競合の共通の祖先ヘッダー背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", + "mergeCommonContentBackground": "行内マージ競合の共通の祖先コンテンツ背景色。下にある装飾を隠さないために、色は不透過であってはなりません。", "mergeBorder": "行内マージ競合のヘッダーとスプリッターの境界線の色。", "overviewRulerCurrentContentForeground": "行内マージ競合の現在の概要ルーラー前景色。", "overviewRulerIncomingContentForeground": "行内マージ競合の入力側の概要ルーラー前景色。", 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 new file mode 100644 index 00000000000..e4fd63e4462 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "saveParticipants": "Save Participants が実行中です..." +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 74c5f0eabd7..3d99fafeeda 100644 --- a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。", - "treeItem.notFound": "ID '{0}' のツリー項目は見つかりませんでした。", - "treeView.duplicateElement": " {0} 要素は既に登録されています。" + "treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 60ed1228f04..69c30877972 100644 --- a/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "ファイルを開く...", "openFolder": "フォルダーを開く...", "openFileFolder": "開く...", - "addFolderToWorkspace": "ワークスペースにフォルダーを追加...", - "add": "追加(&&A)", - "addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加", "globalRemoveFolderFromWorkspace": "ワークスペースからフォルダーを削除...", - "removeFolderFromWorkspace": "ワークスペースからフォルダーを削除", - "openFolderSettings": "フォルダーの設定を開く", "saveWorkspaceAsAction": "名前を付けてワークスペースを保存...", "save": "保存(&&S)", "saveWorkspace": "ワークスペースを保存", "openWorkspaceAction": "ワークスペースを開く...", "openWorkspaceConfigFile": "ワークスペースの構成ファイルを開く", - "openFolderAsWorkspaceInNewWindow": "新しいウィンドウでワークスペースとしてフォルダーを開く", - "workspaceFolderPickerPlaceholder": "ワークスペース フォルダーを選択" + "openFolderAsWorkspaceInNewWindow": "新しいウィンドウでワークスペースとしてフォルダーを開く" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..d1d72afcab9 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "ワークスペースにフォルダーを追加...", + "add": "追加(&&A)", + "addFolderToWorkspaceTitle": "ワークスペースにフォルダーを追加", + "workspaceFolderPickerPlaceholder": "ワークスペース フォルダーを選択" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 86cc5cdfa14..ef30ff122d1 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,18 @@ "groupThreePicker": "3 番目のグループのエディターを表示する", "allEditorsPicker": "開いているエディターをすべて表示する", "view": "表示", - "file": "ファイル" + "file": "ファイル", + "close": "閉じる", + "closeOthers": "その他を閉じる", + "closeRight": "右側を閉じる", + "closeAllUnmodified": "未変更を閉じる", + "closeAll": "すべて閉じる", + "keepOpen": "開いたままにする", + "toggleInlineView": "インライン表示に切り替え", + "showOpenedEditors": "開いているエディターを表示", + "keepEditor": "エディターを保持", + "closeEditorsInGroup": "グループ内のすべてのエディターを閉じる", + "closeUnmodifiedEditors": "グループ内の未変更のエディターを閉じる", + "closeOtherEditors": "その他のエディターを閉じる", + "closeRightEditors": "右側のエディターを閉じる" } \ 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 9e1f0ccd5c3..3d1749e2a39 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,18 +17,13 @@ "closeEditor": "エディターを閉じる", "revertAndCloseActiveEditor": "元に戻してエディターを閉じる", "closeEditorsToTheLeft": "左側のエディターを閉じる", - "closeEditorsToTheRight": "右側のエディターを閉じる", "closeAllEditors": "すべてのエディターを閉じる", - "closeUnmodifiedEditors": "グループ内の未変更のエディターを閉じる", "closeEditorsInOtherGroups": "他のグループ内のエディターを閉じる", - "closeOtherEditorsInGroup": "その他のエディターを閉じる", - "closeEditorsInGroup": "グループ内のすべてのエディターを閉じる", "moveActiveGroupLeft": "エディター グループを左側に移動する", "moveActiveGroupRight": "エディター グループを右側に移動する", "minimizeOtherEditorGroups": "他のエディター グループを最小化する", "evenEditorGroups": "エディター グループの幅を等間隔に設定する", "maximizeEditor": "エディター グループを最大化してサイドバーを非表示にする", - "keepEditor": "エディターを保持", "openNextEditor": "次のエディターを開く", "openPreviousEditor": "以前のエディターを開く", "nextEditorInGroup": "グループ内で次のエディターを開く", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "最初のグループのエディターを表示する", "showEditorsInSecondGroup": "2 番目のグループでエディターを表示する", "showEditorsInThirdGroup": "3 番目のグループのエディターを表示する", - "showEditorsInGroup": "エディターをグループに表示する", "showAllEditors": "すべてのエディターを表示する", "openPreviousRecentlyUsedEditorInGroup": "グループ内の最近使用したエディターのうち前のエディターを開く", "openNextRecentlyUsedEditorInGroup": "グループ内の最近使用したエディターのうち次のエディターを開く", @@ -54,5 +48,8 @@ "moveEditorLeft": "エディターを左へ移動", "moveEditorRight": "エディターを右へ移動", "moveEditorToPreviousGroup": "エディターを前のグループに移動", - "moveEditorToNextGroup": "エディターを次のグループに移動" + "moveEditorToNextGroup": "エディターを次のグループに移動", + "moveEditorToFirstGroup": "エディターを 1 番目のグループに移動", + "moveEditorToSecondGroup": "エディターを 2 番目のグループに移動", + "moveEditorToThirdGroup": "エディターを 3 番目のグループに移動" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 31949627cfd..faa2938621c 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "タブまたはグループ別にアクティブ エディターを移動する", "editorCommand.activeEditorMove.arg.name": "アクティブ エディターの Move 引数", - "editorCommand.activeEditorMove.arg.description": "引数プロパティ:\n\t* 'to': 移動先を指定する文字列値。\n\t* 'by': 移動の単位を指定する文字列値。タブ別またはグループ別。\n\t* 'value': 移動の位置数もしくは絶対位置を指定する数値。", - "commandDeprecated": "コマンド **{0}** は削除されました。代わりに **{1}** を使用できます", - "openKeybindings": "ショートカット キーの構成" + "editorCommand.activeEditorMove.arg.description": "引数プロパティ:\n\t* 'to': 移動先を指定する文字列値。\n\t* 'by': 移動の単位を指定する文字列値。タブ別またはグループ別。\n\t* 'value': 移動の位置数もしくは絶対位置を指定する数値。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index e5581c64d21..17ddb4365e0 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "テキスト ファイル比較エディター。", "navigate.next.label": "次の変更箇所", "navigate.prev.label": "前の変更箇所", - "inlineDiffLabel": "インライン表示に切り替え", - "sideBySideDiffLabel": "並べて表示に切り替え" + "toggleIgnoreTrimWhitespace.label": "末尾の空白文字のトリミングを無視する" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index c10bd2e7b60..f0f64f4f3ad 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "閉じる", - "closeOthers": "その他を閉じる", - "closeRight": "右側を閉じる", - "closeAll": "すべて閉じる", - "closeAllUnmodified": "未変更を閉じる", - "keepOpen": "開いたままにする", - "showOpenedEditors": "開いているエディターを表示", "araLabelEditorActions": "エディター操作" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index 5c96f185104..2ac16cc30bc 100644 --- a/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/jpn/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[サポート対象外]", + "userIsAdmin": "[管理者]", + "userIsSudo": "[スーパー ユーザー]", "devExtensionWindowTitlePrefix": "[拡張機能開発ホスト]" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/common/theme.i18n.json b/i18n/jpn/src/vs/workbench/common/theme.i18n.json index a296fd913c1..61bc140d9d3 100644 --- a/i18n/jpn/src/vs/workbench/common/theme.i18n.json +++ b/i18n/jpn/src/vs/workbench/common/theme.i18n.json @@ -6,9 +6,13 @@ { "tabActiveBackground": "アクティブ タブの背景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", "tabInactiveBackground": "非アクティブ タブの背景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", + "tabHoverBackground": "ホバー時のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", + "tabUnfocusedHoverBackground": "ホバー時のフォーカスされていないグループ内のタブの背景色。タブはエディター領域におけるエディターのコンテナです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", "tabBorder": "タブ同士を分けるための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。", "tabActiveBorder": "アクティブなタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。", "tabActiveUnfocusedBorder": "フォーカスされていないグループ内のアクティブ タブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。", + "tabHoverBorder": "ホバー時のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。", + "tabUnfocusedHoverBorder": "ホバー時のフォーカスされていないグループ内のタブを強調表示するための境界線。タブはエディター領域内にあるエディターのコンテナーです。複数のタブを 1 つのエディター グループで開くことができます。複数のエディター グループがある可能性があります。", "tabActiveForeground": "アクティブ グループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", "tabInactiveForeground": "アクティブ グループ内の非アクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", "tabUnfocusedActiveForeground": "フォーカスされていないグループ内のアクティブ タブの前景色。タブはエディター領域におけるエディターのコンテナーです。1 つのエディター グループで複数のタブを開くことができます。エディター グループを複数にすることもできます。", @@ -16,7 +20,7 @@ "editorGroupBackground": "エディター グループの背景色。エディター グループはエディターのコンテナーです。背景色はエディター グループをドラッグすると表示されます。", "tabsContainerBackground": "タブが有効な場合の エディター グループ タイトル ヘッダーの背景色。エディター グループはエディターのコンテナーです。", "tabsContainerBorder": "タブが有効な場合の エディター グループ タイトル ヘッダーの境界線色。エディター グループはエディターのコンテナーです。", - "editorGroupHeaderBackground": "タブが無効な場合の エディター グループ タイトル ヘッダーの背景色。エディター グループはエディターのコンテナーです。", + "editorGroupHeaderBackground": "タブが無効な場合 (`\"workbench.editor.showTabs\": false`) のエディター グループ タイトル ヘッダーの背景色。エディター グループはエディターのコンテナーです。", "editorGroupBorder": "複数のエディター グループを互いに分離するための色。エディター グループはエディターのコンテナーです。", "editorDragAndDropBackground": "エディターの周囲をドラッグしているときの背景色。エディターのコンテンツが最後まで輝くために、色は透過である必要があります。", "panelBackground": "パネルの背景色。パネルはエディター領域の下に表示され、出力や統合ターミナルなどのビューを含みます。", @@ -33,8 +37,8 @@ "statusBarNoFolderBorder": "フォルダーを開いていないときにサイドバーとエディターを隔てるワークスペースのステータス バーの境界線の色。ステータス バーはウィンドウの下部に表示されます。 ", "statusBarItemActiveBackground": "クリック時のステータス バーの項目の背景色。ステータス バーはウィンドウの下部に表示されます。", "statusBarItemHoverBackground": "ホバーしたときのステータス バーの項目の背景色。ステータス バーはウィンドウの下部に表示されます。", - "statusBarProminentItemBackground": "ステータス バーの重要な項目の背景色。重要な項目は、重要性を示すために他のステータスバーの項目から際立っています。 ステータス バーはウィンドウの下部に表示されます。", - "statusBarProminentItemHoverBackground": "ホバーしたときのステータス バーの重要な項目の背景色。重要な項目は、重要性を示すために他のステータスバーの項目から際立っています。 ステータス バーはウィンドウの下部に表示されます。", + "statusBarProminentItemBackground": "ステータスバーで目立たせる項目の背景色。この項目は、重要性を示すために他のエントリーより目立って表示されます。コマンドパレットから `Toggle Tab Key Moves Focus` に切り替えると例を見ることができます。ステータスバーはウィンドウの下部に表示されます。", + "statusBarProminentItemHoverBackground": "ホバー中のステータスバーで目立たせる項目の背景色。この項目は、重要性を示すために他のエントリーより目立って表示されます。コマンドパレットから `Toggle Tab Key Moves Focus` に切り替えると例を見ることができます。ステータスバーはウィンドウの下部に表示されます。", "activityBarBackground": "アクティビティ バーの背景色。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。", "activityBarForeground": "アクティビティ バーの前景色 (例: アイコンの色)。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。", "activityBarBorder": "サイド バーと隔てるアクティビティ バーの境界線色。アクティビティ バーは左端または右端に表示され、サイド バーのビューを切り替えることができます。", diff --git a/i18n/jpn/src/vs/workbench/common/views.i18n.json b/i18n/jpn/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..3607a9f498a --- /dev/null +++ b/i18n/jpn/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "location `{1}` で id `{0}` のビューが既に登録されています" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json index e4698109a33..68ba00974f3 100644 --- a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "エディターを閉じる", "closeWindow": "ウィンドウを閉じる", "closeWorkspace": "ワークスペースを閉じる", "noWorkspaceOpened": "このインスタンスで現在開いているワークスペースがないので、閉じられません。", @@ -52,21 +51,5 @@ "displayLanguage": "VSCode の表示言語を定義します。", "doc": "サポートされている言語の一覧については、{0} をご覧ください。", "restart": "値を変更するには VS Code の再起動が必要です。", - "fail.createSettings": "'{0}' ({1}) を作成できません。", - "openLogsFolder": "ログ フォルダーを開く", - "showLogs": "ログの表示...", - "mainProcess": "メイン", - "sharedProcess": "共有", - "rendererProcess": "レンダラー", - "extensionHost": "拡張機能ホスト", - "selectProcess": "プロセスの選択", - "setLogLevel": "ログ レベルの設定", - "trace": "トレース", - "debug": "デバッグ", - "info": "情報", - "warn": "警告", - "err": "エラー", - "critical": "重大", - "off": "オフ", - "selectLogLevel": "ログ レベルを選択" + "fail.createSettings": "'{0}' ({1}) を作成できません。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/main.contribution.i18n.json index 2f2b510b284..c0540ea9122 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 @@ -7,8 +7,9 @@ "view": "表示", "help": "ヘルプ", "file": "ファイル", - "developer": "開発者", "workspaces": "ワークスペース", + "developer": "開発者", + "workbenchConfigurationTitle": "ワークベンチ", "showEditorTabs": "開いているエディターをタブに表示するかどうかを制御します。", "workbench.editor.labelFormat.default": "ファイルの名前を表示します。タブが有効かつ 1 つのグループ内の 2 つの同名ファイルがあるときに各ファイルのパスの区切り記号が追加されます。タブを無効にすると、エディターがアクティブな時にワークスペース フォルダーの相対パスが表示されます。", "workbench.editor.labelFormat.short": "ディレクトリ名に続けてファイル名を表示します。", @@ -20,23 +21,23 @@ "showIcons": "開いているエディターをアイコンで表示するかどうかを制御します。これには、アイコンのテーマを有効にする必要もあります。", "enablePreview": "開かれるエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは (例: ダブル クリックまたは編集などによって) 変更される時まで再利用し、斜体で表示します。", "enablePreviewFromQuickOpen": "Quick Open で開いたエディターをプレビューとして表示するかどうかを制御します。プレビュー エディターは、保持されている間、再利用されます (ダブルクリックまたは編集などによって)。", + "closeOnFileDelete": "ファイルを表示しているエディターを、ファイルが削除されるかその他のプロセスによって名前を変更された場合に、自動的に閉じるかどうかを制御します。これを無効にすると、このような場合にエディターはダーティで開かれたままになります。アプリケーション内で削除すると、必ずエディターは閉じられ、ダーティ ファイルは閉じられることがなく、データは保存されませんのでご注意ください。", "editorOpenPositioning": "エディターを開く場所を制御します。'left' または 'right' を選択すると現在アクティブになっているエディターの左または右にエディターを開きます。'first' または 'last' を選択すると現在アクティブになっているエディターとは別個にエディターを開きます。", "revealIfOpen": "任意の表示グループが開かれた場合に、そこにエディターを表示するかどうかを制御します。無効にした場合、エディターは現在のアクティブなエディター グループに優先して開かれます。有効にした場合は、現在のアクティブなエディター グループにもう一度開くのではなく、既に開いているエディターが表示されます。特定のグループ内や現在アクティブなグループの横に強制的にエディターを開いた場合などに、この設定が無視される場合もあることにご注意ください。", + "swipeToNavigate": "3 本の指で横方向にスワイプすると、開いているファイル間を移動できます。", "commandHistory": "コマンド パレットで最近使用したコマンド履歴を保持する数を制御します。0 に設定するとコマンド履歴を無効にします。", "preserveInput": "次回開いたとき、コマンド パレットの最後の入力を復元するかどうかを制御します。", "closeOnFocusLost": "フォーカスを失ったときに Quick Open を自動的に閉じるかどうかを制御します。", "openDefaultSettings": "設定を開くとすべての既定の設定を表示するエディターも開くかどうかを制御します。", "sideBarLocation": "サイド バーの位置を制御します。ワークベンチの左右のいずれかに表示できます。", + "panelDefaultLocation": "パネルの既定の位置を制御します。ワークベンチの下部または右のいずれかに表示できます。", "statusBarVisibility": "ワークベンチの下部にステータス バーを表示するかどうかを制御します。", "activityBarVisibility": "ワークベンチでのアクティビティ バーの表示をコントロールします。", - "closeOnFileDelete": "ファイルを表示しているエディターを、ファイルが削除されるかその他のプロセスによって名前を変更された場合に、自動的に閉じるかどうかを制御します。これを無効にすると、このような場合にエディターはダーティで開かれたままになります。アプリケーション内で削除すると、必ずエディターは閉じられ、ダーティ ファイルは閉じられることがなく、データは保存されませんのでご注意ください。", - "enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。", "fontAliasing": "ワークベンチのフォント エイリアシング方法を制御します。\n- default: サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します\n- antialiased: サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えます\n- none: フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します", "workbench.fontAliasing.default": "サブピクセル方式でフォントを滑らかにします。ほとんどの非 Retina ディスプレイでもっとも鮮明なテキストを提供します。", "workbench.fontAliasing.antialiased": "サブピクセルとは対照的に、ピクセルのレベルでフォントを滑らかにします。フォント全体がより細く見えるようになります。", "workbench.fontAliasing.none": "フォントのスムージングを無効にします。テキストをぎざぎざな尖ったエッジで表示します。", - "swipeToNavigate": "3 本の指で横方向にスワイプすると、開いているファイル間を移動できます。", - "workbenchConfigurationTitle": "ワークベンチ", + "enableNaturalLanguageSettingsSearch": "設定で自然文検索モードを有効にするかどうかを制御します。", "windowConfigurationTitle": "ウィンドウ", "window.openFilesInNewWindow.on": "新しいウィンドウでファイルを開きます", "window.openFilesInNewWindow.off": "ファイルのフォルダーが開かれていたウィンドウまたは最後のアクティブ ウィンドウでファイルを開きます", diff --git a/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json index 0813ed28598..b9e99cd4528 100644 --- a/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/jpn/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "切り取り", "copy": "コピー", "paste": "貼り付け", - "selectAll": "すべて選択" + "selectAll": "すべて選択", + "runningAsRoot": "{0} をルート ユーザーとして実行しないことを推奨します。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json index 1c53dd86bdd..f1f6fe1ec7d 100644 --- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/accessibility.i18n.json @@ -22,5 +22,5 @@ "openDocMac": "command + H キーを押して、ブラウザー ウィンドウを今すぐ開き、アクセシビリティに関連する他の VS Code 情報を確認します。", "openDocWinLinux": "Ctrl + H キーを押して、ブラウザー ウィンドウを今すぐ開き、アクセシビリティに関連する他の VS Code 情報を確認します。", "outroMsg": "Esc キー か Shift+Esc を押すと、ヒントを消してエディターに戻ることができます。", - "ShowAccessibilityHelpAction": "アクセシビリティのヘルプを表示します" + "ShowAccessibilityHelpAction": "アクセシビリティのヘルプを表示" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json index 3b84ee3fdb4..ec3d813e1dc 100644 --- a/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/codeEditor/electron-browser/toggleMultiCursorModifier.i18n.json @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "toggleLocation": "マルチ カーソルの修飾キーを切り替える" + "toggleLocation": "マルチカーソル修飾子の切り替え" } \ 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 57ba460378d..bf61b86ff83 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 @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "openLaunchJson": "{0} を開く", - "launchJsonNeedsConfigurtion": "'launch.json' を構成または修正してください", + "launchJsonNeedsConfigurtion": "'launch.json' の構成や修正", "noFolderDebugConfig": "高度なデバッグ構成を行うには、最初にフォルダーを開いてください。", "startDebug": "デバッグの開始", "startWithoutDebugging": "デバッグなしで開始", diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json index 8876044c17e..00d3b5a76c0 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugToolBarBackground": "デバッグ ツール バーの背景色。" + "debugToolBarBackground": "デバッグ ツール バーの背景色。", + "debugToolBarBorder": "デバッグ ツール バーの境界線色。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json index f9530ecfb90..76d3254c4eb 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/browser/debugQuickOpen.i18n.json @@ -6,7 +6,7 @@ { "entryAriaLabel": "{0}、デバッグ", "debugAriaLabel": "実行する起動構成の名前を入力してください。", - "addConfigTo": "設定 ({0}) の追加 ...", + "addConfigTo": "構成 ({0}) の追加...", "addConfiguration": "構成の追加...", "noConfigurationsMatching": "一致するデバッグ構成はありません", "noConfigurationsFound": "デバッグ構成が見つかりません。'launch.json' ファイルを作成してください。" diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json index 3b2b57ca85d..010c65f0dc8 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/repl.i18n.json @@ -8,5 +8,5 @@ "actions.repl.historyPrevious": "前の履歴", "actions.repl.historyNext": "次の履歴", "actions.repl.acceptInput": "REPL での入力を反映", - "actions.repl.copyAll": "デバッグ: コンソールをすべてコピーする" + "actions.repl.copyAll": "デバッグ: コンソールをすべてコピー" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 248289a591a..af2aec81915 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "デバッグ対象", - "debug.terminal.not.available.error": "統合ターミナルを使用できません" + "debug.terminal.title": "デバッグ対象" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 2a9f118d084..ecb730ce4d3 100644 --- a/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "新しいコマンド プロンプトを開く", "globalConsoleActionMacLinux": "新しいターミナルを開く", "scopedConsoleActionWin": "コマンド プロンプトで開く", - "scopedConsoleActionMacLinux": "ターミナルで開く", - "openFolderInIntegratedTerminal": "ターミナルで開く" + "scopedConsoleActionMacLinux": "ターミナルで開く" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index c381b702335..07e196a71f5 100644 --- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。", "workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。", + "fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。", "exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。", "reallyRecommended2": "このファイルの種類には拡張機能 '{0}' が推奨されます。", "reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。", diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..78d76e265f4 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.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. +{ + "workbenchConfigurationTitle": "ワークベンチ", + "feedbackVisibility": "ワークベンチ下部にあるステータス バーで Twitter のフィードバック (スマイル) を表示するかどうかを制御します。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json index ba6b165a86a..8f7ff5b2b6f 100644 --- a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json @@ -16,6 +16,7 @@ "request a missing feature": "欠落している機能を要求する", "tell us why?": "理由をお知らせください", "commentsHeader": "コメント", + "showFeedback": "ステータス バーにフィードバックの笑顔文字を表示", "tweet": "ツイートする", "character left": "文字入力可", "characters left": "文字入力可", diff --git a/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..e31810d983c --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "hide": "非表示" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 76306159955..8c1cdd182ee 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,26 @@ "filesCategory": "ファイル", "revealInSideBar": "サイド バーに表示", "acceptLocalChanges": "変更を使用してディスクの内容を上書き", - "revertLocalChanges": "変更を破棄してディスク上の内容に戻る" + "revertLocalChanges": "変更を破棄してディスク上の内容に戻る", + "copyPathOfActive": "アクティブ ファイルのパスのコピー", + "saveAllInGroup": "グループ内のすべてを保存する", + "revert": "ファイルを元に戻す", + "compareActiveWithSaved": "保存済みファイルと作業中のファイルを比較", + "closeEditor": "エディターを閉じる", + "view": "表示", + "openToSide": "横に並べて開く", + "revealInWindows": "エクスプローラーで表示", + "revealInMac": "Finder で表示します", + "openContainer": "このアイテムのフォルダーを開く", + "copyPath": "パスのコピー", + "saveAll": "すべて保存", + "compareWithSaved": "保存済みと比較", + "compareWithSelected": "選択項目と比較", + "compareSource": "比較対象の選択", + "compareSelected": "選択項目の比較", + "close": "閉じる", + "closeOthers": "その他を閉じる", + "closeUnmodified": "未変更を閉じる", + "closeAll": "すべて閉じる", + "deleteFile": "完全に削除" } \ 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 2ef009f9c59..7754a978dc6 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "再試行", - "rename": "名前変更", "newFile": "新しいファイル", "newFolder": "新しいフォルダー", + "rename": "名前変更", + "delete": "削除", + "copyFile": "コピー", + "pasteFile": "貼り付け", + "retry": "再試行", "openFolderFirst": "フォルダー内にファイルやフォルダーを作成するには、フォルダーをまず開く必要があります。", "newUntitledFile": "無題の新規ファイル", "createNewFile": "新しいファイル", @@ -15,39 +18,32 @@ "deleteButtonLabelRecycleBin": "ごみ箱に移動(&&M)", "deleteButtonLabelTrash": "ゴミ箱に移動(&&M)", "deleteButtonLabel": "削除(&&D)", + "dirtyMessageFilesDelete": "保存されていない変更があるファイルを削除します。続行しますか?", "dirtyMessageFolderOneDelete": "保存されていない変更がある 1 個のファイルを含むフォルダーを削除します。続行しますか?", "dirtyMessageFolderDelete": "保存されていない変更があるファイルを {0} 個含むフォルダーを削除します。続行しますか?", "dirtyMessageFileDelete": "保存されていない変更があるファイルを削除します。続行しますか?", "dirtyWarning": "保存しないと変更内容が失われます。", + "confirmMoveTrashMessageMultiple": "次の {0} 個のファイルを削除してもよろしいですか?", "confirmMoveTrashMessageFolder": "'{0}' とその内容を削除しますか?", "confirmMoveTrashMessageFile": "'{0}' を削除しますか?", "undoBin": "ごみ箱から復元できます。", "undoTrash": "ゴミ箱から復元できます。", "doNotAskAgain": "再度表示しない", + "confirmDeleteMessageMultiple": "次の {0} 個のファイルを完全に削除してもよろしいですか?", "confirmDeleteMessageFolder": "'{0}' とその内容を完全に削除してもよろしいですか?", "confirmDeleteMessageFile": "'{0}' を完全に削除してもよろしいですか?", "irreversible": "このアクションは元に戻すことができません。", "permDelete": "完全に削除", - "delete": "削除", "importFiles": "ファイルのインポート", "confirmOverwrite": "保存先のフォルダーに同じ名前のファイルまたはフォルダーが既に存在します。置き換えてもよろしいですか?", "replaceButtonLabel": "置換(&&R)", - "copyFile": "コピー", - "pasteFile": "貼り付け", + "fileDeleted": "ファイルは削除されたか移動されています", + "fileIsAncestor": "コピーするファイルがコピー先フォルダの上位にあります", "duplicateFile": "重複", - "openToSide": "横に並べて開く", - "compareSource": "比較対象の選択", "globalCompareFile": "アクティブ ファイルを比較しています...", "openFileToCompare": "まずファイルを開いてから別のファイルと比較してください", - "compareWith": "'{0}' と '{1}' を比較", - "compareFiles": "ファイルの比較", "refresh": "最新の情報に更新", - "save": "保存", - "saveAs": "名前を付けて保存...", - "saveAll": "すべて保存", "saveAllInGroup": "グループ内のすべてを保存する", - "saveFiles": "すべてのファイルを保存", - "revert": "ファイルを元に戻す", "focusOpenEditors": "開いているエディターのビューにフォーカスする", "focusFilesExplorer": "ファイル エクスプローラーにフォーカスを置く", "showInExplorer": "アクティブ ファイルをサイド バーに表示", @@ -56,20 +52,11 @@ "refreshExplorer": "エクスプローラーを最新表示する", "openFileInNewWindow": "新しいウィンドウでアクティブ ファイルを開く", "openFileToShowInNewWindow": "まずファイルを開いてから新しいウィンドウで開きます", - "revealInWindows": "エクスプローラーで表示", - "revealInMac": "Finder で表示します", - "openContainer": "このアイテムのフォルダーを開く", - "revealActiveFileInWindows": "Windows エクスプローラーでアクティブ ファイルを表示する", - "revealActiveFileInMac": "Finder でアクティブ ファイルを表示する", - "openActiveFileContainer": "アクティブ ファイルを含んでいるフォルダーを開く", "copyPath": "パスのコピー", - "copyPathOfActive": "アクティブ ファイルのパスのコピー", "emptyFileNameError": "ファイルまたはフォルダーの名前を指定する必要があります。", "fileNameExistsError": "**{0}** というファイルまたはフォルダーはこの場所に既に存在します。別の名前を指定してください。", "invalidFileNameError": "名前 **{0}** がファイル名またはフォルダー名として無効です。別の名前を指定してください。", "filePathTooLongError": "名前 **{0}** のパスが長すぎます。名前を短くしてください。", - "compareWithSaved": "保存済みファイルと作業中のファイルを比較", - "modifiedLabel": "{0} (ローカル) ↔ {1}", "compareWithClipboard": "クリップボードとアクティブ ファイルを比較", "clipboardComparisonLabel": "クリップボード ↔ {0}" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index 4f2a963e359..e49e3964c1f 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "まずファイルを開いてからそのパスをコピーします", - "openFileToReveal": "まずファイルを開いてから表示します" + "revealInWindows": "エクスプローラーで表示", + "revealInMac": "Finder で表示します", + "openContainer": "このアイテムのフォルダーを開く", + "saveAs": "名前を付けて保存...", + "save": "保存", + "saveAll": "すべて保存", + "saveFiles": "すべてのファイルを保存", + "removeFolderFromWorkspace": "ワークスペースからフォルダーを削除", + "genericRevertError": "元へ戻すことに失敗しました '{0}': {1}", + "modifiedLabel": "{0} (ローカル) ↔ {1}", + "openFileToReveal": "まずファイルを開いてから表示します", + "openFileToCopy": "まずファイルを開いてからそのパスをコピーします" } \ No newline at end of file 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 5461c0b3fa9..9527bde4049 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 @@ -36,8 +36,6 @@ "editorConfigurationTitle": "エディター", "formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。", "explorerConfigurationTitle": "エクスプローラー", - "openEditorsVisible": "[開いているエディター] ウィンドウに表示されているエディターの数。0 に設定するとウィンドウが非表示になります。", - "dynamicHeight": "開いているエディターのセクションの高さを要素の数に合わせて動的に調整するかどうかを制御します。", "autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。", "enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。", "confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。", diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index a11f1cb6ffc..e3aeaafe4e7 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "右側のエディター ツール バーの操作で、変更を [元に戻す] か、ディスクの内容を変更内容で [上書き] します", - "discard": "破棄", + "overwriteElevated": "管理者権限で上書き...", + "saveElevated": "管理者権限で再試行...", "overwrite": "上書き", "retry": "再試行", - "readonlySaveError": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[上書き] を選択して保護を解除してください。", + "discard": "破棄", + "readonlySaveErrorAdmin": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[管理者権限で上書き] を選択して管理者として再試行してください。", + "readonlySaveError": "'{0}' の保存に失敗しました。ファイルが書き込み禁止になっています。[上書き] を選択して保護の解除を試してください。", + "permissionDeniedSaveError": "'{0}' の保存に失敗しました。十分な権限がありません。[管理者権限で再試行] を選択して管理者として再試行してください。", "genericSaveError": "'{0}' の保存に失敗しました: {1}", "staleSaveError": "'{0} の保存に失敗しました。ディスクの内容の方が新しくなっています。[比較] をクリックしてご使用のバージョンをディスク上のバージョンと比較してください。", "compareChanges": "比較", 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 f9c3565a125..3b5ce0838f3 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 @@ -10,6 +10,7 @@ "dropFolder": "ワークスペースにフォルダーを追加しますか?", "addFolders": "フォルダーの追加(&&A)", "addFolder": "フォルダーの追加(&&A)", + "confirmMultiMove": "次の {0} 個のファイルを移動してもよろしいですか?", "confirmMove": "'{0}' を移動しますか?", "doNotAskAgain": "再度表示しない", "moveButtonLabel": "移動(&&M)", diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index b798b662ed0..95dfcf4fae9 100644 --- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "開いているエディター", "openEditosrSection": "[開いているエディター] セクション", - "dirtyCounter": "未保存 ({0})", - "saveAll": "すべて保存", - "closeAllUnmodified": "未変更を閉じる", - "closeAll": "すべて閉じる", - "compareWithSaved": "保存済みと比較", - "close": "閉じる", - "closeOthers": "その他を閉じる" + "dirtyCounter": "未保存 ({0})" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..f95880fcc36 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.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. +{ + "mainLog": "ログ (メイン)", + "sharedLog": "ログ (共有)", + "rendererLog": "ログ (ウィンドウ)", + "extensionsLog": "ログ (拡張機能ホスト)", + "developer": "開発者" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..861a564f2de --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "openLogsFolder": "ログ フォルダーを開く", + "showLogs": "ログの表示...", + "mainProcess": "メイン", + "sharedProcess": "共有", + "rendererProcess": "ウィンドウ", + "extensionHost": "拡張機能ホスト", + "selectProcess": "プロセスの選択", + "openLogFile": "ログ ファイルを開く...", + "setLogLevel": "ログ レベルの設定", + "trace": "トレース", + "debug": "デバッグ", + "info": "情報", + "warn": "警告", + "err": "エラー", + "critical": "重大", + "off": "オフ", + "selectLogLevel": "ログ レベルを選択" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json index efe22d017f6..0c951e42e75 100644 --- a/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,13 +5,13 @@ // Do not edit this file. It is machine generated. { "viewCategory": "表示", - "problems.view.toggle.label": "問題の切り替え", - "problems.view.focus.label": "問題にフォーカス", + "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.build": "現時点でワークスペースの問題は検出されていません。", "markers.panel.no.problems.filters": "指定されたフィルター条件による結果はありません", "markers.panel.action.filter": "問題のフィルター処理", "markers.panel.filter.placeholder": "種類またはテキストでフィルター処理", 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 new file mode 100644 index 00000000000..57deadb1a55 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "出力", + "logViewer": "ログ ビューアー", + "viewCategory": "表示", + "clearOutput.label": "出力のクリア" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8f00064048d --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/output/electron-browser/outputServices.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. +{ + "output": "{0} - 出力", + "channel": "'{0}' の出力チャネル" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json index efdc6c41cac..99ba1fc8808 100644 --- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/keybindingWidgets.i18n.json @@ -5,5 +5,5 @@ // Do not edit this file. It is machine generated. { "defineKeybinding.initial": "任意のキーの組み合わせを押し、ENTER キーを押します。", - "defineKeybinding.chordsTo": "次へのコード:" + "defineKeybinding.chordsTo": "の次に" } \ 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 d963a2915fe..d1d1439074e 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 @@ -31,6 +31,6 @@ "keybindingAriaLabel": "キー バインドは {0} です。", "noKeybinding": "キー バインドが割り当てられていません。", "sourceAriaLabel": "ソースは {0} です。", - "whenAriaLabel": "時間は {0} です。", - "noWhen": "時間コンテキストがありません。" + "whenAriaLabel": "タイミングは {0} です。", + "noWhen": "タイミングのコンテキストがありません。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json index dacdf6ccd9d..00efa778c91 100644 --- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json @@ -11,6 +11,8 @@ "oneSettingFound": "1 つの設定が一致します", "settingsFound": "{0} 個の設定が一致します", "totalSettingsMessage": "合計 {0} 個の設定", + "nlpResult": "自然文 (natural language) の結果", + "filterResult": "フィルター後の結果", "defaultSettings": "既定の設定", "defaultFolderSettings": "既定のフォルダー設定", "defaultEditorReadonly": "既定値を上書きするには、右側のエディターを編集します。", diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index dbb463d1324..05635b7c0f4 100644 --- a/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "自然文検索 (natural language search) を試し下さい!", "defaultSettings": "上書きするには、右側のエディターに設定を入力します。", "noSettingsFound": "設定が見つかりません。", "settingsSwitcherBarAriaLabel": "設定切り替え", "userSettings": "ユーザー設定", "workspaceSettings": "ワークスペースの設定", - "folderSettings": "フォルダーの設定", - "enableFuzzySearch": "自然文検索を有効にする" + "folderSettings": "フォルダーの設定" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index a99b14b8dd8..f28c0310389 100644 --- a/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "よく使用するもの", - "mostRelevant": "最も関連性の高い", "defaultKeybindingsHeader": "キー バインド ファイル内にキー バインドを挿入して、キー バインドを上書きします。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 63217f20e3e..932be0b6bfa 100644 --- a/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "表示", "commandsHandlerDescriptionDefault": "コマンドの表示と実行", "gotoLineDescriptionMac": "行へ移動", "gotoLineDescriptionWin": "行へ移動", diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index b650b0b0eb3..84c7c41eb09 100644 --- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,9 @@ "toggleGitViewlet": "Git を表示", "source control": "ソース管理", "toggleSCMViewlet": "SCM を表示", - "view": "表示" + "view": "表示", + "scmConfigurationTitle": "SCM", + "alwaysShowProviders": "ソース管理プロバイダーのセクションを常に表示するかどうか。", + "diffDecorations": "エディターの差分デコレーターを制御します。", + "inputCounter": "入力文字のカウントをいつ表示するかを制御します。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index 2cd7ee76d8f..58ba9f785fc 100644 --- a/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,9 @@ { "scm providers": "ソース管理プロバイダー", "hideRepository": "非表示", + "commitMessageInfo": "現在の行に {0}  文字", + "commitMessageCountdown": "現在の行で残り {0} 文字", + "commitMessageWarning": "現在の行で {1} から {0} 文字オーバー", "installAdditionalSCMProviders": "その他の SCM プロバイダーをインストール...", "no open repo": "有効なソース管理プロバイダーがありません。", "source control": "ソース管理", 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 d07e4c94a3f..eeb352c7ca2 100644 --- a/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "前の検索語句を表示", "showSearchViewlet": "検索の表示", "findInFiles": "フォルダーを指定して検索", - "findInFilesWithSelectedText": "選択したテキストを含むファイルを検索", "replaceInFiles": "複数のファイルで置換", - "replaceInFilesWithSelectedText": "選択したテキストを含むファイルの置換", "RefreshAction.label": "最新の情報に更新", "CollapseDeepestExpandedLevelAction.label": "すべて折りたたむ", "ClearSearchResultsAction.label": "クリア", diff --git a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index e266c4b0298..5253824e4bd 100644 --- a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "フォルダー内を検索...", + "findInWorkspace": "ワークスペース内を検索...", "showTriggerActions": "ワークスペース内のシンボルへ移動...", "name": "検索", "search": "検索", + "showSearchViewlet": "検索の表示", "view": "表示", + "findInFiles": "フォルダーを指定して検索", "openAnythingHandlerDescription": "ファイルに移動する", "openSymbolDescriptionNormal": "ワークスペース内のシンボルへ移動", "searchOutputChannelTitle": "検索", @@ -18,5 +22,6 @@ "useRipgrep": "テキストとファイル検索で ripgrep を使用するかどうかを制御します", "useIgnoreFiles": "ファイルを検索するときに、.gitignore ファイルを使用するか .ignore ファイルを使用するかを制御します。", "search.quickOpen.includeSymbols": "グローバル シンボル検索の結果を、Quick Open の結果ファイルに含めるように構成します。", - "search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。" + "search.followSymlinks": "検索中にシンボリック リンクをたどるかどうかを制御します。", + "search.smartCase": "すべて小文字のパターンの場合、大文字と小文字を区別しないで検索し、そうでない場合は大文字と小文字を区別して検索する" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..9f9a7171140 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.scope": "(グローバル)", + "global.1": "({0})", + "new.global": "新しいグローバル スニペット ファイル...", + "group.global": "既存のスニペット", + "new.global.sep": "新しいスニペット", + "openSnippet.pickLanguage": "スニペット ファイルの選択もしくはスニペットの作成", + "openSnippet.label": "ユーザー スニペットの構成", + "preferences": "基本設定" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 72cf35b045c..f4559520bc0 100644 --- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,13 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "スニペットの言語を選択", - "openSnippet.errorOnCreate": "{0} を作成できません", - "openSnippet.label": "ユーザー スニペットを開く", - "preferences": "基本設定", "snippetSchema.json.default": "空のスニペット", "snippetSchema.json": "ユーザー スニペット構成", "snippetSchema.json.prefix": "intellisense でスニペットを選択するときに使用するプレフィックス", "snippetSchema.json.body": "スニペットのコンテンツです。カーソルの位置を定義するには '$1', '${1:defaultText}' を使用し、最後のカーソルの位置には '$0' を使用します。'${varName}' と '${varName:defaultText}' を使用すると変数値を挿入します。例: 'This is file: $TM_FILENAME'.", - "snippetSchema.json.description": "スニペットについての記述。" + "snippetSchema.json.description": "スニペットについての記述。", + "snippetSchema.json.scope": "このスニペットを適用する言語名のリスト。例: 'typescript,javascript'。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..6528c4a5c72 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "ユーザー スニペット" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index 247f01f3cea..8d9acf90cf1 100644 --- a/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}", "invalid.path.0": "`contributes.{0}.path` に文字列が必要です。提供された値: {1}", + "invalid.language.0": "言語を省略するとき、`contributes.{0}.path` の値は `.code-snippets`-file にする必要があります。提供された値: {1}", + "invalid.language": "`contributes.{0}.language` で不明な言語です。提供された値: {1}", "invalid.path.1": "拡張機能のフォルダー ({2}) の中に `contributes.{0}.path` ({1}) が含まれている必要があります。これにより拡張を移植できなくなる可能性があります。", "vscode.extension.contributes.snippets": "スニペットを提供します。", "vscode.extension.contributes.snippets-language": "このスニペットの提供先の言語識別子です。", "vscode.extension.contributes.snippets-path": "スニペット ファイルのパス。拡張機能フォルダーの相対パスであり、通常 './snippets/' で始まります。", "badVariableUse": "拡張機能 '{0}' の 1 つまたは複数のスニペットは、スニペット変数とスニペット プレース ホルダーを混乱させる可能性が非常にあります。 (詳細については、 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax を参照してください)", "badFile": "スニペット ファイル \"{0}\" を読み込むことができませんでした。", - "source.snippet": "ユーザー スニペット", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 76dbf9d84f0..189e87c799d 100644 --- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -14,6 +14,7 @@ "terminal.integrated.shell.windows": "Windows でターミナルが使用するシェルのパス。 Windows に同梱されているシェルを使用する場合 (cmd、PowerShell、または Bash on Ubuntu) 。", "terminal.integrated.shellArgs.windows": "Windows ターミナル上の場合に使用されるコマンド ライン引数。", "terminal.integrated.rightClickCopyPaste": "設定している場合、ターミナル内で右クリックしたときにコンテキスト メニューを表示させず、選択範囲がある場合はコピー、選択範囲がない場合は貼り付けの操作を行います。", + "terminal.integrated.copyOnSelection": "設定した場合、ターミナルで選択しているテキストはクリップボードにコピーされます。", "terminal.integrated.fontFamily": "端末のフォント ファミリを制御します。既定値は editor.fontFamily になります。", "terminal.integrated.fontSize": "ターミナルのフォント サイズをピクセル単位で制御します。", "terminal.integrated.lineHeight": "ターミナルの行の高さを制御します。この数値にターミナルのフォント サイズを乗算すると、実際の行の高さ (ピクセル単位) になります。", @@ -24,10 +25,12 @@ "terminal.integrated.setLocaleVariables": "ターミナルの開始時にロケール変数を設定するかどうかを制御します。OS X では既定で true になり、その他のプラットフォームでは false です。", "terminal.integrated.cwd": "端末を起動する明示的な開始パスです。これはシェル プロセスの現在の作業ディレクトリ (cwd) として使用されます。特にルート ディレクトリが cwd に適していない場合に、ワークスペースの設定で役立ちます。", "terminal.integrated.confirmOnExit": "アクティブなターミナル セッションがある場合に終了の確認をするかどうか。", + "terminal.integrated.enableBell": "ターミナルのベルが有効かどうか。", "terminal.integrated.commandsToSkipShell": "キーバインドがシェルに送信されず、代わりに常に Code で処理されるコマンド ID のセット。これにより、ターミナルがフォーカスされていない場合と同じ動作をするシェルによって通常使用されるキーバインドを使用できるようになります。例: Ctrl+p で Quick Open を起動します。", "terminal.integrated.env.osx": "OS X のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト", "terminal.integrated.env.linux": "Linux のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト", "terminal.integrated.env.windows": "Windows のターミナルで使用される VS Code のプロセスに追加される環境変数を持つオブジェクト", + "terminal.integrated.showExitAlert": "0 以外の終了コードのとき `終了コードを伴ってターミナルの処理が終了しました` と警告を表示します。", "terminalCategory": "ターミナル", "viewCategory": "表示" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index 6015fb400ae..96aa73cab67 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 @@ -14,6 +14,8 @@ "workbench.action.terminal.deleteWordRight": "右の文字を削除", "workbench.action.terminal.new": "新しい統合ターミナルの作成", "workbench.action.terminal.new.short": "新しいターミナル", + "workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください", + "workbench.action.terminal.newInActiveWorkspace": "新しい統合ターミナルを作成 (アクティブなワークスペースに)", "workbench.action.terminal.focus": "端末にフォーカス", "workbench.action.terminal.focusNext": "次の端末にフォーカス", "workbench.action.terminal.focusPrevious": "前のターミナルにフォーカス", diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 42ec3aff619..95f2aea84fd 100644 --- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "カスタマイズ ボタンを選択して、既定のターミナル シェルを変更できます。", "customize": "カスタマイズする", "cancel": "キャンセル", - "never again": "OK、今後は表示しない", "terminal.integrated.chooseWindowsShell": "優先するターミナル シェルを選択します。これは後で設定から変更できます", "terminalService.terminalCloseConfirmationSingular": "アクティブなターミナル セッションが 1 つあります。中止しますか?", "terminalService.terminalCloseConfirmationPlural": "アクティブなターミナル セッションが {0} 個あります。中止しますか?" 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 5007e4d58ae..6df9478e8ba 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 @@ -23,11 +23,12 @@ "commandPalette": "コマンド パレット...", "settings": "設定", "keyboardShortcuts": "キーボード ショートカット", + "userSnippets": "ユーザー スニペット", "selectTheme.label": "配色テーマ", "themes.selectIconTheme.label": "ファイル アイコンのテーマ", "not available": "更新は利用できません", "checkingForUpdates": "更新を確認しています...", - "DownloadUpdate": "利用可能な更新プログラムをダウンロードします", + "DownloadUpdate": "利用可能な更新プログラムをダウンロード", "DownloadingUpdate": "更新をダウンロードしています...", "InstallingUpdate": "更新プログラムをインストールしています...", "restartToUpdate": "再起動して更新...", diff --git a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json index fbd940c7d47..39c4fd74ba4 100644 --- a/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json @@ -21,7 +21,7 @@ "welcomePage.gitHubRepository": "GitHub リポジトリ", "welcomePage.stackOverflow": "Stack Overflow", "welcomePage.showOnStartup": "起動時にウェルカム ページを表示", - "welcomePage.customize": "カスタマイズする", + "welcomePage.customize": "カスタマイズ", "welcomePage.installExtensionPacks": "ツールと言語", "welcomePage.installExtensionPacksDescription": "{0} と {1} のサポートをインストールする ", "welcomePage.moreExtensions": "その他", diff --git a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 26fc5404882..6384721117f 100644 --- a/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "ファイルはディレクトリです", + "fileNotModifiedError": "ファイルは次の時点以後に変更されていません:", "fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません" } \ 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 104db33f633..95c0a8bffc2 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 @@ -10,6 +10,7 @@ "fileTooLargeError": "開くファイルが大きすぎます", "fileNotFoundError": "ファイルが見つかりません ({0})", "fileBinaryError": "ファイルはバイナリのようなので、テキストとして開くことができません", + "filePermission": "ファイルへの書き込み許可が拒否されました ({0})", "fileExists": "生成しようとしているファイル ({0}) は既に存在しています", "fileMoveConflict": "移動/コピーできません。移動/コピー先にファイルが既に存在します。", "unableToMoveCopyError": "移動/コピーできません。ファイルが含まれるフォルダーが置き換わることになります。", diff --git a/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json index 4845e670df1..5d95483dfac 100644 --- a/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json @@ -8,19 +8,20 @@ "requirestring": "`{0}` プロパティは必須で、`string` 型でなければなりません", "optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります", "vscode.extension.contributes.keybindings.command": "キー バインドのトリガー時に実行するコマンドの識別子。", - "vscode.extension.contributes.keybindings.key": "キーまたはキー シーケンス (キーは + で区切り、シーケンスはスペースで区切る。例: Ctrl+O や Ctrl+L L のようにキーを同時に押す)。", + "vscode.extension.contributes.keybindings.key": "キーまたはキー シーケンス (キーは + で区切り、シーケンスはスペースで区切ります。例: Ctrl+O、Ctrl+L L)。", "vscode.extension.contributes.keybindings.mac": "Mac 固有のキーまたはキー シーケンス。", "vscode.extension.contributes.keybindings.linux": "Linux 固有のキーまたはキー シーケンス。", "vscode.extension.contributes.keybindings.win": "Windows 固有のキーまたはキー シーケンス。", - "vscode.extension.contributes.keybindings.when": "キーがアクティブの場合の条件。", + "vscode.extension.contributes.keybindings.when": "キーがアクティブになるときの条件。", "vscode.extension.contributes.keybindings": "キー バインドを提供します。", "invalid.keybindings": "正しくない `contributes.{0}`: {1}", "unboundCommands": "他に使用できるコマンドは次のとおりです: ", "keybindings.json.title": "キー バインドの構成", - "keybindings.json.key": "キーまたはキー シーケンス (スペースで区切る) を押します", + "keybindings.json.key": "キーまたはキー シーケンス (スペースで区切る)", "keybindings.json.command": "実行するコマンドの名前", - "keybindings.json.when": "キーがアクティブの場合の条件。", + "keybindings.json.when": "キーがアクティブになるときの条件。", "keybindings.json.args": "実行するコマンドに渡す引数。", "keyboardConfigurationTitle": "キーボード", - "dispatch": "`code` (推奨) または `keyCode` のいずれかを使用するキー操作のディスパッチ ロジックを制御します。" + "dispatch": "`code` (推奨) または `keyCode` のいずれかを使用するキー操作のディスパッチ ロジックを制御します。", + "touchbar.enabled": "利用可能であれば macOS の Touch Bar ボタンを有効にします。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 2b4d38667bc..a570e254df8 100644 --- a/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "{0} に加えた変更を保存しますか?", "saveChangesMessages": "次の {0} ファイルに対する変更を保存しますか?", - "moreFile": "...1 つの追加ファイルが表示されていません", - "moreFiles": "...{0} 個の追加ファイルが表示されていません", "saveAll": "すべて保存(&&S)", "save": "保存(&&S)", "dontSave": "保存しない(&&N)", diff --git a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index b1fd1a9b69e..3430db60129 100644 --- a/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "ファイル アイコンがありません", "iconThemeError": "ファイル アイコンのテーマが不明、またはインストールされていません。", "workbenchColors": "現在選択している配色テーマで配色を上書きします。", - "editorColors": "現在選択している配色テーマで配色とフォント スタイルを上書きします。", "editorColors.comments": "コメントの色とスタイルを設定します", "editorColors.strings": "文字列リテラルの色とスタイルを設定します。", "editorColors.keywords": "キーワードの色とスタイルを設定します。", @@ -19,5 +18,6 @@ "editorColors.types": "型定義と参照の色とスタイルを設定します。", "editorColors.functions": "関数定義と参照の色とスタイルを設定します。", "editorColors.variables": "変数定義と参照の色とスタイルを設定します。", - "editorColors.textMateRules": "textmate テーマ規則 (高度) を使っての色とスタイルを設定します。" + "editorColors.textMateRules": "textmate テーマ規則 (高度) を使っての色とスタイルを設定します。", + "editorColors": "現在選択している配色テーマで配色とフォント スタイルを上書きします。" } \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index ec391b0543b..132852e62ff 100644 --- a/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/jpn/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "ワークスペース構成ファイルに書き込めません。ファイルを開いて、ファイル内のエラー/警告を修正してからもう一度お試しください。", "errorWorkspaceConfigurationFileDirty": "ファイルが変更されているため、ワークスペース構成ファイルに書き込めません。ファイルを保存してから、もう一度お試しください。", "openWorkspaceConfigurationFile": "ワークスペースの構成ファイルを開く", - "close": "閉じる", - "enterWorkspace.close": "閉じる", - "enterWorkspace.dontShowAgain": "今後は表示しない", - "enterWorkspace.moreInfo": "詳細情報", - "enterWorkspace.prompt": "VS Code での複数フォルダーの操作の詳細。" + "close": "閉じる" } \ No newline at end of file diff --git a/i18n/kor/extensions/git/out/autofetch.i18n.json b/i18n/kor/extensions/git/out/autofetch.i18n.json index a02c668eb9d..88fc1cbb4d5 100644 --- a/i18n/kor/extensions/git/out/autofetch.i18n.json +++ b/i18n/kor/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "yes": "예", + "read more": "자세히 알아보기", "no": "아니요", - "not now": "나중에", - "suggest auto fetch": "Git 리포지토리 자동 페치하기를 사용하도록 설정하시겠습니까?" + "not now": "나중에 물어보기" } \ 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 15fcc99ffbe..7ec5dec31a3 100644 --- a/i18n/kor/extensions/git/out/commands.i18n.json +++ b/i18n/kor/extensions/git/out/commands.i18n.json @@ -64,12 +64,11 @@ "no remotes to pull": "리포지토리에 풀하도록 구성된 원격 항목이 없습니다.", "pick remote pull repo": "분기를 가져올 원격 선택", "no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.", - "push with tags success": "태그와 함께 푸시되었습니다.", "nobranch": "원격에 푸시할 분기를 체크 아웃하세요.", + "ok": "확인", + "push with tags success": "태그와 함께 푸시되었습니다.", "pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.", "sync is unpredictable": "이 작업은 '{0}' 간에 커밋을 푸시하고 풀합니다.", - "ok": "확인", - "never again": "다시 표시 안 함", "no remotes to publish": "리포지토리에 게시하도록 구성된 원격이 없습니다.", "no changes stash": "스태시할 변경 내용이 없습니다.", "provide stash message": "필요한 경우 스태시 메시지를 입력하세요.", diff --git a/i18n/kor/extensions/typescript/out/commands.i18n.json b/i18n/kor/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..70c3246796b --- /dev/null +++ b/i18n/kor/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "TypeScript 또는 JavaScript 프로젝트를 사용하려면 VS Code의 폴더를 여세요.", + "typescript.projectConfigUnsupportedFile": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다. 지원되지 않는 파일 형식", + "typescript.projectConfigCouldNotGetInfo": "TypeScript 또는 JavaScript 프로젝트를 확인할 수 없습니다.", + "typescript.noTypeScriptProjectConfig": "파일이 TypeScript 프로젝트의 일부가 아닙니다.", + "typescript.noJavaScriptProjectConfig": "파일이 JavaScript 프로젝트의 일부가 아닙니다.", + "typescript.configureTsconfigQuickPick": "tsconfig.json 구성", + "typescript.configureJsconfigQuickPick": "jsconfig.json 구성", + "typescript.projectConfigLearnMore": "자세한 정보" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/base/node/ps.i18n.json b/i18n/kor/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json index 1fe9d415d3a..15922e98314 100644 --- a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "줄 번호는 절대값으로 렌더링 됩니다.", "lineNumbers.relative": "줄 번호는 커서 위치에서 줄 간격 거리로 렌더링 됩니다.", "lineNumbers.interval": "줄 번호는 매 10 줄마다 렌더링이 이루어집니다.", - "lineNumbers": "줄 번호의 표시 여부를 제어합니다. 가능한 값은 'on', 'off', 'relative'입니다.", + "lineNumbers": "줄 번호의 표시 방식을 제어합니다. 가능한 값은 'on', 'off', 'relative', 'interval' 입니다.", "rulers": "특정 수의 고정 폭 문자 뒤에 세로 눈금자를 렌더링합니다. 여러 눈금자의 경우 여러 값을 사용합니다. 배열이 비어 있는 경우 눈금자가 그려져 있지 않습니다.", "wordSeparators": "단어 관련 탐색 또는 작업을 수행할 때 단어 구분 기호로 사용되는 문자입니다.", "tabSize": "탭 한 개에 해당하는 공백 수입니다. `editor.detectIndentation`이 켜져 있는 경우 이 설정은 파일 콘텐츠에 따라 재정의됩니다.", 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 a8423dd155b..90813fe32fb 100644 --- a/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/kor/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "커서 위치의 줄 강조 표시에 대한 배경색입니다.", "lineHighlightBorderBox": "커서 위치의 줄 테두리에 대한 배경색입니다.", - "rangeHighlight": "빠른 열기 및 찾기 기능 등을 통해 강조 표시된 영역의 배경색입니다.", "caret": "편집기 커서 색입니다.", "editorCursorBackground": "편집기 커서의 배경색입니다. 블록 커서와 겹치는 글자의 색상을 사용자 정의할 수 있습니다.", "editorWhitespaces": "편집기의 공백 문자 색입니다.", 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 58029e4cfcd..73b79e44721 100644 --- a/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/kor/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "다음 오류 또는 경고로 이동", - "markerAction.previous.label": "이전 오류 또는 경고로 이동", "editorMarkerNavigationError": "편집기 표식 탐색 위젯 오류 색입니다.", "editorMarkerNavigationWarning": "편집기 표식 탐색 위젯 경고 색입니다.", "editorMarkerNavigationInfo": "편집기 표식 탐색 위젯 정보 색입니다.", 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 ab340d73f19..8dd1a533f72 100644 --- a/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/kor/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "변수 읽기와 같은 읽기 액세스 중 기호의 배경색입니다.", - "wordHighlightStrong": "변수에 쓰기와 같은 쓰기 액세스 중 기호의 배경색입니다.", "overviewRulerWordHighlightForeground": "기호 강조 표시의 개요 눈금자 마커 색입니다.", "overviewRulerWordHighlightStrongForeground": "쓰기 권한 기호 강조 표시의 개요 눈금자 마커 색입니다.", "wordHighlight.next.label": "다음 강조 기호로 이동", diff --git a/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index ee9870e16a1..8a92234e152 100644 --- a/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/kor/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}`은(는) 유효한 메뉴 식별자가 아닙니다.", "missing.command": "메뉴 항목이 '명령' 섹션에 정의되지 않은 `{0}` 명령을 참조합니다.", "missing.altCommand": "메뉴 항목이 '명령' 섹션에 정의되지 않은 alt 명령 `{0}`을(를) 참조합니다.", - "dupe.command": "메뉴 항목이 동일한 명령을 기본값과 alt 명령으로 참조합니다.", - "nosupport.altCommand": "죄송합니다. 현재 '편집기/제목' 메뉴의 '탐색' 그룹만 alt 명령을 지원합니다." + "dupe.command": "메뉴 항목이 동일한 명령을 기본값과 alt 명령으로 참조합니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json index 43b38b984db..ccaf072898e 100644 --- a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,31 @@ "diff": "두 파일을 서로 비교합니다.", "add": "마지막 활성 창에 폴더를 추가합니다.", "goto": "지정된 줄과 문자 위치에 있는 경로의 파일을 엽니다.", - "locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.", "newWindow": "Code의 새 인스턴스를 강제 적용합니다.", - "performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.", - "prof-startup": "시작하는 동안 CPU 프로파일러 실행", - "inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.", - "inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.", "reuseWindow": "마지막 활성 창에서 파일 또는 폴더를 강제로 엽니다.", - "userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).", - "log": "사용할 로그 수준이며 기본값은 'info'입니다. 허용되는 값은 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'입니다.", - "verbose": "자세한 정보 표시를 출력합니다(--wait를 의미).", "wait": "파일이 닫힐 때 까지 기다린 후 돌아갑니다.", + "locale": "사용할 로캘(예: en-US 또는 zh-TW)입니다.", + "userDataDir": "사용자 데이터가 저장되는 디렉터리를 지정합니다(루트로 실행할 경우 유용함).", + "version": "버전을 출력합니다.", + "help": "사용법을 출력합니다.", "extensionHomePath": "확장의 루트 경로를 설정합니다.", "listExtensions": "설치된 확장을 나열합니다.", "showVersions": "#NAME?", "installExtension": "확장을 설치합니다.", "uninstallExtension": "확장을 제거합니다.", "experimentalApis": "확장에 대해 제안된 API 기능을 사용하도록 설정합니다.", - "disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.", - "disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.", + "verbose": "자세한 정보 표시를 출력합니다(--wait를 의미).", + "log": "사용할 로그 수준이며 기본값은 'info'입니다. 허용되는 값은 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'입니다.", "status": "프로세스 사용 및 진단 정보를 인쇄합니다.", - "version": "버전을 출력합니다.", - "help": "사용법을 출력합니다.", + "performance": "'Developer: Startup Performance' 명령을 사용하여 시작합니다.", + "prof-startup": "시작하는 동안 CPU 프로파일러 실행", + "disableExtensions": "설치된 모든 확장을 사용하지 않도록 설정합니다.", + "inspect-extensions": "디버깅 및 확장 프로파일링을 허용합니다. 연결 uri에 대한 개발자 도구를 확인하십시오.", + "inspect-brk-extensions": "시작 후 일시 중시된 확장 호스트에서 디버깅 및 확장 프로파일링을 허용합니다. 연결 URL은 개발자 도구를 확인하세요.", + "disableGPU": "GPU 하드웨어 가속을 사용하지 않도록 설정합니다.", "usage": "사용법", "options": "옵션", "paths": "경로", + "stdinWindows": "다른 프로그램의 출력을 읽으려면, '-'를 추가하십시오. (예: 'echo Hello World | {0} -')", "optionsUpperCase": "옵션" } \ 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 64578b6f8a5..651652bfe31 100644 --- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,13 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "잘못된 확장: package.json이 JSON 파일이 아닙니다.", - "restartCodeLocal": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.", + "restartCode": "{0}을(를) 다시 설치하기 전에 Code를 다시 시작하세요.", "installingOutdatedExtension": "이 확장의 최신 버전이 이미 설치되어 있습니다. 이 버전을 이전 버전으로 재정의하시겠습니까?", "override": "재정의", "cancel": "취소", - "notFoundCompatible": "VS Code의 현재 버전 '{1}'과(와) 호환되는 '{0}' 확장을 찾을 수 없으므로 설치할 수 없습니다.", - "quitCode": "확장의 사용되지 않는 인스턴스가 계속 실행 중이므로 설치할 수 없습니다. 다시 설치하기 전에 VS Code를 종료했다가 다시 시작하세요.", - "exitCode": "확장의 사용되지 않는 인스턴스가 계속 실행 중이므로 설치할 수 없습니다. 다시 설치하기 전에 VS Code를 종료했다가 다시 시작하세요.", + "notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.", "notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.", + "quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.", "uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?", "uninstallOnly": "만", "uninstallAll": "모두", diff --git a/i18n/kor/src/vs/platform/message/common/message.i18n.json b/i18n/kor/src/vs/platform/message/common/message.i18n.json index 8194d2b9b95..7cec53dd19a 100644 --- a/i18n/kor/src/vs/platform/message/common/message.i18n.json +++ b/i18n/kor/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "닫기", "later": "나중에", - "cancel": "취소" + "cancel": "취소", + "moreFile": "...1개의 추가 파일이 표시되지 않음", + "moreFiles": "...{0}개의 추가 파일이 표시되지 않음" } \ 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 8f111cba06f..ac7b14b24ea 100644 --- a/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/kor/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "편집기 위젯의 테두리 색입니다. 위젯에 테두리가 있고 위젯이 색상을 무시하지 않을 때만 사용됩니다.", "editorSelectionBackground": "편집기 선택 영역의 색입니다.", "editorSelectionForeground": "고대비를 위한 선택 텍스트의 색입니다.", - "editorInactiveSelection": "비활성 편집기 선택 영역의 색입니다.", - "editorSelectionHighlight": "선택 영역과 동일한 콘텐츠가 있는 영역의 색입니다.", "editorFindMatch": "현재 검색 일치 항목의 색입니다.", - "findMatchHighlight": "기타 검색 일치 항목의 색입니다.", - "findRangeHighlight": "검색을 제한하는 영역의 색을 지정합니다.", - "hoverHighlight": "호버가 표시된 단어 아래를 강조 표시합니다.", "hoverBackground": "편집기 호버의 배경색.", "hoverBorder": "편집기 호버의 테두리 색입니다.", "activeLinkForeground": "활성 링크의 색입니다.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "제거된 텍스트의 배경색입니다.", "diffEditorInsertedOutline": "삽입된 텍스트의 윤곽선 색입니다.", "diffEditorRemovedOutline": "제거된 텍스트의 윤곽선 색입니다.", - "mergeCurrentHeaderBackground": "인라인 병합 충돌의 현재 헤더 배경입니다.", - "mergeCurrentContentBackground": "인라인 병합 충돌의 현재 콘텐츠 배경입니다.", - "mergeIncomingHeaderBackground": "인라인 병합 충돌에서 수신 헤더 배경입니다.", - "mergeIncomingContentBackground": "인라인 병합 충돌에서 수신 콘텐츠 배경입니다.", - "mergeCommonHeaderBackground": "인라인 병합 충돌의 공통 과거 헤더 배경입니다.", - "mergeCommonContentBackground": "인라인 병합 충돌의 공통 과거 콘텐츠 배경입니다.", "mergeBorder": "인라인 병합 충돌에서 헤더 및 스플리터의 테두리 색입니다.", "overviewRulerCurrentContentForeground": "인라인 병합 충돌에서 현재 개요 눈금 전경색입니다.", "overviewRulerIncomingContentForeground": "인라인 병합 충돌에서 수신 개요 눈금 전경색입니다.", diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 4dfa6a6e897..80def44cc85 100644 --- a/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/kor/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다.", - "treeItem.notFound": "ID가 '{0}'인 트리 항목을 찾을 수 없습니다.", - "treeView.duplicateElement": "{0} 요소가 이미 등록되어 있습니다." + "treeView.notRegistered": "ID가 '{0}'인 등록된 트리 뷰가 없습니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json index d99bcba35ef..646be54e188 100644 --- a/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "파일 열기...", "openFolder": "폴더 열기...", "openFileFolder": "열기...", - "addFolderToWorkspace": "작업 영역에 폴더 추가...", - "add": "추가(&&A)", - "addFolderToWorkspaceTitle": "작업 영역에 폴더 추가", "globalRemoveFolderFromWorkspace": "작업 영역에서 폴더 제거...", - "removeFolderFromWorkspace": "작업 영역에서 폴더 삭제", - "openFolderSettings": "폴더 설정 열기", "saveWorkspaceAsAction": "작업 영역을 다른 이름으로 저장", "save": "저장(&&S)", "saveWorkspace": "작업 영역 저장", "openWorkspaceAction": "작업 영역 열기...", "openWorkspaceConfigFile": "작업 영역 구성 파일 열기", - "openFolderAsWorkspaceInNewWindow": "새 창에서 작업 영역으로 폴더 열기", - "workspaceFolderPickerPlaceholder": "작업 영역 폴더 선택" + "openFolderAsWorkspaceInNewWindow": "새 창에서 작업 영역으로 폴더 열기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..4aff2c19344 --- /dev/null +++ b/i18n/kor/src/vs/workbench/browser/actions/workspaceCommands.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "addFolderToWorkspace": "작업 영역에 폴더 추가...", + "add": "추가(&&A)", + "addFolderToWorkspaceTitle": "작업 영역에 폴더 추가" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 32f439e8de1..57c83a5d7c5 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "세 번째 그룹에 편집기 표시", "allEditorsPicker": "열려 있는 모든 편집기 표시", "view": "보기", - "file": "파일" + "file": "파일", + "close": "닫기", + "closeOthers": "기타 항목 닫기", + "closeRight": "오른쪽에 있는 항목 닫기", + "closeAllUnmodified": "미수정 항목 닫기", + "closeAll": "모두 닫기", + "keepOpen": "열린 상태 유지", + "showOpenedEditors": "열려 있는 편집기 표시", + "keepEditor": "편집기 유지", + "closeEditorsInGroup": "그룹의 모든 편집기 닫기", + "closeUnmodifiedEditors": "그룹의 수정되지 않은 편집기 닫기", + "closeOtherEditors": "다른 편집기 닫기", + "closeRightEditors": "오른쪽에 있는 편집기 닫기" } \ 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 ed6d0f43e21..92ac30a939f 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,18 +17,13 @@ "closeEditor": "편집기 닫기", "revertAndCloseActiveEditor": "편집기 되돌리기 및 닫기", "closeEditorsToTheLeft": "왼쪽에 있는 편집기 닫기", - "closeEditorsToTheRight": "오른쪽에 있는 편집기 닫기", "closeAllEditors": "모든 편집기 닫기", - "closeUnmodifiedEditors": "그룹의 수정되지 않은 편집기 닫기", "closeEditorsInOtherGroups": "다른 그룹의 편집기 닫기", - "closeOtherEditorsInGroup": "다른 편집기 닫기", - "closeEditorsInGroup": "그룹의 모든 편집기 닫기", "moveActiveGroupLeft": "편집기 그룹을 왼쪽으로 이동", "moveActiveGroupRight": "편집기 그룹을 오른쪽으로 이동", "minimizeOtherEditorGroups": "다른 편집기 그룹 최소화", "evenEditorGroups": "균등한 편집기 그룹 너비", "maximizeEditor": "편집기 그룹 최대화 및 사이드바 숨기기", - "keepEditor": "편집기 유지", "openNextEditor": "다음 편집기 열기", "openPreviousEditor": "이전 편집기 열기", "nextEditorInGroup": "그룹에서 다음 편집기 열기", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "첫 번째 그룹에 편집기 표시", "showEditorsInSecondGroup": "두 번째 그룹에 편집기 표시", "showEditorsInThirdGroup": "세 번째 그룹에 편집기 표시", - "showEditorsInGroup": "그룹의 편집기 표시", "showAllEditors": "모든 편집기 표시", "openPreviousRecentlyUsedEditorInGroup": "그룹에서 최근에 사용한 이전 편집기 열기", "openNextRecentlyUsedEditorInGroup": "그룹에서 최근에 사용한 다음 편집기 열기", diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 6c0c854e4bf..b32e252f6bf 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "활성 편집기를 탭 또는 그룹 단위로 이동", "editorCommand.activeEditorMove.arg.name": "활성 편집기 이동 인수", - "editorCommand.activeEditorMove.arg.description": "인수 속성: * '를': 문자열 값을 제공 하 고 위치를 이동.\n\t* ' 의해': 문자열 이동에 대 한 단위를 제공 하는 값. 탭 또는 그룹.\n\t* ' value': 얼마나 많은 위치 또는 이동 하는 절대 위치를 제공 하는 숫자 값.", - "commandDeprecated": "**{0}** 명령이 제거되었습니다. 대신 **{1}** 명령을 사용할 수 있습니다.", - "openKeybindings": "바로 가기 키 구성" + "editorCommand.activeEditorMove.arg.description": "인수 속성: * '를': 문자열 값을 제공 하 고 위치를 이동.\n\t* ' 의해': 문자열 이동에 대 한 단위를 제공 하는 값. 탭 또는 그룹.\n\t* ' value': 얼마나 많은 위치 또는 이동 하는 절대 위치를 제공 하는 숫자 값." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index dedfef7381b..13977c6a009 100644 --- a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}. 텍스트 파일 비교 편집기입니다.", "editableEditorAriaLabel": "텍스트 파일 비교 편집기입니다.", "navigate.next.label": "다음 변경 내용", - "navigate.prev.label": "이전 변경 내용", - "inlineDiffLabel": "인라인 보기로 전환", - "sideBySideDiffLabel": "세로 정렬 보기로 전환" + "navigate.prev.label": "이전 변경 내용" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index a290c099837..13cca1a3336 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "닫기", - "closeOthers": "기타 항목 닫기", - "closeRight": "오른쪽에 있는 항목 닫기", - "closeAll": "모두 닫기", - "closeAllUnmodified": "미수정 항목 닫기", - "keepOpen": "열린 상태 유지", - "showOpenedEditors": "열려 있는 편집기 표시", "araLabelEditorActions": "편집기 작업" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/common/theme.i18n.json b/i18n/kor/src/vs/workbench/common/theme.i18n.json index c43957e4bd8..4cd1b7fa581 100644 --- a/i18n/kor/src/vs/workbench/common/theme.i18n.json +++ b/i18n/kor/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,7 @@ "editorGroupBackground": "편집기 그룹의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다. 배경색은 편집기 그룹을 끌 때 표시됩니다.", "tabsContainerBackground": "탭을 사용도록 설정한 경우 편집기 그룹 제목 머리글의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다.", "tabsContainerBorder": "탭을 사용하도록 설정한 경우 편집기 그룹 제목 머리글의 테두리 색입니다. 편집기 그룹은 편집기의 컨테이너입니다.", - "editorGroupHeaderBackground": "탭을 사용하지 않도록 설정한 경우 편집기 그룹 제목 머리글의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다.", + "editorGroupHeaderBackground": "탭을 사용하지 않도록 설정한 경우(`\"workbench.editor.showTabs\": false`) 편집기 그룹 제목 머리글의 배경색입니다. 편집기 그룹은 편집기의 컨테이너입니다.", "editorGroupBorder": "여러 편집기 그룹을 서로 구분하기 위한 색입니다. 편집기 그룹은 편집기의 컨테이너입니다.", "editorDragAndDropBackground": "편집기를 끌 때 배경색입니다. 편집기 내용이 계속 비추어 보이도록 이 색은 투명해야 합니다.", "panelBackground": "패널 배경색입니다. 패널은 편집기 영역 아래에 표시되며 출력 및 통합 터미널 같은 보기가 포함됩니다.", @@ -33,8 +33,6 @@ "statusBarNoFolderBorder": "열린 폴더가 없을 때 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.", "statusBarItemActiveBackground": "클릭할 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.", "statusBarItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.", - "statusBarProminentItemBackground": "상태 표시줄 주요 항목 배경색입니다. 주요 항목은 중요도를 나타내는 다른 상태 표시줄 항목보다 눈에 잘 띕니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.", - "statusBarProminentItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 주요 항목 배경색입니다. 주요 항목은 중요도를를 나타내는 다른 상태 표시줄 항목보다 눈에 잘 띕니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.", "activityBarBackground": "작업 막대 배경색입니다. 작업 막대는 맨 왼쪽이나 오른쪽에 표시되며 사이드바의 뷰 간을 전환하는 데 사용할 수 있습니다.", "activityBarForeground": "작업 막대 전경 색(예: 아이콘에 사용됨)입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.", "activityBarBorder": "사이드바와 구분하는 작업 막대 테두리색입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.", diff --git a/i18n/kor/src/vs/workbench/common/views.i18n.json b/i18n/kor/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..6a3532ad44d --- /dev/null +++ b/i18n/kor/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "ID `{0}`이(가) 포함된 뷰가 위치 `{1}`에 이미 등록되어 있습니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json index 96f43aced40..a1086cd9b19 100644 --- a/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/kor/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "편집기 닫기", "closeWindow": "창 닫기", "closeWorkspace": "작업 영역 닫기", "noWorkspaceOpened": "현재 이 인스턴스에 열려 있는 작업 영역이 없습니다.", @@ -52,21 +51,5 @@ "displayLanguage": "VSCode의 표시 언어를 정의합니다.", "doc": "지원되는 언어 목록은 {0} 을(를) 참조하세요.", "restart": "값을 변경하려면 VSCode를 다시 시작해야 합니다.", - "fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다.", - "openLogsFolder": "로그 폴더 열기", - "showLogs": "로그 표시...", - "mainProcess": "기본", - "sharedProcess": "공유", - "rendererProcess": "렌더러", - "extensionHost": "확장 호스트", - "selectProcess": "프로세스 선택", - "setLogLevel": "로그 수준 설정", - "trace": "Trace", - "debug": "디버그", - "info": "정보", - "warn": "경고", - "err": "오류", - "critical": "Critical", - "off": "Off", - "selectLogLevel": "로그 수준 선택" + "fail.createSettings": "{0}'({1})을(를) 만들 수 없습니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/main.contribution.i18n.json index b3ca18516e9..612e6f3495e 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 @@ -7,8 +7,9 @@ "view": "보기", "help": "도움말", "file": "파일", - "developer": "개발자", "workspaces": "작업 영역", + "developer": "개발자", + "workbenchConfigurationTitle": "워크벤치", "showEditorTabs": "열려 있는 편집기를 탭에서 표시할지 여부를 제어합니다.", "workbench.editor.labelFormat.default": "파일 이름을 표시합니다. 탭이 사용하도록 설정되어 있고 하나의 그룹에서 파일 2개의 이름이 동일하면, 각 파일 경로의 특정 섹션이 추가됩니다. 탭이 사용하도록 설정되어 있지 않으면, 작업 영역 폴더에 대한 경로는 편집기가 활성 상태일 때 표시됩니다.", "workbench.editor.labelFormat.short": "디렉터리 이름 앞에 오는 파일의 이름을 표시합니다.", @@ -20,23 +21,23 @@ "showIcons": "열린 편집기를 아이콘과 함께 표시할지 여부를 제어합니다. 이를 위해서는 아이콘 테마도 사용하도록 설정해야 합니다.", "enablePreview": "열려 있는 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용되며 기울임꼴 글꼴 스타일로 표시됩니다.", "enablePreviewFromQuickOpen": "Quick Open에서 연 편집기를 미리 보기로 표시할지 여부를 제어합니다. 미리 보기 편집기는 유지된 상태까지(예: 두 번 클릭 또는 편집을 통해) 다시 사용됩니다.", + "closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.", "editorOpenPositioning": "편집기가 열리는 위치를 제어합니다. 현재 활성 편집기의 왼쪽 또는 오른쪽에서 편집기를 열려면 '왼쪽' 또는 '오른쪽'을 선택합니다. 현재 활성 편집기와 독립적으로 편집기를 열려면 '처음' 또는 '마지막'을 선택합니다.", "revealIfOpen": "편집기를 여는 경우 보이는 그룹 중 하나에 표시할지 여부를 제어합니다. 사용하지 않도록 설정할 경우 편집기가 기본적으로 현재 활성 편집기 그룹에 열립니다. 사용하도록 설정할 경우 현재 활성 편집기 그룹에서 편집기가 다시 열리지 않고 이미 열린 편집기가 표시됩니다. 강제로 편집기가 특정 그룹에서 열리거나 현재 활성 그룹 옆에 열리도록 하는 등의 일부 경우에는 이 설정이 무시됩니다.", + "swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.", "commandHistory": "명령 팔레트 기록을 유지하기 위해 최근 사용한 명령 개수를 제어합니다. 0으로 설정하면 명령 기록을 사용하지 않습니다.", "preserveInput": "다음에 열 때 마지막으로 명령 팔레트에 입력한 내용을 복원할지 결정합니다.", "closeOnFocusLost": "Quick Open가 포커스를 잃으면 자동으로 닫을지 여부를 제어합니다.", "openDefaultSettings": "설정을 열면 모든 기본 설정을 표시하는 편집기도 열리는지 여부를 제어합니다.", "sideBarLocation": "사이드바의 위치를 제어합니다. 워크벤치의 왼쪽이나 오른쪽에 표시될 수 있습니다.", + "panelDefaultLocation": "패널의 기본 위치를 제어합니다. 워크벤치의 아래 또는 오른쪽에 표시될 수 있습니다.", "statusBarVisibility": "워크벤치 아래쪽에서 상태 표시줄의 표시 유형을 제어합니다.", "activityBarVisibility": "워크벤치에서 작업 막대의 표시 유형을 제어합니다.", - "closeOnFileDelete": "일부 다른 프로세스에서 파일을 삭제하거나 이름을 바꿀 때 파일을 표시하는 편집기를 자동으로 닫을지 여부를 제어합니다. 사용하지 않도록 설정하는 경우 이러한 이벤트가 발생하면 편집기가 더티 상태로 계속 열려 있습니다. 응용 프로그램 내에서 삭제하면 항상 편집기가 닫히고 데이터를 유지하기 위해 더티 파일은 닫히지 않습니다.", - "enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.", "fontAliasing": "워크벤치에서 글꼴 앨리어싱 방식을 제어합니다.\n- 기본: 서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 글꼴 제공\n- 안티앨리어싱: 서브 픽셀이 아닌 픽셀 단위에서 글꼴 다듬기. 전반적으로 더 밝은 느낌을 줄 수 있음\n- 없음: 글꼴 다듬기 사용 안 함. 텍스트 모서리가 각지게 표시됨", "workbench.fontAliasing.default": "서브 픽셀 글꼴 다듬기. 대부분의 일반 디스플레이에서 가장 선명한 텍스트를 제공합니다. ", "workbench.fontAliasing.antialiased": "서브 픽셀이 아닌 픽셀 수준에서 글꼴을 다듬습니다. 전반적으로 글꼴이 더 밝게 표시됩니다.", "workbench.fontAliasing.none": "글꼴 다듬기를 사용하지 않습니다. 텍스트 가장자리가 각지게 표시됩니다.", - "swipeToNavigate": "세 손가락으로 가로로 살짝 밀어 열려 있는 파일 간을 이동합니다.", - "workbenchConfigurationTitle": "워크벤치", + "enableNaturalLanguageSettingsSearch": "설정에 대한 자연어 검색 모드를 사용할지 여부를 제어합니다.", "windowConfigurationTitle": "창", "window.openFilesInNewWindow.on": "파일이 새 창에서 열립니다.", "window.openFilesInNewWindow.off": "파일이 파일의 폴더가 열려 있는 창 또는 마지막 활성 창에서 열립니다.", diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 0530d6e3338..744cd683e86 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "디버기", - "debug.terminal.not.available.error": "통합 터미널을 사용할 수 없습니다." + "debug.terminal.title": "디버기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 50730f44076..318c2b33d6f 100644 --- a/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "새 명령 프롬프트 열기", "globalConsoleActionMacLinux": "새 터미널 열기", "scopedConsoleActionWin": "명령 프롬프트에서 열기", - "scopedConsoleActionMacLinux": "터미널에서 열기", - "openFolderInIntegratedTerminal": "터미널에서 열기" + "scopedConsoleActionMacLinux": "터미널에서 열기" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 3b5fdb0caac..109cbec7026 100644 --- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.", "workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.", + "fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.", "exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.", "reallyRecommended2": "이 파일 형식에 대해 '{0}' 확장이 권장됩니다.", "reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.", diff --git a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..f1ae7883f32 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "워크벤치" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 70dd8169321..68afc8f65f7 100644 --- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "파일", "revealInSideBar": "세로 막대에 표시", "acceptLocalChanges": "변경을 적용하고 디스크 콘텐츠 덮어쓰기", - "revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기" + "revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기", + "copyPathOfActive": "활성 파일의 경로 복사", + "saveAllInGroup": "그룹의 모든 항목 저장", + "revert": "파일 되돌리기", + "compareActiveWithSaved": "활성 파일을 저장된 파일과 비교", + "closeEditor": "편집기 닫기", + "view": "보기", + "openToSide": "측면에서 열기", + "revealInWindows": "탐색기에 표시", + "revealInMac": "Finder에 표시", + "openContainer": "상위 폴더 열기", + "copyPath": "경로 복사", + "saveAll": "모두 저장", + "compareWithSaved": "저장된 항목과 비교", + "compareSource": "비교를 위해 선택", + "close": "닫기", + "closeOthers": "기타 항목 닫기", + "closeUnmodified": "미수정 항목 닫기", + "closeAll": "모두 닫기", + "deleteFile": "영구히 삭제" } \ No newline at end of file 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 87d00a4c77a..63c70d80b92 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "다시 시도", - "rename": "이름 바꾸기", "newFile": "새 파일", "newFolder": "새 폴더", + "rename": "이름 바꾸기", + "delete": "삭제", + "copyFile": "복사", + "pasteFile": "붙여넣기", + "retry": "다시 시도", "openFolderFirst": "안에 파일이나 폴더를 만들려면 먼저 폴더를 엽니다.", "newUntitledFile": "제목이 없는 새 파일", "createNewFile": "새 파일", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "'{0}'을(를) 영구히 삭제할까요?", "irreversible": "이 작업은 취소할 수 없습니다.", "permDelete": "영구히 삭제", - "delete": "삭제", "importFiles": "파일 가져오기", "confirmOverwrite": "이름이 같은 파일 또는 폴더가 대상 폴더에 이미 있습니다. 덮어쓸까요?", "replaceButtonLabel": "바꾸기(&&R)", - "copyFile": "복사", - "pasteFile": "붙여넣기", "duplicateFile": "중복", - "openToSide": "측면에서 열기", - "compareSource": "비교를 위해 선택", "globalCompareFile": "활성 파일을 다음과 비교...", "openFileToCompare": "첫 번째 파일을 열어서 다른 파일과 비교합니다.", - "compareWith": "'{0}'과(와) '{1}' 비교", - "compareFiles": "파일 비교", "refresh": "새로 고침", - "save": "저장", - "saveAs": "다른 이름으로 저장...", - "saveAll": "모두 저장", "saveAllInGroup": "그룹의 모든 항목 저장", - "saveFiles": "파일 모두 저장", - "revert": "파일 되돌리기", "focusOpenEditors": "열려 있는 편집기 뷰에 포커스", "focusFilesExplorer": "파일 탐색기에 포커스", "showInExplorer": "세로 막대에서 활성 파일 표시", @@ -56,20 +47,11 @@ "refreshExplorer": "탐색기 새로 고침", "openFileInNewWindow": "새 창에서 활성 파일 열기", "openFileToShowInNewWindow": "먼저 파일 한 개를 새 창에서 엽니다.", - "revealInWindows": "탐색기에 표시", - "revealInMac": "Finder에 표시", - "openContainer": "상위 폴더 열기", - "revealActiveFileInWindows": "Windows 탐색기에 활성 파일 표시", - "revealActiveFileInMac": "Finder에 활성 파일 표시", - "openActiveFileContainer": "활성 파일의 상위 폴더 열기", "copyPath": "경로 복사", - "copyPathOfActive": "활성 파일의 경로 복사", "emptyFileNameError": "파일 또는 폴더 이름을 입력해야 합니다.", "fileNameExistsError": "파일 또는 폴더 **{0}**이(가) 이 위치에 이미 있습니다. 다른 이름을 선택하세요.", "invalidFileNameError": "**{0}**(이)라는 이름은 파일 또는 폴더 이름으로 올바르지 않습니다. 다른 이름을 선택하세요.", "filePathTooLongError": "**{0}**(이)라는 이름을 사용하면 경로가 너무 길어집니다. 짧은 이름을 선택하세요.", - "compareWithSaved": "활성 파일을 저장된 파일과 비교", - "modifiedLabel": "{0}(디스크) ↔ {1}", "compareWithClipboard": "클립보드와 활성 파일 비교", "clipboardComparisonLabel": "클립보드 ↔ {0}" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index f77f75c5013..a5bbd5fb7c4 100644 --- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,15 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다.", - "openFileToReveal": "첫 번째 파일을 열어서 나타냅니다." + "revealInWindows": "탐색기에 표시", + "revealInMac": "Finder에 표시", + "openContainer": "상위 폴더 열기", + "saveAs": "다른 이름으로 저장...", + "save": "저장", + "saveAll": "모두 저장", + "saveFiles": "파일 모두 저장", + "removeFolderFromWorkspace": "작업 영역에서 폴더 삭제", + "modifiedLabel": "{0}(디스크) ↔ {1}", + "openFileToReveal": "첫 번째 파일을 열어서 나타냅니다.", + "openFileToCopy": "첫 번째 파일을 열어서 경로를 복사합니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 64e3a748c1d..f166c5489ca 100644 --- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "편집기", "formatOnSave": "파일 저장 시 서식을 지정합니다. 포맷터를 사용할 수 있어야 하며, 파일이 자동으로 저장되지 않아야 하고, 편집기가 종료되지 않아야 합니다.", "explorerConfigurationTitle": "파일 탐색기", - "openEditorsVisible": "열려 있는 편집기 창에 표시되는 편집기 수입니다. 창을 숨기려면 0으로 설정합니다.", - "dynamicHeight": "열려 있는 편집기 섹션의 높이가 요소 수에 따라 동적으로 조정되는지 여부를 제어합니다.", "autoReveal": "탐색기에서 파일을 열 때 자동으로 표시하고 선택할지를 제어합니다.", "enableDragAndDrop": "탐색기에서 끌어서 놓기를 통한 파일 및 폴더 이동을 허용하는지를 제어합니다.", "confirmDragAndDrop": "끌어서 놓기를 사용하여 파일 및 폴더를 이동하기 위해 탐색기에서 확인을 요청해야 하는지 제어합니다.", diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 6cf353ae712..33af3c52303 100644 --- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,10 @@ // Do not edit this file. It is machine generated. { "userGuide": "오른쪽 편집기 도구 모음의 작업을 사용하여 변경 내용을 **실행 취소**하거나 디스크의 콘텐츠를 변경 내용으로 **덮어쓰기**", - "discard": "삭제", "overwrite": "덮어쓰기", "retry": "다시 시도", - "readonlySaveError": "'{0}'을(를) 저장하지 못했습니다. 파일이 쓰기 보호되어 있습니다. 보호를 제거하려면 '덮어쓰기'를 선택하세요.", + "discard": "삭제", + "permissionDeniedSaveError": "저장 실패 '{0}': 권한 부족. 관리자로 다시 시도하려면 '관리자로 다시 시도'를 선택하세요.", "genericSaveError": "'{0}'을(를) 저장하지 못했습니다. {1}", "staleSaveError": "'{0}'을(를) 저장하지 못했습니다. 디스크의 내용이 최신 버전입니다. 버전을 디스크에 있는 버전과 비교하려면 **비교**를 클릭하세요.", "compareChanges": "비교", diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index 56030126c94..3f6a56914c0 100644 --- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "열려 있는 편집기", "openEditosrSection": "열려 있는 편집기 섹션", - "dirtyCounter": "{0}이(가) 저장되지 않음", - "saveAll": "모두 저장", - "closeAllUnmodified": "미수정 항목 닫기", - "closeAll": "모두 닫기", - "compareWithSaved": "저장된 항목과 비교", - "close": "닫기", - "closeOthers": "기타 항목 닫기" + "dirtyCounter": "{0}이(가) 저장되지 않음" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..c6b46a532f7 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logs.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. +{ + "mainLog": "로그(메인)", + "rendererLog": "로그(창)", + "extensionsLog": "로그(확장 호스트)", + "developer": "개발자" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..e36190cd574 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "로그 폴더 열기", + "showLogs": "로그 표시...", + "mainProcess": "기본", + "sharedProcess": "공유", + "rendererProcess": "창", + "selectProcess": "프로세스 선택", + "setLogLevel": "로그 수준 설정", + "trace": "Trace", + "debug": "디버그", + "info": "정보", + "warn": "경고", + "err": "오류", + "critical": "Critical", + "off": "Off" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json index f9e867de14d..f0b9f22340c 100644 --- a/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // 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": "문제", diff --git a/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..921f1b58efc --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "출력", + "logViewer": "로그 표시기", + "viewCategory": "보기", + "clearOutput.label": "출력 내용 지우기" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..9261a8ba1e2 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "output": "{0} - 출력" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 188fd9c37da..9dc8bd95b1f 100644 --- a/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "자연어 검색을 사용해 보세요!", "defaultSettings": "설정을 오른쪽 편집기에 넣어서 덮어씁니다.", "noSettingsFound": "설정을 찾을 수 없습니다.", "settingsSwitcherBarAriaLabel": "설정 전환기", "userSettings": "사용자 설정", "workspaceSettings": "작업 영역 설정", - "folderSettings": "폴더 설정", - "enableFuzzySearch": "자연어 검색 사용" + "folderSettings": "폴더 설정" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index de4c67a1e30..90960b4f14d 100644 --- a/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "일반적으로 사용되는 설정", - "mostRelevant": "가장 관련 있는 항목", "defaultKeybindingsHeader": "키 바인딩을 키 바인딩 파일에 배치하여 덮어씁니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index 0be24d926bb..c631d0cd782 100644 --- a/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "보기", "commandsHandlerDescriptionDefault": "명령 표시 및 실행", "gotoLineDescriptionMac": "줄 이동", "gotoLineDescriptionWin": "줄 이동", diff --git a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 4b848835e91..29d19883f06 100644 --- a/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Git 표시", "source control": "소스 제어", "toggleSCMViewlet": "SCM 표시", - "view": "보기" + "view": "보기", + "scmConfigurationTitle": "SCM" } \ 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 b045a022b27..68680603aad 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 @@ -12,9 +12,7 @@ "previousSearchTerm": "이전 검색어 표시", "showSearchViewlet": "검색 표시", "findInFiles": "파일에서 찾기", - "findInFilesWithSelectedText": "선택한 텍스트가 있는 파일에서 찾기", "replaceInFiles": "파일에서 바꾸기", - "replaceInFilesWithSelectedText": "선택한 텍스트가 있는 파일에서 바꾸기", "RefreshAction.label": "새로 고침", "CollapseDeepestExpandedLevelAction.label": "모두 축소", "ClearSearchResultsAction.label": "지우기", diff --git a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 9b239f6fd5f..bbdbfe77846 100644 --- a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -7,7 +7,9 @@ "showTriggerActions": "작업 영역에서 기호로 이동...", "name": "검색", "search": "검색", + "showSearchViewlet": "검색 표시", "view": "보기", + "findInFiles": "파일에서 찾기", "openAnythingHandlerDescription": "파일로 이동", "openSymbolDescriptionNormal": "작업 영역에서 기호로 이동", "searchOutputChannelTitle": "검색", diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..37d5355620e --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "기본 설정" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 582f284bf10..7a0857e6f8d 100644 --- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "코드 조각의 언어 선택", - "openSnippet.errorOnCreate": "{0}을(를) 만들 수 없음", - "openSnippet.label": "사용자 코드 조각 열기", - "preferences": "기본 설정", "snippetSchema.json.default": "빈 코드 조각", "snippetSchema.json": "사용자 코드 조각 구성", "snippetSchema.json.prefix": "IntelliSense에서 코드 조각을 선택할 때 사용할 접두사입니다.", diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..587455cd532 --- /dev/null +++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "사용자 코드 조각" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index c423047529b..b33ab06f4bb 100644 --- a/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}", "invalid.path.0": "`contributes.{0}.path`에 문자열이 필요합니다. 제공된 값: {1}", + "invalid.language": "`contributes.{0}.language`에 알 수 없는 언어가 있습니다. 제공된 값: {1}", "invalid.path.1": "확장 폴더({2})에 포함할 `contributes.{0}.path`({1})가 필요합니다. 확장이 이식 불가능해질 수 있습니다.", "vscode.extension.contributes.snippets": "코드 조각을 적용합니다.", "vscode.extension.contributes.snippets-language": "이 코드 조각이 적용되는 언어 식별자입니다.", "vscode.extension.contributes.snippets-path": "코드 조각 파일의 경로입니다. 이 경로는 확장 폴더의 상대 경로이며 일반적으로 './snippets/'로 시작합니다.", "badVariableUse": "'{0}' 확장의 1개 이상의 코드 조각은 snippet-variables 및 snippet-placeholders와 혼동하기 쉽습니다(자세한 내용은 https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax를 참조하세요).", "badFile": "코드 조각 파일 \"{0}\"을(를) 읽을 수 없습니다.", - "source.snippet": "사용자 코드 조각", "detail.snippet": "{0}({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 32869d50216..8483a433151 100644 --- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "터미널의 전경색입니다.", "terminalCursor.foreground": "터미널 커서의 전경색입니다.", "terminalCursor.background": "터미널 커서의 배경색입니다. 블록 커서와 겹친 문자의 색상을 사용자 정의할 수 있습니다.", - "terminal.selectionBackground": "터미널의 선택 영역 배경색입니다.", - "terminal.ansiColor": "터미널의 '{0}' ANSI 색입니다." + "terminal.selectionBackground": "터미널의 선택 영역 배경색입니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index b21bf5b25fa..ed40b375339 100644 --- a/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "사용자 지정 단추를 선택하여 기본 터미널 셸을 변경할 수 있습니다.", "customize": "사용자 지정", "cancel": "취소", - "never again": "다시 표시 안 함", "terminal.integrated.chooseWindowsShell": "기본으로 설정할 터미널 셸을 선택하세요. 나중에 설정에서 이 셸을 변경할 수 있습니다.", "terminalService.terminalCloseConfirmationSingular": "활성 터미널 세션이 있습니다. 종료할까요?", "terminalService.terminalCloseConfirmationPlural": "{0}개의 활성 터미널 세션이 있습니다. 종료할까요?" 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 bb502a90cb6..485a7f763c8 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 @@ -23,6 +23,7 @@ "commandPalette": "명령 팔레트...", "settings": "설정", "keyboardShortcuts": "바로 가기 키(&&K)", + "userSnippets": "사용자 코드 조각", "selectTheme.label": "색 테마", "themes.selectIconTheme.label": "파일 아이콘 테마", "not available": "업데이트를 사용할 수 없음", diff --git a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index d48fe3d053e..196d40bcdb5 100644 --- a/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/kor/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "파일이 디렉터리입니다.", + "fileNotModifiedError": "파일 수정 안 됨", "fileBinaryError": "파일이 이진인 것 같으므로 테스트로 열 수 없습니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index db19c348ac8..56bf06242e3 100644 --- a/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/kor/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "{0}에 대한 변경 내용을 저장할까요?", "saveChangesMessages": "다음 {0}개 파일에 대한 변경 내용을 저장할까요?", - "moreFile": "...1개의 추가 파일이 표시되지 않음", - "moreFiles": "...{0}개의 추가 파일이 표시되지 않음", "saveAll": "모두 저장(&&S)", "save": "저장(&&S)", "dontSave": "저장 안 함(&&N)", diff --git a/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index d365ddcbff5..ae661bf4187 100644 --- a/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/kor/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "현재 선택한 색 테마에서 색을 재정의합니다.", - "editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다.", "editorColors.comments": "주석의 색 및 스타일을 설정합니다.", "editorColors.strings": "문자열 리터럴의 색 및 스타일을 설정합니다.", "editorColors.keywords": "키워드의 색과 스타일을 설정합니다.", @@ -19,5 +18,6 @@ "editorColors.types": "형식 선언 및 참조의 색 및 스타일을 설정합니다.", "editorColors.functions": "함수 선언 및 참조의 색 및 스타일을 설정합니다.", "editorColors.variables": "변수 선언 및 참조의 색 및 스타일을 설정합니다.", - "editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급)." + "editorColors.textMateRules": "textmate 테마 설정 규칙을 사용하여 색 및 스타일을 설정합니다(고급).", + "editorColors": "현재 선택된 색 테마에서 편집기 색상과 글꼴 스타일을 재정의합니다." } \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index e836eb6be3f..a2425123fe5 100644 --- a/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/kor/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "작업 영역 구성 파일에 쓸 수 없습니다. 파일을 열고 오류/경고를 수정한 다음 다시 시도하세요.", "errorWorkspaceConfigurationFileDirty": "파일이 변경되어 작업 영역 구성 파일에 쓸 수 없습니다. 저장하고 다시 시도하세요.", "openWorkspaceConfigurationFile": "작업 영역 구성 파일 열기", - "close": "닫기", - "enterWorkspace.close": "닫기", - "enterWorkspace.dontShowAgain": "다시 표시 안 함", - "enterWorkspace.moreInfo": "추가 정보", - "enterWorkspace.prompt": "VS Code에서 여러 개의 파일을 작업하는 방법에 대해 자세히 알아보세요." + "close": "닫기" } \ No newline at end of file diff --git a/i18n/ptb/extensions/git/out/autofetch.i18n.json b/i18n/ptb/extensions/git/out/autofetch.i18n.json index 1c3c1cf318d..5df527f070d 100644 --- a/i18n/ptb/extensions/git/out/autofetch.i18n.json +++ b/i18n/ptb/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "Sim", + "read more": "Ler Mais", "no": "Não", - "not now": "Agora Não", - "suggest auto fetch": "Deseja habilitar o autopreenchimento dos repositórios Git?" + "not now": "Pergunte-me depois", + "suggest auto fetch": "Você gostaria que o Code executasse periodicamente `git fetch`?" } \ 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 03a6223ad1d..502c4844053 100644 --- a/i18n/ptb/extensions/git/out/commands.i18n.json +++ b/i18n/ptb/extensions/git/out/commands.i18n.json @@ -41,6 +41,8 @@ "confirm discard all 2": "{0}\n\n é IRREVERSÍVEL, o conjunto de trabalho atual será PERDIDO PARA SEMPRE.", "yes discard tracked": "Descartar 1 arquivo controlado", "yes discard tracked multiple": "Descartar arquivos {0} controlados", + "unsaved files single": "O seguinte arquivo não foi salvo: [0}.\n\nGostaria de salvá-lo antes de executar o commit?", + "commit": "Confirmar de qualquer maneira", "no staged changes": "Não há nenhuma modificação escalonada para confirmar.\n\nGostaria de escalonar automaticamente todas as suas alterações e confirmá-las diretamente?", "always": "Sempre", "no changes": "Não há mudanças para confirmar.", @@ -64,12 +66,11 @@ "no remotes to pull": "O seu repositório não possui remotos configurados para efetuar pull.", "pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação", "no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.", - "push with tags success": "Envio de rótulos finalizado com sucesso.", "nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.", + "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}'.", - "ok": "OK", - "never again": "Ok, Nunca 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.", "provide stash message": "Opcionalmente forneça uma mensagem para esconder.", diff --git a/i18n/ptb/extensions/git/out/repository.i18n.json b/i18n/ptb/extensions/git/out/repository.i18n.json index 214c9e1d36f..df6cf8fd751 100644 --- a/i18n/ptb/extensions/git/out/repository.i18n.json +++ b/i18n/ptb/extensions/git/out/repository.i18n.json @@ -27,6 +27,6 @@ "staged changes": "Alterações em Etapas", "changes": "Alterações", "ok": "OK", - "neveragain": "Nunca Mostrar Novamente", + "neveragain": "Não mostrar novamente", "huge": "O repositório git em '{0}' tem muitas atualizações ativas, somente um subconjunto de funcionalidades do Git será habilitado." } \ No newline at end of file diff --git a/i18n/ptb/extensions/git/package.i18n.json b/i18n/ptb/extensions/git/package.i18n.json index 81db50ac04f..d92673284f6 100644 --- a/i18n/ptb/extensions/git/package.i18n.json +++ b/i18n/ptb/extensions/git/package.i18n.json @@ -54,6 +54,7 @@ "command.stashPopLatest": "Pop mais recente Stash", "config.enabled": "Se o git estiver habilitado", "config.path": "Caminho para o executável do git", + "config.autoRepositoryDetection": "Se os repositórios devem ser detectados automaticamente", "config.autorefresh": "Se a atualização automática estiver habilitada", "config.autofetch": "Se a recuperação automática estiver habilitada", "config.enableLongCommitWarning": "Se mensagens longas de confirmação devem ter aviso", @@ -72,5 +73,6 @@ "colors.deleted": "Cor para recursos excluídos.", "colors.untracked": "Cor para recursos não controlados.", "colors.ignored": "Cor para recursos ignorados.", - "colors.conflict": "Cor para recursos com conflitos." + "colors.conflict": "Cor para recursos com conflitos.", + "colors.submodule": "Cor para recursos de sub-módulos." } \ No newline at end of file diff --git a/i18n/ptb/extensions/typescript/out/commands.i18n.json b/i18n/ptb/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..01c9f9ae0d9 --- /dev/null +++ b/i18n/ptb/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Favor abrir uma pasta no VS Code para usar um projeto TypeScript ou JavaScript", + "typescript.projectConfigUnsupportedFile": "Não foi possível determinar o projeto TypeScript ou JavaScript. Tipo de arquivo não suportado", + "typescript.projectConfigCouldNotGetInfo": "Não foi possível determinar o projeto TypeScript ou JavaScript", + "typescript.noTypeScriptProjectConfig": "Arquivo não é parte de um projeto TypeScript", + "typescript.noJavaScriptProjectConfig": "Arquivo não é parte de um projeto JavaScript", + "typescript.configureTsconfigQuickPick": "Configurar tsconfig.json", + "typescript.configureJsconfigQuickPick": "Configurar jsconfig.json", + "typescript.projectConfigLearnMore": "Saiba Mais" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/ptb/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/base/node/ps.i18n.json b/i18n/ptb/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..e8b9b91a595 --- /dev/null +++ b/i18n/ptb/src/vs/base/node/ps.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "collecting": "Coletando informações de CPU e memória. Isso pode demorar alguns segundos." +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json index 52ffce48a73..3e9436d02bf 100644 --- a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "Números de linhas são renderizados em números absolutos.", "lineNumbers.relative": "Números de linhas são renderizadas como distância em linhas até a posição do cursor.", "lineNumbers.interval": "Números de linhas são renderizados a cada 10 linhas.", - "lineNumbers": "Controla a exibição dos números de linha. Os valores possíveis são 'on', 'off' e 'relative'.", + "lineNumbers": "Controla a exibição dos números de linha. Os valores possíveis são 'on', 'off', 'relative' e 'interval'.", "rulers": "Renderiza réguas verticais após um certo número de caracteres de espaço. Use vários valores para várias réguas. Réguas não serão desenhadas se a matriz estiver vazia", "wordSeparators": "Caracteres que serão usados como separadores de palavras ao fazer navegação relacionada a palavras ou operações", "tabSize": "O número de espaços equivalentes a uma tabulação. Esta configuração é sobreposta com base no conteúdo do arquivo quando `editor.detectIndentation` está ligado.", @@ -72,6 +72,7 @@ "cursorBlinking": "Controla o estilo de animação do cursor, os valores possíveis são 'blink', 'smooth', 'phase', 'expand' e 'solid'", "mouseWheelZoom": "Alterar o zoom da fonte editor quando utilizada a roda do mouse e pressionando Ctrl", "cursorStyle": "Controla o estilo do cursor, os valores aceitos são 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'", + "lineCursorWidth": "Controla a largura do cursor quando editor.cursorStyle está definido como 'line'", "fontLigatures": "Habilita ligaduras de fontes", "hideCursorInOverviewRuler": "Controla se o cursor deve ficar oculto na régua de visão geral.", "renderWhitespace": "Controla como o editor deve rendenizar caracteres de espaços em branco, possibilidades são 'none', 'boundary' e 'all'. A opção 'boundary' não rendeniza espaços simples entre palavras.", 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 434fe65993d..5134c6e6945 100644 --- a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Cor de fundo para a posição do cursor na seleção de linhas.", "lineHighlightBorderBox": "Cor de fundo para a borda em volta da linha na posição do cursor", - "rangeHighlight": "Cor de fundo dos ranges selecionados, assim como abertura instantânea e descoberta de recursos ", "caret": "Cor do cursor no editor.", "editorCursorBackground": "A cor de fundo do cursor do editor. Permite customizar a cor de um caractere sobreposto pelo bloco do cursor.", "editorWhitespaces": "Cor dos caracteres em branco no editor", 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 d05aeee6c34..e6fba46dfd7 100644 --- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Ir para o Próximo Erro ou Aviso", - "markerAction.previous.label": "Ir para o Erro ou Aviso Anterior", "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.", 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 6ccc873b02c..99acb12e285 100644 --- a/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/ptb/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Cor de fundo de um símbolo durante acesso de leitura, como ao ler uma variável.", - "wordHighlightStrong": "Cor de fundo de um símbolo durante acesso de escrita, como ao escrever uma variável.", + "wordHighlight": "Cor de fundo de um símbolo durante o acesso de leitura, como ao ler uma variável. A cor não deve ser opaca para não ocultar as decorações subjacentes.", + "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.", "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", diff --git a/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 28adcb87065..5ade9a9290c 100644 --- a/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/ptb/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "'{0}' nao é um identificador de menu válido ", "missing.command": "Identificador do comando para ser executado. O comando deve ser declarado na seção de 'Comandos'", "missing.altCommand": "Referências ao item de menu no alt-command '{0}' qual nao é definido na sessão 'comandos'", - "dupe.command": "Itens de referencias do mesmo comando como padrão e alt-command", - "nosupport.altCommand": "Desculpe, mas atualmente somente o groupo 'navegação' do menu 'editor/título' suporta alt-commands" + "dupe.command": "Itens de referencias do mesmo comando como padrão e alt-command" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json index ed9e5aca99c..e056838d019 100644 --- a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,34 @@ "diff": "Comparar dois arquivos entre si.", "add": "Adicione pasta(s) para a última janela ativa.", "goto": "Abra um arquivo no caminho sobre a linha especificada e a posição do caractere.", - "locale": "Para localização utilize (ex. en-US ou zh-TW).", "newWindow": "Força uma nova instância do Código.", - "performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.", - "prof-startup": "Rodar o CPU profiler durante a inicialização", - "inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.", - "inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.", "reuseWindow": "Forçar a abertura de um arquivo ou pasta na última janela ativa", - "userDataDir": "Especifica o diretório que os dados do usuário serão mantidos, útil quando estiver rodando como root.", - "log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", - "verbose": "Imprimir a saída detalhada (Implica -- esperar).", "wait": "Espere pelos arquivos a serem fechados antes de retornar.", + "locale": "Para localização utilize (ex. en-US ou zh-TW).", + "userDataDir": "Especifica o diretório que os dados do usuário serão mantidos, útil quando estiver rodando como root.", + "version": "Versão de impressão", + "help": "Uso de impressão.", "extensionHomePath": "Defina o caminho raíz para as extensões.", "listExtensions": "Lista de extensões instaladas", "showVersions": "Exibir versões de extensões instaladas, quando estiver usando --list-extension", "installExtension": "Instala uma extensão.", "uninstallExtension": "Desinstala uma extensão.", "experimentalApis": "Permite recursos de api propostos para uma extensão.", - "disableExtensions": "Desabilita todas as extensões instaladas.", - "disableGPU": "Desabilita aceleração de hardware da GPU.", + "verbose": "Imprimir a saída detalhada (Implica -- esperar).", + "log": "Nível de log a ser utilizado. O padrão é 'info'. Os valores permitidos são 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'.", "status": "Utilização do processo de impressão e informações de diagnóstico.", - "version": "Versão de impressão", - "help": "Uso de impressão.", + "performance": "Comece com o 'Desenvolvedor: Desempenho de inicialização' comando habilitado.", + "prof-startup": "Rodar o CPU profiler durante a inicialização", + "disableExtensions": "Desabilita todas as extensões instaladas.", + "inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.", + "inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.", + "disableGPU": "Desabilita aceleração de hardware da GPU.", "usage": "Uso", "options": "opções", "paths": "caminhos", - "optionsUpperCase": "Opções" + "stdinWindows": "Para ler a saída de outro programa, adicione '-' ao final (ex. 'echo Hello World | {0} -')", + "stdinUnix": "Para ler do stdin, adicione '-' ao final (ex. 'ps aux | grep code | {0} -')", + "optionsUpperCase": "Opções", + "extensionsManagement": "Gerenciamento de Extensões", + "troubleshooting": "Solução de problemas" } \ 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 98c0be5cdcb..4fe84adc13b 100644 --- a/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/ptb/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,15 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Extensão inválida: pacote.json nao é um arquivo JSON válido", - "restartCodeLocal": "Por favor reinicie Code antes de reinstalar {0}.", + "restartCode": "Por favor reinicie Code antes de reinstalar {0}.", "installingOutdatedExtension": "Uma nova versão desta extensão já está instalada. Você deseja sobrescrever esta instalação com a versão mais antiga?", "override": "Sobrescrever", "cancel": "Cancelar", - "notFoundCompatible": "Não foi possível instalar porque a extensão '{0}' compatível com a versão atual '{1}' do VS Code não foi encontrada.", - "quitCode": "Não foi possível instalar porque uma instância obsoleta da extensão ainda está em execução. Por favor, pare e inicie o VS Code antes de reinstalar.", - "exitCode": "Não foi possível instalar porque uma instância obsoleta da extensão ainda está em execução. Por favor, pare e inicie o VS Code antes de reinstalar.", + "errorInstallingDependencies": "Erro ao instalar dependências. {0}", + "notFoundCompatible": "Não foi possível instalar '{0}; não existe nenhuma versão compatível com o VSCode '{1}'.", "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", diff --git a/i18n/ptb/src/vs/platform/message/common/message.i18n.json b/i18n/ptb/src/vs/platform/message/common/message.i18n.json index 620c63edd07..0d24937956e 100644 --- a/i18n/ptb/src/vs/platform/message/common/message.i18n.json +++ b/i18n/ptb/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Fechar", "later": "Mais tarde", - "cancel": "Cancelar" + "cancel": "Cancelar", + "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/theme/common/colorRegistry.i18n.json b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json index 6f399a88a06..635a04864da 100644 --- a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,8 @@ "editorWidgetBorder": "Cor da borda das ferramentas do editor. A cor é usada somente se a ferramenta escolhe ter uma borda e a cor não é substituída por uma ferramenta.", "editorSelectionBackground": "Cor de seleção do editor.", "editorSelectionForeground": "Cor do texto selecionado para alto contraste.", - "editorInactiveSelection": "Cor de seleção em um editor inativo.", - "editorSelectionHighlight": "Cor de regiões com o mesmo conteúdo da seleção.", + "editorInactiveSelection": "Cor da seleção em um editor inativo. A cor não deve ser opaca para não esconder decorações subjacentes.", "editorFindMatch": "Cor da correspondência de pesquisa atual.", - "findMatchHighlight": "Cor dos outros resultados de pesquisa.", - "findRangeHighlight": "Cor da faixa que limita a pesquisa.", - "hoverHighlight": "Realçar abaixo da palavra onde é mostrado item flutuante", "hoverBackground": "Cor de fundo para o item flutuante do editor", "hoverBorder": "Cor da borda para o item flutuante do editor.", "activeLinkForeground": "Cor dos links ativos.", @@ -76,12 +72,6 @@ "diffEditorRemoved": "Cor de fundo para texto que foi removido.", "diffEditorInsertedOutline": "Cor de contorno para o texto que foi inserido.", "diffEditorRemovedOutline": "Cor de contorno para o texto que foi removido.", - "mergeCurrentHeaderBackground": "Cor de fundo de cabeçalho atual em conflito de mesclagem em linha.", - "mergeCurrentContentBackground": "Cor de fundo de conteúdo atual em conflito de mesclagem em linha.", - "mergeIncomingHeaderBackground": "Cor de fundo de cabeçalho de entrada em conflito de mesclagem em linha.", - "mergeIncomingContentBackground": "Cor de fundo de conteúdo de entrada em conflito de mesclagem em linha.", - "mergeCommonHeaderBackground": "Ancestral comum da cor de fundo do cabeçalho em conflitos de mesclagem inline.", - "mergeCommonContentBackground": "Ancestral comum da cor de fundo do conteúdo em conflitos de mesclagem inline. ", "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.", diff --git a/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..d2677dfdc5b --- /dev/null +++ b/i18n/ptb/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "saveParticipants": "Executando Salvamento de Participantes..." +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json index d5ca67a9353..a2c9cbd217b 100644 --- a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado.", - "treeItem.notFound": "Nenhum item de árvore com id '{0}' encontrado.", - "treeView.duplicateElement": "Elemento {0} já está registrado" + "treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 18546fb98ab..84f170bd32c 100644 --- a/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/ptb/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Abrir arquivo...", "openFolder": "Abrir Pasta...", "openFileFolder": "Abrir...", - "addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...", - "add": "&& Adicionar", - "addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho", "globalRemoveFolderFromWorkspace": "Remover pasta da área de trabalho", - "removeFolderFromWorkspace": "Remover pasta da área de trabalho", - "openFolderSettings": "Abrir configurações da pasta", "saveWorkspaceAsAction": "Salvar o espaço de trabalho como...", "save": "&&Salvar", "saveWorkspace": "Salvar o espaço de trabalho", "openWorkspaceAction": "Abrir o Espaço de Trabalho...", "openWorkspaceConfigFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho", - "openFolderAsWorkspaceInNewWindow": "Abrir a pasta como espaço de trabalho em nova janela", - "workspaceFolderPickerPlaceholder": "Selecione a pasta de trabalho" + "openFolderAsWorkspaceInNewWindow": "Abrir a pasta como espaço de trabalho em nova janela" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..fdb629550fd --- /dev/null +++ b/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...", + "add": "&&Adicionar", + "addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho" +} \ 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 d1d8a425227..c1dd3fcfe9b 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 @@ -13,5 +13,17 @@ "groupThreePicker": "Mostrar editores no terceiro grupo", "allEditorsPicker": "Mostrar todos editores abertos", "view": "Exibir", - "file": "Arquivo" + "file": "Arquivo", + "close": "Fechar", + "closeOthers": "Fechar Outros", + "closeRight": "Fechar à direita", + "closeAllUnmodified": "Fechar Não Modificados", + "closeAll": "Fechar todos", + "keepOpen": "Manter aberto", + "showOpenedEditors": "Mostrar editores abertos", + "keepEditor": "Manter editor", + "closeEditorsInGroup": "Fechar todos editores no grupo", + "closeUnmodifiedEditors": "Fechar os Editores Não Modificados no Grupo", + "closeOtherEditors": "Fechar outros editores", + "closeRightEditors": "Fechar editores à direita" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorActions.i18n.json index 5035a541040..fce09f85b3d 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,18 +17,13 @@ "closeEditor": "Fechar editor", "revertAndCloseActiveEditor": "Reverter e fechar editor", "closeEditorsToTheLeft": "Fechar editores à esquerda ", - "closeEditorsToTheRight": "Fechar editores à direita", "closeAllEditors": "Fechar todos editores", - "closeUnmodifiedEditors": "Fechar os Editores Não Modificados no Grupo", "closeEditorsInOtherGroups": "Fechar editores nos outros grupos", - "closeOtherEditorsInGroup": "Fechar outros editores", - "closeEditorsInGroup": "Fechar todos editores no grupo", "moveActiveGroupLeft": "Mover grupo de editores para esquerda", "moveActiveGroupRight": "Mover grupo de editores para direita", "minimizeOtherEditorGroups": "Minimizar outros grupos de editores", "evenEditorGroups": "Igualar larguras de grupos de editores", "maximizeEditor": "Maximizar grupo de editor e ocultar barra lateral", - "keepEditor": "Manter editor", "openNextEditor": "Abrir próximo editor", "openPreviousEditor": "Abrir editor anterior", "nextEditorInGroup": "Abrir próximo editor no grupo", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Mostrar editores no primeiro grupo", "showEditorsInSecondGroup": "Mostrar editores no segundo grupo", "showEditorsInThirdGroup": "Mostrar editores no terceiro grupo", - "showEditorsInGroup": "Mostrar editores no grupo", "showAllEditors": "Mostrar todos editores", "openPreviousRecentlyUsedEditorInGroup": "Abrir o Editor Anterior Recentemente Usado no Grupo", "openNextRecentlyUsedEditorInGroup": "Abrir o Próximo Editor Recentemente Usado no Grupo", diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 4b701929e85..550e345a27f 100644 --- a/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Mover o editor ativo por guias ou grupos", "editorCommand.activeEditorMove.arg.name": "Argumento de movimento do editor ativo", - "editorCommand.activeEditorMove.arg.description": "Propriedades do argumento:\n* 'to': Valor do tipo sequencia de caracteres fornecendo onde se mover.\n\t* 'by': sequência de valor, proporcionando a unidade para o movimento. Por guia ou por grupo.\n\t* 'value': valor numérico, fornecendo quantas posições ou uma posição absoluta para mover.", - "commandDeprecated": "Comando **{0}** foi removido. Você pode usar **{1}** em vez disso", - "openKeybindings": "Configurar os atalhos de teclado" + "editorCommand.activeEditorMove.arg.description": "Propriedades do argumento:\n* 'to': Valor do tipo sequencia de caracteres fornecendo onde se mover.\n\t* 'by': sequência de valor, proporcionando a unidade para o movimento. Por guia ou por grupo.\n\t* 'value': valor numérico, fornecendo quantas posições ou uma posição absoluta para mover." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 8af2aff62d5..1e1fde93df0 100644 --- a/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/ptb/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "Editor de comparação de arquivos texto.", "navigate.next.label": "Próxima Alteração", "navigate.prev.label": "Alteração Anterior", - "inlineDiffLabel": "Alternar para exibição embutida", - "sideBySideDiffLabel": "Alternar para exibição lado a lado" + "toggleIgnoreTrimWhitespace.label": "Ignore espaços em branco" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index aafa87dc9bf..b78b8688cfd 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Fechar", - "closeOthers": "Fechar Outros", - "closeRight": "Fechar à direita", - "closeAll": "Fechar todos", - "closeAllUnmodified": "Fechar Não Modificados", - "keepOpen": "Manter aberto", - "showOpenedEditors": "Mostrar editores abertos", "araLabelEditorActions": "Ações de editor" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index 1c3db4d572b..4c843f96e08 100644 --- a/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/ptb/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[Sem Suporte]", + "userIsAdmin": "[Administrador]", + "userIsSudo": "[Superusuário]", "devExtensionWindowTitlePrefix": "[Host de Desenvolvimento de Extensão]" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/common/theme.i18n.json b/i18n/ptb/src/vs/workbench/common/theme.i18n.json index 0ed9a7f5447..b8e2f1b3570 100644 --- a/i18n/ptb/src/vs/workbench/common/theme.i18n.json +++ b/i18n/ptb/src/vs/workbench/common/theme.i18n.json @@ -6,9 +6,13 @@ { "tabActiveBackground": "Cor de fundo da guia ativa. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.", "tabInactiveBackground": "Cor de fundo da guia inativa. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.", + "tabHoverBackground": "Cor de fundo da guia ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.", + "tabUnfocusedHoverBackground": "Cor de fundo da guia em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.", "tabBorder": "Borda para separar uma guia das outras. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.", "tabActiveBorder": "Borda para destacar guias ativas. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.", "tabActiveUnfocusedBorder": "Borda para destacar guias ativas em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.", + "tabHoverBorder": "Borda para destacar guias ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.", + "tabUnfocusedHoverBorder": "Borda para destacar guias em um grupo fora de foco ao passar o mouse. As guias são os contêineres para editores na área do editor. Várias guias podem ser abertas em um grupo de editor. Podem existir vários grupos de editor.", "tabActiveForeground": "Cor de primeiro plano da guia ativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.", "tabInactiveForeground": "Cor de primeiro plano da guia inativa em um grupo ativo. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editor.", "tabUnfocusedActiveForeground": "Cor de primeiro plano da aba ativa em um grupo fora de foco. As guias são os recipientes para editores na área do editor. Várias guias podem ser abertas em um grupo de editores. Podem haver vários grupos de editores.", @@ -16,7 +20,7 @@ "editorGroupBackground": "Cor de fundo de um grupo de editor. Grupos de editor são os recipientes dos editores. A cor de fundo é mostrada ao arrastar o editor de grupos ao redor.", "tabsContainerBackground": "Cor de fundo do cabeçalho do título do grupo de editor quando as guias são habilitadas. Grupos de editor são os recipientes dos editores.", "tabsContainerBorder": "Cor da borda do cabeçalho do título do grupo de editor quando as guias estão habilitadas. Grupos de editor são os recipientes dos editores.", - "editorGroupHeaderBackground": "Cor de fundo do título do cabeçalho do grupo de editor quando as guias são desabilitadas. Grupos de editor são os recipientes dos editores.", + "editorGroupHeaderBackground": "Cor de fundo do título no cabeçalho do grupo de editor quando guias estiverem desabilitadas (`\"workbench.editor.showTabs\": false`). Grupos de editor são os contêineres dos editores.", "editorGroupBorder": "Cor para separar múltiplos grupos de editor de outro. Grupos de editor são os recipientes dos editores.", "editorDragAndDropBackground": "Cor de fundo ao arrastar editores. A cor deve ter transparência para que o conteúdo do editor ainda possa ser visto.", "panelBackground": "Cor de fundo do painel. Os painéis são mostrados abaixo da área do editor e contém visualizações como saída e terminal integrado.", @@ -33,8 +37,8 @@ "statusBarNoFolderBorder": "Cor da borda da barra de status separando para a barra lateral e editor quando nenhuma pasta é aberta. A barra de status é mostrada na parte inferior da janela.", "statusBarItemActiveBackground": "Cor de fundo do item da barra de status quando você clicado. A barra de status é mostrada na parte inferior da janela.", "statusBarItemHoverBackground": "Cor de fundo do item da barra de status quando estiver passando sobre ele. A barra de status é mostrada na parte inferior da janela.", - "statusBarProminentItemBackground": "Cor de fundo de itens proeminentes da barra de status. Itens proeminentes destacam-se outras entradas da barra de status para indicar a importância. A barra de status é mostrada na parte inferior da janela.", - "statusBarProminentItemHoverBackground": "Cor de fundo dos itens proeminentes de barra de status quando estiver passando sobre eles. Itens proeminentes destacam-se outras entradas de barra de status para indicar a importância. A barra de status é mostrada na parte inferior da janela.", + "statusBarProminentItemBackground": "Cor de fundo de itens proeminentes na barra de status. Itens proeminentes destacam-se de outros itens na barra de status para indicar importância. Altere o modo `Alternar Tecla Tab Move o Foco` da paleta de comandos para ver um exemplo. A barra de status é exibida na parte inferior da janela.", + "statusBarProminentItemHoverBackground": "Cor de fundo de itens proeminentes na barra de status ao passar o mouse sobre sobre eles. Itens proeminentes destacam-se de outros itens na barra de status para indicar importância. Altere o modo `Alternar Tecla Tab Move o Foco` da paleta de comandos para ver um exemplo. A barra de status é exibida na parte inferior da janela.", "activityBarBackground": "Cor de fundo da barra de atividades. Barra de atividade está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.", "activityBarForeground": "Cor de primeiro plano da barra de atividades (por exemplo, usada para os ícones). A barra de atividades está visível à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.", "activityBarBorder": "Cor da borda da barra de atividades separando a barra lateral. A barra de atividade é mostrada à esquerda ou à direita e permite alternar entre as visualizações da barra lateral.", diff --git a/i18n/ptb/src/vs/workbench/common/views.i18n.json b/i18n/ptb/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..b7201e3d4af --- /dev/null +++ b/i18n/ptb/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Uma exibição com id '{0}' já está registrada na localização '{1}'" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json index 67b112045f5..44851d18637 100644 --- a/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/ptb/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Fechar Editor", "closeWindow": "Fechar Janela", "closeWorkspace": "Fechar o espaço de trabalho", "noWorkspaceOpened": "Não há nenhum espaço de trabalho aberto nessa instância para ser fechado.", @@ -52,21 +51,5 @@ "displayLanguage": "Define o idioma de exibição do VSCode.", "doc": "Veja {0} para obter uma lista dos idiomas suportados.", "restart": "Modificar o valor requer reinicialização do VSCode.", - "fail.createSettings": "Não foi possível criar '{0}' ({1}).", - "openLogsFolder": "Abrir Pasta de Logs", - "showLogs": "Exibir Logs...", - "mainProcess": "Principal", - "sharedProcess": "Compartilhado", - "rendererProcess": "Renderizador", - "extensionHost": "Host de Extensão", - "selectProcess": "Selecionar processo", - "setLogLevel": "Definir Nível de Log", - "trace": "Rastreamento", - "debug": "Depurar", - "info": "Informações", - "warn": "Aviso", - "err": "Erro", - "critical": "Crítico", - "off": "Desligado", - "selectLogLevel": "Selecione o nível de log" + "fail.createSettings": "Não foi possível criar '{0}' ({1})." } \ 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 06f44d416ff..fc80fefdfe6 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 @@ -7,8 +7,9 @@ "view": "Exibir", "help": "Ajuda", "file": "Arquivo", - "developer": "Desenvolvedor", "workspaces": "Espaços de trabalho", + "developer": "Desenvolvedor", + "workbenchConfigurationTitle": "Área de Trabalho", "showEditorTabs": "Controla se os editores abertos devem ou não serem exibidos em abas.", "workbench.editor.labelFormat.default": "Mostra o nome do arquivo. Quando guias estiverem ativadas e dois arquivos em um grupo tiverem o mesmo nome, a seção de distinção para cada caminho de arquivo é adicionada. Quando guias estiverem desativadas, o caminho relativo para a pasta do espaço de trabalho é exibida se o editor estiver ativo.", "workbench.editor.labelFormat.short": "Mostrar o nome do arquivo seguido pelo nome do diretório.", @@ -20,8 +21,10 @@ "showIcons": "Controla se os editores abertos devem ou não ser exibidos com um ícone. Requer um tema de ícone para ser habilitado. ", "enablePreview": "Controla se editores abertos mostram uma visualização. Editores de visualização são reutilizados até que eles sejam mantidos (por exemplo, através do duplo clique ou edição) e aparecerem com um estilo de fonte em itálico.", "enablePreviewFromQuickOpen": "Controla se os editores abertos da Abertura Rápida são exibidos como visualização. Os editores de visualização são reutilizados até serem preservados (por exemplo, através de um duplo clique ou edição).", + "closeOnFileDelete": "Controla se os editores que mostram um arquivo devem fechar automaticamente quanto o arquivo é apagado ou renomeado por algum outro processo. Desativar isso manterá o editor aberto como sujo neste evento. Note que apagar do aplicativo sempre fechará o editor e os arquivos sujos nunca fecharão para preservar seus dados.", "editorOpenPositioning": "Controla onde os editores serão abertos. Escolha 'esquerda' ou 'direita' para abrir os editores à esquerda ou à direita do editor ativo. Selecione 'primeiro' ou 'último' para abrir os editores independentemente do ativo no momento.", "revealIfOpen": "Controla se um editor é exibido em qualquer um dos grupos, se aberto. Se desabilitado, um editor será aberto preferencialmente no grupo de editores ativo. Se habilitado, um editor já aberto será exibido no grupo de editores ativo, ao invés de ser aberto novamente. Note que há alguns casos onde esta configuração é ignorada, por exemplo, quando for forçada a abertura de um editor em um grupo específico ou ao lado do grupo atualmente ativo.", + "swipeToNavigate": "Navegue entre arquivos abertos usando o deslizamento horizontal de três dedos.", "commandHistory": "Controla o número de comandos usados recentemente a serem mantidos no histórico da paleta de comando. Definir como 0 para desativar o histórico de comandos.", "preserveInput": "Controla se a última entrada digitada na paleta de comandos deve ser restaurada ao abri-la da próxima vez.", "closeOnFocusLost": "Controla se Abertura Rápida deve fechar automaticamente caso perca o foco.", @@ -29,14 +32,11 @@ "sideBarLocation": "Controla a localização da barra lateral. Ele pode ser exibido à esquerda ou à direita da área de trabalho.", "statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.", "activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.", - "closeOnFileDelete": "Controla se os editores que mostram um arquivo devem fechar automaticamente quanto o arquivo é apagado ou renomeado por algum outro processo. Desativar isso manterá o editor aberto como sujo neste evento. Note que apagar do aplicativo sempre fechará o editor e os arquivos sujos nunca fecharão para preservar seus dados.", - "enableNaturalLanguageSettingsSearch": "Controla se deve habilitar o modo de busca de linguagem natural para as configurações.", "fontAliasing": "Controla o método de identificação de fonte no espaço de trabalho.\n- padrão: Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido\n- antialiased: Suaviza a fonte no nível do pixel, em oposição a subpixel. Pode fazer a fonte aparecer mais clara de um modo geral \n- nenhum: Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares", "workbench.fontAliasing.default": "Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido.", "workbench.fontAliasing.antialiased": "Suavizar a fonte no nível do pixel, em oposição a subpixel. Pode fazer com que a fonte apareça mais clara de uma forma geral.", "workbench.fontAliasing.none": "Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares.", - "swipeToNavigate": "Navegue entre arquivos abertos usando o deslizamento horizontal de três dedos.", - "workbenchConfigurationTitle": "Área de Trabalho", + "enableNaturalLanguageSettingsSearch": "Controla se deve habilitar o modo de busca de linguagem natural para as configurações.", "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.", diff --git a/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json b/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json index 8a03ff87882..3bb18871ba8 100644 --- a/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/ptb/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "Recortar", "copy": "Copiar", "paste": "Colar", - "selectAll": "Selecionar Tudo" + "selectAll": "Selecionar Tudo", + "runningAsRoot": "Não é recomendado executar {0} como usuário root." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json index 421e5b19c79..05dd117d6de 100644 --- a/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debugToolBarBackground": "Cor de fundo da barra de ferramentas de depuração." + "debugToolBarBackground": "Cor de fundo da barra de ferramentas de depuração.", + "debugToolBarBorder": "Cor da borda da barra de ferramentas de depuração." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 898a18605fb..68ea94e5a20 100644 --- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "depurado", - "debug.terminal.not.available.error": "Terminal integrado não disponível" + "debug.terminal.title": "depurado" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 548fff57edc..21d5f668ec9 100644 --- a/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Abrir Novo Prompt de Comando", "globalConsoleActionMacLinux": "Abrir Novo Terminal", "scopedConsoleActionWin": "Abrir no Prompt de Comando", - "scopedConsoleActionMacLinux": "Abrir no Terminal", - "openFolderInIntegratedTerminal": "Abrir no Terminal" + "scopedConsoleActionMacLinux": "Abrir no Terminal" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index b4f99cdf746..be106023061 100644 --- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.", "workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.", + "fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.", "exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.", "reallyRecommended2": "A extensão {0} é recomendada para este tipo de arquivo.", "reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.", diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..254a1e7b5f1 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Área de Trabalho" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..afb315a42d4 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "hide": "Ocultar" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 464da97e4e9..1ebe014543e 100644 --- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,25 @@ "filesCategory": "Arquivo", "revealInSideBar": "Revelar na Barra Lateral", "acceptLocalChanges": "Usar suas alterações e substituir o conteúdo do disco", - "revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco" + "revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco", + "copyPathOfActive": "Copiar Caminho do Arquivo Ativo", + "saveAllInGroup": "Salvar Todos no Grupo", + "revert": "Reverter Arquivo", + "compareActiveWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo", + "closeEditor": "Fechar Editor", + "view": "Exibir", + "openToSide": "Aberto para o lado", + "revealInWindows": "Revelar no Explorer", + "revealInMac": "Revelar no Finder", + "openContainer": "Abrir a Pasta", + "copyPath": "Copiar Caminho", + "saveAll": "Salvar Todos", + "compareWithSaved": "Comparar com o salvo", + "compareWithSelected": "Comparar com o Selecionado", + "compareSource": "Selecione para comparar", + "close": "Fechar", + "closeOthers": "Fechar Outros", + "closeUnmodified": "Fechar Não Modificados", + "closeAll": "Fechar todos", + "deleteFile": "Excluir permanentemente" } \ No newline at end of file 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 18ed68af70c..48ba3f85e8c 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Tentar novamente", - "rename": "Renomear", "newFile": "Novo Arquivo", "newFolder": "Nova Pasta", + "rename": "Renomear", + "delete": "Excluir", + "copyFile": "Copiar", + "pasteFile": "Colar", + "retry": "Tentar novamente", "openFolderFirst": "Abrir uma pasta primeiro para criar arquivos ou pastas dentro dele.", "newUntitledFile": "Novo Arquivo Sem Título", "createNewFile": "Novo Arquivo", @@ -28,26 +31,15 @@ "confirmDeleteMessageFile": "Tem certeza de que deseja excluir permanentemente '{0}'?", "irreversible": "Esta ação é irreversível!", "permDelete": "Excluir permanentemente", - "delete": "Excluir", "importFiles": "Importar Arquivos", "confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?", "replaceButtonLabel": "&&Substituir", - "copyFile": "Copiar", - "pasteFile": "Colar", + "fileIsAncestor": "Arquivo a ser copiado é um ancestral da pasta de destino.", "duplicateFile": "Duplicar", - "openToSide": "Aberto para o lado", - "compareSource": "Selecione para comparar", "globalCompareFile": "Compare o Arquivo Ativo Com...", "openFileToCompare": "Abrir um arquivo primeiro para compará-lo com outro arquivo.", - "compareWith": "Comparar '{0}' com '{1}'", - "compareFiles": "Comparar Arquivos", "refresh": "Atualizar", - "save": "Salvar", - "saveAs": "Salvar como...", - "saveAll": "Salvar Todos", "saveAllInGroup": "Salvar Todos no Grupo", - "saveFiles": "Salvar todos os arquivos", - "revert": "Reverter Arquivo", "focusOpenEditors": "Foco na Visualização dos Editores Abertos", "focusFilesExplorer": "Foco no Explorador de Arquivos", "showInExplorer": "Revelar o Arquivo Ativo na Barra Lateral", @@ -56,20 +48,11 @@ "refreshExplorer": "Atualizar Explorador", "openFileInNewWindow": "Abrir o Arquivo Ativo em uma Nova Janela", "openFileToShowInNewWindow": "Abrir um arquivo primeiro para abrir em uma nova janela", - "revealInWindows": "Revelar no Explorer", - "revealInMac": "Revelar no Finder", - "openContainer": "Abrir a Pasta", - "revealActiveFileInWindows": "Revelar Arquivo Ativo no Windows Explorer", - "revealActiveFileInMac": "Revelar Arquivo Ativo no Finder", - "openActiveFileContainer": "Abrir a Pasta do Arquivo Ativo.", "copyPath": "Copiar Caminho", - "copyPathOfActive": "Copiar Caminho do Arquivo Ativo", "emptyFileNameError": "Um nome de arquivo ou pasta deve ser fornecido.", "fileNameExistsError": "Um arquivo ou pasta **{0}** já existe neste local. Escolha um nome diferente.", "invalidFileNameError": "O nome **{0}** não é válido como um nome de arquivo ou pasta. Por favor, escolha um nome diferente.", "filePathTooLongError": "O nome **{0}** resulta em um caminho muito longo. Escolha um nome mais curto.", - "compareWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo", - "modifiedLabel": "{0} (em disco) ↔ {1}", "compareWithClipboard": "Compare o Arquivo Ativo com a Área de Transferência", "clipboardComparisonLabel": "Área de Transferência ↔ {0}" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index 2e61a1656c8..4d9e669b83d 100644 --- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Abrir um arquivo primeiro para copiar seu caminho", - "openFileToReveal": "Abrir um arquivo primeiro para revelar" + "revealInWindows": "Revelar no Explorer", + "revealInMac": "Revelar no Finder", + "openContainer": "Abrir a Pasta", + "saveAs": "Salvar como...", + "save": "Salvar", + "saveAll": "Salvar Todos", + "saveFiles": "Salvar todos os arquivos", + "removeFolderFromWorkspace": "Remover pasta da área de trabalho", + "genericRevertError": "Falha ao reverter '{0}': {1}", + "modifiedLabel": "{0} (em disco) ↔ {1}", + "openFileToReveal": "Abrir um arquivo primeiro para revelar", + "openFileToCopy": "Abrir um arquivo primeiro para copiar seu caminho" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 0e95d226253..f6bbbed75c4 100644 --- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Editor", "formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.", "explorerConfigurationTitle": "Explorador de arquivos", - "openEditorsVisible": "Número de editores mostrado no painel Abrir Editores. Configurá-lo para 0 irá ocultar o painel.", - "dynamicHeight": "Controla se a altura da seção de editores abertos deve adaptar-se dinamicamente para o número de elementos ou não.", "autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.", "enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.", "confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.", diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 09a29894643..5f8a28ec46b 100644 --- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "Use as ações na barra de ferramentas de editor para a direita para **desfazer** suas alterações ou **substituir** o conteúdo no disco com as alterações", - "discard": "Descartar", + "overwriteElevated": "Sobrescrever como Admin...", + "saveElevated": "Tentar novamente como Admin...", "overwrite": "Sobrescrever", "retry": "Tentar novamente", - "readonlySaveError": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Substituir' para remover a proteção.", + "discard": "Descartar", + "readonlySaveErrorAdmin": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever como Admin' para tentar novamente como administrador.", + "readonlySaveError": "Falha ao salvar '{0}': O arquivo está protegido contra gravação. Selecione 'Sobrescrever' para tentar remover a proteção.", + "permissionDeniedSaveError": "Falha ao salvar '{0}': Permissões insuficientes. Selecione 'Tentar novamente como Admin' para tentar novamente como administrador.", "genericSaveError": "Erro ao salvar '{0}': {1}", "staleSaveError": "Falha ao salvar '{0}': O conteúdo no disco é mais recente. Clique em **Comparar** para comparar a sua versão com a do disco.", "compareChanges": "Comparar", 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 83f2a510196..e075736dad3 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,11 +6,5 @@ { "openEditors": "Abrir Editores", "openEditosrSection": "Abrir Seção de Editores", - "dirtyCounter": "{0} não salvos", - "saveAll": "Salvar Todos", - "closeAllUnmodified": "Fechar Não Modificados", - "closeAll": "Fechar todos", - "compareWithSaved": "Comparar com o salvo", - "close": "Fechar", - "closeOthers": "Fechar Outros" + "dirtyCounter": "{0} não salvos" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..05cf5d42db3 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logs.contribution.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. +{ + "mainLog": "Log (Principal)", + "sharedLog": "Log (Compartilhado)", + "rendererLog": "Log (Janela)", + "extensionsLog": "Log (Host de Extensão)", + "developer": "Desenvolvedor" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..30c8e9206e8 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -0,0 +1,23 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "openLogsFolder": "Abrir Pasta de Logs", + "showLogs": "Exibir Logs...", + "mainProcess": "Principal", + "sharedProcess": "Compartilhado", + "rendererProcess": "Janela", + "extensionHost": "Host de Extensão", + "selectProcess": "Selecionar processo", + "setLogLevel": "Definir Nível de Log", + "trace": "Rastreamento", + "debug": "Depurar", + "info": "Informações", + "warn": "Aviso", + "err": "Erro", + "critical": "Crítico", + "off": "Desligado", + "selectLogLevel": "Selecione o nível de log" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json index ad1f8b439c5..f038135e0fb 100644 --- a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Exibir", - "problems.view.toggle.label": "Alternar Problemas", - "problems.view.focus.label": "Problemas de foco", "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", diff --git a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..9a9c6f73156 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Saída", + "logViewer": "Visualizador do Log", + "viewCategory": "Exibir", + "clearOutput.label": "Limpar saída" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..383a9f4835d --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/output/electron-browser/outputServices.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. +{ + "output": "{0} - Saída", + "channel": "Canal de saída para '{0}'" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index 800b9bf18e2..df12c20c366 100644 --- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Tente a busca de linguagem natural!", "defaultSettings": "Coloque suas configurações no editor do lado direito para substituir.", "noSettingsFound": "Não há configurações encontradas.", "settingsSwitcherBarAriaLabel": "Chave de Configurações", "userSettings": "Configurações de Usuário", "workspaceSettings": "Configurações de Espaço de Trabalho", - "folderSettings": "Configurações da Pasta", - "enableFuzzySearch": "Habilitar busca de linguagem natural" + "folderSettings": "Configurações da Pasta" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 9f80cd79e8b..6427118b75b 100644 --- a/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Comumente Utilizado", - "mostRelevant": "Mais Relevante", "defaultKeybindingsHeader": "Substituir as chaves de ligações, colocando-os em seu arquivo de chave ligações." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index e3c6204b605..75a93eabf9c 100644 --- a/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Exibir", "commandsHandlerDescriptionDefault": "Exibir e executar comandos", "gotoLineDescriptionMac": "Ir para linha", "gotoLineDescriptionWin": "Ir para linha", diff --git a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 117ddc11b04..668463cff46 100644 --- a/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,9 @@ "toggleGitViewlet": "Mostrar Git", "source control": "Controle de código-fonte", "toggleSCMViewlet": "Mostrar SCM", - "view": "Exibir" + "view": "Exibir", + "scmConfigurationTitle": "SCM", + "alwaysShowProviders": "Se deverá sempre mostrar a seção Provedor de Controle de Código Fonte.", + "diffDecorations": "Controla decorações do diff no editor.", + "inputCounter": "Controla quando exibir o contador de entrada." } \ 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 fc4f8f90311..916c6469ab8 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 @@ -6,6 +6,9 @@ { "scm providers": "Provedores de Controle de Código Fonte", "hideRepository": "Ocultar", + "commitMessageInfo": "{0} caracteres na linha atual", + "commitMessageCountdown": "{0} caracteres restantes na linha atual", + "commitMessageWarning": "{0} caracteres sobre {1} na linha atual", "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", 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 34ded87a267..62c0f96918e 100644 --- a/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Mostrar Termo de Pesquisa Anterior", "showSearchViewlet": "Mostrar Busca", "findInFiles": "Localizar nos Arquivos", - "findInFilesWithSelectedText": "Localizar nos Arquivos Com o Texto Selecionado", "replaceInFiles": "Substituir nos Arquivos", - "replaceInFilesWithSelectedText": "Substituir nos Arquivos Com o Texto Selecionado", "RefreshAction.label": "Atualizar", "CollapseDeepestExpandedLevelAction.label": "Recolher tudo", "ClearSearchResultsAction.label": "Limpar", diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index b7b7494e9e4..1d6d8fc3238 100644 --- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Procurar na pasta...", + "findInWorkspace": "Procurar no Espaço de Trabalho...", "showTriggerActions": "Ir para Símbolo no Espaço de Trabalho...", "name": "Pesquisar", "search": "Pesquisar", + "showSearchViewlet": "Mostrar Busca", "view": "Exibir", + "findInFiles": "Localizar nos Arquivos", "openAnythingHandlerDescription": "Ir para o Arquivo", "openSymbolDescriptionNormal": "Ir para o Símbolo em Área de Trabalho", "searchOutputChannelTitle": "Pesquisar", diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..5d08c410ab9 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.scope": "(global)", + "global.1": "({0})", + "new.global": "Novo Arquivo de Trechos de Código Global...", + "group.global": "Trechos de código existentes", + "openSnippet.pickLanguage": "Selecionar Arquivo de Trechos de Código ou Criar Trechos de Código", + "openSnippet.label": "Configurar Trechos de Código do Usuário", + "preferences": "Preferências" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index b9823c384ad..5cad5c0f57d 100644 --- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,13 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Selecionar Idioma para o Trecho", - "openSnippet.errorOnCreate": "Não é possível criar {0}", - "openSnippet.label": "Abrir trechos de código do usuário", - "preferences": "Preferências", "snippetSchema.json.default": "Trecho de código vazio", "snippetSchema.json": "Configuração do trecho do usuário", "snippetSchema.json.prefix": "O prefixo usado ao selecionar o trecho no intelliSense", "snippetSchema.json.body": "O conteúdo do trecho. Use '$1', '${1:defaultText}' para definir as posições do cursor, use '$0' para a posição final do cursor. Insira valores de variáveis com '${varName}' e '${varName:defaultText}', por exemplo ' Este é o arquivo: $TM_FILENAME'.", - "snippetSchema.json.description": "A descrição do trecho." + "snippetSchema.json.description": "A descrição do trecho.", + "snippetSchema.json.scope": "Uma lista de nomes de linguagem para a qual este trecho de código aplica-se, por exemplo 'typescript,javascript'." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..bfdaf9232d5 --- /dev/null +++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Trecho de código do usuário" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index a2c0fbab96a..e4fdc20a129 100644 --- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}", "invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}", + "invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}", "invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.", "vscode.extension.contributes.snippets": "Contribui aos trechos de código.", "vscode.extension.contributes.snippets-language": "Identificador de linguagem para o qual este trecho de código contribui.", "vscode.extension.contributes.snippets-path": "Caminho do arquivo de trechos de código. O caminho é relativo à pasta de extensão e normalmente começa com '. /snippets/'.", "badVariableUse": "Um ou mais trechos da extensão '{0}' provavelmente se confundem com trechos de código de variáveis e trechos de código de espaços reservados (veja https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax para mais detalhes)", "badFile": "O arquivo de trechos \"{0}\" não pôde ser lido.", - "source.snippet": "Trecho de código do usuário", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index d97a515c6ea..7eeff308218 100644 --- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -14,6 +14,7 @@ "terminal.integrated.shell.windows": "O caminho do shell que o terminal utiliza no Windows. Quando estiver usando shells fornecidos com o Windows (cmd, PowerShell ou Bash no Ubuntu).", "terminal.integrated.shellArgs.windows": "Os argumentos de linha de comando a serem utilizados no terminal do Windows.", "terminal.integrated.rightClickCopyPaste": "Quando configurado, isto evitará que o menu de contexto apareça quando pressionado o botão direito do mouse dentro do terminal, em vez disso vai copiar quando há uma seleção e colar quando não há nenhuma seleção.", + "terminal.integrated.copyOnSelection": "Quando ativado, texto selecionado no terminal será copiado para a área de transferência.", "terminal.integrated.fontFamily": "Controla a família de fontes do terminal, este padrão é o valor do editor.fontFamily.", "terminal.integrated.fontSize": "Controla o tamanho da fonte em pixels do terminal.", "terminal.integrated.lineHeight": "Controla a altura da linha do terminal, este número é multiplicado pelo tamanho da fonte do terminal para obter a altura real da linha em pixels.", diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index 2ee45b6deb3..f59efd68a97 100644 --- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -14,6 +14,8 @@ "workbench.action.terminal.deleteWordRight": "Excluir Palavra à Direita", "workbench.action.terminal.new": "Criar Novo Terminal Integrado", "workbench.action.terminal.new.short": "Novo Terminal", + "workbench.action.terminal.newWorkspacePlaceholder": "Selecione o diretório de trabalho atual para novo terminal", + "workbench.action.terminal.newInActiveWorkspace": "Criar Novo Terminal Integrado (No Espaço de Trabalho Ativo)", "workbench.action.terminal.focus": "Focalizar Terminal", "workbench.action.terminal.focusNext": "Focalizar Próximo Terminal", "workbench.action.terminal.focusPrevious": "Focalizar Terminal Anterior", diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index 655ae8902e5..345ffbe4d25 100644 --- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -9,5 +9,5 @@ "terminalCursor.foreground": "A cor de primeiro plano do cursor do terminal.", "terminalCursor.background": "A cor de fundo do cursor do terminal. Permite personalizar a cor de um personagem sobreposto por um cursor de bloco.", "terminal.selectionBackground": "A cor de fundo de seleção do terminal.", - "terminal.ansiColor": "'{0}' cor ansi no terminal." + "terminal.ansiColor": "'{0}' cor ANSI no terminal." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 83214ad4be8..a500552f06f 100644 --- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Você pode alterar o terminal shell padrão selecionando o botão Personalizar.", "customize": "Personalizar", "cancel": "Cancelar", - "never again": "Ok, Nunca Mostrar Novamente", "terminal.integrated.chooseWindowsShell": "Selecione o seu terminal shell preferido, você pode alterar isso mais tarde em suas configurações", "terminalService.terminalCloseConfirmationSingular": "Há uma sessão ativa de terminal, você quer finalizá-la?", "terminalService.terminalCloseConfirmationPlural": "Existem {0} sessões ativas de terminal, você quer finalizá-las?" 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 6a2cfcb15ab..84ce2109e07 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 @@ -13,7 +13,7 @@ "read the release notes": "Bem-vindo a {0} v{1}! Gostaria de ler as Notas da Versão?", "licenseChanged": "Nossos termos de licença mudaram, favor revisá-los.", "license": "Ler Licença", - "neveragain": "Nunca Mostrar Novamente", + "neveragain": "Não mostrar novamente", "64bitisavailable": "{0} para Windows de 64 bits está agora disponível!", "learn more": "Saiba Mais", "updateIsReady": "Nova atualização de {0} disponível.", @@ -23,6 +23,7 @@ "commandPalette": "Paleta de comandos...", "settings": "Configurações", "keyboardShortcuts": "Atalhos de Teclado", + "userSnippets": "Trecho de código do usuário", "selectTheme.label": "Tema de Cores", "themes.selectIconTheme.label": "Arquivo de Ícone do Tema", "not available": "Atualizações Indisponíveis", diff --git a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 7b91deaec2e..1cc780952f6 100644 --- a/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/ptb/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "Arquivo é um diretório", + "fileNotModifiedError": "Arquivo não modificado desde", "fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto" } \ 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 ae4ae718743..dba7ada15b5 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 @@ -10,6 +10,7 @@ "fileTooLargeError": "Arquivo muito grande para abrir", "fileNotFoundError": "Arquivo não encontrado ({0})", "fileBinaryError": "Arquivo parece ser binário e não pode ser aberto como texto", + "filePermission": "Permissão negada ao escrever no arquivo ({0})", "fileExists": "Arquivo a ser criado já existe ({0})", "fileMoveConflict": "Não é possível mover/copiar. Arquivo já existe no destino.", "unableToMoveCopyError": "Não é possível mover/copiar. Arquivo poderia substituir a pasta em que está contida.", diff --git a/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json index fedfd5457f0..4e6320dddaa 100644 --- a/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json +++ b/i18n/ptb/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json @@ -22,5 +22,6 @@ "keybindings.json.when": "Condição quando a chave está ativa.", "keybindings.json.args": "Argumentos a serem passados para o comando para executar.", "keyboardConfigurationTitle": "Teclado", - "dispatch": "Controla a lógica de pressionamentos de teclas a ser usada para envio, se será 'code' (recomendado) ou 'keyCode'." + "dispatch": "Controla a lógica de pressionamentos de teclas a ser usada para envio, se será 'code' (recomendado) ou 'keyCode'.", + "touchbar.enabled": "Habilita os botões do touchbar do macOS no teclado se disponível." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 491b19e87c4..f86146be73a 100644 --- a/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/ptb/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Você quer salvar as alterações feitas para {0}?", "saveChangesMessages": "Você quer salvar as alterações para os seguintes {0} arquivos?", - "moreFile": "... 1 arquivo adicional não está mostrado", - "moreFiles": "... {0} arquivos adicionais não estão mostrados", "saveAll": "&&Salvar tudo", "save": "&&Salvar", "dontSave": "&&Não Salvar", diff --git a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 15017c07157..164708fcd63 100644 --- a/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/ptb/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "Nenhum arquivo de ícones", "iconThemeError": "Arquivo de tema de ícones é desconhecido ou não está instalado.", "workbenchColors": "Substitui as cores do tema do tema de cores atualmente selecionado.", - "editorColors": "Substitui as cores e o estilo da fonte do editor do tema de cores atualmente selecionado.", "editorColors.comments": "Define as cores e estilos para os comentários", "editorColors.strings": "Define as cores e estilos para textos literais.", "editorColors.keywords": "Define as cores e estilos para palavras-chave.", @@ -19,5 +18,6 @@ "editorColors.types": "Define as cores e estilos para declarações de tipo e referências.", "editorColors.functions": "Define as cores e estilos para declarações de funções e referências.", "editorColors.variables": "Define as cores e estilos para declarações de variáveis e referências.", - "editorColors.textMateRules": "Define as cores e estilos usando regras de temas textmate (avançado)." + "editorColors.textMateRules": "Define as cores e estilos usando regras de temas textmate (avançado).", + "editorColors": "Substitui as cores e o estilo da fonte do editor do tema de cores atualmente selecionado." } \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 078a8eb1b7d..73fdc1bd8e4 100644 --- a/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/ptb/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Não é possível escrever no arquivo de configuração. Por favor, abra o arquivo para corrigir erros/avisos nele e tente novamente.", "errorWorkspaceConfigurationFileDirty": "Não é possível escrever no arquivo de configuração do espaço de trabalho porque o arquivo está sujo. Por favor, salve-o e tente novamente.", "openWorkspaceConfigurationFile": "Abrir o Arquivo de Configuração do Espaço de Trabalho", - "close": "Fechar", - "enterWorkspace.close": "Fechar", - "enterWorkspace.dontShowAgain": "Não mostrar novamente", - "enterWorkspace.moreInfo": "Mais informações", - "enterWorkspace.prompt": "Saiba mais sobre como trabalhar com várias pastas no VS Code." + "close": "Fechar" } \ No newline at end of file diff --git a/i18n/rus/extensions/git/out/autofetch.i18n.json b/i18n/rus/extensions/git/out/autofetch.i18n.json index 1e461cf4629..d3d761f3636 100644 --- a/i18n/rus/extensions/git/out/autofetch.i18n.json +++ b/i18n/rus/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,6 @@ // Do not edit this file. It is machine generated. { "yes": "Да", - "no": "Нет", - "not now": "Не сейчас", - "suggest auto fetch": "Вы хотите включить автоматическое получение для репозиториев Git?" + "read more": "Подробнее", + "no": "Нет" } \ 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 d8d6feaa35d..b99a2ac09aa 100644 --- a/i18n/rus/extensions/git/out/commands.i18n.json +++ b/i18n/rus/extensions/git/out/commands.i18n.json @@ -64,12 +64,11 @@ "no remotes to pull": "Для вашего репозитория не настроены удаленные репозитории для получения данных.", "pick remote pull repo": "Выберите удаленный компьютер, с которого следует загрузить ветвь", "no remotes to push": "Для вашего репозитория не настроены удаленные репозитории для отправки данных.", - "push with tags success": "Файлы с тегами успешно отправлены.", "nobranch": "Извлеките ветвь, чтобы передать данные в удаленный репозиторий.", + "ok": "ОК", + "push with tags success": "Файлы с тегами успешно отправлены.", "pick remote": "Выберите удаленный сервер, на котором нужно опубликовать ветвь \"{0}\":", "sync is unpredictable": "Это действие отправляет фиксации в \"{0}\" и извлекает их из этого расположения.", - "ok": "ОК", - "never again": "ОК. Больше не показывать", "no remotes to publish": "Для вашего репозитория не настроены удаленные репозитории для публикации.", "no changes stash": "Отсутствуют изменения, которые необходимо спрятать.", "provide stash message": "Укажите сообщение о скрытии", diff --git a/i18n/rus/extensions/typescript/out/commands.i18n.json b/i18n/rus/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..719d56f4f92 --- /dev/null +++ b/i18n/rus/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Откройте папку в VS Code, чтобы использовать проект JavaScript или TypeScript.", + "typescript.projectConfigUnsupportedFile": "Не удалось определить проект TypeScript или JavaScript. Неподдерживаемый тип файла", + "typescript.projectConfigCouldNotGetInfo": "Не удалось определить проект TypeScript или JavaScript.", + "typescript.noTypeScriptProjectConfig": "Файл не является частью проекта TypeScript.", + "typescript.noJavaScriptProjectConfig": "Файл не является частью проекта JavaScript.", + "typescript.configureTsconfigQuickPick": "Настроить tsconfig.json", + "typescript.configureJsconfigQuickPick": "Настроить jsconfig.json", + "typescript.projectConfigLearnMore": "Дополнительные сведения" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/rus/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/base/node/ps.i18n.json b/i18n/rus/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json index f265f8d9eaa..04d052b0abb 100644 --- a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "Отображаются абсолютные номера строк.", "lineNumbers.relative": "Отображаемые номера строк вычисляются как расстояние в строках до положения курсора.", "lineNumbers.interval": "Номера строк отображаются каждые 10 строк.", - "lineNumbers": "Управляет отображением номеров строк. Возможные значения: \"on\", \"off\" и \"relative\".", + "lineNumbers": "Управляет отображением номеров строк. Возможные значения: 'on', 'off', 'relative' и 'interval'.", "rulers": "Отображать вертикальные линейки после определенного числа моноширинных символов. Для отображения нескольких линеек укажите несколько значений. Если не указано ни одного значения, вертикальные линейки отображаться не будут.", "wordSeparators": "Символы, которые будут использоваться как разделители слов при выполнении навигации или других операций, связанных со словами.", "tabSize": "Число пробелов в табуляции. Этот параметр переопределяется на основе содержимого файла, если установлен параметр \"editor.detectIndentation\".", 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 4801d2ec386..435033a9d39 100644 --- a/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/rus/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "Цвет фона для выделения строки в позиции курсора.", "lineHighlightBorderBox": "Цвет фона границ вокруг строки в позиции курсора.", - "rangeHighlight": "Цвет фона выделенных диапазонов, например в функциях быстрого открытия и поиска.", "caret": "Цвет курсора редактора.", "editorCursorBackground": "Цвет фона курсора редактора. Позволяет настраивать цвет символа, перекрываемого прямоугольным курсором.", "editorWhitespaces": "Цвет пробелов в редакторе.", 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 5ca181d11bd..46e2fc5601e 100644 --- a/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/rus/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Перейти к следующей ошибке или предупреждению", - "markerAction.previous.label": "Перейти к предыдущей ошибке или предупреждению", "editorMarkerNavigationError": "Цвет ошибки в мини-приложении навигации по меткам редактора.", "editorMarkerNavigationWarning": "Цвет предупреждения в мини-приложении навигации по меткам редактора.", "editorMarkerNavigationInfo": "Цвет информационного сообщения в мини-приложении навигации по меткам редактора.", 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 ab058cc24db..0894ee93e1f 100644 --- a/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/rus/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Цвет фона символа при доступе на чтение, например считывании переменной.", - "wordHighlightStrong": "Цвет фона символа при доступе на запись, например записи переменной.", "overviewRulerWordHighlightForeground": "Цвет метки линейки в окне просмотра для выделений символов.", "overviewRulerWordHighlightStrongForeground": "Цвет метки линейки в окне просмотра для выделений символов, доступных для записи. ", "wordHighlight.next.label": "Перейти к следующему выделению символов", diff --git a/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index b8216927851..74a4edfb15c 100644 --- a/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/rus/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "\"{0}\" не является допустимым идентификатором меню", "missing.command": "Элемент меню ссылается на команду \"{0}\", которая не определена в разделе commands.", "missing.altCommand": "Элемент меню ссылается на альтернативную команду \"{0}\", которая не определена в разделе commands.", - "dupe.command": "Элемент меню ссылается на одну и ту же команду как команду по умолчанию и альтернативную команду", - "nosupport.altCommand": "Сейчас только группа navigation меню editor/title поддерживает альтернативные команды" + "dupe.command": "Элемент меню ссылается на одну и ту же команду как команду по умолчанию и альтернативную команду" } \ No newline at end of file diff --git a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json index 7314aa06087..ddfd930f08e 100644 --- a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json @@ -8,28 +8,28 @@ "diff": "Сравнение двух файлов друг с другом", "add": "Добавление папок в последнее активное окно.", "goto": "Открытие файла по указанному пути с выделением указанного символа в указанной строке.", - "locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).", "newWindow": "Принудительно запустить новый экземпляр Code.", - "performance": "Запустите с включенной командой \"Developer: Startup Performance\".", - "prof-startup": "Запустить профилировщик ЦП при запуске", - "inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.", - "inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ", "reuseWindow": "Принудительно открыть файл или папку в последнем активном окне.", - "userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.", - "log": "Используемый уровень ведения журнала. Значение по умолчанию — \"info\". Допустимые значения: \"critical\", \"error\", \"warn\", \"info\", \"debug\", \"trace\", \"off\".", - "verbose": "Печать подробного вывода (подразумевает использование параметра \"--wait\").", "wait": "Дождаться закрытия файлов перед возвратом.", + "locale": "Языковой стандарт, который следует использовать (например, en-US или zh-TW).", + "userDataDir": "Указывает каталог, в котором хранятся данные пользователей, используется в случае выполнения от имени привилегированного пользователя.", + "version": "Печать версии.", + "help": "Распечатать данные об использовании.", "extensionHomePath": "Задайте корневой путь для расширений.", "listExtensions": "Перечислить существующие расширения.", "showVersions": "Показать версии установленных расширений при указании параметра --list-extension.", "installExtension": "Устанавливает расширение.", "uninstallExtension": "Удаляет расширение.", "experimentalApis": "Включает предложенные функции API для расширения.", - "disableExtensions": "Отключить все установленные расширения.", - "disableGPU": "Отключить аппаратное ускорение GPU.", + "verbose": "Печать подробного вывода (подразумевает использование параметра \"--wait\").", + "log": "Используемый уровень ведения журнала. Значение по умолчанию — \"info\". Допустимые значения: \"critical\", \"error\", \"warn\", \"info\", \"debug\", \"trace\", \"off\".", "status": "Выводить сведения об использовании процесса и диагностическую информацию.", - "version": "Печать версии.", - "help": "Распечатать данные об использовании.", + "performance": "Запустите с включенной командой \"Developer: Startup Performance\".", + "prof-startup": "Запустить профилировщик ЦП при запуске", + "disableExtensions": "Отключить все установленные расширения.", + "inspect-extensions": "Разрешить отладку и профилирование расширений. Проверьте URI подключения для инструментов разработчика.", + "inspect-brk-extensions": "Разрешить отладку и профилирование расширений, когда узел расширения приостановлен после запуска. Проверьте URI подключения для инструментов разработчика. ", + "disableGPU": "Отключить аппаратное ускорение GPU.", "usage": "Использование", "options": "параметры", "paths": "пути", 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 c25a9a85ff7..8201cea8194 100644 --- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,13 +5,10 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Недопустимое расширение: package.json не является файлом JSON.", - "restartCodeLocal": "Перезапустите код перед переустановкой {0}.", + "restartCode": "Перезапустите код перед переустановкой {0}.", "installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?", "override": "Переопределить", "cancel": "Отмена", - "notFoundCompatible": "Не удается выполнить установку, так как не найдено расширение '{0}', совместимое с текущей версией VS Code '{1}'.", - "quitCode": "Не удается выполнить установку, так как устаревший экземпляр расширения еще запущен. Закройте и снова откройте VS Code, затем запустите установку повторно.", - "exitCode": "Не удается выполнить установку, так как устаревший экземпляр расширения еще запущен. Закройте и снова откройте VS Code, затем запустите установку повторно. ", "notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ", "uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?", "uninstallOnly": "Только", diff --git a/i18n/rus/src/vs/platform/message/common/message.i18n.json b/i18n/rus/src/vs/platform/message/common/message.i18n.json index 62863fdeb53..aab52c88b34 100644 --- a/i18n/rus/src/vs/platform/message/common/message.i18n.json +++ b/i18n/rus/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Закрыть", "later": "Позже", - "cancel": "Отмена" + "cancel": "Отмена", + "moreFile": "...1 дополнительный файл не показан", + "moreFiles": "...не показано дополнительных файлов: {0}" } \ 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 98e2cebe278..bbb9e4cefb0 100644 --- a/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/rus/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Цвет границы мини-приложений редактора. Этот цвет используется только в том случае, если у мини-приложения есть граница и если этот цвет не переопределен мини-приложением.", "editorSelectionBackground": "Цвет выделения редактора.", "editorSelectionForeground": "Цвет выделенного текста в режиме высокого контраста.", - "editorInactiveSelection": "Цвет выделения в неактивном редакторе.", - "editorSelectionHighlight": "Цвет регионов с тем же содержимым, что и в выделении.", "editorFindMatch": "Цвет текущего поиска совпадений.", - "findMatchHighlight": "Цвет других совпадений поиска.", - "findRangeHighlight": "Цвет диапазона, ограничивающего поиск.", - "hoverHighlight": "Выделение под словом, для которого показано наведение.", "hoverBackground": "Цвет фона при наведении указателя на редактор.", "hoverBorder": "Цвет границ при наведении указателя на редактор.", "activeLinkForeground": "Цвет активных ссылок.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Цвет фона для удаленных строк.", "diffEditorInsertedOutline": "Цвет контура для добавленных строк.", "diffEditorRemovedOutline": "Цвет контура для удаленных строк.", - "mergeCurrentHeaderBackground": "Цвет фона текущего заголовка во внутренних конфликтах слияния.", - "mergeCurrentContentBackground": "Цвет фона текущего содержимого во внутренних конфликтах слияния.", - "mergeIncomingHeaderBackground": "Цвет фона входящего заголовка во внутренних конфликтах слияния.", - "mergeIncomingContentBackground": "Цвет фона входящего содержимого во внутренних конфликтах слияния.", - "mergeCommonHeaderBackground": "Цвет фона заголовка для общего предка во внутренних конфликтах слияния.", - "mergeCommonContentBackground": "Цвет фона содержимого для общего предка во внутренних конфликтах слияния.", "mergeBorder": "Цвет границы заголовков и разделителя во внутренних конфликтах слияния.", "overviewRulerCurrentContentForeground": "Цвет переднего плана линейки текущего окна во внутренних конфликтах слияния.", "overviewRulerIncomingContentForeground": "Цвет переднего плана линейки входящего окна во внутренних конфликтах слияния.", diff --git a/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 9f9c8f9221d..9dad9f3a71b 100644 --- a/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/rus/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'.", - "treeItem.notFound": "Отсутствует элемент дерева с идентификатором '{0}'.", - "treeView.duplicateElement": "Элемент {0} уже зарегистрирован" + "treeView.notRegistered": "Отсутствует зарегистрированное представление в виде дерева с идентификатором '{0}'." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json index 7f87d17117e..c63304e93ba 100644 --- a/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Открыть файл...", "openFolder": "Открыть папку...", "openFileFolder": "Открыть...", - "addFolderToWorkspace": "Добавить папку в рабочую область...", - "add": "&&Добавить", - "addFolderToWorkspaceTitle": "Добавить папку в рабочую область", "globalRemoveFolderFromWorkspace": "Удалить папку из рабочей области...", - "removeFolderFromWorkspace": "Удалить папку из рабочей области", - "openFolderSettings": "Открыть параметры папок", "saveWorkspaceAsAction": "Сохранить рабочую область как...", "save": "Сохранить", "saveWorkspace": "Сохранить рабочую область", "openWorkspaceAction": "Открыть рабочую область...", "openWorkspaceConfigFile": "Открыть файл конфигурации рабочей области", - "openFolderAsWorkspaceInNewWindow": "Открыть папку как рабочую область в новом окне", - "workspaceFolderPickerPlaceholder": "Выберите папку рабочей области" + "openFolderAsWorkspaceInNewWindow": "Открыть папку как рабочую область в новом окне" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..80b92b74445 --- /dev/null +++ b/i18n/rus/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "Добавить папку в рабочую область...", + "add": "&&Добавить", + "addFolderToWorkspaceTitle": "Добавить папку в рабочую область", + "workspaceFolderPickerPlaceholder": "Выберите папку рабочей области" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 3c123d9ce41..6382785efa1 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Показать редакторы в третьей группе", "allEditorsPicker": "Показать все открытые редакторы", "view": "Просмотр", - "file": "Файл" + "file": "Файл", + "close": "Закрыть", + "closeOthers": "Закрыть другие", + "closeRight": "Закрыть справа", + "closeAllUnmodified": "Закрыть без изменений", + "closeAll": "Закрыть все", + "keepOpen": "Оставить открытым", + "showOpenedEditors": "Показать открытые редакторы", + "keepEditor": "Сохранить редактор", + "closeEditorsInGroup": "Закрыть все редакторы в группе", + "closeUnmodifiedEditors": "Закрыть редакторы без изменений в группе", + "closeOtherEditors": "Закрыть другие редакторы", + "closeRightEditors": "Закрыть редакторы справа" } \ 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 4dba80c961d..f1572dc1c18 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,18 +17,13 @@ "closeEditor": "Закрыть редактор", "revertAndCloseActiveEditor": "Отменить изменения и закрыть редактор", "closeEditorsToTheLeft": "Закрыть редакторы слева", - "closeEditorsToTheRight": "Закрыть редакторы справа", "closeAllEditors": "Закрыть все редакторы", - "closeUnmodifiedEditors": "Закрыть редакторы без изменений в группе", "closeEditorsInOtherGroups": "Закрыть редакторы в других группах", - "closeOtherEditorsInGroup": "Закрыть другие редакторы", - "closeEditorsInGroup": "Закрыть все редакторы в группе", "moveActiveGroupLeft": "Переместить группу редакторов влево", "moveActiveGroupRight": "Переместить группу редакторов вправо", "minimizeOtherEditorGroups": "Свернуть другие группы редакторов", "evenEditorGroups": "Уравнять ширину групп редакторов", "maximizeEditor": "Развернуть группу редакторов и скрыть боковую панель", - "keepEditor": "Сохранить редактор", "openNextEditor": "Открыть следующий редактор", "openPreviousEditor": "Открыть предыдущий редактор", "nextEditorInGroup": "Открыть следующий редактор в группе", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "Показать редакторы в первой группе", "showEditorsInSecondGroup": "Показать редакторы во второй группе", "showEditorsInThirdGroup": "Показать редакторы в третьей группе", - "showEditorsInGroup": "Показать редакторы в группе", "showAllEditors": "Показать все редакторы", "openPreviousRecentlyUsedEditorInGroup": "Открыть предыдущий недавно использованный редактор в группе", "openNextRecentlyUsedEditorInGroup": "Открыть следующий недавно использованный редактор в группе", diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 32e566863c8..64223b3c4b5 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Перемещение активного редактора по вкладкам или группам", "editorCommand.activeEditorMove.arg.name": "Аргумент перемещения активного редактора", - "editorCommand.activeEditorMove.arg.description": "Свойства аргумента:\n\t* 'to': строковое значение, указывающее направление перемещения.\n\t* 'by': строковое значение, указывающее единицу перемещения (вкладка или группа).\n\t* 'value': числовое значение, указывающее количество позиций перемещения или абсолютную позицию для перемещения.", - "commandDeprecated": "Команда **{0}** удалена. Вместо нее можно использовать **{1}**", - "openKeybindings": "Настройка сочетаний клавиш" + "editorCommand.activeEditorMove.arg.description": "Свойства аргумента:\n\t* 'to': строковое значение, указывающее направление перемещения.\n\t* 'by': строковое значение, указывающее единицу перемещения (вкладка или группа).\n\t* 'value': числовое значение, указывающее количество позиций перемещения или абсолютную позицию для перемещения." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 7e9ef4fb62e..f8b0ee45376 100644 --- a/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/rus/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,7 +10,5 @@ "editableEditorWithInputAriaLabel": "{0}. Редактор сравнения текстовых файлов.", "editableEditorAriaLabel": "Редактор сравнения текстовых файлов.", "navigate.next.label": "Следующее исправление", - "navigate.prev.label": "Предыдущее исправление", - "inlineDiffLabel": "Переключиться на представление в строке", - "sideBySideDiffLabel": "Переключиться на параллельное представление" + "navigate.prev.label": "Предыдущее исправление" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index f09bdce2324..cf0dce309ed 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Закрыть", - "closeOthers": "Закрыть другие", - "closeRight": "Закрыть справа", - "closeAll": "Закрыть все", - "closeAllUnmodified": "Закрыть без изменений", - "keepOpen": "Оставить открытым", - "showOpenedEditors": "Показать открытые редакторы", "araLabelEditorActions": "Действия редактора" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/common/theme.i18n.json b/i18n/rus/src/vs/workbench/common/theme.i18n.json index bd0d0f8b98b..364c328c4c0 100644 --- a/i18n/rus/src/vs/workbench/common/theme.i18n.json +++ b/i18n/rus/src/vs/workbench/common/theme.i18n.json @@ -16,7 +16,6 @@ "editorGroupBackground": "Цвет фона группы редакторов. Группы редакторов представляют собой контейнеры редакторов. Цвет фона отображается при перетаскивании групп редакторов.", "tabsContainerBackground": "Цвет фона для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.", "tabsContainerBorder": "Цвет границы для заголовка группы редакторов, когда вкладки включены. Группы редакторов представляют собой контейнеры редакторов.", - "editorGroupHeaderBackground": "Цвет фона для заголовка группы редакторов, когда вкладки отключены. Группы редакторов представляют собой контейнеры редакторов.", "editorGroupBorder": "Цвет для разделения нескольких групп редакторов. Группы редакторов — это контейнеры редакторов.", "editorDragAndDropBackground": "Цвет фона при перетаскивании редакторов. Этот цвет должен обладать прозрачностью, чтобы содержимое редактора оставалось видимым.", "panelBackground": "Цвет фона панели. Панели показаны под областью редактора и содержат такие представления, как выходные данные и встроенный терминал.", @@ -33,8 +32,6 @@ "statusBarNoFolderBorder": "Цвет границы строки состояния, который распространяется на боковую панель и редактор, когда открытые папки отсутствуют. Строка состояния расположена в нижней части окна.", "statusBarItemActiveBackground": "Цвет фона элементов панели состояния при щелчке. Панель состояния отображается внизу окна.", "statusBarItemHoverBackground": "Цвет фона элементов панели состояния при наведении. Панель состояния отображается внизу окна.", - "statusBarProminentItemBackground": "Цвет фона приоритетных элементов панели состояния. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Панель состояния отображается в нижней части окна.", - "statusBarProminentItemHoverBackground": "Цвет фона приоритетных элементов панели состояния при наведении. Приоритетные элементы выделяются на фоне других элементов панели состояния, чтобы подчеркнуть их значение. Панель состояния отображается в нижней части окна.", "activityBarBackground": "Цвет фона панели действий. Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.", "activityBarForeground": "Цвет переднего плана панели действий (например, цвет, используемый для значков). Панель действий отображается слева или справа и позволяет переключаться между представлениями боковой панели.", "activityBarBorder": "Цвет границы панели действий, который распространяется на боковую панель. Панель действий отображается слева или справа и позволяет переключаться между представлениями в боковой панели.", diff --git a/i18n/rus/src/vs/workbench/common/views.i18n.json b/i18n/rus/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..2feabab41e5 --- /dev/null +++ b/i18n/rus/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "Представление с идентификатором '{0}' уже зарегистрировано в расположении '{1}'" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json index 2380d05741c..5768ee78d85 100644 --- a/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/rus/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Закрыть редактор", "closeWindow": "Закрыть окно", "closeWorkspace": "Закрыть рабочую область", "noWorkspaceOpened": "В этом экземпляре отсутствуют открытые рабочие области.", @@ -52,21 +51,5 @@ "displayLanguage": "Определяет язык интерфейса VSCode.", "doc": "Список поддерживаемых языков см. в {0}.", "restart": "Для изменения значения требуется перезапуск VSCode.", - "fail.createSettings": "Невозможно создать \"{0}\" ({1}).", - "openLogsFolder": "Открыть папку журналов", - "showLogs": "Показать журналы...", - "mainProcess": "Главный", - "sharedProcess": "Общий", - "rendererProcess": "Отрисовщик", - "extensionHost": "Узел расширения", - "selectProcess": "Выберите процесс", - "setLogLevel": "Установите уровень ведения журнала", - "trace": "Трассировка", - "debug": "Отладка", - "info": "Сведения", - "warn": "Предупреждение", - "err": "Ошибка", - "critical": "Критический", - "off": "Отключено", - "selectLogLevel": "Установите уровень ведения журнала" + "fail.createSettings": "Невозможно создать \"{0}\" ({1})." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/rus/src/vs/workbench/electron-browser/main.contribution.i18n.json index f0c8c83bedf..e6779131585 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 @@ -7,8 +7,9 @@ "view": "Просмотреть", "help": "Справка", "file": "Файл", - "developer": "Разработчик", "workspaces": "Рабочие области", + "developer": "Разработчик", + "workbenchConfigurationTitle": "Workbench", "showEditorTabs": "Определяет, должны ли открытые редакторы отображаться на вкладках или нет.", "workbench.editor.labelFormat.default": "Отображать имя файла. Если вкладки включены и в одной группе есть два файла с одинаковыми именами, то к имени каждого из этих файлов будут добавлены различающиеся части пути. Если вкладки отключены, то для активного редактора отображается путь по отношению к папке рабочей области.", "workbench.editor.labelFormat.short": "Отображать имя файла и имя каталога.", @@ -20,8 +21,10 @@ "showIcons": "Определяет, должны ли открытые редакторы отображаться со значком. Требует включить тему значков.", "enablePreview": "Определяет, отображаются ли открытые редакторы в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра можно использовать, пока они открыты (например, с помощью двойного щелчка мыши или изменения). Текст в таких редакторах отображается курсивом.", "enablePreviewFromQuickOpen": "Определяет, отображаются ли редакторы из Quick Open в режиме предварительного просмотра. Редакторы в режиме предварительного просмотра повторно используются до сохранения (например, с помощью двойного щелчка или изменения).", + "closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.", "editorOpenPositioning": "Определяет место открытия редакторов. Выберите 'left' или 'right', чтобы открывать редакторы слева или справа от активного редактора. Выберите 'first' или 'last', чтобы открывать редакторы независимо от активного редактора.", "revealIfOpen": "Определяет, отображается ли редактор в какой-либо из видимых групп при открытии. Если функция отключена, редактор открывается в текущей активной группе редакторов. Если функция включена, вместо открытия уже открытый редактор будет отображен в текущей активной группе редакторов. Обратите внимание, что в некоторых случаях этот параметр игнорируется, например при принудительном открытии редактора в определенной группе или сбоку от текущей активной группы редакторов.", + "swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.", "commandHistory": "Определяет количество недавно использованных команд, которые следует хранить в журнале палитры команд. Установите значение 0, чтобы отключить журнал команд.", "preserveInput": "Определяет, следует ли восстановить последнюю введенную команду в палитре команд при следующем открытии палитры.", "closeOnFocusLost": "Управляет автоматическим закрытием Quick Open при потере фокуса.", @@ -29,14 +32,11 @@ "sideBarLocation": "Определяет расположение боковой панели: слева или справа от рабочего места.", "statusBarVisibility": "Управляет видимостью строки состояния в нижней части рабочего места.", "activityBarVisibility": "Управляет видимостью панели действий на рабочем месте.", - "closeOnFileDelete": "Определяет, следует ли автоматически закрывать редакторы, когда отображаемый в них файл удален или переименован другим процессом. При отключении этой функции редактор остается открытым в качестве черновика. Обратите внимание, что при удалении из приложения редактор закрывается всегда и что файлы черновиков никогда не закрываются для сохранения данных.", - "enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.", "fontAliasing": "Управляет методом сглаживания шрифтов в рабочей области.-по умолчанию: субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina - сглаживание: сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания; позволит сделать шрифт более светлым в целом - нет: сглаживание шрифтов отключено; текст будет отображаться с неровными острыми краями ", "workbench.fontAliasing.default": "Субпиксельное сглаживание шрифтов; позволит добиться максимальной четкости текста на большинстве дисплеев за исключением Retina.", "workbench.fontAliasing.antialiased": "Сглаживание шрифтов на уровне пикселей, в отличие от субпиксельного сглаживания. Может сделать шрифт светлее в целом.", "workbench.fontAliasing.none": "Отключает сглаживание шрифтов; текст будет отображаться с неровными острыми краями.", - "swipeToNavigate": "Переключайтесь между открытыми файлами, проводя по экрану по горизонтали тремя пальцами.", - "workbenchConfigurationTitle": "Workbench", + "enableNaturalLanguageSettingsSearch": "Определяет, следует ли включить режим поиска естественного языка для параметров.", "windowConfigurationTitle": "Окно", "window.openFilesInNewWindow.on": "Файлы будут открываться в новом окне.", "window.openFilesInNewWindow.off": "Файлы будут открываться в окне с открытой папкой файлов или последнем активном окне.", diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index 64ed05c0958..80636157f78 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "отлаживаемый объект", - "debug.terminal.not.available.error": "Интегрированный терминал недоступен." + "debug.terminal.title": "отлаживаемый объект" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 4671a2c1d23..7b4f9ca1fd9 100644 --- a/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Открыть новую командную строку", "globalConsoleActionMacLinux": "Открыть новый терминал", "scopedConsoleActionWin": "Открыть в командной строке", - "scopedConsoleActionMacLinux": "Открыть в терминале", - "openFolderInIntegratedTerminal": "Открыть в терминале" + "scopedConsoleActionMacLinux": "Открыть в терминале" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 3e00ebd8896..e55b39d762b 100644 --- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).", "workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.", + "fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).", "exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.", "reallyRecommended2": "Для этого типа файлов рекомендуется использовать расширение '{0}'.", "reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.", diff --git a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..933a96a0d6f --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Рабочее место" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 821930bfc87..8ff5f3c27f7 100644 --- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,24 @@ "filesCategory": "Файл", "revealInSideBar": "Показать в боковой панели", "acceptLocalChanges": "Использовать изменения и перезаписать содержимое диска", - "revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске" + "revertLocalChanges": "Отменить изменения и вернуться к содержимому на диске", + "copyPathOfActive": "Копировать путь к активному файлу", + "saveAllInGroup": "Сохранить все в группе", + "revert": "Отменить изменения в файле", + "compareActiveWithSaved": "Сравнить активный файл с сохраненным", + "closeEditor": "Закрыть редактор", + "view": "Просмотр", + "openToSide": "Открыть сбоку", + "revealInWindows": "Отобразить в проводнике", + "revealInMac": "Отобразить в Finder", + "openContainer": "Открыть содержащую папку", + "copyPath": "Скопировать путь", + "saveAll": "Сохранить все", + "compareWithSaved": "Сравнить с сохраненным", + "compareSource": "Выбрать для сравнения", + "close": "Закрыть", + "closeOthers": "Закрыть другие", + "closeUnmodified": "Закрыть без изменений", + "closeAll": "Закрыть все", + "deleteFile": "Удалить навсегда" } \ No newline at end of file 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 8e87ab6930a..33066ff5f33 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Повторить попытку", - "rename": "Переименовать", "newFile": "Создать файл", "newFolder": "Создать папку", + "rename": "Переименовать", + "delete": "Удалить", + "copyFile": "Копировать", + "pasteFile": "Вставить", + "retry": "Повторить попытку", "openFolderFirst": "Сначала откройте папку, в которой будут созданы файлы и папки.", "newUntitledFile": "Новый файл без имени", "createNewFile": "Создать файл", @@ -28,26 +31,14 @@ "confirmDeleteMessageFile": "Вы действительно хотите удалить \"{0}\" без возможности восстановления?", "irreversible": "Это действие необратимо.", "permDelete": "Удалить навсегда", - "delete": "Удалить", "importFiles": "Импорт файлов", "confirmOverwrite": "Файл или папка с таким именем уже существует в конечной папке. Заменить их?", "replaceButtonLabel": "Заменить", - "copyFile": "Копировать", - "pasteFile": "Вставить", "duplicateFile": "Дублировать", - "openToSide": "Открыть сбоку", - "compareSource": "Выбрать для сравнения", "globalCompareFile": "Сравнить активный файл с...", "openFileToCompare": "Чтобы сравнить файл с другим файлом, сначала откройте его.", - "compareWith": "Сравнить '{0}' с '{1}'", - "compareFiles": "Сравнить файлы", "refresh": "Обновить", - "save": "Сохранить", - "saveAs": "Сохранить как...", - "saveAll": "Сохранить все", "saveAllInGroup": "Сохранить все в группе", - "saveFiles": "Сохранить все файлы", - "revert": "Отменить изменения в файле", "focusOpenEditors": "Фокус на представлении открытых редакторов", "focusFilesExplorer": "Фокус на проводнике", "showInExplorer": "Показать активный файл в боковой панели", @@ -56,20 +47,11 @@ "refreshExplorer": "Обновить окно проводника", "openFileInNewWindow": "Открыть активный файл в новом окне", "openFileToShowInNewWindow": "Чтобы открыть файл в новом окне, сначала откройте его.", - "revealInWindows": "Отобразить в проводнике", - "revealInMac": "Отобразить в Finder", - "openContainer": "Открыть содержащую папку", - "revealActiveFileInWindows": "Отобразить активный файл в проводнике", - "revealActiveFileInMac": "Отобразить активный файл в Finder", - "openActiveFileContainer": "Открыть папку, содержащую активный файл", "copyPath": "Скопировать путь", - "copyPathOfActive": "Копировать путь к активному файлу", "emptyFileNameError": "Необходимо указать имя файла или папки.", "fileNameExistsError": "Файл или папка **{0}** уже существует в данном расположении. Выберите другое имя.", "invalidFileNameError": "Имя **{0}** недопустимо для файла или папки. Выберите другое имя.", "filePathTooLongError": "Из-за использования имени **{0}** путь слишком длинный. Выберите более короткое имя.", - "compareWithSaved": "Сравнить активный файл с сохраненным", - "modifiedLabel": "{0} (на диске) ↔ {1}", "compareWithClipboard": "Сравнить активный файл с буфером обмена", "clipboardComparisonLabel": "Буфер обмена ↔ {0}" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index f51fb88b34b..18416689c01 100644 --- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его", - "openFileToReveal": "Чтобы отобразить файл, сначала откройте его" + "revealInWindows": "Отобразить в проводнике", + "revealInMac": "Отобразить в Finder", + "openContainer": "Открыть содержащую папку", + "saveAs": "Сохранить как...", + "save": "Сохранить", + "saveAll": "Сохранить все", + "removeFolderFromWorkspace": "Удалить папку из рабочей области", + "modifiedLabel": "{0} (на диске) ↔ {1}", + "openFileToReveal": "Чтобы отобразить файл, сначала откройте его", + "openFileToCopy": "Чтобы скопировать путь к файлу, сначала откройте его" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index d0ffe58b0f9..6f4f5194bc6 100644 --- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Редактор", "formatOnSave": "Форматирование файла при сохранении. Модуль форматирования должен быть доступен, файл не должен сохраняться автоматически, а работа редактора не должна завершаться.", "explorerConfigurationTitle": "Проводник", - "openEditorsVisible": "Число редакторов, отображаемых на панели открытых редакторов. Задайте значение 0, чтобы скрыть панель.", - "dynamicHeight": "Определяет, будет ли высота раздела открытых редакторов динамически адаптироваться к количеству элементов.", "autoReveal": "Определяет, будет ли проводник автоматически отображать и выбирать файлы при их открытии.", "enableDragAndDrop": "Определяет, разрешено ли перемещение файлов и папок перетаскиванием в проводнике.", "confirmDragAndDrop": "Определяет, должно ли запрашиваться подтверждение при перемещении файлов и папок в проводнике.", diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index d5622eec39a..a99d73ed519 100644 --- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,9 @@ // Do not edit this file. It is machine generated. { "userGuide": "Используйте команды на панели инструментов редактора справа для **отмены** изменений или **перезаписи** содержимого на диске с учетом этих изменений", - "discard": "Отмена", "overwrite": "Перезаписать", "retry": "Повторить попытку", - "readonlySaveError": "Не удалось сохранить \"{0}\": файл защищен от записи. Чтобы снять защиту, нажмите \"Перезаписать\".", + "discard": "Отмена", "genericSaveError": "Не удалось сохранить \"{0}\": {1}", "staleSaveError": "Не удалось сохранить \"{0}\": содержимое на диске более новое. Чтобы сравнить свою версию с версией на диске, нажмите **Сравнить**.", "compareChanges": "Сравнить", diff --git a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index ecfb243efe9..e8bc16acb29 100644 --- a/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Открытые редакторы", "openEditosrSection": "Раздел открытых редакторов", - "dirtyCounter": "Не сохранено: {0}", - "saveAll": "Сохранить все", - "closeAllUnmodified": "Закрыть без изменений", - "closeAll": "Закрыть все", - "compareWithSaved": "Сравнить с сохраненным", - "close": "Закрыть", - "closeOthers": "Закрыть другие" + "dirtyCounter": "Не сохранено: {0}" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..fa130c143cf --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Разработчик" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..6d7a48207b9 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "Открыть папку журналов", + "mainProcess": "Главный", + "sharedProcess": "Общий", + "rendererProcess": "Окно", + "extensionHost": "Узел расширения", + "setLogLevel": "Установите уровень ведения журнала", + "trace": "Трассировка", + "debug": "Отладка", + "info": "Сведения", + "warn": "Предупреждение", + "err": "Ошибка", + "off": "Отключено", + "selectLogLevel": "Установите уровень ведения журнала" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json index 4a0ebeccf87..c561464b583 100644 --- a/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // 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": "Проблемы", diff --git a/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json new file mode 100644 index 00000000000..68cc0434ecd --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Вывод", + "viewCategory": "Просмотр", + "clearOutput.label": "Очистить выходные данные" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index cdba5fc34b2..aa42a73f571 100644 --- a/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Попробуйте режим поиска естественного языка!", "defaultSettings": "Чтобы переопределить параметры по умолчанию, укажите свои параметры в области справа.", "noSettingsFound": "Параметры не найдены.", "settingsSwitcherBarAriaLabel": "Переключатель параметров", "userSettings": "Параметры пользователя", "workspaceSettings": "Параметры рабочей области", - "folderSettings": "Параметры папок", - "enableFuzzySearch": "Включить режим поиска естественного языка" + "folderSettings": "Параметры папок" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index 345c107b419..3305d6aa84d 100644 --- a/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Часто используемые", - "mostRelevant": "Наиболее релевантные", "defaultKeybindingsHeader": "Перезапишите настраиваемое сочетание клавиш, поместив их в файл настраиваемых сочетаний клавиш." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index a683b0d8467..f0071d32bf8 100644 --- a/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Просмотр", "commandsHandlerDescriptionDefault": "Показать и выполнить команды", "gotoLineDescriptionMac": "Перейти к строке", "gotoLineDescriptionWin": "Перейти к строке", diff --git a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 029a91dd121..9b3baff6083 100644 --- a/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Показать GIT", "source control": "Система управления версиями", "toggleSCMViewlet": "Показать SCM", - "view": "Просмотреть" + "view": "Просмотреть", + "scmConfigurationTitle": "SCM" } \ 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 acbdea84856..cd1b6966535 100644 --- a/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Показать предыдущее условие поиска", "showSearchViewlet": "Показать средство поиска", "findInFiles": "Найти в файлах", - "findInFilesWithSelectedText": "Найти в файлах с выделенным текстом", "replaceInFiles": "Заменить в файлах", - "replaceInFilesWithSelectedText": "Заменить в файлах с выделенным текстом", "RefreshAction.label": "Обновить", "CollapseDeepestExpandedLevelAction.label": "Свернуть все", "ClearSearchResultsAction.label": "Очистить", diff --git a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index fb91734ab3b..e2ad0465583 100644 --- a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -7,7 +7,9 @@ "showTriggerActions": "Перейти к символу в рабочей области...", "name": "Поиск", "search": "Поиск", + "showSearchViewlet": "Показать средство поиска", "view": "Просмотр", + "findInFiles": "Найти в файлах", "openAnythingHandlerDescription": "Перейти к файлу", "openSymbolDescriptionNormal": "Перейти к символу в рабочей области", "searchOutputChannelTitle": "Поиск", diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..26ab76b193c --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Параметры" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index a3a8c117e65..0bfa5d00f22 100644 --- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Выберите язык для фрагментов кода", - "openSnippet.errorOnCreate": "Не удалось создать {0}.", - "openSnippet.label": "Открыть пользовательские фрагменты", - "preferences": "Параметры", "snippetSchema.json.default": "Пустой фрагмент", "snippetSchema.json": "Настройка фрагмента пользователя", "snippetSchema.json.prefix": "Префикс, используемый при выборе фрагмента в Intellisense.", diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..dd3a311fe89 --- /dev/null +++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Фрагмент кода пользователя" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index 6c5ec091a1a..afe0462f8a1 100644 --- a/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}", "invalid.path.0": "В contributes.{0}.path требуется строка. Указанное значение: {1}", + "invalid.language": "Неизвестный язык в contributes.{0}.language. Указанное значение: {1}", "invalid.path.1": "contributes.{0}.path ({1}) должен был быть включен в папку расширения ({2}). Это может сделать расширение непереносимым.", "vscode.extension.contributes.snippets": "Добавляет фрагменты.", "vscode.extension.contributes.snippets-language": "Идентификатор языка, для которого добавляется этот фрагмент.", "vscode.extension.contributes.snippets-path": "Путь к файлу фрагментов. Путь указывается относительно папки расширения и обычно начинается с \"./snippets/\".", "badVariableUse": "Похоже, что в одном или нескольких фрагментах расширения \"{0}\" перепутаны переменные и заполнители. Дополнительные сведения см. на странице https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax.", "badFile": "Не удалось прочитать файл фрагмента \"{0}\".", - "source.snippet": "Фрагмент кода пользователя", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index fc208588fb0..04ba7d28169 100644 --- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "Цвет переднего плана терминала.", "terminalCursor.foreground": "Цвет переднего плана курсора терминала.", "terminalCursor.background": "Цвет фона курсора терминала. Позволяет выбрать цвет символа, который перекрывается блочным курсором.", - "terminal.selectionBackground": "Цвет фона выделения терминала.", - "terminal.ansiColor": "Цвет ANSI \"{0}\" в терминале." + "terminal.selectionBackground": "Цвет фона выделения терминала." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 440d374ef82..9de408a9653 100644 --- a/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Вы можете изменить оболочку терминала по умолчанию, нажав кнопку \"Настроить\".", "customize": "Настроить", "cancel": "Отмена", - "never again": "ОК. Больше не показывать", "terminal.integrated.chooseWindowsShell": "Выберите предпочитаемую оболочку терминала. Ее можно позже изменить в параметрах", "terminalService.terminalCloseConfirmationSingular": "Есть активный сеанс терминала, завершить его?", "terminalService.terminalCloseConfirmationPlural": "Есть несколько активных сеансов терминала ({0}), завершить их?" diff --git a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 54fbd1ada7b..04cb07cdd65 100644 --- a/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/rus/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileNotModifiedError": "undefined", "fileBinaryError": "Похоже, файл является двоичным, и его нельзя открыть как текстовый." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index fd9cd98e381..27106b8b44d 100644 --- a/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/rus/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "Сохранить изменения, внесенные в {0}?", "saveChangesMessages": "Сохранить изменения в указанных файлах ({0})?", - "moreFile": "...1 дополнительный файл не показан", - "moreFiles": "...не показано дополнительных файлов: {0}", "saveAll": "&&Сохранить все", "save": "&&Сохранить", "dontSave": "&&Не сохранять", diff --git a/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 9cba5bba5fd..768f28f6eae 100644 --- a/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/rus/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "No file icons", "iconThemeError": "File icon theme is unknown or not installed.", "workbenchColors": "Переопределяет цвета из выбранной цветовой темы.", - "editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы.", "editorColors.comments": "Задает цвета и стили для комментариев", "editorColors.strings": "Задает цвета и стили для строковых литералов.", "editorColors.keywords": "Задает цвета и стили для ключевых слов.", @@ -19,5 +18,6 @@ "editorColors.types": "Задает цвета и стили для объявлений типов и ссылок. ", "editorColors.functions": "Задает цвета и стили для объявлений функций и ссылок. ", "editorColors.variables": "Задает цвета и стили для объявлений переменных и для ссылок. ", - "editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр)." + "editorColors.textMateRules": "Задает цвета и стили с использованием правил оформления textmate (расширенный параметр).", + "editorColors": "Переопределяет цвета редактора и стиль шрифта из текущей выбранной цветовой темы." } \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 019229d3fbb..d4e81ae004d 100644 --- a/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/rus/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Не удается записать файл конфигурации рабочей области. Откройте файл, исправьте ошибки и предупреждения и повторите попытку.", "errorWorkspaceConfigurationFileDirty": "Не удается записать файл конфигурации рабочей области, так как файл был изменен. Сохраните файл и повторите попытку.", "openWorkspaceConfigurationFile": "Открыть файл конфигурации рабочей области", - "close": "Закрыть", - "enterWorkspace.close": "Закрыть", - "enterWorkspace.dontShowAgain": "Больше не показывать", - "enterWorkspace.moreInfo": "Дополнительные сведения", - "enterWorkspace.prompt": "Дополнительные сведения о работе с несколькими папками в VS Code." + "close": "Закрыть" } \ No newline at end of file diff --git a/i18n/trk/extensions/git/out/autofetch.i18n.json b/i18n/trk/extensions/git/out/autofetch.i18n.json index 95a3249f5f4..737e720ea79 100644 --- a/i18n/trk/extensions/git/out/autofetch.i18n.json +++ b/i18n/trk/extensions/git/out/autofetch.i18n.json @@ -5,7 +5,8 @@ // Do not edit this file. It is machine generated. { "yes": "Evet", + "read more": "Devamını oku", "no": "Hayır", - "not now": "Şu An İstemiyorum", - "suggest auto fetch": "Otomatik Git depoları alımını etkinleştirmek ister misiniz?" + "not now": "Daha sonra hatırlat", + "suggest auto fetch": "Code'un düzenli olarak `git fetch` komutunu çalıştırmasını ister misiniz?" } \ 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 fac3c95bae7..1f602af17de 100644 --- a/i18n/trk/extensions/git/out/commands.i18n.json +++ b/i18n/trk/extensions/git/out/commands.i18n.json @@ -41,6 +41,10 @@ "confirm discard all 2": "{0}\n\nBu GERİ DÖNDÜRÜLEMEZ, mevcut çalışma grubunuz TAMAMEN KAYBOLACAK.", "yes discard tracked": "İzlenen 1 Dosyayı Göz Ardı Et", "yes discard tracked multiple": "İzlenen {0} Dosyayı Göz Ardı Et", + "unsaved files single": "Aşağıdaki dosya kaydedilmemiş: {0}.\n\nCommit'lemeden önce kaydetmek ister misiniz?", + "unsaved files": "{0} kaydedilmemiş dosya var.\n\nCommit'lemeden önce kaydetmek ister misiniz?", + "save and commit": "Tümünü Kaydet & Commit'le", + "commit": "Yine de Commit'le", "no staged changes": "Commit'lenecek hazırlanmış değişiklik yok.\n\nTüm değişikliklerinizi otomatik olarak hazırlamak ve direkt olarak commit'lemek ister misiniz?", "always": "Her Zaman", "no changes": "Commit'lenecek değişiklik yok.", @@ -64,12 +68,12 @@ "no remotes to pull": "Deponuzda çekme işleminin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.", "pick remote pull repo": "Dalın çekileceği bir uzak uçbirim seçin", "no remotes to push": "Deponuzda gönderimin yapılacağı hiçbir uzak uçbirim yapılandırılmamış.", - "push with tags success": "Başarılı bir şekilde etiketlerle gönderildi.", "nobranch": "Lütfen uzak uçbirime gönderilecek dala geçiş yapın.", + "confirm publish branch": "'{0}' dalında bir ana depo(upstream) dalı bulunmuyor. Bu dalı yayınlamak ister misiniz?", + "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.", - "ok": "Tamam", - "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.", "provide stash message": "İsteğe bağlı olarak bir geçici olarak saklama mesajı belirtin", diff --git a/i18n/trk/extensions/git/out/main.i18n.json b/i18n/trk/extensions/git/out/main.i18n.json index 34a8658c392..ebd9e4be3fa 100644 --- a/i18n/trk/extensions/git/out/main.i18n.json +++ b/i18n/trk/extensions/git/out/main.i18n.json @@ -7,7 +7,7 @@ "looking": "Git, şu konumda aranıyor: {0}", "using git": "{1} yolundaki git {0} kullanılıyor", "downloadgit": "Git'i İndir", - "neverShowAgain": "Tekrar gösterme", + "neverShowAgain": "Tekrar Gösterme", "notfound": "Git bulunamadı. Git'i kurun veya 'git.path' ayarı ile yapılandırın.", "updateGit": "Git'i Güncelle", "git20": "git {0} yüklemiş olarak görünüyorsunuz. Code, git >= 2 ile en iyi şekilde çalışır" diff --git a/i18n/trk/extensions/git/package.i18n.json b/i18n/trk/extensions/git/package.i18n.json index 3955baf58a0..7e10d7b3dae 100644 --- a/i18n/trk/extensions/git/package.i18n.json +++ b/i18n/trk/extensions/git/package.i18n.json @@ -54,6 +54,7 @@ "command.stashPopLatest": "En Son Geçici Olarak Saklananı Geri Yükle", "config.enabled": "Git'in etkinleştirilip etkinleştirilmediği", "config.path": "Çalıştırılabilir Git dosyasının yolu", + "config.autoRepositoryDetection": "Depoların otomatik olarak algılanıp algılanmayacağı", "config.autorefresh": "Otomatik yenilemenin etkinleştirilip etkinleştirilmediği", "config.autofetch": "Otomatik getirmenin etkinleştirilip etkinleştirilmediği", "config.enableLongCommitWarning": "Uzun commit mesajları hakkında uyarıda bulunulup bulunulmayacağı", @@ -72,5 +73,6 @@ "colors.deleted": "Silinen kaynakların rengi.", "colors.untracked": "İzlenmeyen kaynakların rengi.", "colors.ignored": "Yok sayılan kaynakların rengi.", - "colors.conflict": "Çakışma içeren kaynakların rengi." + "colors.conflict": "Çakışma içeren kaynakların rengi.", + "colors.submodule": "Alt modül kaynaklarının rengi." } \ No newline at end of file diff --git a/i18n/trk/extensions/typescript/out/commands.i18n.json b/i18n/trk/extensions/typescript/out/commands.i18n.json new file mode 100644 index 00000000000..2751d3bb07c --- /dev/null +++ b/i18n/trk/extensions/typescript/out/commands.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. +{ + "typescript.projectConfigNoWorkspace": "Bir TypeScript veya JavaScript projesini kullanmak için lütfen bir klasör açın", + "typescript.projectConfigUnsupportedFile": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi. Desteklenmeyen dosya türü", + "typescript.projectConfigCouldNotGetInfo": "TypeScript mi yoksa JavaScript mi projesi olduğu tespit edilemedi", + "typescript.noTypeScriptProjectConfig": "Dosya bir TypeScript projesinin bir parçası değil", + "typescript.noJavaScriptProjectConfig": "Dosya bir JavaScript projesinin bir parçası değil", + "typescript.configureTsconfigQuickPick": "tsconfig.json'u yapılandır", + "typescript.configureJsconfigQuickPick": "jsconfig.json'u yapılandır", + "typescript.projectConfigLearnMore": "Daha Fazla Bilgi Edin" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json new file mode 100644 index 00000000000..ed15423097d --- /dev/null +++ b/i18n/trk/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "selectAriaOption": "{0}" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/base/node/ps.i18n.json b/i18n/trk/src/vs/base/node/ps.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/trk/src/vs/base/node/ps.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json index 3a5d4006fd7..d00cee8579f 100644 --- a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -14,7 +14,7 @@ "lineNumbers.on": "Satır numaraları mutlak sayı olarak gösterilir.", "lineNumbers.relative": "Satır numaraları imlecin konumuna olan uzaklık olarak gösterilir.", "lineNumbers.interval": "Satır numaraları her 10 satırda bir gösterilir.", - "lineNumbers": "Satır numaralarının görüntülenmesini denetler. Olası değerler 'on', 'off' ve 'relative'dir.", + "lineNumbers": "Satır numaralarının görüntülenmesini denetler. Olası değerler 'on', 'off', 'relative' ve 'interval'dir.\n", "rulers": "Belirli bir eşit genişlikli karakterlerden sonra dikey cetveller göster. Birden çok cetvel için birden çok değer kullanın. Dizi boş ise cetvel gösterilmez", "wordSeparators": "Sözcüklerle ilgili gezinti veya işlem yaparken kelime ayırıcı olarak kullanılacak karakterler", "tabSize": "Bir sekmenin eşit olduğu boşluk sayısı. Bu ayar, `editor.detectIndentation` açıkken dosya içeriğine bağlı olarak geçersiz kılınır.", 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 6022a86b6cc..8fb29c3b6d6 100644 --- a/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/trk/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,7 +6,6 @@ { "lineHighlight": "İmlecin bulunduğu satırın vurgusunun arka plan rengi.", "lineHighlightBorderBox": "İmlecin bulunduğu satırın kenarlığının arka plan rengi.", - "rangeHighlight": "Hızlı açma ve bulma özellikleri gibi vurgulanan alanların arka plan rengi.", "caret": "Düzenleyici imlecinin rengi.", "editorCursorBackground": "Düzenleyici imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.", "editorWhitespaces": "Düzenleyicideki boşluk karakterlerinin 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 6bc3935d6f4..b9f1dd5ddfd 100644 --- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", - "markerAction.next.label": "Sonraki Hata veya Uyarıya Git", - "markerAction.previous.label": "Önceki Hata veya Uyarıya Git", "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.", 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 6faf663326d..f6e38f50e99 100644 --- a/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/trk/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "wordHighlight": "Bir değişkeni okumak gibi, okuma-erişimi sırasındaki bir sembolün arka plan rengi.", - "wordHighlightStrong": "Bir değişkene yazmak gibi, yazma-erişimi sırasındaki bir sembolün arka plan 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.", "wordHighlight.next.label": "Sonraki Sembol Vurgusuna Git", diff --git a/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json b/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json index 5ddafd4b6b9..5565278f23e 100644 --- a/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json +++ b/i18n/trk/src/vs/platform/actions/electron-browser/menusExtensionPoint.i18n.json @@ -40,6 +40,5 @@ "menuId.invalid": "`{0}` geçerli bir menü tanımlayıcısı değil", "missing.command": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` komutuna başvuruyor.", "missing.altCommand": "Menü ögesi, 'commands' bölümünde tanımlanmamış bir `{0}` alternatif komutuna başvuruyor.", - "dupe.command": "Menü ögesi, aynı varsayılan ve alternatif komutlarına başvuruyor", - "nosupport.altCommand": "Üzgünüz, fakat sadece 'editor/title' menüsünün 'navigation' grubu alternatif komutları destekliyor" + "dupe.command": "Menü ögesi, aynı varsayılan ve alternatif komutlarına başvuruyor" } \ No newline at end of file diff --git a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json index a4c4cd296d5..6838345e4f9 100644 --- a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json @@ -8,30 +8,34 @@ "diff": "İki dosyayı birbiriyle karşılaştır.", "add": "Son aktif pencereye klasör(ler) ekle.", "goto": "Konumdaki bir dosyayı belirtilen satır ve sütunda aç.", - "locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).", "newWindow": "Yeni bir Code örneğini zorla.", - "performance": "'Geliştirici: Başlangıç Performansı' komutu etkinleştirilmiş olarak başlat.", - "prof-startup": "Başlangıç sırasında CPU profil oluşturucusunu çalıştır", - "inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", - "inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", "reuseWindow": "Bir dosya veya klasörü son etkin pencerede açmaya zorlayın.", - "userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir, root olarak çalışırken yararlıdır.", - "log": "Kullanılacak günlüğe yazma düzeyi. Varsayılan değer 'info'dur. İzin verilen değerler 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' şeklindedir.", - "verbose": "Ayrıntılı çıktı oluştur (--wait anlamına gelir).", "wait": "Geri dönmeden önce dosyaların kapanmasını bekle.", + "locale": "Kullanılacak yerel dil (örnek: en-US veya zh-TW).", + "userDataDir": "Kullanıcı verilerinin tutulacağı klasörü belirtir, root olarak çalışırken yararlıdır.", + "version": "Sürümü göster.", + "help": "Kullanımı göster.", "extensionHomePath": "Eklentilerin kök dizinini belirle.", "listExtensions": "Yüklü eklentileri listele.", "showVersions": "--list-extensions'u kullanırken, yüklü eklentilerin sürümlerini gösterir.", "installExtension": "Bir eklenti yükler.", "uninstallExtension": "Bir eklentiyi kaldırır.", "experimentalApis": "Bir eklenti için önerilen API özelliklerini etkinleştirir.", - "disableExtensions": "Yüklü tüm eklentileri devre dışı bırak.", - "disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.", + "verbose": "Ayrıntılı çıktı oluştur (--wait anlamına gelir).", + "log": "Kullanılacak günlüğe yazma düzeyi. Varsayılan değer 'info'dur. İzin verilen değerler 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off' şeklindedir.", "status": "İşlem kullanımını ve tanılama bilgilerini yazdır.", - "version": "Sürümü göster.", - "help": "Kullanımı göster.", + "performance": "'Geliştirici: Başlangıç Performansı' komutu etkinleştirilmiş olarak başlat.", + "prof-startup": "Başlangıç sırasında CPU profil oluşturucusunu çalıştır", + "disableExtensions": "Yüklü tüm eklentileri devre dışı bırak.", + "inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", + "inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", + "disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.", "usage": "Kullanım", "options": "seçenekler", "paths": "yollar", - "optionsUpperCase": "Seçenekler" + "stdinWindows": "Başka bir programın çıktısını okumak için '-' karakterini ekleyin. (ör. 'echo Hello World | {0} -')", + "stdinUnix": "stdin'den okutmak için '-' karakterini ekleyin (ör. 'ps aux | grep code | {0} -')", + "optionsUpperCase": "Seçenekler", + "extensionsManagement": "Eklenti Yönetimi", + "troubleshooting": "Sorun giderme" } \ 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 7cf70b2f373..4014a5cf542 100644 --- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -5,14 +5,14 @@ // Do not edit this file. It is machine generated. { "invalidManifest": "Eklenti geçersiz: package.json bir JSON dosyası değil.", - "restartCodeLocal": "{0} eklentisini yeniden yüklemeden önce lütfen Code'u yeniden başlatın.", + "restartCode": "{0} eklentisini yeniden yüklemeden önce lütfen Code'u yeniden başlatın.", "installingOutdatedExtension": "Bu eklentinin daha yeni bir sürümü zaten yüklü. Bunu, daha eski bir sürümle geçersiz kılmak ister misiniz?", "override": "Geçersiz Kıl", "cancel": "İptal", - "notFoundCompatible": "Yükleme başarısız oldu çünkü, '{0}' eklentisinin uyumlu olduğu VS Code'un '{1}' sürümü bulunamadı.", - "quitCode": "Yükleme başarısız oldu çünkü, eklentinin eski bir örneği hâlâ çalışıyor. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.", - "exitCode": "Yükleme başarısız oldu çünkü, eklentinin eski bir örneği hâlâ çalışıyor. Yeniden yüklemeden önce lütfen VS Code'dan çıkın ve tekrar açın.", + "notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.", "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ı.", + "quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.", + "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ü", diff --git a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json b/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json index 8d0fe384379..a5e03c83816 100644 --- a/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json +++ b/i18n/trk/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "integrity.ok": "Tamam", - "integrity.dontShowAgain": "Tekrar gösterme", + "integrity.dontShowAgain": "Tekrar Gösterme", "integrity.moreInfo": "Daha fazla bilgi", "integrity.prompt": "{0} kurulumunuz bozuk görünüyor. Lütfen yeniden yükleyin." } \ No newline at end of file diff --git a/i18n/trk/src/vs/platform/message/common/message.i18n.json b/i18n/trk/src/vs/platform/message/common/message.i18n.json index 4f9a44f9383..3d5ccdec1e6 100644 --- a/i18n/trk/src/vs/platform/message/common/message.i18n.json +++ b/i18n/trk/src/vs/platform/message/common/message.i18n.json @@ -6,5 +6,7 @@ { "close": "Kapat", "later": "Daha Sonra", - "cancel": "İptal" + "cancel": "İptal", + "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/theme/common/colorRegistry.i18n.json b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json index d6e0e3db142..f57a875d1db 100644 --- a/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/trk/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,12 +63,7 @@ "editorWidgetBorder": "Editör araçlarının kenarlık rengi. Renk, araç bir kenarlığı olmasına karar verdiğinde ve renk hiçbir eklenti tarafından geçersiz kılınmadığında kullanılır.", "editorSelectionBackground": "Düzenleyici seçiminin rengi.", "editorSelectionForeground": "Yüksek karşıtlık için seçilen metnin rengi.", - "editorInactiveSelection": "Bir pasif düzenleyicideki seçimin rengi.", - "editorSelectionHighlight": "Seçimle aynı içeriğe sahip bölgelerin rengi.", "editorFindMatch": "Geçerli arama eşleşmesinin rengi.", - "findMatchHighlight": "Diğer arama eşleşmelerinin rengi.", - "findRangeHighlight": "Aramayı sınırlayan aralığı renklendirin.", - "hoverHighlight": "Bağlantı vurgusu gösterilen bir sözcüğün altını vurgulayın.", "hoverBackground": "Düzenleyici bağlantı vurgusunun arka plan rengi.", "hoverBorder": "Düzenleyici bağlantı vurgusunun kenarlık rengi.", "activeLinkForeground": "Aktif bağlantıların rengi.", @@ -76,12 +71,6 @@ "diffEditorRemoved": "Çıkarılan metnin arka plan rengi.", "diffEditorInsertedOutline": "Eklenen metnin ana hat rengi.", "diffEditorRemovedOutline": "Çıkarılan metnin ana hat rengi.", - "mergeCurrentHeaderBackground": "Satır içi birleştirme çakışmalarında geçerli üstbilgi arka planı.", - "mergeCurrentContentBackground": "Satır içi birleştirme çakışmalarında geçerli içerik arka planı.", - "mergeIncomingHeaderBackground": "Satır içi birleştirme çakışmalarında gelen üstbilgi arka planı.", - "mergeIncomingContentBackground": "Satır içi birleştirme çakışmalarında gelen içerik arka planı.", - "mergeCommonHeaderBackground": "Satır içi birleştirme çakışmalarında ortak ata üstbilgisi arka planı.", - "mergeCommonContentBackground": "Satır içi birleştirme çakışmalarında ortak ata içeriği arka planı.", "mergeBorder": "Satır içi birleştirme çakışmalarında üst bilgi ve ayırıcıdaki kenarlık rengi.", "overviewRulerCurrentContentForeground": "Satır içi birleştirme çakışmalarında geçerli genel bakış cetveli ön planı.", "overviewRulerIncomingContentForeground": "Satır içi birleştirme çakışmalarında gelen genel bakış cetveli ön planı.", diff --git a/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json new file mode 100644 index 00000000000..94c6abc9b61 --- /dev/null +++ b/i18n/trk/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "saveParticipants": "Katılımcıların Kaydedilmesi İşlemi Çalıştırılıyor..." +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json index a3dd0ab5f95..737337540bf 100644 --- a/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/trk/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,7 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok.", - "treeItem.notFound": "'{0}' Id'li ağaç ögesi yok.", - "treeView.duplicateElement": "{0} ögesi zaten kayıtlı" + "treeView.notRegistered": "Kayıtlı '{0}' Id'li ağaç görünümü yok." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json index a8ba8956df1..43558a9d00d 100644 --- a/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json +++ b/i18n/trk/src/vs/workbench/browser/actions/workspaceActions.i18n.json @@ -7,17 +7,11 @@ "openFile": "Dosya Aç...", "openFolder": "Klasör Aç...", "openFileFolder": "Aç...", - "addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...", - "add": "&&Ekle", - "addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle", "globalRemoveFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır...", - "removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır", - "openFolderSettings": "Klasör Ayarlarını Aç", "saveWorkspaceAsAction": "Çalışma Alanını Farklı Kaydet...", "save": "&&Kaydet", "saveWorkspace": "Çalışma Alanını Kaydet", "openWorkspaceAction": "Çalışma Alanı Aç...", "openWorkspaceConfigFile": "Çalışma Alanı Yapılandırma Dosyasını Aç", - "openFolderAsWorkspaceInNewWindow": "Klasörü Yeni Pencerede Çalışma Alanı Olarak Aç", - "workspaceFolderPickerPlaceholder": "Çalışma alanı klasörü seçin" + "openFolderAsWorkspaceInNewWindow": "Klasörü Yeni Pencerede Çalışma Alanı Olarak Aç" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.i18n.json new file mode 100644 index 00000000000..1b71f510ec6 --- /dev/null +++ b/i18n/trk/src/vs/workbench/browser/actions/workspaceCommands.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. +{ + "addFolderToWorkspace": "Çalışma Alanına Klasör Ekle...", + "add": "&&Ekle", + "addFolderToWorkspaceTitle": "Çalışma Alanına Klasör Ekle", + "workspaceFolderPickerPlaceholder": "Çalışma alanı klasörü seçin" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 5ff77e04882..4ee34bebb2d 100644 --- a/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -13,5 +13,17 @@ "groupThreePicker": "Üçüncü Gruptaki Düzenleyicileri Göster", "allEditorsPicker": "Açık Tüm Düzenleyicileri Göster", "view": "Görüntüle", - "file": "Dosya" + "file": "Dosya", + "close": "Kapat", + "closeOthers": "Diğerlerini Kapat", + "closeRight": "Sağdakileri Kapat", + "closeAllUnmodified": "Değiştirilmeyenleri Kapat", + "closeAll": "Tümünü Kapat", + "keepOpen": "Açık Tut", + "showOpenedEditors": "Açık Düzenleyicileri Göster", + "keepEditor": "Düzenleyiciyi Tut", + "closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat", + "closeUnmodifiedEditors": "Gruptaki Değiştirilmemiş Düzenleyicileri Kapat", + "closeOtherEditors": "Diğer Düzenleyicileri Kapat", + "closeRightEditors": "Düzenleyicinin Sağındakileri Kapat" } \ 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 b32e97503d9..3264a4ed56e 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,18 +17,13 @@ "closeEditor": "Düzenleyiciyi Kapat", "revertAndCloseActiveEditor": "Geri Al ve Düzenleyiciyi Kapat", "closeEditorsToTheLeft": "Düzenleyicinin Solundakileri Kapat", - "closeEditorsToTheRight": "Düzenleyicinin Sağındakileri Kapat", "closeAllEditors": "Tüm Düzenleyicileri Kapat", - "closeUnmodifiedEditors": "Gruptaki Değiştirilmemiş Düzenleyicileri Kapat", "closeEditorsInOtherGroups": "Diğer Gruplardaki Tüm Düzenleyicileri Kapat", - "closeOtherEditorsInGroup": "Diğer Düzenleyicileri Kapat", - "closeEditorsInGroup": "Gruptaki Tüm Düzenleyicileri Kapat", "moveActiveGroupLeft": "Düzenleyici Grubunu Sola Taşı", "moveActiveGroupRight": "Düzenleyici Grubunu Sağa Taşı", "minimizeOtherEditorGroups": "Diğer Düzenleyici Gruplarını Küçült", "evenEditorGroups": "Düzenleyici Grup Genişliklerini Eşitle", "maximizeEditor": "Düzenleyici Grubunu Olabildiğince Genişlet ve Kenar Çubuğunu Gizle", - "keepEditor": "Düzenleyiciyi Tut", "openNextEditor": "Sonraki Düzenleyiciyi Aç", "openPreviousEditor": "Önceki Düzenleyiciyi Aç", "nextEditorInGroup": "Gruptaki Sonraki Düzenleyiciyi Aç", @@ -42,7 +37,6 @@ "showEditorsInFirstGroup": "İlk Gruptaki Düzenleyicileri Göster", "showEditorsInSecondGroup": "İkinci Gruptaki Düzenleyicileri Göster", "showEditorsInThirdGroup": "Üçüncü Gruptaki Düzenleyicileri Göster", - "showEditorsInGroup": "Gruptaki Düzenleyicileri Göster", "showAllEditors": "Tüm Düzenleyicileri Göster", "openPreviousRecentlyUsedEditorInGroup": "Gruptaki Son Kullanılan Önceki Düzenleyiciyi Aç", "openNextRecentlyUsedEditorInGroup": "Gruptaki Son Kullanılan Sonraki Düzenleyiciyi Aç", @@ -54,5 +48,8 @@ "moveEditorLeft": "Düzenleyiciyi Sola Taşı", "moveEditorRight": "Düzenleyiciyi Sağa Taşı", "moveEditorToPreviousGroup": "Düzenleyiciyi Önceki Gruba Taşı", - "moveEditorToNextGroup": "Düzenleyiciyi Sonraki Gruba Taşı" + "moveEditorToNextGroup": "Düzenleyiciyi Sonraki Gruba Taşı", + "moveEditorToFirstGroup": "Düzenleyiciyi İlk Gruba Taşı", + "moveEditorToSecondGroup": "Düzenleyiciyi İkinci Gruba Taşı", + "moveEditorToThirdGroup": "Düzenleyiciyi Üçüncü Gruba Taşı" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json index 4eac419d706..0f560d95c00 100644 --- a/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json +++ b/i18n/trk/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json @@ -6,7 +6,5 @@ { "editorCommand.activeEditorMove.description": "Aktif düzenleyiciyi sekmeler veya gruplar halinde taşıyın", "editorCommand.activeEditorMove.arg.name": "Aktif düzenleyici taşıma argümanı", - "editorCommand.activeEditorMove.arg.description": "Argüman Özellikleri:\n\t* 'to': Nereye taşınacağını belirten dize değeri.\n\t* 'by': Kaç birim taşınacağını belirten dize değeri. Sekme veya gruba göre.\n\t* 'value': Kaç tane pozisyonun taşınacağını belirten sayı değeri.", - "commandDeprecated": "**{0}** komutu kaldırıldı. Onun yerine **{1}** komutunu kullanabilirsiniz", - "openKeybindings": "Klavye Kısayollarını Yapılandır" + "editorCommand.activeEditorMove.arg.description": "Argüman Özellikleri:\n\t* 'to': Nereye taşınacağını belirten dize değeri.\n\t* 'by': Kaç birim taşınacağını belirten dize değeri. Sekme veya gruba göre.\n\t* 'value': Kaç tane pozisyonun taşınacağını belirten sayı değeri." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 9fb7a026e34..e73c3315e6d 100644 --- a/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/trk/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -11,6 +11,5 @@ "editableEditorAriaLabel": "Metin dosyası karşılaştırma düzenleyicisi.", "navigate.next.label": "Sonraki Değişiklik", "navigate.prev.label": "Önceki Değişiklik", - "inlineDiffLabel": "Satır İçi Görünüme Geç", - "sideBySideDiffLabel": "Yan Yana Görünüme Geç" + "toggleIgnoreTrimWhitespace.label": "Kırpma Boşluğunu Yoksay" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/editor/titleControl.i18n.json index 18e318decfd..d62c167e7b6 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 @@ -5,11 +5,5 @@ // Do not edit this file. It is machine generated. { "close": "Kapat", - "closeOthers": "Diğerlerini Kapat", - "closeRight": "Sağdakileri Kapat", - "closeAll": "Tümünü Kapat", - "closeAllUnmodified": "Değiştirilmeyenleri Kapat", - "keepOpen": "Açık Tut", - "showOpenedEditors": "Açık Düzenleyicileri Göster", "araLabelEditorActions": "Düzenleyici eylemleri" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json index f143e04de94..1b5f24a5398 100644 --- a/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json +++ b/i18n/trk/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json @@ -5,5 +5,7 @@ // Do not edit this file. It is machine generated. { "patchedWindowTitle": "[Desteklenmiyor]", + "userIsAdmin": "[Yönetici]", + "userIsSudo": "[Süper Kullanıcı]", "devExtensionWindowTitlePrefix": "[Eklenti Geliştirme Sunucusu]" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/common/theme.i18n.json b/i18n/trk/src/vs/workbench/common/theme.i18n.json index 9eb9ad116a5..02c2f8fa5d6 100644 --- a/i18n/trk/src/vs/workbench/common/theme.i18n.json +++ b/i18n/trk/src/vs/workbench/common/theme.i18n.json @@ -6,9 +6,13 @@ { "tabActiveBackground": "Aktif sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabInactiveBackground": "Pasif sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", + "tabHoverBackground": "Fareyle üzerine gelindiğinde sekme arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", + "tabUnfocusedHoverBackground": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki aktif sekmenin arka plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabBorder": "Sekmeleri birbirinden ayıran kenarlığın rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabActiveBorder": "Aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabActiveUnfocusedBorder": "Odaklanılmamış bir gruptaki aktif sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", + "tabHoverBorder": "Fareyle üzerine gelindiğinde sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", + "tabUnfocusedHoverBorder": "Fareyle üzerine gelindiğinde odaklanılmamış bir gruptaki sekmeleri vurgulayacak kenarlık. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabActiveForeground": "Aktif bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabInactiveForeground": "Aktif bir gruptaki pasif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", "tabUnfocusedActiveForeground": "Odaklanılmamış bir gruptaki aktif sekmenin ön plan rengi. Sekmeler, düzenleyici alanındaki düzenleyicilerin kapsayıcılarıdır. Bir düzenleyici grubunda birden fazla sekme açılabilir. Birden fazla düzenleyici grupları var olabilir.", @@ -16,7 +20,7 @@ "editorGroupBackground": "Bir düzenleyici grubunun arka plan rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. Arka plan rengi, düzenleyici grubunu sürüklerken gösterilir.", "tabsContainerBackground": "Sekmeler etkinleştirilmiş durumdayken, düzenleyici grubu başlık üstbilgisi arka plan rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ", "tabsContainerBorder": "Sekmeler etkinleştirilmiş durumdayken, düzenleyici grubu başlık üstbilgisi kenarlık rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ", - "editorGroupHeaderBackground": "Sekmeler devre dışı iken, düzenleyici grubu başlık üstbilgisi arka plan rengi. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ", + "editorGroupHeaderBackground": "Sekmeler devre dışı iken, düzenleyici grubu başlık üstbilgisi arka plan rengi (`\"workbench.editor.showTabs\": false`). Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ", "editorGroupBorder": "Birden fazla düzenleyici grubunu birbirinden ayıracak renk. Düzenleyici grupları, düzenleyicilerin kapsayıcılarıdır. ", "editorDragAndDropBackground": "Düzenleyici grubunu sürüklerken gösterilecek arka plan rengi. Düzenleyici içeriğinin hâlâ iyi görünmeye devam edebilmesi için renk şeffaf olmalıdır.", "panelBackground": "Panel arka plan rengi. Paneller düzenleyici alanının altında gösterilir ve çıktı ve entegre terminal gibi görünümler içerir.", @@ -33,8 +37,8 @@ "statusBarNoFolderBorder": "Hiçbir klasör açık olmadığında durum çubuğunu kenar çubuğundan ve düzenleyiciden ayıran kenarlık rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.", "statusBarItemActiveBackground": "Durum çubuğu ögesi tıklanırken arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.", "statusBarItemHoverBackground": "Durum çubuğu ögesinin mouse ile üzerine gelindiğindeki arka plan rengi. Durum çubuğu, pencerenin alt kısmında gösterilir.", - "statusBarProminentItemBackground": "Durum çubuğu belirgin ögelerinin arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Durum çubuğu, pencerenin alt kısmında gösterilir.", - "statusBarProminentItemHoverBackground": "Durum çubuğu belirgin ögelerinin mouse ile üzerine gelindiğindeki arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Durum çubuğu, pencerenin alt kısmında gösterilir.", + "statusBarProminentItemBackground": "Durum çubuğu belirgin ögelerinin arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Bir örnek görmek için komut paletinden `Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat` ile modu değiştirin. Durum çubuğu, pencerenin alt kısmında gösterilir.", + "statusBarProminentItemHoverBackground": "Fareyle üzerine gelindiğinde durum çubuğu belirgin ögelerinin arka plan rengi. Belirgin ögeler, önemi belirtmek için diğer durum çubuğu girdilerinden öne çıkarılır. Bir örnek görmek için komut paletinden `Tab Tuşu İle Odak Değiştirmeyi Aç/Kapat` ile modu değiştirin. Durum çubuğu, pencerenin alt kısmında gösterilir.", "activityBarBackground": "Etkinlik çubuğu arka plan rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.", "activityBarForeground": "Etkinlik çubuğu ön plan rengi (ör. simgeler için kullanılır). Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.", "activityBarBorder": "Etkinlik çubuğunu kenar çubuğundan ayıran kenarlığın rengi. Etkinlik çubuğu, en sol veya en sağda gösterilir ve kenar çubuğunun görünümleriyle yer değiştirmeye izin verir.", diff --git a/i18n/trk/src/vs/workbench/common/views.i18n.json b/i18n/trk/src/vs/workbench/common/views.i18n.json new file mode 100644 index 00000000000..d412455fd99 --- /dev/null +++ b/i18n/trk/src/vs/workbench/common/views.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "duplicateId": "`{0}` kimliğine sahip bir görünüm `{1}` konumunda zaten kayıtlı" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json index e3e29379b77..5cb1f86f054 100644 --- a/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/trk/src/vs/workbench/electron-browser/actions.i18n.json @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "closeActiveEditor": "Düzenleyiciyi Kapat", "closeWindow": "Pencereyi Kapat", "closeWorkspace": "Çalışma Alanını Kapat", "noWorkspaceOpened": "Şu an bu örnekte kapatmak için açık bir çalışma alanı bulunmuyor.", @@ -52,21 +51,5 @@ "displayLanguage": "VSCode'un görüntüleme dilini tanımlar.", "doc": "Desteklenen dillerin listesi için göz atın: {0}", "restart": "Değeri değiştirirseniz VSCode'u yeniden başlatmanız gerekir.", - "fail.createSettings": " '{0}' oluşturulamadı ({1}).", - "openLogsFolder": "Günlük Klasörünü Aç", - "showLogs": "Günlükleri Göster...", - "mainProcess": "Ana", - "sharedProcess": "Paylaşılan", - "rendererProcess": "Render Alan", - "extensionHost": "Eklenti Sunucusu", - "selectProcess": "İşlem seçin", - "setLogLevel": "Günlük Düzeyini Ayarla", - "trace": "İzle", - "debug": "Hata Ayıklama", - "info": "Bilgi", - "warn": "Uyarı", - "err": "Hata", - "critical": "Kritik", - "off": "Kapalı", - "selectLogLevel": "Günlük düzeyini seçin" + "fail.createSettings": " '{0}' oluşturulamadı ({1})." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/main.contribution.i18n.json index 8aacc6f4f6e..b66debcf9ce 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 @@ -7,8 +7,9 @@ "view": "Görüntüle", "help": "Yardım", "file": "Dosya", - "developer": "Geliştirici", "workspaces": "Çalışma Alanları", + "developer": "Geliştirici", + "workbenchConfigurationTitle": "Çalışma Ekranı", "showEditorTabs": "Açık düzenleyicilerin sekmelerde gösterilip gösterilmeyeceğini denetler", "workbench.editor.labelFormat.default": "Dosyanın adını göster. Sekmeler etkinleştirilmiş ve bir grupta iki dosya aynı ada sahiplerse, her dosyanın yolundaki ayırt edici bölümler eklenir. Sekmeler devre dışı ve düzenleyici aktifse, çalışma alanı klasörüne göreli yol gösterilir.", "workbench.editor.labelFormat.short": "Dosyanın adını ve ardından dizin adını göster.", @@ -20,23 +21,23 @@ "showIcons": "Açık düzenleyicilerin bir simge ile gösterilip gösterilmemelerini denetler. Bu, bir simge temasının etkinleştirilmesini de gerektirir.", "enablePreview": "Açık düzenleyicilerin önizleme olarak gösterilip gösterilmeyeceğini denetler. Önizleme düzenleyicileri kalıcı olarak açılana kadar (ör. çift tıklama veya düzenleme ile) tekrar kullanılırlar ve italik yazı tipiyle gösterilirler.", "enablePreviewFromQuickOpen": "Hızlı Aç'taki açık düzenleyicilerin önizleme olarak gösterilip gösterilmeyeceğini denetler. Önizleme düzenleyicileri kalıcı olarak açılana kadar (ör. çift tıklama veya düzenleme ile) tekrar kullanılırlar.", + "closeOnFileDelete": "Düzenleyicinin gösterdiği bir dosyanın, başka bir işlem tarafından silinmesi veya yeniden adlandırması durumunda dosyayı otomatik olarak kapatıp kapatmamasını denetler. Bunu devre dışı bırakmak, böyle bir durumda düzenleyicinin kaydedilmemiş değişiklikler içeriyor durumunda kalmasını sağlar. Uygulama içinde silmek, düzenleyiciyi her zaman kapatır ve kaydedilmemiş değişiklikler içeren dosyalar, verilerinizin korunması için otomatik olarak kapatılmaz.", "editorOpenPositioning": "Düzenleyicilerin nerede açılacağını denetler. Düzenleyicileri, şu an geçerli olanın soluna veya sağına açmak için 'left' veya 'right' seçeneklerinden birini seçin. Düzenleyicileri, geçerli olandan bağımsız bir şekilde açmak için 'first' veya 'last' seçeneklerinden birini seçin.", "revealIfOpen": "Düzenleyicinin görünen gruplardan herhangi birinde açıldıysa ortaya çıkarılıp çıkarılmayacağını denetler. Devre dışı bırakılırsa; bir düzenleyici, o an aktif düzenleyici grubunda açılmayı tercih edecektir. Etkinleştirilirse; o an aktif düzenleyici grubunda tekrar açılmak yerine, zaten açık olan düzenleyici ortaya çıkarılacaktır. Bu ayarın yok sayılacağı bazı durumların olduğunu unutmayın, ör. bir düzenleyiciyi, belirli bir grupta veya o an aktif grubun yanına açmaya zorladığınızda. ", + "swipeToNavigate": "Yatay olarak üç parmakla kaydırma ile açık dosyalar arasında gezinin.", "commandHistory": "Komut paleti geçmişinde tutulacak son kullanılan komutların sayısını denetler. Komut geçmişini kapatmak için 0 olarak ayarlayın.", "preserveInput": "Komut paletine son girilen girdinin, bir sonraki açılışta tekrar yer alıp almayacağını denetler.", "closeOnFocusLost": "Hızlı Aç'ın odağını kaybettiğinde otomatik olarak kapanıp kapanmayacağını denetler.", "openDefaultSettings": "Ayarları açmanın ayrıca tüm varsayılan ayarları gösteren bir düzenleyici açıp açmayacağını denetler.", "sideBarLocation": "Kenar çubuğunun konumunu denetler. Çalışma ekranının ya solunda ya da sağında gösterilebilir.", + "panelDefaultLocation": "Panelin varsayılan konumunu denetler. Çalışma ekranının ya altında ya da sağında gösterilebilir.", "statusBarVisibility": "Çalışma ekranının altındaki durum çubuğunun görünürlüğünü denetler.", "activityBarVisibility": "Çalışma ekranındaki etkinlik çubuğunun görünürlüğünü denetler.", - "closeOnFileDelete": "Düzenleyicinin gösterdiği bir dosyanın, başka bir işlem tarafından silinmesi veya yeniden adlandırması durumunda dosyayı otomatik olarak kapatıp kapatmamasını denetler. Bunu devre dışı bırakmak, böyle bir durumda düzenleyicinin kaydedilmemiş değişiklikler içeriyor durumunda kalmasını sağlar. Uygulama içinde silmek, düzenleyiciyi her zaman kapatır ve kaydedilmemiş değişiklikler içeren dosyalar, verilerinizin korunması için otomatik olarak kapatılmaz.", - "enableNaturalLanguageSettingsSearch": "Ayarlar için doğal dil arama modunun etkinleştirilip etkinleştirilmeyeceğini denetler.", "fontAliasing": "Çalışma ekranındaki yazı tipi yumuşatma yöntemini denetler.\n- default: Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir\n- antialiased: Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir\n- none: Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.", "workbench.fontAliasing.default": "Alt-piksel yazı tipi yumuşatma. Bu, çoğu retina olmayan ekranda en keskin metni verir.", "workbench.fontAliasing.antialiased": "Alt-pikselin tersine, pikselin seviyesine göre yazı tipini yumuşat. Yazı tipinin genel olarak daha açık görünmesini sağlayabilir.", "workbench.fontAliasing.none": "Yazı tipi yumuşatmayı devre dışı bırakır. Metin pürüzlü keskin kenarlarla gösterilir.", - "swipeToNavigate": "Yatay olarak üç parmakla kaydırma ile açık dosyalar arasında gezinin.", - "workbenchConfigurationTitle": "Çalışma Ekranı", + "enableNaturalLanguageSettingsSearch": "Ayarlar için doğal dil arama modunun etkinleştirilip etkinleştirilmeyeceğini denetler.", "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", diff --git a/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json b/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json index c583af8e7cc..394ee06ccfd 100644 --- a/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/trk/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "Kes", "copy": "Kopyala", "paste": "Yapıştır", - "selectAll": "Tümünü Seç" + "selectAll": "Tümünü Seç", + "runningAsRoot": "[0] uygulamasını root olarak çalıştırmanız önerilmez." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json index 01e4868daa1..793bdc84f28 100644 --- a/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/codeEditor/electron-browser/wordWrapMigration.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "wordWrapMigration.ok": "Tamam", - "wordWrapMigration.dontShowAgain": "Tekrar gösterme", + "wordWrapMigration.dontShowAgain": "Tekrar Gösterme", "wordWrapMigration.openSettings": "Ayarları Aç", "wordWrapMigration.prompt": "`editor.wrappingColumn` ayarı, `editor.wordWrap` yüzünden kullanım dışıdır." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json index b5f38fd9078..d27710092c4 100644 --- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json @@ -4,6 +4,5 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "debug.terminal.title": "hata ayıklanan", - "debug.terminal.not.available.error": "Entegre terminal mevcut değil" + "debug.terminal.title": "hata ayıklanan" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json index 010a09cd0cb..ca0fb5ce188 100644 --- a/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/execution/electron-browser/execution.contribution.i18n.json @@ -12,6 +12,5 @@ "globalConsoleActionWin": "Yeni Komut İstemi Aç", "globalConsoleActionMacLinux": "Yeni Terminal Aç", "scopedConsoleActionWin": "Komut İsteminde Aç", - "scopedConsoleActionMacLinux": "Terminalde Aç", - "openFolderInIntegratedTerminal": "Terminalde Aç" + "scopedConsoleActionMacLinux": "Terminalde Aç" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index 63820e9cd1c..2cb48be881f 100644 --- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.", "workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.", + "fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.", "exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.", "reallyRecommended2": "'{0}' eklentisi bu dosya türü için tavsiye edilir.", "reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.", "showRecommendations": "Tavsiyeleri Göster", "install": "Yükle", - "neverShowAgain": "Tekrar gösterme", + "neverShowAgain": "Tekrar Gösterme", "close": "Kapat", "workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.", "installAll": "Tümünü Yükle", diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json new file mode 100644 index 00000000000..0b6bb4e4396 --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Çalışma Ekranı" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 09b50f5c819..4d413486366 100644 --- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -7,5 +7,25 @@ "filesCategory": "Dosya", "revealInSideBar": "Kenar Çubuğunda Ortaya Çıkar", "acceptLocalChanges": "Değişikliklerinizi kullanın ve diskteki içeriklerin üzerine yazın", - "revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün" + "revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün", + "copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala", + "saveAllInGroup": "Gruptaki Tümünü Kadet", + "revert": "Dosyayı Geri Döndür", + "compareActiveWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır", + "closeEditor": "Düzenleyiciyi Kapat", + "view": "Görüntüle", + "openToSide": "Yana Aç", + "revealInWindows": "Gezginde Ortaya Çıkar", + "revealInMac": "Finder'da Ortaya Çıkar", + "openContainer": "İçeren Klasörü Aç", + "copyPath": "Yolu Kopyala", + "saveAll": "Tümünü Kaydet", + "compareWithSaved": "Kaydedilenle Karşılaştır", + "compareWithSelected": "Seçilenle Karşılaştır", + "compareSource": "Karşılaştırma İçin Seç", + "close": "Kapat", + "closeOthers": "Diğerlerini Kapat", + "closeUnmodified": "Değiştirilmeyenleri Kapat", + "closeAll": "Tümünü Kapat", + "deleteFile": "Kalıcı Olarak Sil" } \ No newline at end of file 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 2be3f4a5668..e326729b004 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 @@ -4,10 +4,13 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "retry": "Yeniden Dene", - "rename": "Yeniden Adlandır", "newFile": "Yeni Dosya", "newFolder": "Yeni Klasör", + "rename": "Yeniden Adlandır", + "delete": "Sil", + "copyFile": "Kopyala", + "pasteFile": "Yapıştır", + "retry": "Yeniden Dene", "openFolderFirst": "İçinde dosyalar veya klasörler oluşturmak için ilk olarak bir klasör açın.", "newUntitledFile": "Yeni İsimsiz Dosya", "createNewFile": "Yeni Dosya", @@ -28,26 +31,16 @@ "confirmDeleteMessageFile": "'{0}' öğesini kalıcı olarak silmek istediğinizden emin misiniz?", "irreversible": "Bu eylem geri döndürülemez!", "permDelete": "Kalıcı Olarak Sil", - "delete": "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", - "copyFile": "Kopyala", - "pasteFile": "Yapıştır", + "fileDeleted": "Dosya bu arada silindi veya taşındı", + "fileIsAncestor": "Hedef klasör, kopyalanacak klasörün içinde yer alıyor", "duplicateFile": "Çoğalt", - "openToSide": "Yana Aç", - "compareSource": "Karşılaştırma İçin Seç", "globalCompareFile": "Aktif Dosyayı Karşılaştır...", "openFileToCompare": "Bir başka dosya ile karşılaştırmak için ilk olarak bir dosya açın.", - "compareWith": "'{0}' dosyasını '{1}' ile karşılaştır", - "compareFiles": "Dosyaları Karşılaştır", "refresh": "Yenile", - "save": "Kaydet", - "saveAs": "Farklı Kaydet...", - "saveAll": "Tümünü Kaydet", "saveAllInGroup": "Gruptaki Tümünü Kadet", - "saveFiles": "Tüm Dosyaları Kaydet", - "revert": "Dosyayı Geri Döndür", "focusOpenEditors": "Açık Düzenleyiciler Görünümüne Odakla", "focusFilesExplorer": "Dosya Gezginine Odakla", "showInExplorer": "Aktif Dosyayı Kenar Çubuğunda Ortaya Çıkar", @@ -56,20 +49,11 @@ "refreshExplorer": "Gezgini Yenile", "openFileInNewWindow": "Aktif Dosyayı Yeni Pencerede Aç", "openFileToShowInNewWindow": "Yeni pencerede açmak için ilk olarak bir dosya açın", - "revealInWindows": "Gezginde Ortaya Çıkar", - "revealInMac": "Finder'da Ortaya Çıkar", - "openContainer": "İçeren Klasörü Aç", - "revealActiveFileInWindows": "Aktif Dosyayı Windows Gezgini'nde Ortaya Çıkar", - "revealActiveFileInMac": "Aktif Dosyayı Finder'da Ortaya Çıkar", - "openActiveFileContainer": "Aktif Dosyayı İçeren Klasörü Aç", "copyPath": "Yolu Kopyala", - "copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala", "emptyFileNameError": "Bir dosya veya klasör adı sağlanması gerekiyor.", "fileNameExistsError": "Bu konumda bir **{0}** dosyası veya klasörü zaten mevcut. Lütfen başka bir ad seçin.", "invalidFileNameError": "**{0}** adı, bir dosya veya klasör adı olarak geçerli değildir. Lütfen başka bir ad seçin.", "filePathTooLongError": "**{0}** adı çok uzun bir yol ile sonuçlanıyor. Lütfen daha kısa bir ad seçin.", - "compareWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır", - "modifiedLabel": "{0} (diskte) ↔ {1}", "compareWithClipboard": "Aktif Dosyayı Panodakiyle Karşılaştır", "clipboardComparisonLabel": "Pano ↔ {0}" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json index 699305824d3..b1f43f0662a 100644 --- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json @@ -4,6 +4,16 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openFileToCopy": "Yolunu kopyalamak için ilk olarak bir dosya açın", - "openFileToReveal": "Ortaya çıkarmak için ilk olarak bir dosya açın" + "revealInWindows": "Gezginde Ortaya Çıkar", + "revealInMac": "Finder'da Ortaya Çıkar", + "openContainer": "İçeren Klasörü Aç", + "saveAs": "Farklı Kaydet...", + "save": "Kaydet", + "saveAll": "Tümünü Kaydet", + "saveFiles": "Tüm Dosyaları Kaydet", + "removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır", + "genericRevertError": "'{0}' geri döndürülemedi: {1}", + "modifiedLabel": "{0} (diskte) ↔ {1}", + "openFileToReveal": "Ortaya çıkarmak için ilk olarak bir dosya açın", + "openFileToCopy": "Yolunu kopyalamak için ilk olarak bir dosya açın" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 4948cddf5c4..642be842a15 100644 --- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,8 +36,6 @@ "editorConfigurationTitle": "Düzenleyici", "formatOnSave": "Dosyayı kaydederken biçimlendir. Bir biçimlendirici mevcut olmalıdır, dosya otomatik olarak kaydedilmemelidir, ve düzenleyici kapanmıyor olmalıdır.", "explorerConfigurationTitle": "Dosya Gezgini", - "openEditorsVisible": "Açık Editörler bölmesinde gösterilen düzenleyici sayısı. Bölmeyi gizlemek için 0 olarak ayarlayın.", - "dynamicHeight": "Açık düzenleyiciler bölümü yüksekliğinin öge sayısına göre dinamik olarak uyarlanıp uyarlanmayacağını denetler.", "autoReveal": "Gezginin dosyaları açarken, onları otomatik olarak ortaya çıkartmasını ve seçmesini denetler.", "enableDragAndDrop": "Gezgeinin sürükle bırak ile dosyaları ve klasörleri taşımaya izin verip vermeyeceğini denetler.", "confirmDragAndDrop": "Gezginin, sürükle bırak ile dosyalar ve klasörlerin taşındığı zaman onay isteyip istemeyeceğini denetler.", diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 660d16789d0..a7b5a9c8bb9 100644 --- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,10 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "Değişikliklerinizi **geri al**mak veya diskteki içeriğin **üzerine yaz**mak için düzenleyicideki araç çubuğunu kullanabilirsiniz", - "discard": "At", + "overwriteElevated": "Yönetici Olarak Üzerine Yaz...", + "saveElevated": "Yönetici Olarak Yeniden Dene...", "overwrite": "Üzerine Yaz", "retry": "Yeniden Dene", - "readonlySaveError": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Korumayı kaldırmak için 'Üzerine Yaz'ı seçin.", + "discard": "At", + "readonlySaveErrorAdmin": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Yönetici olarak denemek için 'Yönetici Olarak Üzerine Yaz'ı seçin.", + "readonlySaveError": "'{0}' kaydedilemedi: Dosya yazmaya karşı korunuyor. Korumayı kaldırmayı denemek için 'Üzerine Yaz'ı seçin.", + "permissionDeniedSaveError": "'{0}' kaydedilemedi: Yetersiz yetki. Yönetici olarak denemek için 'Yönetici Olarak Yeniden Dene'yi seçin.", "genericSaveError": "'{0}' kaydedilemedi: ({1}).", "staleSaveError": "'{0}' kaydedilemedi: Diskteki içerik daha yeni. Sizdeki sürüm ile disktekini karşılaştırmak için **Karşılaştır**a tıklayın.", "compareChanges": "Karşılaştır", diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json index 9f1cee51d98..d1e6467f5d8 100644 --- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.i18n.json @@ -6,11 +6,5 @@ { "openEditors": "Açık Düzenleyiciler", "openEditosrSection": "Açık Düzenleyiciler Bölümü", - "dirtyCounter": "{0} kaydedilmemiş", - "saveAll": "Tümünü Kaydet", - "closeAllUnmodified": "Değiştirilmeyenleri Kapat", - "closeAll": "Tümünü Kapat", - "compareWithSaved": "Kaydedilenle Karşılaştır", - "close": "Kapat", - "closeOthers": "Diğerlerini Kapat" + "dirtyCounter": "{0} kaydedilmemiş" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json new file mode 100644 index 00000000000..aeb7121cb05 --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "developer": "Geliştirici" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json new file mode 100644 index 00000000000..ad7b602e907 --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.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. +{ + "openLogsFolder": "Günlük Klasörünü Aç", + "showLogs": "Günlükleri Göster...", + "rendererProcess": "Pencere", + "extensionHost": "Eklenti Sunucusu", + "selectProcess": "İşlem seçin", + "setLogLevel": "Günlük Düzeyini Ayarla", + "trace": "İzle", + "debug": "Hata Ayıklama", + "info": "Bilgi", + "warn": "Uyarı", + "err": "Hata", + "selectLogLevel": "Günlük düzeyini seçin" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json index fe543da8a99..ca58bfe5d32 100644 --- a/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,8 +5,6 @@ // Do not edit this file. It is machine generated. { "viewCategory": "Görüntüle", - "problems.view.toggle.label": "Sorunları Aç/Kapat", - "problems.view.focus.label": "Sorunlara Odakla", "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", 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 new file mode 100644 index 00000000000..fe8f6125b1a --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/output/electron-browser/output.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. +{ + "output": "Çıktı", + "viewCategory": "Görüntüle", + "clearOutput.label": "Çıktıyı Temizle" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json index dad393ec3bf..dc51088525e 100644 --- a/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/preferences/browser/preferencesWidgets.i18n.json @@ -4,12 +4,10 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "defaultSettingsFuzzyPrompt": "Doğal dil aramasını deneyin!", "defaultSettings": "Geçersiz kılmak için ayarlarınızı sağ taraftaki düzeyiciye ekleyin.", "noSettingsFound": "Hiçbir Ayar Bulunamadı.", "settingsSwitcherBarAriaLabel": "Ayar Değiştirici", "userSettings": "Kullanıcı Ayarları", "workspaceSettings": "Çalışma Alanı Ayarları", - "folderSettings": "Klasör Ayarları", - "enableFuzzySearch": "Doğal dil aramasını etkinleştir" + "folderSettings": "Klasör Ayarları" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json b/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json index ad4ed40e889..dc4c28efe52 100644 --- a/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/preferences/common/preferencesModels.i18n.json @@ -5,6 +5,5 @@ // Do not edit this file. It is machine generated. { "commonlyUsed": "Yaygın Olarak Kullanılan", - "mostRelevant": "En Uygun", "defaultKeybindingsHeader": "Tuş bağları dosyanıza yerleştirerek tuş bağlarının üzerine yazın." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json index fe14853bad6..018ca1806dd 100644 --- a/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.i18n.json @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "view": "Görüntüle", "commandsHandlerDescriptionDefault": "Komutları Göster ve Çalıştır", "gotoLineDescriptionMac": "Satıra Git", "gotoLineDescriptionWin": "Satıra Git", 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 cf14cf9120f..d06d8e0857e 100644 --- a/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/search/browser/searchActions.i18n.json @@ -12,9 +12,7 @@ "previousSearchTerm": "Önceki Arama Terimini Göster", "showSearchViewlet": "Aramayı Göster", "findInFiles": "Dosyalarda Bul", - "findInFilesWithSelectedText": "Seçili Metni Dosyalarda Bul", "replaceInFiles": "Dosyalardakileri Değiştir", - "replaceInFilesWithSelectedText": "Dosyalardaki Seçili Metni Değiştir", "RefreshAction.label": "Yenile", "CollapseDeepestExpandedLevelAction.label": "Tümünü Daralt", "ClearSearchResultsAction.label": "Temizle", diff --git a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index fd6f32d47d6..58d2149f726 100644 --- a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -4,10 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "findInFolder": "Klasörde Bul...", + "findInWorkspace": "Çalışma Alanında Bul...", "showTriggerActions": "Çalışma Alanında Sembole Git...", "name": "Ara", "search": "Ara", + "showSearchViewlet": "Aramayı Göster", "view": "Görüntüle", + "findInFiles": "Dosyalarda Bul", "openAnythingHandlerDescription": "Dosyaya Git", "openSymbolDescriptionNormal": "Çalışma Alanında Sembole Git", "searchOutputChannelTitle": "Ara", diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json new file mode 100644 index 00000000000..a6843828675 --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.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. +{ + "global.1": "({0})", + "preferences": "Tercihler" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json index 11671c7d0b4..7e1c6237303 100644 --- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json @@ -4,10 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "openSnippet.pickLanguage": "Parçacık için Dil seçin", - "openSnippet.errorOnCreate": "{0} oluşturulamadı", - "openSnippet.label": "Kullanıcı Parçacıklarını Aç", - "preferences": "Tercihler", "snippetSchema.json.default": "Boş parçacık", "snippetSchema.json": "Kullanıcı parçacığı yapılandırması", "snippetSchema.json.prefix": "Parçacığı IntelliSense'de seçerken kullanılacak ön ek", diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json new file mode 100644 index 00000000000..d246a5f624d --- /dev/null +++ b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsFile.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "source.snippet": "Kullanıcı Parçacığı" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json index ebad445a20b..8257fed50b0 100644 --- a/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json @@ -4,15 +4,14 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}", "invalid.path.0": "`contributes.{0}.path` ögesinde dize bekleniyor. Sağlanan değer: {1}", + "invalid.language": "`contributes.{0}.language` ögesinde bilinmeyen dil. Sağlanan değer: {1}", "invalid.path.1": "`contributes.{0}.path` ögesinin ({1}) eklentinin klasöründe ({2}) yer alması bekleniyor. Bu, eklentiyi taşınamaz yapabilir.", "vscode.extension.contributes.snippets": "Parçacıklara ekleme yapar.", "vscode.extension.contributes.snippets-language": "Bu parçacığın ekleneceği dilin tanımlayıcısı.", "vscode.extension.contributes.snippets-path": "Parçacıklar dosyasının yolu. Yol, eklenti klasörüne görecelidir ve genellikle './snippets/' ile başlar.", "badVariableUse": "'{0}' eklentisindeki bir veya daha çok parçacık yüksek olasılıkla parçacık değişkenleri ile parçacık yer tutucularını karıştırıyor (daha fazla bilgi için https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax adresini ziyaret edin).", "badFile": "Parçacık dosyası \"{0}\" okunamadı.", - "source.snippet": "Kullanıcı Parçacığı", "detail.snippet": "{0} ({1})", "snippetSuggest.longLabel": "{0}, {1}" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json index a994ebe0909..644e7e44a52 100644 --- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json @@ -8,6 +8,5 @@ "terminal.foreground": "Terminalin ön plan rengi.", "terminalCursor.foreground": "Terminal imlecinin ön plan rengi.", "terminalCursor.background": "Terminal imlecinin arka plan rengi. Bir blok imlecinin kapladığı bir karakterin rengini özelleştirmeyi sağlar.", - "terminal.selectionBackground": "Terminalin seçim arkaplanı rengi.", - "terminal.ansiColor": "Terminalde '{0}' ANSI rengi." + "terminal.selectionBackground": "Terminalin seçim arkaplanı rengi." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index a30794054e1..2c0a6d7607f 100644 --- a/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,7 +7,6 @@ "terminal.integrated.chooseWindowsShellInfo": "Özelleştir butonuna tıklayıp varsayılan terminal kabuğunu seçebilirsiniz.", "customize": "Özelleştir", "cancel": "İptal", - "never again": "Tamam, Tekrar Gösterme", "terminal.integrated.chooseWindowsShell": "Tercih ettiğiniz terminal kabuğunu seçin, bunu daha sonra ayarlarınızdan değiştirebilirsiniz", "terminalService.terminalCloseConfirmationSingular": "Aktif bir terminal oturumu var, sonlandırmak istiyor musunuz?", "terminalService.terminalCloseConfirmationPlural": "{0} aktif terminal oturumu var, bunları sonlandırmak istiyor musunuz?" 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 61ebe35f50c..64fe6d494db 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 @@ -23,6 +23,7 @@ "commandPalette": "Komut Paleti...", "settings": "Ayarlar", "keyboardShortcuts": "Klavye Kısayolları", + "userSnippets": "Kullanıcı Parçacıkları", "selectTheme.label": "Renk Teması", "themes.selectIconTheme.label": "Dosya Simgesi Teması", "not available": "Güncelleştirme Yok", diff --git a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json b/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json index 320c074b5d2..699613ce8f0 100644 --- a/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json +++ b/i18n/trk/src/vs/workbench/services/files/electron-browser/remoteFileService.i18n.json @@ -4,5 +4,7 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "fileIsDirectoryError": "Dosya bir dizindir", + "fileNotModifiedError": "Dosya şu tarihten beri değiştirilmemiş:", "fileBinaryError": "Dosya ikili olarak görünüyor ve metin olarak açılamıyor" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json b/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json index 5284725dbcb..f0547df6a62 100644 --- a/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json +++ b/i18n/trk/src/vs/workbench/services/textfile/electron-browser/textFileService.i18n.json @@ -6,8 +6,6 @@ { "saveChangesMessage": "{0} dosyasına yaptığınız değişiklikleri kaydetmek istiyor musunuz?", "saveChangesMessages": "Aşağıdaki {0} dosyaya yaptığınız değişiklikleri kaydetmek istiyor musunuz?", - "moreFile": "...1 ek dosya gösterilmiyor", - "moreFiles": "...{0} ek dosya gösterilmiyor", "saveAll": "&&Tümünü Kaydet", "save": "&&Kaydet", "dontSave": "Kaydet&&me", diff --git a/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json b/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json index 06e828ba73e..f60dda6f647 100644 --- a/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json +++ b/i18n/trk/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.i18n.json @@ -11,7 +11,6 @@ "noIconThemeDesc": "Dosya simgesi yok", "iconThemeError": "Dosya simgesi teması bilinmiyor veya yüklenmemiş.", "workbenchColors": "Şu an seçili renk temasındaki renkleri geçersiz kılar.", - "editorColors": "Şu an seçili renk temasındaki düzenleyici renklerini ve yazı tipi stilini geçersiz kılar.", "editorColors.comments": "Yorumların rengini ve stillerini ayarlar", "editorColors.strings": "Dizelerin rengini ve stillerini ayarlar.", "editorColors.keywords": "Anahtar sözcüklerin rengini ve stillerini ayarlar.", @@ -19,5 +18,6 @@ "editorColors.types": "Tür bildirimi ve başvurularının rengini ve stillerini ayarlar.", "editorColors.functions": "Fonksiyon bildirimi ve başvurularının rengini ve stillerini ayarlar.", "editorColors.variables": "Değişken bildirimi ve başvurularının rengini ve stillerini ayarlar.", - "editorColors.textMateRules": "Textmate tema kurallarını kullanarak renkleri ve stilleri ayarlar (gelişmiş)." + "editorColors.textMateRules": "Textmate tema kurallarını kullanarak renkleri ve stilleri ayarlar (gelişmiş).", + "editorColors": "Şu an seçili renk temasındaki düzenleyici renklerini ve yazı tipi stilini geçersiz kılar." } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json b/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json index 38e103f1ee8..19e6e2498a4 100644 --- a/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json +++ b/i18n/trk/src/vs/workbench/services/workspace/node/workspaceEditingService.i18n.json @@ -7,9 +7,5 @@ "errorInvalidTaskConfiguration": "Çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyadaki hata/uyarıları düzeltmek için dosyayı açın ve tekrar deneyin.", "errorWorkspaceConfigurationFileDirty": "Kaydedilmemiş değişiklikler içerdiği için çalışma alanı yapılandırma dosyasına yazılamıyor. Lütfen dosyayı kaydedin ve tekrar deneyin.", "openWorkspaceConfigurationFile": "Çalışma Alanı Yapılandırma Dosyasını Aç", - "close": "Kapat", - "enterWorkspace.close": "Kapat", - "enterWorkspace.dontShowAgain": "Tekrar Gösterme", - "enterWorkspace.moreInfo": "Daha Fazla Bilgi", - "enterWorkspace.prompt": "VS Code'da birden çok klasörle çalışmak hakkında daha fazla bilgi edinin." + "close": "Kapat" } \ No newline at end of file From 783d4744737cb55922c19b4959de76079ffbac8f Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 17:23:18 -0800 Subject: [PATCH 295/710] EOL normalization. --- .../pieceTableTextBuffer/pieceTableBase.ts | 231 ++++++++++++----- .../pieceTableTextBuffer.ts | 35 +-- .../pieceTableTextBufferBuilder.ts | 235 +++++++++--------- .../model/pieceTableTextBuffer/textSource.ts | 96 ------- src/vs/editor/common/model/textModel.ts | 5 + src/vs/editor/contrib/folding/folding.ts | 2 +- .../pieceTableTextBuffer.test.ts | 4 +- 7 files changed, 313 insertions(+), 295 deletions(-) delete mode 100644 src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 6906b2edd78..f6eb26c67ac 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -5,6 +5,7 @@ 'use strict'; import { Position } from 'vs/editor/common/core/position'; +import { CharCode } from 'vs/base/common/charCode'; export const enum NodeColor { Black = 0, @@ -55,42 +56,84 @@ function resetSentinel(): void { const lfRegex = new RegExp(/\r\n|\r|\n/g); -export function constructLineStarts(chunk: string): number[] { - let lineStarts = [0]; +export function createUint32Array(arr: number[]): Uint32Array { + let r = new Uint32Array(arr.length); + r.set(arr, 0); + return r; +} - // Reset regex to search from the beginning - lfRegex.lastIndex = 0; - let prevMatchStartIndex = -1; - let prevMatchLength = 0; +export class LineStarts { + constructor( + public readonly lineStarts: Uint32Array | number[], + public readonly cr: number, + public readonly lf: number, + public readonly crlf: number, + public readonly isBasicASCII: boolean + ) { } +} - let m: RegExpExecArray; - do { - if (prevMatchStartIndex + prevMatchLength === chunk.length) { - // Reached the end of the line - break; +export function createLineStartsFast(str: string, readonly: boolean = true): Uint32Array | number[] { + let r: number[] = [0], rLength = 1; + + 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; } + } + if (readonly) { + return createUint32Array(r); + } else { + return r; + } +} - m = lfRegex.exec(chunk); - if (!m) { - break; +export function createLineStarts(r: number[], str: string): LineStarts { + r.length = 0; + r[0] = 0; + let rLength = 1; + 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 matchStartIndex = m.index; - const matchLength = m[0].length; + const result = new LineStarts(createUint32Array(r), cr, lf, crlf, isBasicASCII); + r.length = 0; - if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { - // Exit early if the regex matches the same range twice - break; - } - - prevMatchStartIndex = matchStartIndex; - prevMatchLength = matchLength; - - lineStarts.push(matchStartIndex + matchLength); - - } while (m); - - return lineStarts; + return result; } export class TreeNode { @@ -215,9 +258,9 @@ export class Piece { export class StringBuffer { buffer: string; - lineStarts: number[]; + lineStarts: number[] | Uint32Array; - constructor(buffer: string, lineStarts: number[]) { + constructor(buffer: string, lineStarts: number[] | Uint32Array) { this.buffer = buffer; this.lineStarts = lineStarts; } @@ -241,7 +284,7 @@ export class PieceTableBase { for (let i = 0, len = chunks.length; i < len; i++) { if (chunks[i].buffer.length > 0) { if (!chunks[i].lineStarts) { - chunks[i].lineStarts = constructLineStarts(chunks[i].buffer); + chunks[i].lineStarts = createLineStartsFast(chunks[i].buffer); } let piece = new Piece( @@ -259,6 +302,75 @@ export class PieceTableBase { this.computeLineCount(); } + normalizeEOL(eol: '\r\n' | '\n') { + let averageBufferSize = 65536; + let min = averageBufferSize - Math.floor(averageBufferSize / 3); + let max = min * 2; + + let tempChunk = ''; + let tempChunkLen = 0; + let chunks: StringBuffer[] = []; + + this.iterate(this._root, (str) => { + let len = str.length; + if (tempChunkLen <= min) { + tempChunk += str; + tempChunkLen += len; + return; + } + + if (tempChunkLen > max) { + // flush anyways + let text = tempChunk.replace(/\r\n|\r|\n/g, eol); + chunks.push(new StringBuffer(text, createLineStartsFast(text))); + tempChunk = str; + tempChunkLen = len; + return; + } + + // tempChunkLen > min + if (tempChunkLen + len < max) { + tempChunk += str; + tempChunkLen += len; + } else { + // flush tempChunk + let text = tempChunk.replace(/\r\n|\r|\n/g, eol); + chunks.push(new StringBuffer(text, createLineStartsFast(text))); + tempChunk = str; + tempChunkLen = len; + } + }); + + if (tempChunkLen > 0) { + let text = tempChunk.replace(/\r\n|\r|\n/g, eol); + chunks.push(new StringBuffer(text, createLineStartsFast(text))); + } + + this._buffers = [ + new StringBuffer('', [0]) + ]; + this._lastChangeBufferPos = { line: 0, column: 0 }; + this._root = SENTINEL; + this._lineCnt = 1; + let lastNode: TreeNode = null; + + for (let i = 0, len = chunks.length; i < len; i++) { + if (chunks[i].buffer.length > 0) { + let piece = new Piece( + i + 1, + { line: 0, column: 0 }, + { line: chunks[i].lineStarts.length - 1, column: chunks[i].buffer.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1] }, + chunks[i].lineStarts.length - 1, + chunks[i].buffer.length + ); + this._buffers.push(chunks[i]); + lastNode = this.rbInsertRight(lastNode, piece); + } + } + + this.computeLineCount(); + } + // #region Piece Table insert(offset: number, value: string): void { // todo, validate value and offset. @@ -542,7 +654,7 @@ export class PieceTableBase { createNewPiece(text: string): Piece { let startOffset = this._buffers[0].buffer.length; - const lineStarts = constructLineStarts(text); + const lineStarts = createLineStartsFast(text, false); let start = this._lastChangeBufferPos; if (this._buffers[0].lineStarts[this._buffers[0].lineStarts.length - 1] === startOffset @@ -556,14 +668,14 @@ export class PieceTableBase { for (let i = 0; i < lineStarts.length; i++) { lineStarts[i] += startOffset + 1; } - this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); this._buffers[0].buffer += '_' + text; startOffset += 1; } else { for (let i = 0; i < lineStarts.length; i++) { lineStarts[i] += startOffset; } - this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); this._buffers[0].buffer += text; } @@ -745,17 +857,17 @@ export class PieceTableBase { let hitCRLF = this.startWithLF(value) && this.endWithCR(node); const startOffset = this._buffers[0].buffer.length; this._buffers[0].buffer += value; - const lineStarts = constructLineStarts(value); + const lineStarts = createLineStartsFast(value, false); for (let i = 0; i < lineStarts.length; i++) { lineStarts[i] += startOffset; } if (hitCRLF) { let prevStartOffset = this._buffers[0].lineStarts[this._buffers[0].lineStarts.length - 2]; - this._buffers[0].lineStarts.pop(); + (this._buffers[0].lineStarts).pop(); // _lastChangeBufferPos is already wrong this._lastChangeBufferPos = { line: this._lastChangeBufferPos.line - 1, column: startOffset - prevStartOffset }; } - this._buffers[0].lineStarts.push(...lineStarts.slice(1)); + (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); const endOffset = this._buffers[0].buffer.length; let endIndex = this._buffers[0].lineStarts.length - 1; let endColumn = endOffset - this._buffers[0].lineStarts[endIndex]; @@ -1026,6 +1138,22 @@ export class PieceTableBase { // #endregion // #region Red Black Tree + iterate(node: TreeNode, callback: (str: string) => void): void { + if (node === SENTINEL) { + callback(''); + return; + } + + this.iterate(node.left, callback); + let buffer = this._buffers[node.piece.bufferIndex]; + let currentContent; + let piece = node.piece; + let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); + let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); + currentContent = buffer.buffer.substring(startOffset, endOffset); + callback(currentContent); + this.iterate(node.right, callback); + } leftRotate(x: TreeNode) { let y = x.right; @@ -1396,30 +1524,13 @@ export class PieceTableBase { } getContentOfSubTree(node: TreeNode): string { - if (node === SENTINEL) { - return ''; - } + let str = ''; - let buffer = this._buffers[node.piece.bufferIndex]; - let currentContent; - let piece = node.piece; - let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start); - let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end); - currentContent = buffer.buffer.substring(startOffset, endOffset); + this.iterate(node, (newStr) => { + str += newStr; + }); - return this.getContentOfSubTree(node.left) + currentContent + this.getContentOfSubTree(node.right); - } - - constructLineLengths(chunk: string): Uint32Array { - let lineStarts = constructLineStarts(chunk); - const lineLengths = new Uint32Array(lineStarts.length); - for (let i = 1; i < lineStarts.length; i++) { - lineLengths[i - 1] = lineStarts[i] - lineStarts[i - 1]; - } - - lineLengths[lineStarts.length - 1] = chunk.length - lineStarts[lineStarts.length - 1]; - - return lineLengths; + return str; } // #endregion } diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 251cb9dd6a1..ccc8cc4e493 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -7,9 +7,8 @@ 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 { ITextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; import { IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer'; -import { PieceTableBase, SENTINEL } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { PieceTableBase, SENTINEL, StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; import { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; @@ -19,12 +18,12 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer private _mightContainRTL: boolean; private _mightContainNonBasicASCII: boolean; - constructor(textSource: ITextSource) { - super(textSource.chunks); - this._BOM = textSource.BOM; - this._EOL = textSource.EOL; - this._mightContainNonBasicASCII = !textSource.isBasicASCII; - this._mightContainRTL = textSource.containsRTL; + constructor(chunks: StringBuffer[], BOM: string, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) { + super(chunks); + this._BOM = BOM; + this._EOL = eol; + this._mightContainNonBasicASCII = !isBasicASCII; + this._mightContainRTL = containsRTL; } // #region TextBuffer @@ -57,22 +56,9 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer return ''; } - if (range.startLineNumber === range.endLineNumber) { - return this.getLineRawContent(range.startLineNumber).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.getLineContent(startLineIndex + 1).substring(range.startColumn - 1)); - for (let i = startLineIndex + 1; i < endLineIndex; i++) { - resultLines.push(this.getLineContent(i + 1)); - } - resultLines.push(this.getLineContent(endLineIndex + 1).substring(0, range.endColumn - 1)); - - return resultLines.join(lineEnding); + const text = this.getValueInRange2(range, eol); + return text.replace(/\r\n|\r|\n/g, lineEnding); } public getValueInRange2(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { @@ -214,8 +200,9 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer return this._EOL; } - public setEOL(newEOL: string): void { + public setEOL(newEOL: '\r\n' | '\n'): void { this._EOL = newEOL; + this.normalizeEOL(newEOL); } public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 6b3525505a7..0df1c931e70 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -6,43 +6,88 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } from 'vs/editor/common/model'; -import { TextSource, IRawTextSource } from 'vs/editor/common/model/pieceTableTextBuffer/textSource'; import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; -import { StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { StringBuffer, createLineStarts, createLineStartsFast } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; import { CharCode } from 'vs/base/common/charCode'; export class PieceTableTextBufferFactory implements ITextBufferFactory { - constructor(private readonly rawTextSource: IRawTextSource) { + constructor( + private readonly _chunks: StringBuffer[], + private readonly _bom: string, + private readonly _cr: number, + private readonly _lf: number, + private readonly _crlf: number, + private readonly _containsRTL: boolean, + private readonly _isBasicASCII: boolean, + ) { } + + 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 textSource = TextSource.fromRawTextSource(this.rawTextSource, defaultEOL); - return new PieceTableTextBuffer(textSource); + const eol = this._getEOL(defaultEOL); + let chunks = this._chunks; + + 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 = chunks.length; i < len; i++) { + let str = chunks[i].buffer.replace(/\r\n|\r|\n/g, eol); + let newLineStart = createLineStartsFast(str); + chunks[i] = new StringBuffer(str, newLineStart); + } + } + + return new PieceTableTextBuffer(chunks, this._bom, eol, this._containsRTL, this._isBasicASCII); } public getFirstLineText(lengthLimit: number): string { - return this.rawTextSource.chunks[0].buffer.substr(0, 100).split(/\r\n|\r|\n/)[0]; + return this._chunks[0].buffer.substr(0, 100).split(/\r\n|\r|\n/)[0]; } } -class PTBasedBuilder { - private leftoverEndsInCR: boolean; +export class PieceTableTextBufferBuilder implements ITextBufferBuilder { private chunks: StringBuffer[]; - private lineFeedCnt: number; private BOM: string; - private chunkIndex: number; - private totalCRCount: number; - private _regex: RegExp; + + private _hasPreviousChar: boolean; + private _previousChar: number; + private _tmpLineStarts: number[]; + + private cr: number; + private lf: number; + private crlf: number; + private containsRTL: boolean; + private isBasicASCII: boolean; constructor() { - this.leftoverEndsInCR = false; this.chunks = []; this.BOM = ''; - this.chunkIndex = 0; - this.totalCRCount = 0; - this._regex = new RegExp(/\r\n|\r|\n/g); - this.lineFeedCnt = 0; + + this._hasPreviousChar = false; + this._previousChar = 0; + this._tmpLineStarts = []; + + this.cr = 0; + this.lf = 0; + this.crlf = 0; + this.containsRTL = false; + this.isBasicASCII = true; } public acceptChunk(chunk: string): void { @@ -50,118 +95,84 @@ class PTBasedBuilder { return; } - let lineStarts = [0]; - if (this.chunkIndex === 0) { + if (this.chunks.length === 0) { if (strings.startsWithUTF8BOM(chunk)) { this.BOM = strings.UTF8_BOM_CHARACTER; chunk = chunk.substr(1); } } - if (this.leftoverEndsInCR) { - chunk = '\r' + chunk; - } - - if (chunk.charCodeAt(chunk.length - 1) === CharCode.CarriageReturn) { - this.leftoverEndsInCR = true; - chunk = chunk.substr(0, chunk.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.leftoverEndsInCR = false; + this._acceptChunk1(chunk, false); + this._hasPreviousChar = false; + this._previousChar = lastChar; } - - // Reset regex to search from the beginning - this._regex.lastIndex = 0; - let prevMatchStartIndex = -1; - let prevMatchLength = 0; - - let m: RegExpExecArray; - do { - if (prevMatchStartIndex + prevMatchLength === chunk.length) { - // Reached the end of the line - break; - } - - m = this._regex.exec(chunk); - if (!m) { - break; - } - - const matchStartIndex = m.index; - const matchLength = m[0].length; - - if (matchStartIndex === prevMatchStartIndex && matchLength === prevMatchLength) { - // Exit early if the regex matches the same range twice - break; - } - - if (matchLength === 2 || m[0] === '\r') { - this.totalCRCount++; - } - - prevMatchStartIndex = matchStartIndex; - prevMatchLength = matchLength; - - lineStarts.push(matchStartIndex + matchLength); - this.lineFeedCnt++; - } while (m); - - this.chunks.push(new StringBuffer(chunk, lineStarts)); - this.chunkIndex++; } - public finish(containsRTL: boolean, isBasicASCII: boolean): PieceTableTextBufferFactory { - if (this.chunks.length === 0) { - this.chunks.push(new StringBuffer('', [0])); - } - - if (this.leftoverEndsInCR) { - // we don't want need to create a new chunk for this standalone \r - let lastChunk = this.chunks[this.chunks.length - 1]; - lastChunk.buffer += '\r'; - lastChunk.lineStarts.push(lastChunk.buffer.length); - } - - return new PieceTableTextBufferFactory({ - chunks: this.chunks, - lineFeedCnt: this.lineFeedCnt, - BOM: this.BOM, - totalCRCount: this.totalCRCount, - containsRTL: containsRTL, - isBasicASCII: isBasicASCII - }); - } -} - -export class PieceTableTextBufferBuilder implements ITextBufferBuilder { - - private containsRTL: boolean; - private isBasicASCII: boolean; - - private ptBasedBuilder: PTBasedBuilder; - - constructor() { - this.containsRTL = false; - this.isBasicASCII = true; - this.ptBasedBuilder = new PTBasedBuilder(); - } - - public acceptChunk(chunk: string): void { - if (chunk.length === 0) { + private _acceptChunk1(chunk: string, allowEmptyStrings: boolean): void { + if (!allowEmptyStrings && chunk.length === 0) { + // Nothing to do return; } - // update lineStart to offset mapping - if (!this.containsRTL) { + if (this._hasPreviousChar) { + this._acceptChunk2(String.fromCharCode(this._previousChar) + chunk); + } else { + this._acceptChunk2(chunk); + } + } + + private _acceptChunk2(chunk: string): void { + const lineStarts = createLineStarts(this._tmpLineStarts, chunk); + + this.chunks.push(new StringBuffer(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); } - if (this.isBasicASCII) { - this.isBasicASCII = strings.isBasicASCII(chunk); - } - - this.ptBasedBuilder.acceptChunk(chunk); } public finish(): PieceTableTextBufferFactory { - return this.ptBasedBuilder.finish(this.containsRTL, this.isBasicASCII); + this._finish(); + return new PieceTableTextBufferFactory( + this.chunks, + this.BOM, + this.cr, + this.lf, + this.crlf, + this.containsRTL, + this.isBasicASCII + ); + } + + private _finish(): void { + if (this.chunks.length === 0) { + this._acceptChunk1('', true); + } + + if (this._hasPreviousChar) { + this._hasPreviousChar = false; + // recreate last chunk + let lastChunk = this.chunks[this.chunks.length - 1]; + lastChunk.buffer += String.fromCharCode(this._previousChar); + let newLineStarts = createLineStartsFast(lastChunk.buffer); + lastChunk.lineStarts = newLineStarts; + if (this._previousChar === CharCode.CarriageReturn) { + this.cr++; + } + } } } diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts b/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts deleted file mode 100644 index aa7ba64c777..00000000000 --- a/src/vs/editor/common/model/pieceTableTextBuffer/textSource.ts +++ /dev/null @@ -1,96 +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 { StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; - -/** - * A processed string ready to be turned into an editor model. - */ -export interface IRawTextSource { - /** - * The text split into lines. - */ - readonly chunks: StringBuffer[]; - readonly lineFeedCnt: number; - /** - * 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; -} - -/** - * A processed string with its EOL resolved ready to be turned into an editor model. - */ -export interface ITextSource { - /** - * The text split into lines. - */ - readonly chunks: StringBuffer[]; - readonly lineFeedCnt: number; - /** - * 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; -} - -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' { - let lineFeedCnt = rawTextSource.lineFeedCnt; - // 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 { - chunks: rawTextSource.chunks, - lineFeedCnt: rawTextSource.lineFeedCnt, - BOM: rawTextSource.BOM, - EOL: this._getEOL(rawTextSource, defaultEOL), - containsRTL: rawTextSource.containsRTL, - isBasicASCII: rawTextSource.isBasicASCII, - }; - } -} diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 9590a31f978..43e9f172270 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -494,6 +494,11 @@ export class TextModel extends Disposable implements model.ITextModel { public isDominatedByLongLines(): boolean { this._assertNotDisposed(); + if (this.isTooLargeForTokenization()) { + // Cannot word wrap huge files anyways, so it doesn't really matter + return false; + } + let smallLineCharCount = 0; let longLineCharCount = 0; diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts index 283801a2d60..b54ea646777 100644 --- a/src/vs/editor/contrib/folding/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -133,7 +133,7 @@ export class FoldingController implements IEditorContribution { this.localToDispose = dispose(this.localToDispose); let model = this.editor.getModel(); - if (!this._isEnabled || !model) { + if (!this._isEnabled || !model || model.isTooLargeForTokenization()) { return; } diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts index 6cb275030c0..61aa9620dd7 100644 --- a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts @@ -935,7 +935,7 @@ suite('get text in range', () => { }); }); -suite('CRLF', () => { +/* suite('CRLF', () => { test('delete CR in CRLF 1', () => { let pieceTable = createTextBuffer(['']); pieceTable.insert(0, 'a\r\nb'); @@ -1452,4 +1452,4 @@ suite('random is unsupervised', () => { testLineStarts(str, pieceTable); testLinesContent(str, pieceTable); }); -}); +}); */ From 6e1765ef5f8fc352ac97bbf3817b00783c6eb843 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 17:27:04 -0800 Subject: [PATCH 296/710] remove duplicate code. --- .../pieceTableTextBuffer/pieceTableBase.ts | 57 +++++-------------- 1 file changed, 13 insertions(+), 44 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index f6eb26c67ac..ed9123c9f59 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -273,6 +273,10 @@ export class PieceTableBase { private _lastChangeBufferPos: BufferCursor; constructor(chunks: StringBuffer[]) { + this.create(chunks); + } + + create(chunks: StringBuffer[]) { this._buffers = [ new StringBuffer('', [0]) ]; @@ -300,6 +304,7 @@ export class PieceTableBase { } this.computeLineCount(); + } normalizeEOL(eol: '\r\n' | '\n') { @@ -313,32 +318,18 @@ export class PieceTableBase { this.iterate(this._root, (str) => { let len = str.length; - if (tempChunkLen <= min) { + if (tempChunkLen <= min || tempChunkLen + len < max) { tempChunk += str; tempChunkLen += len; return; } - if (tempChunkLen > max) { - // flush anyways - let text = tempChunk.replace(/\r\n|\r|\n/g, eol); - chunks.push(new StringBuffer(text, createLineStartsFast(text))); - tempChunk = str; - tempChunkLen = len; - return; - } - - // tempChunkLen > min - if (tempChunkLen + len < max) { - tempChunk += str; - tempChunkLen += len; - } else { - // flush tempChunk - let text = tempChunk.replace(/\r\n|\r|\n/g, eol); - chunks.push(new StringBuffer(text, createLineStartsFast(text))); - tempChunk = str; - tempChunkLen = len; - } + // flush anyways + let text = tempChunk.replace(/\r\n|\r|\n/g, eol); + chunks.push(new StringBuffer(text, createLineStartsFast(text))); + tempChunk = str; + tempChunkLen = len; + return; }); if (tempChunkLen > 0) { @@ -346,29 +337,7 @@ export class PieceTableBase { chunks.push(new StringBuffer(text, createLineStartsFast(text))); } - this._buffers = [ - new StringBuffer('', [0]) - ]; - this._lastChangeBufferPos = { line: 0, column: 0 }; - this._root = SENTINEL; - this._lineCnt = 1; - let lastNode: TreeNode = null; - - for (let i = 0, len = chunks.length; i < len; i++) { - if (chunks[i].buffer.length > 0) { - let piece = new Piece( - i + 1, - { line: 0, column: 0 }, - { line: chunks[i].lineStarts.length - 1, column: chunks[i].buffer.length - chunks[i].lineStarts[chunks[i].lineStarts.length - 1] }, - chunks[i].lineStarts.length - 1, - chunks[i].buffer.length - ); - this._buffers.push(chunks[i]); - lastNode = this.rbInsertRight(lastNode, piece); - } - } - - this.computeLineCount(); + this.create(chunks); } // #region Piece Table From 54240a7bd3854fc9e0c07b399683547500a1914e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 16 Jan 2018 17:49:19 -0800 Subject: [PATCH 297/710] also add the workspace name, #41408 --- src/vs/workbench/api/node/extHostExtensionService.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index d16146a5e0d..d39a58a432e 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -106,7 +106,10 @@ class ExtensionStoragePath { await mkdirp(storagePath); await writeFile( join(storagePath, 'meta.json'), - JSON.stringify({ id: this._workspace.id }) + JSON.stringify({ + id: this._workspace.id, + name: this._workspace.name + }, undefined, 2) ); return storagePath; From d6d307ede7235beaaf3d6fe0f1b171d96e6e730a Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 17 Jan 2018 07:30:49 +0300 Subject: [PATCH 298/710] Add tests for time snippets --- .../snippet/test/snippetVariables.test.ts | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts index 704173368f7..7eb0f74f147 100644 --- a/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts +++ b/src/vs/editor/contrib/snippet/test/snippetVariables.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { isWindows } from 'vs/base/common/platform'; import URI from 'vs/base/common/uri'; import { Selection } from 'vs/editor/common/core/selection'; -import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables'; +import { SelectionBasedVariableResolver, CompositeSnippetVariableResolver, ModelBasedVariableResolver, ClipboardBasedVariableResolver, TimeBasedVariableResolver } from 'vs/editor/contrib/snippet/snippetVariables'; import { SnippetParser, Variable, VariableResolver } from 'vs/editor/contrib/snippet/snippetParser'; import { TextModel } from 'vs/editor/common/model/textModel'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; @@ -261,4 +261,25 @@ suite('Snippet Variables Resolver', function () { resolver = new ClipboardBasedVariableResolver(clipboardService, 0, 2); assertVariableResolve(resolver, 'CLIPBOARD', 'line1'); }); + + + function assertVariableResolve3(resolver: VariableResolver, varName: string) { + const snippet = new SnippetParser().parse(`$${varName}`); + const variable = snippet.children[0]; + + assert.equal(variable.resolve(resolver), true, `${varName} failed to resolve`); + } + + test('Add time variables for snippets #41631', function () { + + const resolver = new TimeBasedVariableResolver; + + assertVariableResolve3(resolver, 'CURRENT_YEAR'); + assertVariableResolve3(resolver, 'CURRENT_YEAR_SHORT'); + assertVariableResolve3(resolver, 'CURRENT_MONTH'); + assertVariableResolve3(resolver, 'CURRENT_DATE'); + assertVariableResolve3(resolver, 'CURRENT_HOUR'); + assertVariableResolve3(resolver, 'CURRENT_MINUTE'); + assertVariableResolve3(resolver, 'CURRENT_SECOND'); + }); }); From 696d3183cb37e46ef304a732a350659021bae834 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 16:32:40 +0100 Subject: [PATCH 299/710] Move RawContentChange events creation to TextModel --- src/vs/editor/common/model.ts | 3 +- .../model/linesTextBuffer/linesTextBuffer.ts | 24 ++---- src/vs/editor/common/model/textModel.ts | 74 +++++++++++++++++-- .../common/viewModel/splitLinesCollection.ts | 1 + src/vs/editor/test/common/model/model.test.ts | 3 - 5 files changed, 78 insertions(+), 27 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 9f25ed1118f..9d58b81cc05 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -12,7 +12,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { Position, IPosition } from 'vs/editor/common/core/position'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange, ModelRawChange } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange } from 'vs/editor/common/model/textModelEvents'; import { ThemeColor } from 'vs/platform/theme/common/themeService'; /** @@ -1098,7 +1098,6 @@ export class ApplyEditsResult { constructor( public readonly reverseEdits: IIdentifiedSingleEditOperation[], - public readonly rawChanges: ModelRawChange[], public readonly changes: IInternalModelContentChange[], public readonly trimAutoWhitespaceLineNumbers: number[] ) { } diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 09cafe2246c..1cbd9fe7c92 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -9,7 +9,6 @@ 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 { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { ISingleEditOperationIdentifier, IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; export interface IValidatedEditOperation { @@ -252,7 +251,7 @@ export class LinesTextBuffer implements ITextBuffer { public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { if (rawOperations.length === 0) { - return new ApplyEditsResult([], [], [], []); + return new ApplyEditsResult([], [], []); } let mightContainRTL = this._mightContainRTL; @@ -341,7 +340,7 @@ export class LinesTextBuffer implements ITextBuffer { this._mightContainRTL = mightContainRTL; this._mightContainNonBasicASCII = mightContainNonBasicASCII; - const [rawContentChanges, contentChanges] = this._doApplyEdits(operations); + const contentChanges = this._doApplyEdits(operations); let trimAutoWhitespaceLineNumbers: number[] = null; if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) { @@ -369,7 +368,6 @@ export class LinesTextBuffer implements ITextBuffer { return new ApplyEditsResult( reverseOperations, - rawContentChanges, contentChanges, trimAutoWhitespaceLineNumbers ); @@ -451,18 +449,16 @@ export class LinesTextBuffer implements ITextBuffer { }; } - private _setLineContent(lineNumber: number, content: string, rawContentChanges: ModelRawChange[]): void { + private _setLineContent(lineNumber: number, content: string): void { this._lines[lineNumber - 1] = content; this._lineStarts.changeValue(lineNumber - 1, content.length + this._EOL.length); - rawContentChanges.push(new ModelRawLineChanged(lineNumber, content)); } - private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { + private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] { // Sort operations descending operations.sort(LinesTextBuffer._sortOpsDescending); - let rawContentChanges: ModelRawChange[] = []; let contentChanges: IInternalModelContentChange[] = []; for (let i = 0, len = operations.length; i < len; i++) { @@ -497,7 +493,7 @@ export class LinesTextBuffer implements ITextBuffer { ); } - this._setLineContent(editLineNumber, editText, rawContentChanges); + this._setLineContent(editLineNumber, editText); } if (editingLinesCnt < deletingLinesCnt) { @@ -507,12 +503,10 @@ export class LinesTextBuffer implements ITextBuffer { const endLineRemains = this._lines[endLineNumber - 1].substring(endColumn - 1); // Reconstruct first line - this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains, rawContentChanges); + this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains); this._lines.splice(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); this._lineStarts.removeValues(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); - - rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); } if (editingLinesCnt < insertingLinesCnt) { @@ -527,7 +521,7 @@ export class LinesTextBuffer implements ITextBuffer { // Split last line const leftoverLine = this._lines[spliceLineNumber - 1].substring(spliceColumn - 1); - this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1), rawContentChanges); + this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1)); // Lines in the middle let newLines: string[] = new Array(insertingLinesCnt - editingLinesCnt); @@ -540,8 +534,6 @@ export class LinesTextBuffer implements ITextBuffer { newLinesLengths[newLines.length - 1] += leftoverLine.length; this._lines = arrays.arrayInsert(this._lines, startLineNumber + editingLinesCnt, newLines); this._lineStarts.insertValues(startLineNumber + editingLinesCnt, newLinesLengths); - - rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); } const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn); @@ -556,7 +548,7 @@ export class LinesTextBuffer implements ITextBuffer { }); } - return [rawContentChanges, contentChanges]; + return contentChanges; } /** diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 43e9f172270..7213d0a6039 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -11,7 +11,7 @@ import { LanguageIdentifier, TokenizationRegistry, LanguageId } from 'vs/editor/ import { EditStack } from 'vs/editor/common/model/editStack'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged, ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { onUnexpectedError } from 'vs/base/common/errors'; import { IMarkdownString } from 'vs/base/common/htmlContent'; import * as strings from 'vs/base/common/strings'; @@ -1044,21 +1044,83 @@ export class TextModel extends Disposable implements model.ITextModel { } } + private static _eolCount(text: string): number { + let eolCount = 0; + for (let i = 0, len = text.length; i < len; i++) { + const chr = text.charCodeAt(i); + + if (chr === CharCode.CarriageReturn) { + eolCount++; + if (i + 1 < len && text.charCodeAt(i + 1) === CharCode.LineFeed) { + // \r\n... case + i++; // skip \n + } else { + // \r... case + } + } else if (chr === CharCode.LineFeed) { + eolCount++; + } + } + return eolCount; + } + private _applyEdits(rawOperations: model.IIdentifiedSingleEditOperation[]): model.IIdentifiedSingleEditOperation[] { for (let i = 0, len = rawOperations.length; i < len; i++) { rawOperations[i].range = this.validateRange(rawOperations[i].range); } + + const oldLineCount = this._buffer.getLineCount(); const result = this._buffer.applyEdits(rawOperations, this._options.trimAutoWhitespace); - const rawContentChanges = result.rawChanges; + const newLineCount = this._buffer.getLineCount(); + const contentChanges = result.changes; this._trimAutoWhitespaceLines = result.trimAutoWhitespaceLineNumbers; - if (rawContentChanges.length !== 0 || contentChanges.length !== 0) { + if (contentChanges.length !== 0) { + let rawContentChanges: ModelRawChange[] = []; + + let lineCount = oldLineCount; for (let i = 0, len = contentChanges.length; i < len; i++) { - const contentChange = contentChanges[i]; - this._tokens.applyEdits(contentChange.range, contentChange.lines); + const change = contentChanges[i]; + this._tokens.applyEdits(change.range, change.lines); this._onDidChangeDecorations.fire(); - this._decorationsTree.acceptReplace(contentChange.rangeOffset, contentChange.rangeLength, contentChange.text.length, contentChange.forceMoveMarkers); + this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers); + + const startLineNumber = change.range.startLineNumber; + const endLineNumber = change.range.endLineNumber; + + const deletingLinesCnt = endLineNumber - startLineNumber; + const insertingLinesCnt = TextModel._eolCount(change.text); + const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt); + + const changeLineCountDelta = (insertingLinesCnt - deletingLinesCnt); + + for (let j = editingLinesCnt; j >= 0; j--) { + const editLineNumber = startLineNumber + j; + const currentEditLineNumber = newLineCount - lineCount - changeLineCountDelta + editLineNumber; + rawContentChanges.push(new ModelRawLineChanged(editLineNumber, this.getLineContent(currentEditLineNumber))); + } + + if (editingLinesCnt < deletingLinesCnt) { + // Must delete some lines + const spliceStartLineNumber = startLineNumber + editingLinesCnt; + rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); + } + + if (editingLinesCnt < insertingLinesCnt) { + // Must insert some lines + const spliceLineNumber = startLineNumber + editingLinesCnt; + const cnt = insertingLinesCnt - editingLinesCnt; + const fromLineNumber = newLineCount - lineCount - cnt + spliceLineNumber + 1; + let newLines: string[] = []; + for (let i = 0; i < cnt; i++) { + let lineNumber = fromLineNumber + i; + newLines[lineNumber - fromLineNumber] = this.getLineContent(lineNumber); + } + rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); + } + + lineCount += changeLineCountDelta; } this._increaseVersionId(); diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index 9855eda6939..24009cea46a 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts @@ -403,6 +403,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection { insertPrefixSumValues[i] = outputLineCount; } + // TODO@Alex: use arrays.arrayInsert this.lines = this.lines.slice(0, fromLineNumber - 1).concat(insertLines).concat(this.lines.slice(fromLineNumber - 1)); this.prefixSumComputer.insertValues(fromLineNumber - 1, insertPrefixSumValues); diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index 92b7e5b714a..e610caa3ddf 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -129,7 +129,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nNo longer')]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My new line First Line'), new ModelRawLineChanged(1, 'My new line'), new ModelRawLinesInserted(2, 2, ['No longer First Line']), ], @@ -245,7 +244,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Second Line'), new ModelRawLinesDeleted(2, 2), ], @@ -266,7 +264,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Third Line'), new ModelRawLinesDeleted(2, 3), ], From 0784ba0b394ba4fd6697f0b77ca72ee8fdca6e62 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 21:51:00 -0800 Subject: [PATCH 300/710] Test pass. --- .../pieceTableTextBuffer/pieceTableBase.ts | 2 +- .../pieceTableTextBuffer.ts | 24 +------ .../pieceTableTextBufferBuilder.ts | 12 ++-- .../pieceTableTextBuffer.test.ts | 68 +++++++++---------- 4 files changed, 45 insertions(+), 61 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index ed9123c9f59..66b15924c17 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -54,7 +54,7 @@ function resetSentinel(): void { SENTINEL.parent = SENTINEL; } -const lfRegex = new RegExp(/\r\n|\r|\n/g); +// const lfRegex = new RegExp(/\r\n|\r|\n/g); export function createUint32Array(arr: number[]): Uint32Array { let r = new Uint32Array(arr.length); diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index ccc8cc4e493..99930be3f52 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -292,7 +292,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer this._mightContainRTL = mightContainRTL; this._mightContainNonBasicASCII = mightContainNonBasicASCII; - const [rawContentChanges, contentChanges] = this._doApplyEdits(operations); + const contentChanges = this._doApplyEdits(operations); let trimAutoWhitespaceLineNumbers: number[] = null; if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) { @@ -320,16 +320,14 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer return new ApplyEditsResult( reverseOperations, - rawContentChanges, contentChanges, trimAutoWhitespaceLineNumbers ); } - private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { + private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] { operations.sort(PieceTableTextBuffer._sortOpsDescending); - let rawContentChanges: ModelRawChange[] = []; let contentChanges: IInternalModelContentChange[] = []; // operations are from bottom to top @@ -362,18 +360,6 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer this.delete(op.rangeOffset, op.rangeLength); } - for (let j = startLineNumber; j <= startLineNumber + editingLinesCnt; j++) { - rawContentChanges.push( - new ModelRawLineChanged(j, this.getLineContent(j)) - ); - } - - if (editingLinesCnt < deletingLinesCnt) { - rawContentChanges.push( - new ModelRawLinesDeleted(startLineNumber + editingLinesCnt + 1, endLineNumber) - ); - } - if (editingLinesCnt < insertingLinesCnt) { let newLinesContent: string[] = []; for (let j = editingLinesCnt + 1; j <= insertingLinesCnt; j++) { @@ -381,10 +367,6 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } newLinesContent[newLinesContent.length - 1] = this.getLineContent(startLineNumber + insertingLinesCnt - 1); - - rawContentChanges.push( - new ModelRawLinesInserted(startLineNumber + editingLinesCnt + 1, startLineNumber + insertingLinesCnt, newLinesContent) - ); } const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn); @@ -397,7 +379,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer forceMoveMarkers: op.forceMoveMarkers }); } - return [rawContentChanges, contentChanges]; + return contentChanges; } public getValueLengthInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): number { diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts index 0df1c931e70..80e0b5aeb2f 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts @@ -20,6 +20,7 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { private readonly _crlf: number, private readonly _containsRTL: boolean, private readonly _isBasicASCII: boolean, + private readonly _normalizeEOL: boolean ) { } private _getEOL(defaultEOL: DefaultEndOfLine): '\r\n' | '\n' { @@ -41,9 +42,9 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { const eol = this._getEOL(defaultEOL); let chunks = this._chunks; - if ( - (eol === '\r\n' && (this._cr > 0 || this._lf > 0)) - || (eol === '\n' && (this._cr > 0 || this._crlf > 0)) + if (this._normalizeEOL && + ((eol === '\r\n' && (this._cr > 0 || this._lf > 0)) + || (eol === '\n' && (this._cr > 0 || this._crlf > 0))) ) { // Normalize pieces for (let i = 0, len = chunks.length; i < len; i++) { @@ -145,7 +146,7 @@ export class PieceTableTextBufferBuilder implements ITextBufferBuilder { } } - public finish(): PieceTableTextBufferFactory { + public finish(normalizeEOL: boolean = true): PieceTableTextBufferFactory { this._finish(); return new PieceTableTextBufferFactory( this.chunks, @@ -154,7 +155,8 @@ export class PieceTableTextBufferBuilder implements ITextBufferBuilder { this.lf, this.crlf, this.containsRTL, - this.isBasicASCII + this.isBasicASCII, + normalizeEOL ); } diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts index 61aa9620dd7..4dff320fe90 100644 --- a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts @@ -145,12 +145,12 @@ function testLineStarts(str: string, pieceTable: PieceTableTextBuffer) { } } -function createTextBuffer(val: string[]): PieceTableTextBuffer { +function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTableTextBuffer { let bufferBuilder = new PieceTableTextBufferBuilder(); for (let i = 0; i < val.length; i++) { bufferBuilder.acceptChunk(val[i]); } - let factory = bufferBuilder.finish(); + let factory = bufferBuilder.finish(normalizeEOL); return factory.create(DefaultEndOfLine.LF); } @@ -935,9 +935,9 @@ suite('get text in range', () => { }); }); -/* suite('CRLF', () => { +suite('CRLF', () => { test('delete CR in CRLF 1', () => { - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, 'a\r\nb'); pieceTable.delete(0, 2); @@ -945,7 +945,7 @@ suite('get text in range', () => { }); test('delete CR in CRLF 2', () => { - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, 'a\r\nb'); pieceTable.delete(2, 2); @@ -954,7 +954,7 @@ suite('get text in range', () => { test('random bug 1', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\n\r\r'); str = str.substring(0, 0) + '\n\n\r\r' + str.substring(0); pieceTable.insert(1, '\r\n\r\n'); @@ -969,7 +969,7 @@ suite('get text in range', () => { }); test('random bug 2', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\r\n\r'); str = str.substring(0, 0) + '\n\r\n\r' + str.substring(0); @@ -983,7 +983,7 @@ suite('get text in range', () => { }); test('random bug 3', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\n\n\r'); str = str.substring(0, 0) + '\n\n\n\r' + str.substring(0); @@ -1003,7 +1003,7 @@ suite('get text in range', () => { }); test('random bug 4', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\n\n\n'); str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); @@ -1020,7 +1020,7 @@ suite('get text in range', () => { }); test('random bug 5', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\n\n\n'); str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); @@ -1045,7 +1045,7 @@ suite('get text in range', () => { }); test('random bug 6', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\r\r\n'); str = str.substring(0, 0) + '\n\r\r\n' + str.substring(0); @@ -1068,7 +1068,7 @@ suite('get text in range', () => { }); test('random bug 8', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\r\n\n\r'); str = str.substring(0, 0) + '\r\n\n\r' + str.substring(0); @@ -1083,7 +1083,7 @@ suite('get text in range', () => { }); test('random bug 7', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\r\r\n\n'); str = str.substring(0, 0) + '\r\r\n\n' + str.substring(0); @@ -1098,7 +1098,7 @@ suite('get text in range', () => { test('random bug 10', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, 'qneW'); str = str.substring(0, 0) + 'qneW' + str.substring(0); @@ -1118,7 +1118,7 @@ suite('get text in range', () => { test('random bug 9', () => { let str = ''; - let pieceTable = createTextBuffer(['']); + let pieceTable = createTextBuffer([''], false); pieceTable.insert(0, '\n\n\n\n'); str = str.substring(0, 0) + '\n\n\n\n' + str.substring(0); @@ -1139,7 +1139,7 @@ suite('get text in range', () => { suite('centralized lineStarts with CRLF', () => { test('delete CR in CRLF 1', () => { - let pieceTable = createTextBuffer(['a\r\nb']); + let pieceTable = createTextBuffer(['a\r\nb'], false); pieceTable.delete(2, 2); assert.equal(pieceTable.getLineCount(), 2); }); @@ -1152,7 +1152,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 1', () => { let str = '\n\n\r\r'; - let pieceTable = createTextBuffer(['\n\n\r\r']); + let pieceTable = createTextBuffer(['\n\n\r\r'], false); pieceTable.insert(1, '\r\n\r\n'); str = str.substring(0, 1) + '\r\n\r\n' + str.substring(1); pieceTable.delete(5, 3); @@ -1165,7 +1165,7 @@ suite('centralized lineStarts with CRLF', () => { }); test('random bug 2', () => { let str = '\n\r\n\r'; - let pieceTable = createTextBuffer(['\n\r\n\r']); + let pieceTable = createTextBuffer(['\n\r\n\r'], false); pieceTable.insert(2, '\n\r\r\r'); str = str.substring(0, 2) + '\n\r\r\r' + str.substring(2); @@ -1178,7 +1178,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 3', () => { let str = '\n\n\n\r'; - let pieceTable = createTextBuffer(['\n\n\n\r']); + let pieceTable = createTextBuffer(['\n\n\n\r'], false); pieceTable.delete(2, 2); str = str.substring(0, 2) + str.substring(2 + 2); @@ -1197,7 +1197,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 4', () => { let str = '\n\n\n\n'; - let pieceTable = createTextBuffer(['\n\n\n\n']); + let pieceTable = createTextBuffer(['\n\n\n\n'], false); pieceTable.delete(3, 1); str = str.substring(0, 3) + str.substring(3 + 1); @@ -1213,7 +1213,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 5', () => { let str = '\n\n\n\n'; - let pieceTable = createTextBuffer(['\n\n\n\n']); + let pieceTable = createTextBuffer(['\n\n\n\n'], false); pieceTable.delete(3, 1); str = str.substring(0, 3) + str.substring(3 + 1); @@ -1237,7 +1237,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 6', () => { let str = '\n\r\r\n'; - let pieceTable = createTextBuffer(['\n\r\r\n']); + let pieceTable = createTextBuffer(['\n\r\r\n'], false); pieceTable.insert(4, '\r\n\n\r'); str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); @@ -1259,7 +1259,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 7', () => { let str = '\r\n\n\r'; - let pieceTable = createTextBuffer(['\r\n\n\r']); + let pieceTable = createTextBuffer(['\r\n\n\r'], false); pieceTable.delete(1, 0); str = str.substring(0, 1) + str.substring(1 + 0); @@ -1273,7 +1273,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 8', () => { let str = '\r\r\n\n'; - let pieceTable = createTextBuffer(['\r\r\n\n']); + let pieceTable = createTextBuffer(['\r\r\n\n'], false); pieceTable.insert(4, '\r\n\n\r'); str = str.substring(0, 4) + '\r\n\n\r' + str.substring(4); @@ -1286,7 +1286,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 9', () => { let str = 'qneW'; - let pieceTable = createTextBuffer(['qneW']); + let pieceTable = createTextBuffer(['qneW'], false); pieceTable.insert(0, 'YhIl'); str = str.substring(0, 0) + 'YhIl' + str.substring(0); @@ -1304,7 +1304,7 @@ suite('centralized lineStarts with CRLF', () => { test('random bug 10', () => { let str = '\n\n\n\n'; - let pieceTable = createTextBuffer(['\n\n\n\n']); + let pieceTable = createTextBuffer(['\n\n\n\n'], false); pieceTable.insert(3, '\n\r\n\r'); str = str.substring(0, 3) + '\n\r\n\r' + str.substring(3); @@ -1321,7 +1321,7 @@ suite('centralized lineStarts with CRLF', () => { }); test('random chunk bug 1', () => { - let pieceTable = createTextBuffer(['\n\r\r\n\n\n\r\n\r']); + let pieceTable = createTextBuffer(['\n\r\r\n\n\n\r\n\r'], false); let str = '\n\r\r\n\n\n\r\n\r'; pieceTable.delete(0, 2); str = str.substring(0, 0) + str.substring(0 + 2); @@ -1337,7 +1337,7 @@ suite('centralized lineStarts with CRLF', () => { test('random chunk bug 2', () => { let pieceTable = createTextBuffer([ '\n\r\n\n\n\r\n\r\n\r\r\n\n\n\r\r\n\r\n' - ]); + ], false); let str = '\n\r\n\n\n\r\n\r\n\r\r\n\n\n\r\r\n\r\n'; pieceTable.insert(16, '\r\n\r\r'); str = str.substring(0, 16) + '\r\n\r\r' + str.substring(16); @@ -1355,7 +1355,7 @@ suite('centralized lineStarts with CRLF', () => { }); test('random chunk bug 3', () => { - let pieceTable = createTextBuffer(['\r\n\n\n\n\n\n\r\n']); + let pieceTable = createTextBuffer(['\r\n\n\n\n\n\n\r\n'], false); let str = '\r\n\n\n\n\n\n\r\n'; pieceTable.insert(4, '\n\n\r\n\r\r\n\n\r'); str = str.substring(0, 4) + '\n\n\r\n\r\r\n\n\r' + str.substring(4); @@ -1371,7 +1371,7 @@ suite('centralized lineStarts with CRLF', () => { }); test('random chunk bug 4', () => { - let pieceTable = createTextBuffer(['\n\r\n\r']); + let pieceTable = createTextBuffer(['\n\r\n\r'], false); let str = '\n\r\n\r'; pieceTable.insert(4, '\n\n\r\n'); str = str.substring(0, 4) + '\n\n\r\n' + str.substring(4); @@ -1385,7 +1385,7 @@ suite('centralized lineStarts with CRLF', () => { suite('test case from vscode', () => { let str = 'line one\nline two'; - let pieceTable = createTextBuffer([str]); + let pieceTable = createTextBuffer([str], false); assert.deepEqual(pieceTable.getPositionAt(20), new Position(2, 9)); }); @@ -1393,7 +1393,7 @@ suite('test case from vscode', () => { suite('random is unsupervised', () => { test('random insert delete', () => { let str = ''; - let pieceTable = createTextBuffer([str]); + let pieceTable = createTextBuffer([str], false); for (let i = 0; i < 1000; i++) { if (Math.random() < 0.6) { @@ -1426,7 +1426,7 @@ suite('random is unsupervised', () => { chunks.push(randomStr(1000)); } - let pieceTable = createTextBuffer(chunks); + let pieceTable = createTextBuffer(chunks, false); let str = chunks.join(''); for (let i = 0; i < 1000; i++) { @@ -1452,4 +1452,4 @@ suite('random is unsupervised', () => { testLineStarts(str, pieceTable); testLinesContent(str, pieceTable); }); -}); */ +}); From dadeb2224a9840cbcbfe8736c2579f740a260cf8 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Tue, 16 Jan 2018 22:43:29 -0800 Subject: [PATCH 301/710] RBTree invariants validation. --- .../pieceTableTextBuffer/pieceTableBase.ts | 67 +++--- .../pieceTableTextBuffer.ts | 9 +- .../pieceTableTextBuffer.test.ts | 191 ++++++++++++------ 3 files changed, 163 insertions(+), 104 deletions(-) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts index 66b15924c17..1760d4b4c18 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts @@ -12,7 +12,7 @@ export const enum NodeColor { Red = 1, } -function getNodeColor(node: TreeNode) { +export function getNodeColor(node: TreeNode) { return node.color; } @@ -267,8 +267,9 @@ export class StringBuffer { } export class PieceTableBase { + root: TreeNode; + protected _buffers: StringBuffer[]; // 0 is change buffer, others are readonly original buffer. - protected _root: TreeNode; protected _lineCnt: number; private _lastChangeBufferPos: BufferCursor; @@ -281,7 +282,7 @@ export class PieceTableBase { new StringBuffer('', [0]) ]; this._lastChangeBufferPos = { line: 0, column: 0 }; - this._root = SENTINEL; + this.root = SENTINEL; this._lineCnt = 1; let lastNode: TreeNode = null; @@ -316,7 +317,7 @@ export class PieceTableBase { let tempChunkLen = 0; let chunks: StringBuffer[] = []; - this.iterate(this._root, (str) => { + this.iterate(this.root, (str) => { let len = str.length; if (tempChunkLen <= min || tempChunkLen + len < max) { tempChunk += str; @@ -343,7 +344,7 @@ export class PieceTableBase { // #region Piece Table insert(offset: number, value: string): void { // todo, validate value and offset. - if (this._root !== SENTINEL) { + if (this.root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); let piece = node.piece; let bufferIndex = piece.bufferIndex; @@ -422,7 +423,7 @@ export class PieceTableBase { } delete(offset: number, cnt: number): void { - if (cnt <= 0 || this._root === SENTINEL) { + if (cnt <= 0 || this.root === SENTINEL) { return; } @@ -664,11 +665,11 @@ export class PieceTableBase { } getLinesRawContent(): string { - return this.getContentOfSubTree(this._root); + return this.getContentOfSubTree(this.root); } getLineRawContent(lineNumber: number): string { - let x = this._root; + let x = this.root; let ret = ''; while (x !== SENTINEL) { @@ -716,7 +717,7 @@ export class PieceTableBase { } computeLineCount() { - let x = this._root; + let x = this.root; let ret = 1; while (x !== SENTINEL) { @@ -852,7 +853,7 @@ export class PieceTableBase { } nodeAt(offset: number): NodePosition { - let x = this._root; + let x = this.root; let nodeStartOffset = 0; while (x !== SENTINEL) { @@ -876,7 +877,7 @@ export class PieceTableBase { } nodeAt2(position: Position): NodePosition { - let x = this._root; + let x = this.root; let lineNumber = position.lineNumber; let column = position.column; let nodeStartOffset = 0; @@ -958,7 +959,7 @@ export class PieceTableBase { return 0; } let pos = node.size_left; - while (node !== this._root) { + while (node !== this.root) { if (node.parent.right === node) { pos += node.parent.size_left + node.parent.piece.length; } @@ -1137,7 +1138,7 @@ export class PieceTableBase { } y.parent = x.parent; if (x.parent === SENTINEL) { - this._root = y; + this.root = y; } else if (x.parent.left === x) { x.parent.left = y; } else { @@ -1160,7 +1161,7 @@ export class PieceTableBase { y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0); if (y.parent === SENTINEL) { - this._root = x; + this.root = x; } else if (y === y.parent.right) { y.parent.right = x; } else { @@ -1186,9 +1187,9 @@ export class PieceTableBase { z.size_left = 0; z.lf_left = 0; - let x = this._root; + let x = this.root; if (x === SENTINEL) { - this._root = z; + this.root = z; setNodeColor(z, NodeColor.Black); } else if (node.right === SENTINEL) { node.right = z; @@ -1218,9 +1219,9 @@ export class PieceTableBase { z.size_left = 0; z.lf_left = 0; - let x = this._root; + let x = this.root; if (x === SENTINEL) { - this._root = z; + this.root = z; setNodeColor(z, NodeColor.Black); } else if (node.left === SENTINEL) { node.left = z; @@ -1250,15 +1251,15 @@ export class PieceTableBase { x = y.right; } - if (y === this._root) { - this._root = x; + if (y === this.root) { + this.root = x; // if x is null, we are removing the only node setNodeColor(x, NodeColor.Black); z.detach(); resetSentinel(); - this._root.parent = SENTINEL; + this.root.parent = SENTINEL; return; } @@ -1289,8 +1290,8 @@ export class PieceTableBase { y.parent = z.parent; setNodeColor(y, getNodeColor(z)); - if (z === this._root) { - this._root = y; + if (z === this.root) { + this.root = y; } else { if (z === z.parent.left) { z.parent.left = y; @@ -1335,7 +1336,7 @@ export class PieceTableBase { // RB-DELETE-FIXUP let w: TreeNode; - while (x !== this._root && getNodeColor(x) === NodeColor.Black) { + while (x !== this.root && getNodeColor(x) === NodeColor.Black) { if (x === x.parent.left) { w = x.parent.right; @@ -1361,7 +1362,7 @@ export class PieceTableBase { setNodeColor(x.parent, NodeColor.Black); setNodeColor(w.right, NodeColor.Black); this.leftRotate(x.parent); - x = this._root; + x = this.root; } } else { w = x.parent.left; @@ -1389,7 +1390,7 @@ export class PieceTableBase { setNodeColor(x.parent, NodeColor.Black); setNodeColor(w.left, NodeColor.Black); this.rightRotate(x.parent); - x = this._root; + x = this.root; } } } @@ -1400,7 +1401,7 @@ export class PieceTableBase { fixInsert(x: TreeNode) { this.recomputeMetadata(x); - while (x !== this._root && getNodeColor(x.parent) === NodeColor.Red) { + while (x !== this.root && getNodeColor(x.parent) === NodeColor.Red) { if (x.parent === x.parent.parent.left) { const y = x.parent.parent.right; @@ -1439,12 +1440,12 @@ export class PieceTableBase { } } - setNodeColor(this._root, NodeColor.Black); + setNodeColor(this.root, NodeColor.Black); } updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { // node length change or line feed count change - while (x !== this._root && x !== SENTINEL) { + while (x !== this.root && x !== SENTINEL) { if (x.parent.left === x) { x.parent.size_left += delta; x.parent.lf_left += lineFeedCntDelta; @@ -1457,17 +1458,17 @@ export class PieceTableBase { recomputeMetadata(x: TreeNode) { let delta = 0; let lf_delta = 0; - if (x === this._root) { + if (x === this.root) { return; } if (delta === 0) { // go upwards till the node whose left subtree is changed. - while (x !== this._root && x === x.parent.right) { + while (x !== this.root && x === x.parent.right) { x = x.parent; } - if (x === this._root) { + if (x === this.root) { // well, it means we add a node to the end (inorder) return; } @@ -1482,7 +1483,7 @@ export class PieceTableBase { } // go upwards till root. O(logN) - while (x !== this._root && (delta !== 0 || lf_delta !== 0)) { + while (x !== this.root && (delta !== 0 || lf_delta !== 0)) { if (x.parent.left === x) { x.parent.size_left += delta; x.parent.lf_left += lf_delta; diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts index 99930be3f52..30e2bb75fe9 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts @@ -10,7 +10,6 @@ import * as strings from 'vs/base/common/strings'; import { IValidatedEditOperation } from 'vs/editor/common/model/linesTextBuffer/linesTextBuffer'; import { PieceTableBase, SENTINEL, StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; -import { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer { private _BOM: string; @@ -28,11 +27,11 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer // #region TextBuffer public getLinesContent(): string[] { - return this.getContentOfSubTree(this._root).split(/\r\n|\r|\n/); + return this.getContentOfSubTree(this.root).split(/\r\n|\r|\n/); } public getLinesContent2(): string { - return this.getContentOfSubTree(this._root); + return this.getContentOfSubTree(this.root); } public getLineCount(): number { @@ -107,7 +106,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer public getOffsetAt(lineNumber: number, column: number): number { let leftLen = 0; // inorder - let x = this._root; + let x = this.root; while (x !== SENTINEL) { if (x.left !== SENTINEL && x.lf_left + 1 >= lineNumber) { @@ -131,7 +130,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer offset = Math.floor(offset); offset = Math.max(0, offset); - let x = this._root; + let x = this.root; let lfCnt = 0; let originalOffset = offset; diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts index 4dff320fe90..6fad2c6aff2 100644 --- a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts @@ -10,6 +10,7 @@ import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; import { DefaultEndOfLine } from 'vs/editor/common/model'; +import { getNodeColor, SENTINEL, NodeColor, PieceTableBase, TreeNode } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n'; @@ -68,6 +69,8 @@ function trimLineFeed(text: string): string { return text; } +//#region Assertion + function testLinesContent(str: string, pieceTable: PieceTableTextBuffer) { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); @@ -154,6 +157,57 @@ function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTab return factory.create(DefaultEndOfLine.LF); } +function assertTreeInvariants(T: PieceTableBase): void { + assert(getNodeColor(SENTINEL) === NodeColor.Black); + assert(SENTINEL.parent === SENTINEL); + assert(SENTINEL.left === SENTINEL); + assert(SENTINEL.right === SENTINEL); + assert(SENTINEL.size_left === 0); + assert(SENTINEL.lf_left === 0); + assertValidTree(T); +} + +function depth(n: TreeNode): number { + if (n === SENTINEL) { + // The leafs are black + return 1; + } + assert(depth(n.left) === depth(n.right)); + return (getNodeColor(n) === NodeColor.Black ? 1 : 0) + depth(n.left); +} + +function assertValidNode(n: TreeNode): { size: number, lf_cnt: number } { + if (n === SENTINEL) { + return { size: 0, lf_cnt: 0 }; + } + + let l = n.left; + let r = n.right; + + if (getNodeColor(n) === NodeColor.Red) { + assert(getNodeColor(l) === NodeColor.Black); + assert(getNodeColor(r) === NodeColor.Black); + } + + let actualLeft = assertValidNode(l); + assert(actualLeft.lf_cnt === n.lf_left); + assert(actualLeft.size === n.size_left); + let actualRight = assertValidNode(r); + + return { size: n.size_left + n.piece.length + actualRight.size, lf_cnt: n.lf_left + n.piece.lineFeedCnt + actualRight.lf_cnt }; +} + +function assertValidTree(T: PieceTableBase): void { + if (T.root === SENTINEL) { + return; + } + assert(getNodeColor(T.root) === NodeColor.Black); + assert(depth(T.root.left) === depth(T.root.right)); + assertValidNode(T.root); +} + +//#endregion + suite('inserts and deletes', () => { test('basic insert/delete', () => { let pieceTable = createTextBuffer([ @@ -170,6 +224,7 @@ suite('inserts and deletes', () => { pieceTable.getLinesRawContent(), 'This is a document with some text.This is more text to insert at offset 34.' ); + assertTreeInvariants(pieceTable); }); test('more inserts', () => { @@ -183,6 +238,7 @@ suite('inserts and deletes', () => { assert.equal(pt.getLinesRawContent(), 'BBBAAACCC'); pt.insert(5, 'DDD'); assert.equal(pt.getLinesRawContent(), 'BBBAADDDACCC'); + assertTreeInvariants(pt); }); test('more deletes', () => { @@ -197,6 +253,7 @@ suite('inserts and deletes', () => { assert.equal(pt.getLinesRawContent(), '12345'); pt.delete(0, 5); assert.equal(pt.getLinesRawContent(), ''); + assertTreeInvariants(pt); }); test('random test 1', () => { @@ -212,10 +269,10 @@ suite('inserts and deletes', () => { str = str.substring(0, 38) + 'cyNcHxjNPPoehBJldLS ' + str.substring(38); assert.equal(pieceTable.getLinesRawContent(), str); pieceTable.insert(59, 'ejMx\nOTgWlbpeDExjOk '); - str = - str.substring(0, 59) + 'ejMx\nOTgWlbpeDExjOk ' + str.substring(59); + str = str.substring(0, 59) + 'ejMx\nOTgWlbpeDExjOk ' + str.substring(59); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random test 2', () => { @@ -233,6 +290,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 10) + 'Gbtp ' + str.substring(10); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random test 3', () => { @@ -281,6 +339,7 @@ suite('inserts and deletes', () => { pieceTable.delete(0, 1); str = str.substring(0, 0) + str.substring(0 + 1); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random delete 2', () => { @@ -306,6 +365,7 @@ suite('inserts and deletes', () => { pieceTable.delete(3, 5); str = str.substring(0, 3) + str.substring(3 + 5); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random delete 3', () => { @@ -338,6 +398,7 @@ suite('inserts and deletes', () => { pieceTable.delete(3, 4); str = str.substring(0, 3) + str.substring(3 + 4); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random insert/delete \\r bug 1', () => { @@ -363,6 +424,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 5) + '\n\na\r' + str.substring(5); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random insert/delete \\r bug 2', () => { @@ -390,6 +452,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 2) + 'a\ra\n' + str.substring(2); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random insert/delete \\r bug 3', () => { @@ -418,6 +481,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 21) + str.substring(21 + 3); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random insert/delete \\r bug 4s', () => { @@ -445,6 +509,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 3) + 'a\naa' + str.substring(3); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); test('random insert/delete \\r bug 5', () => { let str = ''; @@ -471,6 +536,7 @@ suite('inserts and deletes', () => { str = str.substring(0, 15) + '\n\r\r\r' + str.substring(15); assert.equal(pieceTable.getLinesRawContent(), str); + assertTreeInvariants(pieceTable); }); }); @@ -494,6 +560,7 @@ suite('prefix sum for line feed', () => { assert.equal(pieceTable.getOffsetAt(3, 1), 4); assert.equal(pieceTable.getOffsetAt(3, 2), 5); assert.equal(pieceTable.getOffsetAt(4, 1), 6); + assertTreeInvariants(pieceTable); }); test('append', () => { @@ -503,6 +570,7 @@ suite('prefix sum for line feed', () => { assert.equal(pieceTable.getLineCount(), 6); assert.deepEqual(pieceTable.getPositionAt(9), new Position(4, 4)); assert.equal(pieceTable.getOffsetAt(1, 1), 0); + assertTreeInvariants(pieceTable); }); test('insert', () => { @@ -525,6 +593,7 @@ suite('prefix sum for line feed', () => { assert.equal(pieceTable.getOffsetAt(6, 1), 12); assert.equal(pieceTable.getOffsetAt(6, 2), 13); assert.equal(pieceTable.getOffsetAt(6, 3), 14); + assertTreeInvariants(pieceTable); }); test('delete', () => { @@ -548,6 +617,7 @@ suite('prefix sum for line feed', () => { assert.equal(pieceTable.getOffsetAt(6, 1), 11); assert.equal(pieceTable.getOffsetAt(6, 2), 12); assert.equal(pieceTable.getOffsetAt(6, 3), 13); + assertTreeInvariants(pieceTable); }); test('add+delete 1', () => { @@ -572,6 +642,7 @@ suite('prefix sum for line feed', () => { assert.equal(pieceTable.getOffsetAt(6, 1), 11); assert.equal(pieceTable.getOffsetAt(6, 2), 12); assert.equal(pieceTable.getOffsetAt(6, 3), 13); + assertTreeInvariants(pieceTable); }); test('insert random bug 1: prefixSumComputer.removeValues(start, cnt) cnt is 1 based.', () => { @@ -587,22 +658,8 @@ suite('prefix sum for line feed', () => { str.substring(0, 14) + 'X ZZ\nYZZYZXXY Y XY\n ' + str.substring(14); assert.equal(pieceTable.getLinesRawContent(), str); - - let lineFeedIndex = -1; - let lineCnt = 1; - while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { - if (lineFeedIndex + 1 === str.length) { - // last line feed - break; - } - - lineCnt += 1; - assert.deepEqual( - pieceTable.getPositionAt(lineFeedIndex + 1), - new Position(lineCnt, 1) - ); - assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); - } + testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('insert random bug 2: prefixSumComputer initialize does not do deep copy of UInt32Array.', () => { @@ -615,22 +672,8 @@ suite('prefix sum for line feed', () => { str = str.substring(0, 3) + 'XXY \n\nY Y YYY ZYXY ' + str.substring(3); assert.equal(pieceTable.getLinesRawContent(), str); - - let lineFeedIndex = -1; - let lineCnt = 1; - while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { - if (lineFeedIndex + 1 === str.length) { - // last line feed - break; - } - - lineCnt += 1; - assert.deepEqual( - pieceTable.getPositionAt(lineFeedIndex + 1), - new Position(lineCnt, 1) - ); - assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); - } + testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('delete random bug 1: I forgot to update the lineFeedCnt when deletion is on one single piece.', () => { @@ -657,22 +700,8 @@ suite('prefix sum for line feed', () => { pieceTable.insert(33, 'acaa\nacb\n\naa\n\nc\n\n\n\n '); let str = pieceTable.getLinesRawContent(); - let lineFeedIndex = -1; - let lineCnt = 1; - - while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { - if (lineFeedIndex + 1 === str.length) { - // last line feed - break; - } - - lineCnt += 1; - assert.deepEqual( - pieceTable.getPositionAt(lineFeedIndex + 1), - new Position(lineCnt, 1) - ); - assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); - } + testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('delete random bug rb tree 1', () => { @@ -686,22 +715,8 @@ suite('prefix sum for line feed', () => { str = str.substring(0, 0) + 'ZXYY\nX\nZ\n' + str.substring(0); pieceTable.insert(10, '\nXY\nYXYXY'); str = str.substring(0, 10) + '\nXY\nYXYXY' + str.substring(10); - let lineFeedIndex = -1; - let lineCnt = 1; - - while ((lineFeedIndex = str.indexOf('\n', lineFeedIndex + 1)) !== -1) { - if (lineFeedIndex + 1 === str.length) { - // last line feed - break; - } - - lineCnt += 1; - assert.deepEqual( - pieceTable.getPositionAt(lineFeedIndex + 1), - new Position(lineCnt, 1) - ); - assert.equal(pieceTable.getOffsetAt(lineCnt, 1), lineFeedIndex + 1); - } + testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('delete random bug rb tree 2', () => { @@ -721,6 +736,7 @@ suite('prefix sum for line feed', () => { str = str.substring(0, 0) + str.substring(0 + 4); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('delete random bug rb tree 3', () => { @@ -748,6 +764,7 @@ suite('prefix sum for line feed', () => { str = str.substring(0, 30) + str.substring(30 + 3); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); @@ -771,6 +788,7 @@ suite('offset 2 position', () => { str = str.substring(0, 4) + 'S umSnYrqOmOAV\nEbZJ ' + str.substring(4); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); @@ -787,6 +805,7 @@ suite('get text in range', () => { assert.equal(pieceTable.getValueInRange(new Range(4, 1, 4, 4)), 'dh\n'); assert.equal(pieceTable.getValueInRange(new Range(5, 1, 5, 3)), 'i\n'); assert.equal(pieceTable.getValueInRange(new Range(6, 1, 6, 3)), 'jk'); + assertTreeInvariants(pieceTable); }); test('random test value in range', () => { @@ -805,6 +824,7 @@ suite('get text in range', () => { str = str.substring(0, 12) + 'YYYX' + str.substring(12); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random test value in range exception', () => { let str = ''; @@ -822,6 +842,7 @@ suite('get text in range', () => { str = str.substring(0, 0) + str.substring(0 + 4); pieceTable.getValueInRange(new Range(1, 1, 1, 1)); + assertTreeInvariants(pieceTable); }); test('random tests bug 1', () => { @@ -842,6 +863,7 @@ suite('get text in range', () => { pieceTable.insert(4, 'S umSnYrqOmOAV\nEbZJ '); str = str.substring(0, 4) + 'S umSnYrqOmOAV\nEbZJ ' + str.substring(4); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random tests bug 2', () => { @@ -871,6 +893,7 @@ suite('get text in range', () => { str.substring(0, 15) + 'KJCozaXTvkE\nxnqAeTz ' + str.substring(15); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('get line content', () => { @@ -878,6 +901,7 @@ suite('get text in range', () => { assert.equal(pieceTable.getLineRawContent(1), '1'); pieceTable.insert(1, '2'); assert.equal(pieceTable.getLineRawContent(1), '12'); + assertTreeInvariants(pieceTable); }); test('get line content basic', () => { @@ -886,6 +910,7 @@ suite('get text in range', () => { assert.equal(pieceTable.getLineRawContent(2), '2\n'); assert.equal(pieceTable.getLineRawContent(3), '3\n'); assert.equal(pieceTable.getLineRawContent(4), '4'); + assertTreeInvariants(pieceTable); }); test('get line content after inserts/deletes', () => { @@ -900,6 +925,7 @@ suite('get text in range', () => { assert.equal(pieceTable.getLineRawContent(4), 'dh\n'); assert.equal(pieceTable.getLineRawContent(5), 'i\n'); assert.equal(pieceTable.getLineRawContent(6), 'jk'); + assertTreeInvariants(pieceTable); }); test('random 1', () => { @@ -914,6 +940,7 @@ suite('get text in range', () => { str = str.substring(0, 5) + str.substring(5 + 1); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random 2', () => { @@ -932,6 +959,7 @@ suite('get text in range', () => { str.substring(0, 18) + 'vH\nNlvfqQJPm\nSFkhMc ' + str.substring(18); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); @@ -942,6 +970,7 @@ suite('CRLF', () => { pieceTable.delete(0, 2); assert.equal(pieceTable.getLineCount(), 2); + assertTreeInvariants(pieceTable); }); test('delete CR in CRLF 2', () => { @@ -950,6 +979,7 @@ suite('CRLF', () => { pieceTable.delete(2, 2); assert.equal(pieceTable.getLineCount(), 2); + assertTreeInvariants(pieceTable); }); test('random bug 1', () => { @@ -966,6 +996,7 @@ suite('CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 2', () => { let str = ''; @@ -980,6 +1011,7 @@ suite('CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 3', () => { let str = ''; @@ -1000,6 +1032,7 @@ suite('CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 4', () => { let str = ''; @@ -1017,6 +1050,7 @@ suite('CRLF', () => { str = str.substring(0, 5) + str.substring(5 + 3); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 5', () => { let str = ''; @@ -1042,6 +1076,7 @@ suite('CRLF', () => { str = str.substring(0, 20) + '\n\n\r\n' + str.substring(20); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 6', () => { let str = ''; @@ -1065,6 +1100,7 @@ suite('CRLF', () => { str = str.substring(0, 8) + str.substring(8 + 4); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 8', () => { let str = ''; @@ -1080,6 +1116,7 @@ suite('CRLF', () => { str = str.substring(0, 7) + '\n\n\r\n' + str.substring(7); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 7', () => { let str = ''; @@ -1094,6 +1131,7 @@ suite('CRLF', () => { pieceTable.insert(11, '\n\n\r\n'); str = str.substring(0, 11) + '\n\n\r\n' + str.substring(11); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 10', () => { @@ -1114,6 +1152,7 @@ suite('CRLF', () => { str = str.substring(0, 9) + 'V\rSA' + str.substring(9); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 9', () => { @@ -1134,6 +1173,7 @@ suite('CRLF', () => { str = str.substring(0, 3) + '\n\n\r\r' + str.substring(3); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); @@ -1142,12 +1182,14 @@ suite('centralized lineStarts with CRLF', () => { let pieceTable = createTextBuffer(['a\r\nb'], false); pieceTable.delete(2, 2); assert.equal(pieceTable.getLineCount(), 2); + assertTreeInvariants(pieceTable); }); test('delete CR in CRLF 2', () => { let pieceTable = createTextBuffer(['a\r\nb']); pieceTable.delete(0, 2); assert.equal(pieceTable.getLineCount(), 2); + assertTreeInvariants(pieceTable); }); test('random bug 1', () => { @@ -1162,6 +1204,7 @@ suite('centralized lineStarts with CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 2', () => { let str = '\n\r\n\r'; @@ -1174,6 +1217,7 @@ suite('centralized lineStarts with CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 3', () => { @@ -1193,6 +1237,7 @@ suite('centralized lineStarts with CRLF', () => { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); + assertTreeInvariants(pieceTable); }); test('random bug 4', () => { @@ -1209,6 +1254,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 5) + str.substring(5 + 3); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 5', () => { @@ -1233,6 +1279,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 20) + '\n\n\r\n' + str.substring(20); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 6', () => { @@ -1255,6 +1302,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 8) + str.substring(8 + 4); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 7', () => { @@ -1269,6 +1317,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 7) + '\n\n\r\n' + str.substring(7); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 8', () => { @@ -1282,6 +1331,7 @@ suite('centralized lineStarts with CRLF', () => { pieceTable.insert(11, '\n\n\r\n'); str = str.substring(0, 11) + '\n\n\r\n' + str.substring(11); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 9', () => { @@ -1300,6 +1350,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 9) + 'V\rSA' + str.substring(9); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random bug 10', () => { @@ -1318,6 +1369,7 @@ suite('centralized lineStarts with CRLF', () => { str = str.substring(0, 3) + '\n\n\r\r' + str.substring(3); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random chunk bug 1', () => { @@ -1332,6 +1384,7 @@ suite('centralized lineStarts with CRLF', () => { assert.equal(pieceTable.getLinesRawContent(), str); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random chunk bug 2', () => { @@ -1352,6 +1405,7 @@ suite('centralized lineStarts with CRLF', () => { assert.equal(pieceTable.getLinesRawContent(), str); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random chunk bug 3', () => { @@ -1368,6 +1422,7 @@ suite('centralized lineStarts with CRLF', () => { assert.equal(pieceTable.getLinesRawContent(), str); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random chunk bug 4', () => { @@ -1380,6 +1435,7 @@ suite('centralized lineStarts with CRLF', () => { assert.equal(pieceTable.getLinesRawContent(), str); testLineStarts(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); @@ -1388,6 +1444,7 @@ suite('test case from vscode', () => { let pieceTable = createTextBuffer([str], false); assert.deepEqual(pieceTable.getPositionAt(20), new Position(2, 9)); + assertTreeInvariants(pieceTable); }); suite('random is unsupervised', () => { @@ -1418,6 +1475,7 @@ suite('random is unsupervised', () => { testLineStarts(str, pieceTable); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); test('random chunks', () => { @@ -1451,5 +1509,6 @@ suite('random is unsupervised', () => { assert.equal(pieceTable.getLinesRawContent(), str); testLineStarts(str, pieceTable); testLinesContent(str, pieceTable); + assertTreeInvariants(pieceTable); }); }); From 1cbacf4b6a9fc3b0101223d9cc33345a2682d44b Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 17 Jan 2018 08:22:54 +0100 Subject: [PATCH 302/710] restore "..." menu for inactive editor groups --- .../workbench/browser/parts/editor/titleControl.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index d60983725ca..4c2fbffde2a 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -310,7 +310,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl const titleBarMenu = this.menuService.createMenu(MenuId.EditorTitle, scopedContextKeyService); this.disposeOnEditorActions.push(titleBarMenu, titleBarMenu.onDidChange(_ => this.update())); - fillInActions(titleBarMenu, { arg: this.resourceContext.get() }, { primary, secondary }, this.contextMenuService); + fillInActions(titleBarMenu, { arg: this.resourceContext.get(), shouldForwardArgs: true }, { primary, secondary }, this.contextMenuService); } return { primary, secondary }; @@ -328,16 +328,20 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl // Update Editor Actions Toolbar let primaryEditorActions: IAction[] = []; let secondaryEditorActions: IAction[] = []; + + const editorActions = this.getEditorActions({ group, editor }); + + // Primary actions only for the active group if (isActive) { - const editorActions = this.getEditorActions({ group, editor }); primaryEditorActions = prepareActions(editorActions.primary); - if (isActive && editor instanceof EditorInput && editor.supportsSplitEditor()) { + if (editor instanceof EditorInput && editor.supportsSplitEditor()) { this.updateSplitActionEnablement(); primaryEditorActions.push(this.splitEditorAction); } - secondaryEditorActions = prepareActions(editorActions.secondary); } + secondaryEditorActions = prepareActions(editorActions.secondary); + const tabOptions = this.editorGroupService.getTabOptions(); const primaryEditorActionIds = primaryEditorActions.map(a => a.id); From 728f825f04647ab9b886d8842cf62cde238d739e Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 09:28:16 +0100 Subject: [PATCH 303/710] Add more TextModel tests --- .../test/common/model/textModel.test.ts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts index 323ca9886b3..0994bbe7c32 100644 --- a/src/vs/editor/test/common/model/textModel.test.ts +++ b/src/vs/editor/test/common/model/textModel.test.ts @@ -763,6 +763,66 @@ suite('Editor Model - TextModel', () => { model.dispose(); }); + + test('getLineFirstNonWhitespaceColumn', () => { + let model = TextModel.createFromString([ + 'asd', + ' asd', + '\tasd', + ' asd', + '\t\tasd', + ' ', + ' ', + '\t', + '\t\t', + ' \tasd', + '', + '' + ].join('\n')); + + assert.equal(model.getLineFirstNonWhitespaceColumn(1), 1, '1'); + assert.equal(model.getLineFirstNonWhitespaceColumn(2), 2, '2'); + assert.equal(model.getLineFirstNonWhitespaceColumn(3), 2, '3'); + assert.equal(model.getLineFirstNonWhitespaceColumn(4), 3, '4'); + assert.equal(model.getLineFirstNonWhitespaceColumn(5), 3, '5'); + assert.equal(model.getLineFirstNonWhitespaceColumn(6), 0, '6'); + assert.equal(model.getLineFirstNonWhitespaceColumn(7), 0, '7'); + assert.equal(model.getLineFirstNonWhitespaceColumn(8), 0, '8'); + assert.equal(model.getLineFirstNonWhitespaceColumn(9), 0, '9'); + assert.equal(model.getLineFirstNonWhitespaceColumn(10), 4, '10'); + assert.equal(model.getLineFirstNonWhitespaceColumn(11), 0, '11'); + assert.equal(model.getLineFirstNonWhitespaceColumn(12), 0, '12'); + }); + + test('getLineLastNonWhitespaceColumn', () => { + let model = TextModel.createFromString([ + 'asd', + 'asd ', + 'asd\t', + 'asd ', + 'asd\t\t', + ' ', + ' ', + '\t', + '\t\t', + 'asd \t', + '', + '' + ].join('\n')); + + assert.equal(model.getLineLastNonWhitespaceColumn(1), 4, '1'); + assert.equal(model.getLineLastNonWhitespaceColumn(2), 4, '2'); + assert.equal(model.getLineLastNonWhitespaceColumn(3), 4, '3'); + assert.equal(model.getLineLastNonWhitespaceColumn(4), 4, '4'); + assert.equal(model.getLineLastNonWhitespaceColumn(5), 4, '5'); + assert.equal(model.getLineLastNonWhitespaceColumn(6), 0, '6'); + assert.equal(model.getLineLastNonWhitespaceColumn(7), 0, '7'); + assert.equal(model.getLineLastNonWhitespaceColumn(8), 0, '8'); + assert.equal(model.getLineLastNonWhitespaceColumn(9), 0, '9'); + assert.equal(model.getLineLastNonWhitespaceColumn(10), 4, '10'); + assert.equal(model.getLineLastNonWhitespaceColumn(11), 0, '11'); + assert.equal(model.getLineLastNonWhitespaceColumn(12), 0, '12'); + }); }); suite('TextModel.mightContainRTL', () => { From 4ad47b013d35a8510ece6bd854af769f120bfe63 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 09:29:15 +0100 Subject: [PATCH 304/710] Implement ChunksTextBuffer.getLineLastNonWhitespaceColumn --- .../model/chunksTextBuffer/bufferPiece.ts | 18 +++++- .../chunksTextBuffer/chunksTextBuffer.ts | 58 ++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts index 78c9915d8b8..f91a6157d1c 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -66,12 +66,26 @@ export class BufferPiece { return -1; } - public findLineFirstNonWhitespaceIndexInLeaf(searchStartOffset: number): number { + 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 -1; + 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; diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 7677656adc8..33d31749722 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -149,7 +149,11 @@ export class ChunksTextBuffer implements ITextBuffer { return result + 1; } getLineLastNonWhitespaceColumn(lineNumber: number): number { - throw new Error('TODO'); + const result = this._actual.getLineLastNonWhitespaceIndex(lineNumber); + if (result === -1) { + return 0; + } + return result + 1; } setEOL(newEOL: '\r\n' | '\n'): void { if (this.getEOL() === newEOL) { @@ -929,7 +933,11 @@ class Buffer { while (true) { const leaf = this._leafs[leafIndex]; - const leafResult = leaf.findLineFirstNonWhitespaceIndexInLeaf(searchStartOffset); + const leafResult = leaf.findLineFirstNonWhitespaceIndex(searchStartOffset); + if (leafResult === -2) { + // reached EOL + return -1; + } if (leafResult !== -1) { return (leafResult - searchStartOffset) + totalDelta; } @@ -945,6 +953,52 @@ class Buffer { } } + 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(this.getLineCount()); let resultIndex = 0; From 5422c4bd0a5fa79c340ea1d0941d8be7ec66de19 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 09:32:20 +0100 Subject: [PATCH 305/710] Handle BOM (if present at the start of the first piece) --- .../model/chunksTextBuffer/chunksTextBuffer.ts | 7 ++++--- .../chunksTextBuffer/chunksTextBufferBuilder.ts | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 33d31749722..13a8933380e 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -24,11 +24,13 @@ export interface IValidatedEditOperation { export class ChunksTextBuffer implements ITextBuffer { + private _BOM: string; private _actual: Buffer; private _mightContainRTL: boolean; private _mightContainNonBasicASCII: boolean; - constructor(pieces: BufferPiece[], _averageChunkSize: number, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: 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; @@ -51,8 +53,7 @@ export class ChunksTextBuffer implements ITextBuffer { return this._mightContainNonBasicASCII; } getBOM(): string { - // TODO - return ''; + return this._BOM; } getEOL(): string { return this._actual.getEOL(); diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index e1268de0dd5..8be31da92c0 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -15,6 +15,7 @@ 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, @@ -56,7 +57,7 @@ export class TextBufferFactory implements ITextBufferFactory { pieces[i] = BufferPiece.normalizeEOL(pieces[i], eol); } } - return new ChunksTextBuffer(pieces, this._averageChunkSize, eol, this._containsRTL, this._isBasicASCII); + return new ChunksTextBuffer(pieces, this._averageChunkSize, this._BOM, eol, this._containsRTL, this._isBasicASCII); } public getFirstLineText(lengthLimit: number): string { @@ -73,6 +74,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { private _averageChunkSize: number; private _tmpLineStarts: number[]; + private BOM: string; private cr: number; private lf: number; private crlf: number; @@ -86,6 +88,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { this._averageChunkSize = 0; this._tmpLineStarts = []; + this.BOM = ''; this.cr = 0; this.lf = 0; this.crlf = 0; @@ -98,6 +101,13 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { 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); @@ -145,7 +155,7 @@ export class ChunksTextBufferBuilder implements ITextBufferBuilder { public finish(): TextBufferFactory { this._finish(); - return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.cr, this.lf, this.crlf, this.containsRTL, this.isBasicASCII); + return new TextBufferFactory(this._rawPieces, this._averageChunkSize, this.BOM, this.cr, this.lf, this.crlf, this.containsRTL, this.isBasicASCII); } private _finish(): void { From aa1e5e7ecfe2b6afc67a3ecf0fcaa421eae75c2c Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 10:27:46 +0100 Subject: [PATCH 306/710] TreeViewsViewlet no action if expanded state does not change fixes #41706 --- src/vs/workbench/browser/parts/views/viewsViewlet.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 5b7544394ff..1ab63b6f749 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -122,8 +122,10 @@ export abstract class TreeViewsViewletPanel extends ViewsViewletPanel { } setExpanded(expanded: boolean): void { - this.updateTreeVisibility(this.tree, expanded); - super.setExpanded(expanded); + if (this.isExpanded() !== expanded) { + this.updateTreeVisibility(this.tree, expanded); + super.setExpanded(expanded); + } } protected renderHeader(container: HTMLElement): void { @@ -784,4 +786,4 @@ export class FileIconThemableWorkbenchTree extends WorkbenchTree { this.disposables.push(themeService.onDidFileIconThemeChange(onFileIconThemeChange)); onFileIconThemeChange(themeService.getFileIconTheme()); } -} \ No newline at end of file +} From 1cb7f355394ecf96a47ded53eed7f41e43bb68b7 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 10:41:56 +0100 Subject: [PATCH 307/710] fix close unmodified command --- .../browser/parts/editor/editorCommands.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index a09a31f09cf..a7cc041cdeb 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -264,12 +264,22 @@ function registerEditorCommands() { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_U), handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => { const editorGroupService = accessor.get(IEditorGroupService); + const model = editorGroupService.getStacksModel(); const editorService = accessor.get(IWorkbenchEditorService); const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); - const positions = contexts.map(context => positionAndInput(editorGroupService, editorService, context).position); - return TPromise.join(distinct(positions.filter(p => typeof p === 'number')) - .map(position => editorService.closeEditors(position, { unmodifiedOnly: true }))); + let positionOne: { unmodifiedOnly: boolean } = undefined; + let positionTwo: { unmodifiedOnly: boolean } = undefined; + let positionThree: { unmodifiedOnly: boolean } = undefined; + contexts.forEach(c => { + switch (model.positionOfGroup(c.group)) { + case Position.ONE: positionOne = { unmodifiedOnly: true }; break; + case Position.TWO: positionTwo = { unmodifiedOnly: true }; break; + case Position.THREE: positionThree = { unmodifiedOnly: true }; break; + } + }); + + return editorService.closeEditors({ positionOne, positionTwo, positionThree }); } }); From ba0690523d8eed5bb3498995c1682b8d3d7def3d Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 10:51:40 +0100 Subject: [PATCH 308/710] fix save all across groups --- src/vs/workbench/parts/files/electron-browser/fileCommands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 23f1b15a206..b74a405a0d9 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -495,9 +495,9 @@ CommandsRegistry.registerCommand({ saveAllArg = true; } else { const fileService = accessor.get(IFileService); + saveAllArg = []; contexts.forEach(context => { const editorGroup = context.group; - saveAllArg = []; editorGroup.getEditors().forEach(editor => { const resource = toResource(editor, { supportSideBySide: true }); if (resource && (resource.scheme === 'untitled' || fileService.canHandleResource(resource))) { From 53669f642eb17ce82a530569f30d3cb82a2c8fb8 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 11:10:58 +0100 Subject: [PATCH 309/710] Improved implementations --- .../model/chunksTextBuffer/bufferPiece.ts | 20 +++--- .../chunksTextBufferBuilder.ts | 9 ++- .../chunksTextBuffer/bufferPiece.test.ts | 61 +++++++++++++++++++ 3 files changed, 81 insertions(+), 9 deletions(-) create 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 index f91a6157d1c..53063409aea 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/bufferPiece.ts @@ -54,16 +54,22 @@ export class BufferPiece { return -1; } - // TODO: implement binary search - for (let i = this._lineStarts.length - 1; i >= 0; i--) { - let lineStart = this._lineStarts[i]; + let low = 0, high = this._lineStarts.length - 1; - if (lineStart <= offset) { - return i; + 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 -1; + return low; } public findLineFirstNonWhitespaceIndex(searchStartOffset: number): number { @@ -111,7 +117,7 @@ export class BufferPiece { } let newLineStarts = new Uint32Array(newLineStartsLength); - newLineStarts.set(targetLineStarts); // TODO: does this work correctly? + newLineStarts.set(targetLineStarts); return new BufferPiece( target._str.substr(0, targetCharsLength - 1), diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts index 8be31da92c0..12eaf167b28 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder.ts @@ -61,8 +61,13 @@ export class TextBufferFactory implements ITextBufferFactory { } public getFirstLineText(lengthLimit: number): string { - console.log(`TODO`); - return ''; + 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)); } } diff --git a/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts b/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts new file mode 100644 index 00000000000..a6cc8f6f22d --- /dev/null +++ b/src/vs/editor/test/common/model/chunksTextBuffer/bufferPiece.test.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ + +'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 b51704092412c6feda365178c658a29daa175d88 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 11:21:45 +0100 Subject: [PATCH 310/710] "Toggle Side Bar Location" -> "Toggle Side Bar Position" fixes #41663 --- src/vs/workbench/browser/actions/toggleSidebarPosition.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts index 2dc5bab450f..d338760c2c3 100644 --- a/src/vs/workbench/browser/actions/toggleSidebarPosition.ts +++ b/src/vs/workbench/browser/actions/toggleSidebarPosition.ts @@ -16,7 +16,7 @@ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configur export class ToggleSidebarPositionAction extends Action { public static readonly ID = 'workbench.action.toggleSidebarPosition'; - public static readonly LABEL = nls.localize('toggleLocation', "Toggle Side Bar Location"); + public static readonly LABEL = nls.localize('toggleSidebarPosition', "Toggle Side Bar Position"); private static readonly sidebarPositionConfigurationKey = 'workbench.sideBar.location'; @@ -40,4 +40,4 @@ export class ToggleSidebarPositionAction extends Action { } const registry = Registry.as(Extensions.WorkbenchActions); -registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.LABEL), 'View: Toggle Side Bar Location', nls.localize('view', "View")); \ No newline at end of file +registry.registerWorkbenchAction(new SyncActionDescriptor(ToggleSidebarPositionAction, ToggleSidebarPositionAction.ID, ToggleSidebarPositionAction.LABEL), 'View: Toggle Side Bar Position', nls.localize('view', "View")); From 70924ef4ea18c93542cf555f589fcbc3eec7152c Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 17 Jan 2018 12:01:27 +0100 Subject: [PATCH 311/710] multi select - wire context keyservice properly --- src/vs/platform/list/browser/listService.ts | 4 ++-- .../files/electron-browser/views/explorerViewer.ts | 12 ++++++++---- .../files/electron-browser/views/openEditorsView.ts | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts index 05dc85f8165..a8c4ebfeeea 100644 --- a/src/vs/platform/list/browser/listService.ts +++ b/src/vs/platform/list/browser/listService.ts @@ -104,8 +104,8 @@ export class WorkbenchList extends List { @IThemeService themeService: IThemeService ) { super(container, delegate, renderers, options); - this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(contextKeyService); this.contextKeyService = createScopedContextKeyService(contextKeyService, this); + this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService); this.disposables.push(combinedDisposable([ this.contextKeyService, @@ -164,8 +164,8 @@ export class WorkbenchTree extends Tree { ) { super(container, configuration, options); - this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(contextKeyService); this.contextKeyService = createScopedContextKeyService(contextKeyService, this); + this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService); this.disposables.push( this.contextKeyService, 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 1105d96bf3f..3d8c4d19c53 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -56,6 +56,7 @@ import { extractResources } from 'vs/workbench/browser/editor'; import { relative } from 'path'; import { DataTransfers } from 'vs/base/browser/dnd'; import { distinctParents } from 'vs/base/common/resources'; +import { WorkbenchTree } from 'vs/platform/list/browser/listService'; export class FileDataSource implements IDataSource { constructor( @@ -334,14 +335,12 @@ export class FileController extends DefaultController implements IDisposable { constructor( @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IContextMenuService private contextMenuService: IContextMenuService, @ITelemetryService private telemetryService: ITelemetryService, - @IMenuService menuService: IMenuService, + @IMenuService private menuService: IMenuService, @IContextKeyService contextKeyService: IContextKeyService ) { super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */, keyboardSupport: false /* handled via IListService */ }); this.toDispose = []; - this.contributedContextMenu = menuService.createMenu(MenuId.ExplorerContext, contextKeyService); - this.toDispose.push(this.contributedContextMenu); } public onLeftClick(tree: ITree, stat: FileStat | Model, event: IMouseEvent, origin: string = 'mouse'): boolean { @@ -427,7 +426,7 @@ export class FileController extends DefaultController implements IDisposable { return true; } - public onContextMenu(tree: ITree, stat: FileStat | Model, event: ContextMenuEvent): boolean { + public onContextMenu(tree: WorkbenchTree, stat: FileStat | Model, event: ContextMenuEvent): boolean { if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') { return false; } @@ -437,6 +436,11 @@ export class FileController extends DefaultController implements IDisposable { tree.setFocus(stat); + if (!this.contributedContextMenu) { + this.contributedContextMenu = this.menuService.createMenu(MenuId.ExplorerContext, tree.contextKeyService); + this.toDispose.push(this.contributedContextMenu); + } + const anchor = { x: event.posx, y: event.posy }; const selection = tree.getSelection(); this.contextMenuService.showContextMenu({ diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts index 4e2016ba3cc..fb55f5d1ce7 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts @@ -79,7 +79,7 @@ export class OpenEditorsView extends ViewsViewletPanel { @IContextKeyService private contextKeyService: IContextKeyService, @IThemeService private themeService: IThemeService, @ITelemetryService private telemetryService: ITelemetryService, - @IMenuService menuService: IMenuService + @IMenuService private menuService: IMenuService ) { super({ ...(options as IViewOptions), @@ -98,8 +98,6 @@ export class OpenEditorsView extends ViewsViewletPanel { } this.needsRefresh = false; }, this.structuralRefreshDelay); - this.contributedContextMenu = menuService.createMenu(MenuId.OpenEditorsContext, contextKeyService); - this.disposables.push(this.contributedContextMenu); // update on model changes this.disposables.push(this.model.onModelChanged(e => this.onEditorStacksModelChanged(e))); @@ -160,6 +158,9 @@ export class OpenEditorsView extends ViewsViewletPanel { identityProvider: element => element instanceof OpenEditor ? element.getId() : element.id.toString() }, this.contextKeyService, this.listService, this.themeService); + this.contributedContextMenu = this.menuService.createMenu(MenuId.OpenEditorsContext, this.list.contextKeyService); + this.disposables.push(this.contributedContextMenu); + this.updateSize(); // Bind context keys From 0665fd2b8c3fbc9650a1dbd78235ee343c1b7901 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 12:48:46 +0100 Subject: [PATCH 312/710] explorer input box: restore focus based on blur fixes #41559 --- .../files/electron-browser/views/explorerViewer.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 3d8c4d19c53..83037b46262 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -280,16 +280,15 @@ export class FileRenderer implements IRenderer { inputBox.select({ start: 0, end: lastDot > 0 && !stat.isDirectory ? lastDot : value.length }); inputBox.focus(); - const done = once((commit: boolean) => { + const done = once((commit: boolean, blur: boolean) => { tree.clearHighlight(); if (commit && inputBox.value) { editableData.action.run({ value: inputBox.value }); } - const restoreFocus = document.activeElement === inputBox.inputElement; // https://github.com/Microsoft/vscode/issues/20269 setTimeout(() => { - if (restoreFocus) { + if (!blur) { // https://github.com/Microsoft/vscode/issues/20269 tree.DOMFocus(); } lifecycle.dispose(toDispose); @@ -302,14 +301,14 @@ export class FileRenderer implements IRenderer { DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: IKeyboardEvent) => { if (e.equals(KeyCode.Enter)) { if (inputBox.validate()) { - done(true); + done(true, false); } } else if (e.equals(KeyCode.Escape)) { - done(false); + done(false, false); } }), DOM.addDisposableListener(inputBox.inputElement, DOM.EventType.BLUR, () => { - done(inputBox.isInputValid()); + done(inputBox.isInputValid(), true); }), label, styler From 27f7c0bcea86be36d911ea89e3f561cfb59cc0cb Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 13:01:29 +0100 Subject: [PATCH 313/710] fix cmd + w not working when wrong list selected --- .../browser/parts/editor/editorCommands.ts | 46 ++++++++++--------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index a7cc041cdeb..c5fd59b2c87 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -318,34 +318,36 @@ function registerEditorCommands() { const editorsToClose = new Map(); - if (groups.length === 0) { + groups.forEach(group => { + const position = editorGroupService.getStacksModel().positionOfGroup(group); + if (position >= 0) { + editorsToClose.set(position, contexts.map(c => { + if (group === c.group) { + let input = c ? c.editor : undefined; + if (!input) { + + // Get Top Editor at Position + const visibleEditors = editorService.getVisibleEditors(); + if (visibleEditors[position]) { + input = visibleEditors[position].input; + } + } + + return input; + } + + return undefined; + }).filter(input => !!input)); + } + }); + + if (editorsToClose.size === 0) { const activeEditor = editorService.getActiveEditor(); if (activeEditor) { return editorService.closeEditor(activeEditor.position, activeEditor.input); } } - groups.forEach(group => { - const position = editorGroupService.getStacksModel().positionOfGroup(group); - editorsToClose.set(position, contexts.map(c => { - if (group === c.group) { - let input = c ? c.editor : undefined; - if (!input) { - - // Get Top Editor at Position - const visibleEditors = editorService.getVisibleEditors(); - if (visibleEditors[position]) { - input = visibleEditors[position].input; - } - } - - return input; - } - - return undefined; - }).filter(input => !!input)); - }); - return editorService.closeEditors({ positionOne: editorsToClose.get(Position.ONE), positionTwo: editorsToClose.get(Position.TWO), From 4d3ca2a56b3a74b5a13f30edeaed007a114ed840 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 15:26:00 +0100 Subject: [PATCH 314/710] Implement more efficient getLineCharCode --- .../chunksTextBuffer/chunksTextBuffer.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts index 13a8933380e..b4c26664a75 100644 --- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts +++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts @@ -134,8 +134,7 @@ export class ChunksTextBuffer implements ITextBuffer { } getLineCharCode(lineNumber: number, index: number): number { - // TODO - return this.getLineContent(lineNumber).charCodeAt(index); + return this._actual.getLineCharCode(lineNumber, index); } getLineLength(lineNumber: number): number { @@ -894,6 +893,23 @@ class Buffer { 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(); From 5507f635bde0ff2ed8d8be434f8c307d190466c1 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 15 Jan 2018 16:32:40 +0100 Subject: [PATCH 315/710] Move RawContentChange events creation to TextModel --- src/vs/editor/common/model.ts | 3 +- .../model/linesTextBuffer/linesTextBuffer.ts | 24 ++---- src/vs/editor/common/model/textModel.ts | 74 +++++++++++++++++-- .../common/viewModel/splitLinesCollection.ts | 1 + src/vs/editor/test/common/model/model.test.ts | 3 - 5 files changed, 78 insertions(+), 27 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 9f25ed1118f..9d58b81cc05 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -12,7 +12,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { Position, IPosition } from 'vs/editor/common/core/position'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange, ModelRawChange } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange } from 'vs/editor/common/model/textModelEvents'; import { ThemeColor } from 'vs/platform/theme/common/themeService'; /** @@ -1098,7 +1098,6 @@ export class ApplyEditsResult { constructor( public readonly reverseEdits: IIdentifiedSingleEditOperation[], - public readonly rawChanges: ModelRawChange[], public readonly changes: IInternalModelContentChange[], public readonly trimAutoWhitespaceLineNumbers: number[] ) { } diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 09cafe2246c..1cbd9fe7c92 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -9,7 +9,6 @@ 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 { ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { ISingleEditOperationIdentifier, IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; export interface IValidatedEditOperation { @@ -252,7 +251,7 @@ export class LinesTextBuffer implements ITextBuffer { public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { if (rawOperations.length === 0) { - return new ApplyEditsResult([], [], [], []); + return new ApplyEditsResult([], [], []); } let mightContainRTL = this._mightContainRTL; @@ -341,7 +340,7 @@ export class LinesTextBuffer implements ITextBuffer { this._mightContainRTL = mightContainRTL; this._mightContainNonBasicASCII = mightContainNonBasicASCII; - const [rawContentChanges, contentChanges] = this._doApplyEdits(operations); + const contentChanges = this._doApplyEdits(operations); let trimAutoWhitespaceLineNumbers: number[] = null; if (recordTrimAutoWhitespace && newTrimAutoWhitespaceCandidates.length > 0) { @@ -369,7 +368,6 @@ export class LinesTextBuffer implements ITextBuffer { return new ApplyEditsResult( reverseOperations, - rawContentChanges, contentChanges, trimAutoWhitespaceLineNumbers ); @@ -451,18 +449,16 @@ export class LinesTextBuffer implements ITextBuffer { }; } - private _setLineContent(lineNumber: number, content: string, rawContentChanges: ModelRawChange[]): void { + private _setLineContent(lineNumber: number, content: string): void { this._lines[lineNumber - 1] = content; this._lineStarts.changeValue(lineNumber - 1, content.length + this._EOL.length); - rawContentChanges.push(new ModelRawLineChanged(lineNumber, content)); } - private _doApplyEdits(operations: IValidatedEditOperation[]): [ModelRawChange[], IInternalModelContentChange[]] { + private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] { // Sort operations descending operations.sort(LinesTextBuffer._sortOpsDescending); - let rawContentChanges: ModelRawChange[] = []; let contentChanges: IInternalModelContentChange[] = []; for (let i = 0, len = operations.length; i < len; i++) { @@ -497,7 +493,7 @@ export class LinesTextBuffer implements ITextBuffer { ); } - this._setLineContent(editLineNumber, editText, rawContentChanges); + this._setLineContent(editLineNumber, editText); } if (editingLinesCnt < deletingLinesCnt) { @@ -507,12 +503,10 @@ export class LinesTextBuffer implements ITextBuffer { const endLineRemains = this._lines[endLineNumber - 1].substring(endColumn - 1); // Reconstruct first line - this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains, rawContentChanges); + this._setLineContent(spliceStartLineNumber, this._lines[spliceStartLineNumber - 1] + endLineRemains); this._lines.splice(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); this._lineStarts.removeValues(spliceStartLineNumber, endLineNumber - spliceStartLineNumber); - - rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); } if (editingLinesCnt < insertingLinesCnt) { @@ -527,7 +521,7 @@ export class LinesTextBuffer implements ITextBuffer { // Split last line const leftoverLine = this._lines[spliceLineNumber - 1].substring(spliceColumn - 1); - this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1), rawContentChanges); + this._setLineContent(spliceLineNumber, this._lines[spliceLineNumber - 1].substring(0, spliceColumn - 1)); // Lines in the middle let newLines: string[] = new Array(insertingLinesCnt - editingLinesCnt); @@ -540,8 +534,6 @@ export class LinesTextBuffer implements ITextBuffer { newLinesLengths[newLines.length - 1] += leftoverLine.length; this._lines = arrays.arrayInsert(this._lines, startLineNumber + editingLinesCnt, newLines); this._lineStarts.insertValues(startLineNumber + editingLinesCnt, newLinesLengths); - - rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); } const contentChangeRange = new Range(startLineNumber, startColumn, endLineNumber, endColumn); @@ -556,7 +548,7 @@ export class LinesTextBuffer implements ITextBuffer { }); } - return [rawContentChanges, contentChanges]; + return contentChanges; } /** diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index dff56a1a7a8..ac54f0999f6 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -11,7 +11,7 @@ import { LanguageIdentifier, TokenizationRegistry, LanguageId } from 'vs/editor/ import { EditStack } from 'vs/editor/common/model/editStack'; import { Range, IRange } from 'vs/editor/common/core/range'; import { Selection } from 'vs/editor/common/core/selection'; -import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged } from 'vs/editor/common/model/textModelEvents'; +import { ModelRawContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelOptionsChangedEvent, IModelContentChangedEvent, InternalModelContentChangeEvent, ModelRawFlush, ModelRawEOLChanged, ModelRawChange, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted } from 'vs/editor/common/model/textModelEvents'; import { onUnexpectedError } from 'vs/base/common/errors'; import { IMarkdownString } from 'vs/base/common/htmlContent'; import * as strings from 'vs/base/common/strings'; @@ -1033,21 +1033,83 @@ export class TextModel extends Disposable implements model.ITextModel { } } + private static _eolCount(text: string): number { + let eolCount = 0; + for (let i = 0, len = text.length; i < len; i++) { + const chr = text.charCodeAt(i); + + if (chr === CharCode.CarriageReturn) { + eolCount++; + if (i + 1 < len && text.charCodeAt(i + 1) === CharCode.LineFeed) { + // \r\n... case + i++; // skip \n + } else { + // \r... case + } + } else if (chr === CharCode.LineFeed) { + eolCount++; + } + } + return eolCount; + } + private _applyEdits(rawOperations: model.IIdentifiedSingleEditOperation[]): model.IIdentifiedSingleEditOperation[] { for (let i = 0, len = rawOperations.length; i < len; i++) { rawOperations[i].range = this.validateRange(rawOperations[i].range); } + + const oldLineCount = this._buffer.getLineCount(); const result = this._buffer.applyEdits(rawOperations, this._options.trimAutoWhitespace); - const rawContentChanges = result.rawChanges; + const newLineCount = this._buffer.getLineCount(); + const contentChanges = result.changes; this._trimAutoWhitespaceLines = result.trimAutoWhitespaceLineNumbers; - if (rawContentChanges.length !== 0 || contentChanges.length !== 0) { + if (contentChanges.length !== 0) { + let rawContentChanges: ModelRawChange[] = []; + + let lineCount = oldLineCount; for (let i = 0, len = contentChanges.length; i < len; i++) { - const contentChange = contentChanges[i]; - this._tokens.applyEdits(contentChange.range, contentChange.lines); + const change = contentChanges[i]; + this._tokens.applyEdits(change.range, change.lines); this._onDidChangeDecorations.fire(); - this._decorationsTree.acceptReplace(contentChange.rangeOffset, contentChange.rangeLength, contentChange.text.length, contentChange.forceMoveMarkers); + this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers); + + const startLineNumber = change.range.startLineNumber; + const endLineNumber = change.range.endLineNumber; + + const deletingLinesCnt = endLineNumber - startLineNumber; + const insertingLinesCnt = TextModel._eolCount(change.text); + const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt); + + const changeLineCountDelta = (insertingLinesCnt - deletingLinesCnt); + + for (let j = editingLinesCnt; j >= 0; j--) { + const editLineNumber = startLineNumber + j; + const currentEditLineNumber = newLineCount - lineCount - changeLineCountDelta + editLineNumber; + rawContentChanges.push(new ModelRawLineChanged(editLineNumber, this.getLineContent(currentEditLineNumber))); + } + + if (editingLinesCnt < deletingLinesCnt) { + // Must delete some lines + const spliceStartLineNumber = startLineNumber + editingLinesCnt; + rawContentChanges.push(new ModelRawLinesDeleted(spliceStartLineNumber + 1, endLineNumber)); + } + + if (editingLinesCnt < insertingLinesCnt) { + // Must insert some lines + const spliceLineNumber = startLineNumber + editingLinesCnt; + const cnt = insertingLinesCnt - editingLinesCnt; + const fromLineNumber = newLineCount - lineCount - cnt + spliceLineNumber + 1; + let newLines: string[] = []; + for (let i = 0; i < cnt; i++) { + let lineNumber = fromLineNumber + i; + newLines[lineNumber - fromLineNumber] = this.getLineContent(lineNumber); + } + rawContentChanges.push(new ModelRawLinesInserted(spliceLineNumber + 1, startLineNumber + insertingLinesCnt, newLines)); + } + + lineCount += changeLineCountDelta; } this._increaseVersionId(); diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index 9855eda6939..24009cea46a 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts @@ -403,6 +403,7 @@ export class SplitLinesCollection implements IViewModelLinesCollection { insertPrefixSumValues[i] = outputLineCount; } + // TODO@Alex: use arrays.arrayInsert this.lines = this.lines.slice(0, fromLineNumber - 1).concat(insertLines).concat(this.lines.slice(fromLineNumber - 1)); this.prefixSumComputer.insertValues(fromLineNumber - 1, insertPrefixSumValues); diff --git a/src/vs/editor/test/common/model/model.test.ts b/src/vs/editor/test/common/model/model.test.ts index 92b7e5b714a..e610caa3ddf 100644 --- a/src/vs/editor/test/common/model/model.test.ts +++ b/src/vs/editor/test/common/model/model.test.ts @@ -129,7 +129,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.insert(new Position(1, 3), ' new line\nNo longer')]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My new line First Line'), new ModelRawLineChanged(1, 'My new line'), new ModelRawLinesInserted(2, 2, ['No longer First Line']), ], @@ -245,7 +244,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 2, 6))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Second Line'), new ModelRawLinesDeleted(2, 2), ], @@ -266,7 +264,6 @@ suite('Editor Model - Model', () => { thisModel.applyEdits([EditOperation.delete(new Range(1, 4, 3, 5))]); assert.deepEqual(e, new ModelRawContentChangedEvent( [ - new ModelRawLineChanged(1, 'My '), new ModelRawLineChanged(1, 'My Third Line'), new ModelRawLinesDeleted(2, 3), ], From a27776bfd8287d25f6b4e9ab406718b626caf79a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 15:41:19 +0100 Subject: [PATCH 316/710] Validate offset before passing it down --- src/vs/editor/common/model.ts | 1 + .../editor/common/model/linesTextBuffer/linesTextBuffer.ts | 4 ++++ src/vs/editor/common/model/textModel.ts | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 9d58b81cc05..3ce343c7411 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -1079,6 +1079,7 @@ export interface ITextBuffer { getValueInRange(range: Range, eol: EndOfLinePreference): string; getValueLengthInRange(range: Range, eol: EndOfLinePreference): number; + getLength(): number; getLineCount(): number; getLinesContent(): string[]; getLineContent(lineNumber: number): string; diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 1cbd9fe7c92..6b451df0c51 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -198,6 +198,10 @@ export class LinesTextBuffer implements ITextBuffer { return this._lines.slice(0); } + public getLength(): number { + return this._lineStarts.getTotalValue(); + } + public getLineContent(lineNumber: number): string { return this._lines[lineNumber - 1]; } diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index ac54f0999f6..18119338a27 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -630,8 +630,9 @@ export class TextModel extends Disposable implements model.ITextModel { return this._buffer.getOffsetAt(position.lineNumber, position.column); } - public getPositionAt(offset: number): Position { + public getPositionAt(rawOffset: number): Position { this._assertNotDisposed(); + let offset = (Math.min(this._buffer.getLength(), Math.max(0, rawOffset))); return this._buffer.getPositionAt(offset); } @@ -890,7 +891,8 @@ export class TextModel extends Disposable implements model.ITextModel { public modifyPosition(rawPosition: IPosition, offset: number): Position { this._assertNotDisposed(); - return this.getPositionAt(this.getOffsetAt(rawPosition) + offset); + let candidate = this.getOffsetAt(rawPosition) + offset; + return this.getPositionAt(Math.min(this._buffer.getLength(), Math.max(0, candidate))); } public getFullModelRange(): Range { From 4d01741c488d6be05c3c5eb15c2cfa736667f4f0 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 12:29:00 +0100 Subject: [PATCH 317/710] Optimize away looping through lines for huge files --- src/vs/editor/common/model/textModel.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 18119338a27..d597c795dcb 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -488,6 +488,10 @@ export class TextModel extends Disposable implements model.ITextModel { public isDominatedByLongLines(): boolean { this._assertNotDisposed(); + if (this.isTooLargeForTokenization()) { + // Cannot word wrap huge files anyways, so it doesn't really matter + return false; + } let smallLineCharCount = 0; let longLineCharCount = 0; From e5ba93712f4dcfd9f8b00457f26ca464df620016 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 15:44:16 +0100 Subject: [PATCH 318/710] Clarify argument type --- src/vs/editor/common/model.ts | 2 +- src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts index 3ce343c7411..6c208408ba3 100644 --- a/src/vs/editor/common/model.ts +++ b/src/vs/editor/common/model.ts @@ -1088,7 +1088,7 @@ export interface ITextBuffer { getLineFirstNonWhitespaceColumn(lineNumber: number): number; getLineLastNonWhitespaceColumn(lineNumber: number): number; - setEOL(newEOL: string): void; + setEOL(newEOL: '\r\n' | '\n'): void; applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult; } diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 6b451df0c51..af20bfb5ade 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -232,7 +232,7 @@ export class LinesTextBuffer implements ITextBuffer { //#region Editing - public setEOL(newEOL: string): void { + public setEOL(newEOL: '\r\n' | '\n'): void { this._EOL = newEOL; this._constructLineStarts(); } From e2179ca10b5455b35f6411d7aa9f0feef13703bf Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 09:28:16 +0100 Subject: [PATCH 319/710] Add more TextModel tests --- .../test/common/model/textModel.test.ts | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts index 323ca9886b3..0994bbe7c32 100644 --- a/src/vs/editor/test/common/model/textModel.test.ts +++ b/src/vs/editor/test/common/model/textModel.test.ts @@ -763,6 +763,66 @@ suite('Editor Model - TextModel', () => { model.dispose(); }); + + test('getLineFirstNonWhitespaceColumn', () => { + let model = TextModel.createFromString([ + 'asd', + ' asd', + '\tasd', + ' asd', + '\t\tasd', + ' ', + ' ', + '\t', + '\t\t', + ' \tasd', + '', + '' + ].join('\n')); + + assert.equal(model.getLineFirstNonWhitespaceColumn(1), 1, '1'); + assert.equal(model.getLineFirstNonWhitespaceColumn(2), 2, '2'); + assert.equal(model.getLineFirstNonWhitespaceColumn(3), 2, '3'); + assert.equal(model.getLineFirstNonWhitespaceColumn(4), 3, '4'); + assert.equal(model.getLineFirstNonWhitespaceColumn(5), 3, '5'); + assert.equal(model.getLineFirstNonWhitespaceColumn(6), 0, '6'); + assert.equal(model.getLineFirstNonWhitespaceColumn(7), 0, '7'); + assert.equal(model.getLineFirstNonWhitespaceColumn(8), 0, '8'); + assert.equal(model.getLineFirstNonWhitespaceColumn(9), 0, '9'); + assert.equal(model.getLineFirstNonWhitespaceColumn(10), 4, '10'); + assert.equal(model.getLineFirstNonWhitespaceColumn(11), 0, '11'); + assert.equal(model.getLineFirstNonWhitespaceColumn(12), 0, '12'); + }); + + test('getLineLastNonWhitespaceColumn', () => { + let model = TextModel.createFromString([ + 'asd', + 'asd ', + 'asd\t', + 'asd ', + 'asd\t\t', + ' ', + ' ', + '\t', + '\t\t', + 'asd \t', + '', + '' + ].join('\n')); + + assert.equal(model.getLineLastNonWhitespaceColumn(1), 4, '1'); + assert.equal(model.getLineLastNonWhitespaceColumn(2), 4, '2'); + assert.equal(model.getLineLastNonWhitespaceColumn(3), 4, '3'); + assert.equal(model.getLineLastNonWhitespaceColumn(4), 4, '4'); + assert.equal(model.getLineLastNonWhitespaceColumn(5), 4, '5'); + assert.equal(model.getLineLastNonWhitespaceColumn(6), 0, '6'); + assert.equal(model.getLineLastNonWhitespaceColumn(7), 0, '7'); + assert.equal(model.getLineLastNonWhitespaceColumn(8), 0, '8'); + assert.equal(model.getLineLastNonWhitespaceColumn(9), 0, '9'); + assert.equal(model.getLineLastNonWhitespaceColumn(10), 4, '10'); + assert.equal(model.getLineLastNonWhitespaceColumn(11), 0, '11'); + assert.equal(model.getLineLastNonWhitespaceColumn(12), 0, '12'); + }); }); suite('TextModel.mightContainRTL', () => { From 160bfdedb42f011ade3711b62702830d335fffcf Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 16 Jan 2018 12:24:56 +0100 Subject: [PATCH 320/710] Folding is not supported for huge files --- src/vs/editor/contrib/folding/folding.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts index 283801a2d60..21e8d35f4ce 100644 --- a/src/vs/editor/contrib/folding/folding.ts +++ b/src/vs/editor/contrib/folding/folding.ts @@ -133,7 +133,8 @@ export class FoldingController implements IEditorContribution { this.localToDispose = dispose(this.localToDispose); let model = this.editor.getModel(); - if (!this._isEnabled || !model) { + if (!this._isEnabled || !model || model.isTooLargeForTokenization()) { + // huge files get no view model, so they cannot support hidden areas return; } From 2209a63eb77910b0ca619f529772ac8e5e73a623 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 17 Jan 2018 15:49:12 +0100 Subject: [PATCH 321/710] Fix bad merge --- src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts index 52386d0ab8d..af20bfb5ade 100644 --- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts +++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts @@ -190,10 +190,6 @@ export class LinesTextBuffer implements ITextBuffer { return endOffset - startOffset; } - public getLength(): number { - return this._lineStarts.getTotalValue(); - } - public getLineCount(): number { return this._lines.length; } From 38e165395bb1264f7c42d103a79aa1391dc014d0 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 16:39:07 +0100 Subject: [PATCH 322/710] bring back save all files to command palette fixes #41734 --- .../parts/files/electron-browser/fileActions.contribution.ts | 3 ++- src/vs/workbench/parts/files/electron-browser/fileCommands.ts | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts index 448a7a7dff1..0ef23baac4c 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -11,7 +11,7 @@ import { revertLocalChangesCommand, acceptLocalChangesCommand, CONFLICT_RESOLUTI import { SyncActionDescriptor, MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; -import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL } from 'vs/workbench/parts/files/electron-browser/fileCommands'; +import { openWindowCommand, REVEAL_IN_OS_COMMAND_ID, COPY_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_ALL_IN_GROUP_COMMAND_ID, OpenEditorsGroupContext, COMPARE_WITH_SAVED_COMMAND_ID, COMPARE_RESOURCE_COMMAND_ID, SELECT_FOR_COMPARE_COMMAND_ID, ResourceSelectedForCompareContext, REVEAL_IN_OS_LABEL, DirtyEditorContext, COMPARE_SELECTED_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_FILES_COMMAND_ID } from 'vs/workbench/parts/files/electron-browser/fileCommands'; import { CommandsRegistry, ICommandHandler } from 'vs/platform/commands/common/commands'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry'; @@ -148,6 +148,7 @@ function appendToCommandPalette(id: string, title: string, category: string, whe appendToCommandPalette(COPY_PATH_COMMAND_ID, nls.localize('copyPathOfActive', "Copy Path of Active File"), category); appendToCommandPalette(SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, category); appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, nls.localize('saveAllInGroup', "Save All in Group"), category); +appendToCommandPalette(SAVE_FILES_COMMAND_ID, nls.localize('saveFiles', "Save All Files"), category); appendToCommandPalette(REVERT_FILE_COMMAND_ID, nls.localize('revert', "Revert File"), category); appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, nls.localize('compareActiveWithSaved', "Compare Active File with Saved"), category); appendToCommandPalette(REVEAL_IN_OS_COMMAND_ID, REVEAL_IN_OS_LABEL, category); diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index b74a405a0d9..23990abc9fe 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -68,7 +68,6 @@ export const SAVE_ALL_LABEL = nls.localize('saveAll', "Save All"); export const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup'; export const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles'; -export const SAVE_FILES_LABEL = nls.localize('saveFiles', "Save All Files"); export const OpenEditorsGroupContext = new RawContextKey('groupFocusedInOpenEditors', false); export const DirtyEditorContext = new RawContextKey('dirtyEditor', false); From da08a3550af670b9e0df81c20a98163a7940b60b Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 17 Jan 2018 16:46:22 +0100 Subject: [PATCH 323/710] fix close all editors in group when triggered via keybinding --- .../workbench/browser/parts/editor/editorCommands.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index c5fd59b2c87..d8c491c64e7 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -292,11 +292,14 @@ function registerEditorCommands() { const editorGroupService = accessor.get(IEditorGroupService); const editorService = accessor.get(IWorkbenchEditorService); const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService)); - const positions = contexts.map(context => positionAndInput(editorGroupService, editorService, context).position); - const distinctPositions = distinct(positions.filter(p => typeof p === 'number')); + const distinctGroups = distinct(contexts.map(c => c.group)); - if (distinctPositions.length) { - return editorService.closeEditors(distinctPositions); + if (distinctGroups.length) { + return editorService.closeEditors(distinctGroups.map(g => editorGroupService.getStacksModel().positionOfGroup(g))); + } + const activeEditor = editorService.getActiveEditor(); + if (activeEditor) { + return editorService.closeEditors(activeEditor.position); } return TPromise.as(false); From 044a8be8b28f2a2e577dcf95cfcf3430995e7e22 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jan 2018 11:30:28 +0100 Subject: [PATCH 324/710] Introduce more error categories --- .../extensionManagement/node/extensionManagementService.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index f3752b10161..8307eb715fb 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -45,6 +45,8 @@ const INSTALL_ERROR_GALLERY = 'gallery'; const INSTALL_ERROR_LOCAL = 'local'; const INSTALL_ERROR_EXTRACTING = 'extracting'; const INSTALL_ERROR_DELETING = 'deleting'; +const INSTALL_ERROR_READING_EXTENSION_FROM_DISK = 'readingExtension'; +const INSTALL_ERROR_SAVING_METADATA = 'savingMetadata'; const INSTALL_ERROR_UNKNOWN = 'unknown'; export class ExtensionManagementError extends Error { @@ -396,7 +398,7 @@ export class ExtensionManagementService implements IExtensionManagementService { () => { this.logService.info(`Extracted extension to ${extensionPath}:`, id); return TPromise.join([readManifest(extensionPath), pfs.readdir(extensionPath)]) - .then(null, e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_LOCAL))); + .then(null, e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_READING_EXTENSION_FROM_DISK))); }, e => TPromise.wrapError(new ExtensionManagementError(e.message, INSTALL_ERROR_EXTRACTING))) .then(([{ manifest }, children]) => { @@ -414,7 +416,7 @@ export class ExtensionManagementService implements IExtensionManagementService { .then(() => { this.logService.info(`Updated metadata of the extension:`, id); return local; - }, e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_LOCAL))); + }, e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_SAVING_METADATA))); }); }, e => TPromise.wrapError(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING))); } From 49f938b9b7817c971cbbf5ca1ca5cb9955c3b5a5 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jan 2018 16:31:30 +0100 Subject: [PATCH 325/710] :lipstick: --- .../node/extensionsWorkbenchService.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 10a5d3b69ed..2c9ffe5c97f 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -743,25 +743,25 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private onDidInstallExtension(event: DidInstallExtensionEvent): void { const { local, zipPath, error, gallery } = event; - const installing = gallery ? this.installing.filter(e => areSameExtensions(e.extension, gallery.identifier))[0] : null; - const extension: Extension = installing ? installing.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null; + const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e.extension, gallery.identifier))[0] : null; + const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null; if (extension) { - this.installing = installing ? this.installing.filter(e => e !== installing) : this.installing; + this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing; if (error) { if (extension.gallery) { // Updating extension can be only a gallery extension const installed = this.installed.filter(e => e.id === extension.id)[0]; - if (installed && installing) { - installing.operation = Operation.Updating; + if (installed && installingExtension) { + installingExtension.operation = Operation.Updating; } } } else { extension.local = local; const installed = this.installed.filter(e => e.id === extension.id)[0]; if (installed) { - if (installing) { - installing.operation = Operation.Updating; + if (installingExtension) { + installingExtension.operation = Operation.Updating; } installed.local = local; } else { @@ -770,7 +770,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { } if (extension.gallery) { // Report telemetry only for gallery extensions - this.reportTelemetry(installing, error); + this.reportTelemetry(installingExtension, error); } } this._onChange.fire(); From 0880691a196a0ee0328909f0f0d76ab4b8767a7c Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jan 2018 17:03:16 +0100 Subject: [PATCH 326/710] Implement #41751 --- .../sharedProcess/contrib/contributions.ts | 9 +- .../contrib/languagePackExtensions.ts | 107 ++++++++++++++++++ .../common/extensionManagement.ts | 8 +- 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts b/src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts index 9690ef75a7c..593d731262f 100644 --- a/src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts +++ b/src/vs/code/electron-browser/sharedProcess/contrib/contributions.ts @@ -7,7 +7,12 @@ import { NodeCachedDataCleaner } from 'vs/code/electron-browser/sharedProcess/contrib/nodeCachedDataCleaner'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { LanguagePackExtensions } from 'vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions'; +import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; -export function createSharedProcessContributions(service: IInstantiationService): void { - service.createInstance(NodeCachedDataCleaner); +export function createSharedProcessContributions(service: IInstantiationService): IDisposable { + return combinedDisposable([ + service.createInstance(NodeCachedDataCleaner), + service.createInstance(LanguagePackExtensions) + ]); } diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts new file mode 100644 index 00000000000..98f80d2e7a8 --- /dev/null +++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts @@ -0,0 +1,107 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import * as pfs from 'vs/base/node/pfs'; +import { IExtensionManagementService, ILocalExtension, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { Disposable } from 'vs/base/common/lifecycle'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; +import { join } from 'vs/base/common/paths'; +import { TPromise } from 'vs/base/common/winjs.base'; +import { Limiter } from 'vs/base/common/async'; +import { areSameExtensions, getGalleryExtensionIdFromLocal, getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { ILogService } from 'vs/platform/log/common/log'; + +interface ILanguageSource { + extensionIdentifier: IExtensionIdentifier; + path: string; +} + +export class LanguagePackExtensions extends Disposable { + + private languagePacksFilePath: string; + private languagePacksFileLimiter: Limiter; + + constructor( + @IExtensionManagementService private extensionManagementService: IExtensionManagementService, + @IEnvironmentService environmentService: IEnvironmentService, + @ILogService private logService: ILogService + ) { + super(); + this.languagePacksFilePath = join(environmentService.userDataPath, 'languagepacks.json'); + this.languagePacksFileLimiter = new Limiter(1); + + this._register(extensionManagementService.onDidInstallExtension(({ local }) => this.onDidInstallExtension(local))); + this._register(extensionManagementService.onDidUninstallExtension(({ identifier }) => this.onDidUninstallExtension(identifier))); + + this.reset(); + } + + private reset(): void { + this.extensionManagementService.getInstalled() + .then(installed => { + this.withLanguagePacks(languagePacks => { + for (const language of Object.keys(languagePacks)) { + languagePacks[language] = []; + } + this.addLanguagePacksFromExtensions(languagePacks, ...installed); + }); + }); + } + + private onDidInstallExtension(extension: ILocalExtension): void { + if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length) { + this.logService.debug('Adding language packs from the extension', extension.identifier.id); + this.withLanguagePacks(languagePacks => { + this.removeLanguagePacksFromExtensions(languagePacks, { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid }); + this.addLanguagePacksFromExtensions(languagePacks, extension); + }); + } + } + + private onDidUninstallExtension(identifier: IExtensionIdentifier): void { + this.logService.debug('Removing language packs from the extension', identifier.id); + this.withLanguagePacks(languagePacks => this.removeLanguagePacksFromExtensions(languagePacks, { id: getIdFromLocalExtensionId(identifier.id), uuid: identifier.uuid })); + } + + private addLanguagePacksFromExtensions(languagePacks: { [language: string]: ILanguageSource[] }, ...extensions: ILocalExtension[]): void { + for (const extension of extensions) { + if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length) { + const extensionIdentifier = { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid }; + for (const localeContribution of extension.manifest.contributes.locales) { + const languageSources = languagePacks[localeContribution.locale] || []; + languageSources.splice(0, 0, { extensionIdentifier, path: join(extension.path, localeContribution.path) }); + languagePacks[localeContribution.locale] = languageSources; + } + } + } + } + + private removeLanguagePacksFromExtensions(languagePacks: { [language: string]: ILanguageSource[] }, ...extensionIdentifiers: IExtensionIdentifier[]): void { + for (const language of Object.keys(languagePacks)) { + languagePacks[language] = languagePacks[language].filter(languageSource => !extensionIdentifiers.some(extensionIdentifier => areSameExtensions(extensionIdentifier, languageSource.extensionIdentifier))); + } + } + + private withLanguagePacks(fn: (languagePacks: { [language: string]: ILanguageSource[] }) => T): TPromise { + return this.languagePacksFileLimiter.queue(() => { + let result: T = null; + return pfs.readFile(this.languagePacksFilePath, 'utf8') + .then(null, err => err.code === 'ENOENT' ? TPromise.as('{}') : TPromise.wrapError(err)) + .then<{ [language: string]: ILanguageSource[] }>(raw => { try { return JSON.parse(raw); } catch (e) { return {}; } }) + .then(languagePacks => { result = fn(languagePacks); return languagePacks; }) + .then(languagePacks => { + for (const language of Object.keys(languagePacks)) { + if (!(languagePacks[language] && languagePacks[language].length)) { + delete languagePacks[language]; + } + } + const raw = JSON.stringify(languagePacks); + this.logService.debug('Writing language packs', raw); + return pfs.writeFile(this.languagePacksFilePath, raw); + }) + .then(() => result, error => this.logService.error(error)); + }); + } +} \ No newline at end of file diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts index ca36e02bff8..288d9d42531 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -85,6 +85,11 @@ export interface IColor { defaults: { light: string, dark: string, highContrast: string }; } +export interface ILocale { + locale: string; + path: string; +} + export interface IExtensionContributions { commands?: ICommand[]; configuration?: IConfiguration; @@ -98,7 +103,8 @@ export interface IExtensionContributions { themes?: ITheme[]; iconThemes?: ITheme[]; views?: { [location: string]: IView[] }; - colors: IColor[]; + colors?: IColor[]; + locales?: ILocale[]; } export interface IExtensionManifest { From 2ee65b3eaaa7632276dd034423c47b2b7a17d01f Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jan 2018 17:25:53 +0100 Subject: [PATCH 327/710] #41752 Show contributed locales in the intellisense in language file --- .../configuration-editing/src/extension.ts | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts index e215f0fb5a9..aacb21ff777 100644 --- a/extensions/configuration-editing/src/extension.ts +++ b/extensions/configuration-editing/src/extension.ts @@ -30,6 +30,9 @@ export function activate(context: vscode.ExtensionContext): void { //extensions suggestions context.subscriptions.push(...registerExtensionsCompletions()); + //locale suggestions + context.subscriptions.push(registerLocaleCompletionsInLanguageDocument()); + // launch.json decorations context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => updateLaunchJsonDecorations(editor), null, context.subscriptions)); context.subscriptions.push(vscode.workspace.onDidChangeTextDocument(event => { @@ -67,6 +70,44 @@ function registerSettingsCompletions(): vscode.Disposable { }); } +function registerLocaleCompletionsInLanguageDocument(): vscode.Disposable { + return vscode.languages.registerCompletionItemProvider({ pattern: '**/locale.json' }, { + provideCompletionItems(document, position, token) { + const location = getLocation(document.getText(), document.offsetAt(position)); + const range = document.getWordRangeAtPosition(position) || new vscode.Range(position, position); + if (location.path[0] === 'locale') { + const extensionsContent = parse(document.getText()); + return provideContributedLocalesProposals(range); + } + return []; + } + }); +} + +function provideContributedLocalesProposals(range: vscode.Range): vscode.ProviderResult { + const contributedLocales: string[] = []; + for (const extension of vscode.extensions.all) { + if (extension.packageJSON && extension.packageJSON['contributes'] && extension.packageJSON['contributes']['locales'] && extension.packageJSON['contributes']['locales'].length) { + const locales: { locale: string }[] = extension.packageJSON['contributes']['locales']; + for (const locale of locales) { + if (contributedLocales.indexOf(locale.locale) === -1) { + contributedLocales.push(locale.locale); + } + } + } + } + return contributedLocales.map(locale => { + const text = `"${locale}"`; + const item = new vscode.CompletionItem(text); + item.kind = vscode.CompletionItemKind.Value; + item.insertText = text; + item.range = range; + item.filterText = text; + return item; + }); +} + + interface IExtensionsContent { recommendations: string[]; } From 685f8f40bfd35e628730f9be72d3cf6459e5f5f3 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 17 Jan 2018 18:33:26 +0100 Subject: [PATCH 328/710] Implement #41759 --- .../extensions/browser/extensionsStatus.ts | 61 +++++++++++++++++++ .../extensions.contribution.ts | 6 ++ 2 files changed, 67 insertions(+) create mode 100644 src/vs/workbench/parts/extensions/browser/extensionsStatus.ts diff --git a/src/vs/workbench/parts/extensions/browser/extensionsStatus.ts b/src/vs/workbench/parts/extensions/browser/extensionsStatus.ts new file mode 100644 index 00000000000..78d5f7be002 --- /dev/null +++ b/src/vs/workbench/parts/extensions/browser/extensionsStatus.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ + +import * as DOM from 'vs/base/browser/dom'; +import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; +import { Disposable, toDisposable, IDisposable } from 'vs/base/common/lifecycle'; +import { IExtensionManagementService, InstallExtensionEvent, DidInstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { localize } from 'vs/nls'; +import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; + +export class InstallingStatusItem extends Disposable implements IStatusbarItem { + + private statusElement: HTMLElement; + private installingExtensions: string[] = []; + + constructor( + @IExtensionManagementService extensionManagementService: IExtensionManagementService + ) { + super(); + this.statusElement = DOM.$('div'); + this.statusElement.style.display = 'none'; + + this._register(extensionManagementService.onInstallExtension(e => this.onInstallingExtension(e))); + this._register(extensionManagementService.onDidInstallExtension(e => this.onDidInstallExtension(e))); + } + + render(parent: HTMLElement): IDisposable { + parent.appendChild(this.statusElement); + return toDisposable(() => this.dispose()); + } + + private onInstallingExtension(e: InstallExtensionEvent): void { + this.statusElement.style.display = 'block'; + this.installingExtensions.push(getIdFromLocalExtensionId(e.identifier.id)); + + if (this.installingExtensions.length === 1) { + this.statusElement.textContent = localize('installingExtension', "Installing {0}", this.installingExtensions[0]); + } else { + this.statusElement.textContent = localize('installingExtensions', "Installing {0} extensions", this.installingExtensions.length); + } + } + + private onDidInstallExtension(e: DidInstallExtensionEvent): void { + const index = this.installingExtensions.indexOf(getIdFromLocalExtensionId(e.identifier.id)); + if (index !== -1) { + this.installingExtensions.splice(index, 1); + if (this.installingExtensions.length === 0) { + this.statusElement.textContent = ''; + this.statusElement.style.display = 'none'; + } else if (this.installingExtensions.length === 1) { + this.statusElement.textContent = localize('installingExtension', "Installing {0}", this.installingExtensions[0]); + } else { + this.statusElement.textContent = localize('installingExtensions', "Installing {0} extensions", this.installingExtensions.length); + } + + } + } + +} \ No newline at end of file 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 18f4e4a6d56..52a5da3d7a4 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts @@ -43,6 +43,8 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { RuntimeExtensionsEditor, RuntimeExtensionsInput, ShowRuntimeExtensionsAction, IExtensionHostProfileService } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor'; import { EditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor'; import { ExtensionHostProfileService } from 'vs/workbench/parts/extensions/electron-browser/extensionProfileService'; +import { IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar'; +import { InstallingStatusItem } from 'vs/workbench/parts/extensions/browser/extensionsStatus'; // Singletons registerSingleton(IExtensionGalleryService, ExtensionGalleryService); @@ -223,3 +225,7 @@ CommandsRegistry.registerCommand('_extensions.manage', (accessor: ServicesAccess extensionService.open(extension[0]).done(null, errors.onUnexpectedError); } }); + + +let statusbarRegistry = Registry.as(StatusbarExtensions.Statusbar); +statusbarRegistry.registerStatusbarItem(new StatusbarItemDescriptor(InstallingStatusItem, StatusbarAlignment.LEFT, 50 /* Medium Priority */)); \ No newline at end of file From 3c8ed9206f5e613cc09be14b2315d838fc204b71 Mon Sep 17 00:00:00 2001 From: Sam Ervin Date: Wed, 17 Jan 2018 11:50:38 -0600 Subject: [PATCH 329/710] Correct "branchs" to "branches" typo --- extensions/git/package.nls.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json index 179c430eb4b..355d8b07a63 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json @@ -55,7 +55,7 @@ "config.enableLongCommitWarning": "Whether long commit messages should be warned about", "config.confirmSync": "Confirm before synchronizing git repositories", "config.countBadge": "Controls the git badge counter. `all` counts all changes. `tracked` counts only the tracked changes. `off` turns it off.", - "config.checkoutType": "Controls what type of branches are listed when running `Checkout to...`. `all` shows all refs, `local` shows only the local branchs, `tags` shows only tags and `remote` shows only remote branches.", + "config.checkoutType": "Controls what type of branches are listed when running `Checkout to...`. `all` shows all refs, `local` shows only the local branches, `tags` shows only tags and `remote` shows only remote branches.", "config.ignoreLegacyWarning": "Ignores the legacy Git warning", "config.ignoreMissingGitWarning": "Ignores the warning when Git is missing", "config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository", @@ -70,4 +70,4 @@ "colors.ignored": "Color for ignored resources.", "colors.conflict": "Color for resources with conflicts.", "colors.submodule": "Color for submodule resources." -} \ No newline at end of file +} From 09986eb7eb00b6548eb7e597343291be9f6fdf19 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 17 Jan 2018 10:37:26 -0800 Subject: [PATCH 330/710] Rename to PieceTree which reflects its data structure more precisely. --- .../pieceTreeBase.ts} | 66 ++++++++++--------- .../pieceTreeTextBuffer.ts} | 17 +++-- .../pieceTreeTextBufferBuilder.ts} | 14 ++-- src/vs/editor/common/model/textModel.ts | 8 +-- .../model/benchmark/modelbuilder.benchmark.ts | 6 +- .../model/benchmark/operations.benchmark.ts | 10 +-- .../benchmark/searchNReplace.benchmark.ts | 6 +- .../pieceTreeTextBuffer.test.ts} | 20 +++--- 8 files changed, 77 insertions(+), 70 deletions(-) rename src/vs/editor/common/model/{pieceTableTextBuffer/pieceTableBase.ts => pieceTreeTextBuffer/pieceTreeBase.ts} (96%) rename src/vs/editor/common/model/{pieceTableTextBuffer/pieceTableTextBuffer.ts => pieceTreeTextBuffer/pieceTreeTextBuffer.ts} (96%) rename src/vs/editor/common/model/{pieceTableTextBuffer/pieceTableTextBufferBuilder.ts => pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts} (90%) rename src/vs/editor/test/common/model/{pieceTableTextBuffer/pieceTableTextBuffer.test.ts => pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts} (98%) diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts similarity index 96% rename from src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts rename to src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts index 1760d4b4c18..5e49803aac9 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableBase.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts @@ -266,11 +266,11 @@ export class StringBuffer { } } -export class PieceTableBase { +export class PieceTreeBase { root: TreeNode; - protected _buffers: StringBuffer[]; // 0 is change buffer, others are readonly original buffer. protected _lineCnt: number; + protected _length: number; private _lastChangeBufferPos: BufferCursor; constructor(chunks: StringBuffer[]) { @@ -284,6 +284,7 @@ export class PieceTableBase { this._lastChangeBufferPos = { line: 0, column: 0 }; this.root = SENTINEL; this._lineCnt = 1; + this._length = 0; let lastNode: TreeNode = null; for (let i = 0, len = chunks.length; i < len; i++) { @@ -304,7 +305,7 @@ export class PieceTableBase { } } - this.computeLineCount(); + this.computeBufferMetadata(); } @@ -343,7 +344,6 @@ export class PieceTableBase { // #region Piece Table insert(offset: number, value: string): void { - // todo, validate value and offset. if (this.root !== SENTINEL) { let { node, remainder, nodeStartOffset } = this.nodeAt(offset); let piece = node.piece; @@ -356,7 +356,7 @@ export class PieceTableBase { ) { // changed buffer this.appendToNode(node, value); - this.computeLineCount(); + this.computeBufferMetadata(); return; } @@ -419,7 +419,7 @@ export class PieceTableBase { } // todo, this is too brutal. Total line feed count should be updated the same way as lf_left. - this.computeLineCount(); + this.computeBufferMetadata(); } delete(offset: number, cnt: number): void { @@ -441,25 +441,25 @@ export class PieceTableBase { let next = startNode.next(); this.rbDelete(startNode); this.validateCRLFWithPrevNode(next); - this.computeLineCount(); + this.computeBufferMetadata(); return; } this.deleteNodeHead(startNode, endSplitPosInBuffer); this.validateCRLFWithPrevNode(startNode); - this.computeLineCount(); + this.computeBufferMetadata(); return; } if (startPosition.nodeStartOffset + startNode.piece.length === offset + cnt) { this.deleteNodeTail(startNode, startSplitPosInBuffer); this.validateCRLFWithNextNode(startNode); - this.computeLineCount(); + this.computeBufferMetadata(); return; } // delete content in the middle, this node will be splitted to nodes this.shrinkNode(startNode, startSplitPosInBuffer, endSplitPosInBuffer); - this.computeLineCount(); + this.computeBufferMetadata(); return; } @@ -487,7 +487,7 @@ export class PieceTableBase { let prev = startNode.piece.length === 0 ? startNode.prev() : startNode; this.deleteNodes(nodesToDel); this.validateCRLFWithNextNode(prev); - this.computeLineCount(); + this.computeBufferMetadata(); } insertContentToNodeLeft(value: string, node: TreeNode) { @@ -503,7 +503,7 @@ export class PieceTableBase { piece.length -= 1; value += '\n'; - this.updateMetadata(node, -1, -1); + this.updateTreeMetadata(node, -1, -1); if (node.piece.length === 0) { nodesToDel.push(node); @@ -716,16 +716,20 @@ export class PieceTableBase { return ret; } - computeLineCount() { + computeBufferMetadata() { let x = this.root; - let ret = 1; + let lfCnt = 1; + let len = 0; + while (x !== SENTINEL) { - ret += x.lf_left + x.piece.lineFeedCnt; + lfCnt += x.lf_left + x.piece.lineFeedCnt; + len += x.size_left + x.piece.length; x = x.right; } - this._lineCnt = ret; + this._lineCnt = lfCnt; + this._length = len; } // #region node operations @@ -774,7 +778,7 @@ export class PieceTableBase { let lf_delta = piece.lineFeedCnt - originalLFCnt; let size_delta = newEndOffset - originalEndOffset; piece.length += size_delta; - this.updateMetadata(node, size_delta, lf_delta); + this.updateTreeMetadata(node, size_delta, lf_delta); } deleteNodeHead(node: TreeNode, pos: BufferCursor) { @@ -788,7 +792,7 @@ export class PieceTableBase { let lf_delta = piece.lineFeedCnt - originalLFCnt; let size_delta = originalStartOffset - newStartOffset; piece.length += size_delta; - this.updateMetadata(node, size_delta, lf_delta); + this.updateTreeMetadata(node, size_delta, lf_delta); } shrinkNode(node: TreeNode, start: BufferCursor, end: BufferCursor) { @@ -804,7 +808,7 @@ export class PieceTableBase { let newLength = this.offsetInBuffer(piece.bufferIndex, start) - this.offsetInBuffer(piece.bufferIndex, originalStartPos); let newLFCnt = piece.lineFeedCnt; piece.length = newLength; - this.updateMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt); + this.updateTreeMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt); // new right piece, end, originalEndPos let newPiece = new Piece( @@ -849,7 +853,7 @@ export class PieceTableBase { node.piece.lineFeedCnt = newLineFeedCnt; let lf_delta = newLineFeedCnt - oldLineFeedCnt; this._lastChangeBufferPos = endPos; - this.updateMetadata(node, value.length, lf_delta); + this.updateTreeMetadata(node, value.length, lf_delta); } nodeAt(offset: number): NodePosition { @@ -1051,7 +1055,7 @@ export class PieceTableBase { prev.piece.length -= 1; prev.piece.lineFeedCnt -= 1; - this.updateMetadata(prev, - 1, -1); + this.updateTreeMetadata(prev, - 1, -1); if (prev.piece.length === 0) { nodesToDel.push(prev); } @@ -1063,7 +1067,7 @@ export class PieceTableBase { next.piece.lineFeedCnt = this.getLineFeedCnt(next.piece.bufferIndex, next.piece.start, next.piece.end); // @todo, we can optimize // } - this.updateMetadata(next, - 1, -1); + this.updateTreeMetadata(next, - 1, -1); if (next.piece.length === 0) { nodesToDel.push(next); } @@ -1094,7 +1098,7 @@ export class PieceTableBase { piece.start = newStart; piece.length -= 1; piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize - this.updateMetadata(nextNode, -1, -1); + this.updateTreeMetadata(nextNode, -1, -1); } return true; } @@ -1274,7 +1278,7 @@ export class PieceTableBase { if (y === z) { x.parent = y.parent; - this.recomputeMetadata(x); + this.recomputeTreeMetadata(x); } else { if (y.parent === z) { x.parent = y; @@ -1283,7 +1287,7 @@ export class PieceTableBase { } // as we make changes to x's hierarchy, update size_left of subtree first - this.recomputeMetadata(x); + this.recomputeTreeMetadata(x); y.left = z.left; y.right = z.right; @@ -1310,7 +1314,7 @@ export class PieceTableBase { // we replace z with y, so in this sub tree, the length change is z.item.length y.size_left = z.size_left; y.lf_left = z.lf_left; - this.recomputeMetadata(y); + this.recomputeTreeMetadata(y); } z.detach(); @@ -1323,11 +1327,11 @@ export class PieceTableBase { let lf_delta = newLFLeft - x.parent.lf_left; x.parent.size_left = newSizeLeft; x.parent.lf_left = newLFLeft; - this.updateMetadata(x.parent, delta, lf_delta); + this.updateTreeMetadata(x.parent, delta, lf_delta); } } - this.recomputeMetadata(x.parent); + this.recomputeTreeMetadata(x.parent); if (yWasRed) { resetSentinel(); @@ -1399,7 +1403,7 @@ export class PieceTableBase { } fixInsert(x: TreeNode) { - this.recomputeMetadata(x); + this.recomputeTreeMetadata(x); while (x !== this.root && getNodeColor(x.parent) === NodeColor.Red) { if (x.parent === x.parent.parent.left) { @@ -1443,7 +1447,7 @@ export class PieceTableBase { setNodeColor(this.root, NodeColor.Black); } - updateMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { + updateTreeMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void { // node length change or line feed count change while (x !== this.root && x !== SENTINEL) { if (x.parent.left === x) { @@ -1455,7 +1459,7 @@ export class PieceTableBase { } } - recomputeMetadata(x: TreeNode) { + recomputeTreeMetadata(x: TreeNode) { let delta = 0; let lf_delta = 0; if (x === this.root) { diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts similarity index 96% rename from src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts rename to src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts index 30e2bb75fe9..be3bc9cb280 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts @@ -8,10 +8,10 @@ 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 { PieceTableBase, SENTINEL, StringBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { PieceTreeBase, SENTINEL, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; -export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer { +export class PieceTreeTextBuffer extends PieceTreeBase implements ITextBuffer { private _BOM: string; private _EOL: string; private _mightContainRTL: boolean; @@ -38,6 +38,10 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer return this._lineCnt; } + public getLength(): number { + return this._length; + } + private _getEndOfLine(eol: EndOfLinePreference): string { switch (eol) { case EndOfLinePreference.LF: @@ -61,7 +65,6 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } public getValueInRange2(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { - // todo, validate range. if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { return ''; } @@ -168,7 +171,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } public equals(other: ITextBuffer): boolean { - if (!(other instanceof PieceTableTextBuffer)) { + if (!(other instanceof PieceTreeTextBuffer)) { return false; } if (this._BOM !== other._BOM) { @@ -236,7 +239,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } // Sort operations ascending - operations.sort(PieceTableTextBuffer._sortOpsAscending); + operations.sort(PieceTreeTextBuffer._sortOpsAscending); for (let i = 0, count = operations.length - 1; i < count; i++) { let rangeEnd = operations[i].range.getEndPosition(); @@ -253,7 +256,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } // Delta encode operations - let reverseRanges = PieceTableTextBuffer._getInverseEditRanges(operations); + let reverseRanges = PieceTreeTextBuffer._getInverseEditRanges(operations); let newTrimAutoWhitespaceCandidates: { lineNumber: number, oldContent: string }[] = []; for (let i = 0; i < operations.length; i++) { @@ -325,7 +328,7 @@ export class PieceTableTextBuffer extends PieceTableBase implements ITextBuffer } private _doApplyEdits(operations: IValidatedEditOperation[]): IInternalModelContentChange[] { - operations.sort(PieceTableTextBuffer._sortOpsDescending); + operations.sort(PieceTreeTextBuffer._sortOpsDescending); let contentChanges: IInternalModelContentChange[] = []; diff --git a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts similarity index 90% rename from src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts rename to src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts index 80e0b5aeb2f..ab46a6892b3 100644 --- a/src/vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.ts @@ -6,11 +6,11 @@ import * as strings from 'vs/base/common/strings'; import { ITextBufferBuilder, DefaultEndOfLine, ITextBufferFactory, ITextBuffer } from 'vs/editor/common/model'; -import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; -import { StringBuffer, createLineStarts, createLineStartsFast } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer'; +import { StringBuffer, createLineStarts, createLineStartsFast } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; import { CharCode } from 'vs/base/common/charCode'; -export class PieceTableTextBufferFactory implements ITextBufferFactory { +export class PieceTreeTextBufferFactory implements ITextBufferFactory { constructor( private readonly _chunks: StringBuffer[], @@ -54,7 +54,7 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { } } - return new PieceTableTextBuffer(chunks, this._bom, eol, this._containsRTL, this._isBasicASCII); + return new PieceTreeTextBuffer(chunks, this._bom, eol, this._containsRTL, this._isBasicASCII); } public getFirstLineText(lengthLimit: number): string { @@ -62,7 +62,7 @@ export class PieceTableTextBufferFactory implements ITextBufferFactory { } } -export class PieceTableTextBufferBuilder implements ITextBufferBuilder { +export class PieceTreeTextBufferBuilder implements ITextBufferBuilder { private chunks: StringBuffer[]; private BOM: string; @@ -146,9 +146,9 @@ export class PieceTableTextBufferBuilder implements ITextBufferBuilder { } } - public finish(normalizeEOL: boolean = true): PieceTableTextBufferFactory { + public finish(normalizeEOL: boolean = true): PieceTreeTextBufferFactory { this._finish(); - return new PieceTableTextBufferFactory( + return new PieceTreeTextBufferFactory( this.chunks, this.BOM, this.cr, diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 2ebe61972b7..14ab56e1632 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -34,14 +34,14 @@ import { TextModelSearch, SearchParams } from 'vs/editor/common/model/textModelS import { TPromise } from 'vs/base/common/winjs.base'; import { IStringStream } from 'vs/platform/files/common/files'; import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; // Here is the master switch for the text buffer implementation: -const USE_PIECE_TABLE_IMPLEMENTATION = true; +const USE_PIECE_TREE_IMPLEMENTATION = true; function createTextBufferBuilder() { - if (USE_PIECE_TABLE_IMPLEMENTATION) { - return new PieceTableTextBufferBuilder(); + if (USE_PIECE_TREE_IMPLEMENTATION) { + return new PieceTreeTextBufferBuilder(); } return new LinesTextBufferBuilder(); } 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 3f65a3eb387..41445a17df9 100644 --- a/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/modelbuilder.benchmark.ts @@ -5,13 +5,13 @@ 'use strict'; import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +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 pieceTableTextBufferBuilder = new PieceTableTextBufferBuilder(); +let pieceTreeTextBufferBuilder = new PieceTreeTextBufferBuilder(); let chunks = []; for (let i = 0; i < 100; i++) { @@ -30,5 +30,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, pieceTableTextBufferBuilder], i); + modelBuildBenchmark(`${i} random chunks`, [linesTextBufferBuilder, pieceTreeTextBufferBuilder], i); } diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts index 4682098ea0c..53d8754b04c 100644 --- a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts @@ -5,7 +5,7 @@ 'use strict'; import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; import { ITextBuffer, IIdentifiedSingleEditOperation, EndOfLinePreference } from 'vs/editor/common/model'; import { generateRandomEdits, createMockBuffer, createMockText, generateSequentialInserts } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; import { Range } from 'vs/editor/common/core/range'; @@ -58,11 +58,11 @@ for (let i = 0, len = suites.length; i < len; i++) { console.log('|---|---|---|'); for (let j of [10, 100, 1000]) { let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); - let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + let pieceTreeTextBuffer = createMockBuffer(text, new PieceTreeTextBufferBuilder()); let edits = suites[i].generateEdits(text, j); - appyEditsBenchmark(`apply ${j} edits`, [linesTextBuffer, pieceTableTextBuffer], edits); - readLinesBenchmark(`getLineContent after ${j} edits`, [linesTextBuffer, pieceTableTextBuffer]); - getValueBenchmark(`save after ${j} edits`, [linesTextBuffer, pieceTableTextBuffer]); + appyEditsBenchmark(`apply ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer], edits); + readLinesBenchmark(`getLineContent after ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer]); + getValueBenchmark(`save after ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer]); } } \ No newline at end of file diff --git a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts index 1360f776208..e02ead30070 100644 --- a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts +++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts @@ -5,7 +5,7 @@ 'use strict'; import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model'; import { createMockText, createMockBuffer, generateRandomReplaces } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils'; import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils'; @@ -24,7 +24,7 @@ console.log(`\n|replace all\t|line buffer\t|piece table\t|`); console.log('|---|---|---|'); for (let i of [10, 100, 500, 1000]) { let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder()); - let pieceTableTextBuffer = createMockBuffer(text, new PieceTableTextBufferBuilder()); + let pieceTreeTextBuffer = createMockBuffer(text, new PieceTreeTextBufferBuilder()); let edits = generateRandomReplaces(text, i, 5, 10); - appyEditsBenchmark(`replace ${i} occurrences`, [linesTextBuffer, pieceTableTextBuffer], edits); + appyEditsBenchmark(`replace ${i} occurrences`, [linesTextBuffer, pieceTreeTextBuffer], edits); } \ No newline at end of file diff --git a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts similarity index 98% rename from src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts rename to src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts index 6fad2c6aff2..a25871a0507 100644 --- a/src/vs/editor/test/common/model/pieceTableTextBuffer/pieceTableTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts @@ -5,12 +5,12 @@ 'use strict'; import * as assert from 'assert'; -import { PieceTableTextBuffer } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBuffer'; +import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; -import { PieceTableTextBufferBuilder } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableTextBufferBuilder'; +import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; import { DefaultEndOfLine } from 'vs/editor/common/model'; -import { getNodeColor, SENTINEL, NodeColor, PieceTableBase, TreeNode } from 'vs/editor/common/model/pieceTableTextBuffer/pieceTableBase'; +import { getNodeColor, SENTINEL, NodeColor, PieceTreeBase, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n'; @@ -71,7 +71,7 @@ function trimLineFeed(text: string): string { //#region Assertion -function testLinesContent(str: string, pieceTable: PieceTableTextBuffer) { +function testLinesContent(str: string, pieceTable: PieceTreeTextBuffer) { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); assert.equal(pieceTable.getLinesRawContent(), str); @@ -93,7 +93,7 @@ function testLinesContent(str: string, pieceTable: PieceTableTextBuffer) { } } -function testLineStarts(str: string, pieceTable: PieceTableTextBuffer) { +function testLineStarts(str: string, pieceTable: PieceTreeTextBuffer) { let lineStarts = [0]; // Reset regex to search from the beginning @@ -148,16 +148,16 @@ function testLineStarts(str: string, pieceTable: PieceTableTextBuffer) { } } -function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTableTextBuffer { - let bufferBuilder = new PieceTableTextBufferBuilder(); +function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTreeTextBuffer { + let bufferBuilder = new PieceTreeTextBufferBuilder(); for (let i = 0; i < val.length; i++) { bufferBuilder.acceptChunk(val[i]); } let factory = bufferBuilder.finish(normalizeEOL); - return factory.create(DefaultEndOfLine.LF); + return factory.create(DefaultEndOfLine.LF); } -function assertTreeInvariants(T: PieceTableBase): void { +function assertTreeInvariants(T: PieceTreeBase): void { assert(getNodeColor(SENTINEL) === NodeColor.Black); assert(SENTINEL.parent === SENTINEL); assert(SENTINEL.left === SENTINEL); @@ -197,7 +197,7 @@ function assertValidNode(n: TreeNode): { size: number, lf_cnt: number } { return { size: n.size_left + n.piece.length + actualRight.size, lf_cnt: n.lf_left + n.piece.lineFeedCnt + actualRight.lf_cnt }; } -function assertValidTree(T: PieceTableBase): void { +function assertValidTree(T: PieceTreeBase): void { if (T.root === SENTINEL) { return; } From 3904a9d8784179f05f4301078db29c3e2bd354db Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 17 Jan 2018 10:58:44 -0800 Subject: [PATCH 331/710] Pull in latest terminal screen reader changes --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index aa70e1e524a..480e75ed2b1 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "vscode-debugprotocol": "1.25.0", "vscode-ripgrep": "^0.7.1-patch.0", "vscode-textmate": "^3.2.0", - "vscode-xterm": "3.1.0-beta2", + "vscode-xterm": "3.1.0-beta3", "yauzl": "2.8.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 625afd3a6d8..025f0b25545 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0: fast-plist "^0.1.2" oniguruma "^6.0.1" -vscode-xterm@3.1.0-beta2: - version "3.1.0-beta2" - resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta2.tgz#74adae19283738fab15f0ef145797f2eff5cc608" +vscode-xterm@3.1.0-beta3: + version "3.1.0-beta3" + resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta3.tgz#03ac017cb828ea51873c65b6c06ed045efa981ec" vso-node-api@^6.1.2-preview: version "6.1.2-preview" From 1ad6051e3a25c6e4a605145755051577b7a5cb7e Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 17 Jan 2018 11:13:13 -0800 Subject: [PATCH 332/710] Refactor piece tree to hide tree related logic from Buffer API. --- .../pieceTreeTextBuffer/pieceTreeBase.ts | 163 +++++++++ .../pieceTreeTextBuffer.ts | 328 ++++++------------ .../pieceTreeTextBuffer.test.ts | 12 +- 3 files changed, 282 insertions(+), 221 deletions(-) diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts index 5e49803aac9..8f47a88dc80 100644 --- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts @@ -6,6 +6,9 @@ import { Position } from 'vs/editor/common/core/position'; import { CharCode } from 'vs/base/common/charCode'; +import { EndOfLinePreference } from 'vs/editor/common/model'; +import { Range } from 'vs/editor/common/core/range'; +import * as strings from 'vs/base/common/strings'; export const enum NodeColor { Black = 0, @@ -342,6 +345,166 @@ export class PieceTreeBase { this.create(chunks); } + // #region Buffer API + public equal(other: PieceTreeBase): boolean { + if (this.getLinesRawContent() !== other.getLinesRawContent()) { + return false; + } + return true; + } + + public getOffsetAt(lineNumber: number, column: number): number { + let leftLen = 0; // inorder + + let x = this.root; + + while (x !== SENTINEL) { + if (x.left !== SENTINEL && x.lf_left + 1 >= lineNumber) { + x = x.left; + } else if (x.lf_left + x.piece.lineFeedCnt + 1 >= lineNumber) { + leftLen += x.size_left; + // lineNumber >= 2 + let accumualtedValInCurrentIndex = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); + return leftLen += accumualtedValInCurrentIndex + column - 1; + } else { + lineNumber -= x.lf_left + x.piece.lineFeedCnt; + leftLen += x.size_left + x.piece.length; + x = x.right; + } + } + + return leftLen; + } + + public getPositionAt(offset: number): Position { + offset = Math.floor(offset); + offset = Math.max(0, offset); + + let x = this.root; + let lfCnt = 0; + let originalOffset = offset; + + while (x !== SENTINEL) { + if (x.size_left !== 0 && x.size_left >= offset) { + x = x.left; + } else if (x.size_left + x.piece.length >= offset) { + let out = this.getIndexOf(x, offset - x.size_left); + + lfCnt += x.lf_left + out.index; + + if (out.index === 0) { + let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); + let column = originalOffset - lineStartOffset; + return new Position(lfCnt + 1, column + 1); + } + + return new Position(lfCnt + 1, out.remainder + 1); + } else { + offset -= x.size_left + x.piece.length; + lfCnt += x.lf_left + x.piece.lineFeedCnt; + + if (x.right === SENTINEL) { + // last node + let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); + let column = originalOffset - offset - lineStartOffset; + return new Position(lfCnt + 1, column + 1); + } else { + x = x.right; + } + } + } + + return new Position(1, 1); + } + + public getValueInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { + if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { + return ''; + } + + let startPosition = this.nodeAt2(new Position(range.startLineNumber, range.startColumn)); + let endPosition = this.nodeAt2(new Position(range.endLineNumber, range.endColumn)); + + if (startPosition.node === endPosition.node) { + let node = startPosition.node; + let buffer = this._buffers[node.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(node); + return buffer.substring(startOffset + startPosition.remainder, startOffset + endPosition.remainder); + } + + let x = startPosition.node; + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); + let ret = buffer.substring(startOffset + startPosition.remainder, startOffset + x.piece.length); + + x = x.next(); + while (x !== SENTINEL) { + let buffer = this._buffers[x.piece.bufferIndex].buffer; + let startOffset = this.getStartOffset(x); + + if (x === endPosition.node) { + ret += buffer.substring(startOffset, startOffset + endPosition.remainder); + break; + } else { + ret += buffer.substr(startOffset, x.piece.length); + } + + x = x.next(); + } + + return ret; + } + + public getLinesContent(): string[] { + return this.getContentOfSubTree(this.root).split(/\r\n|\r|\n/); + } + + public getLength(): number { + return this._length; + } + + public getLineCount(): number { + return this._lineCnt; + } + + public getLineContent(lineNumber): string { + return this.getLineRawContent(lineNumber).replace(/(\r\n|\r|\n)$/, ''); + } + + public getLineCharCode(lineNumber: number, index: number): number { + return this.getLineContent(lineNumber).charCodeAt(index); + } + + public getLineLength(lineNumber: number): number { + return this.getLineContent(lineNumber).length; + } + + public getLineMinColumn(lineNumber: number): number { + return 1; + } + + public getLineMaxColumn(lineNumber: number): number { + return this.getLineLength(lineNumber) + 1; + } + + public getLineFirstNonWhitespaceColumn(lineNumber: number): number { + const result = strings.firstNonWhitespaceIndex(this.getLineContent(lineNumber)); + if (result === -1) { + return 0; + } + return result + 1; + } + + public getLineLastNonWhitespaceColumn(lineNumber: number): number { + const result = strings.lastNonWhitespaceIndex(this.getLineContent(lineNumber)); + if (result === -1) { + return 0; + } + return result + 2; + } + + // #endregion + // #region Piece Table insert(offset: number, value: string): void { if (this.root !== SENTINEL) { diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts index be3bc9cb280..0b748f7abbe 100644 --- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts @@ -8,38 +8,133 @@ 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, SENTINEL, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; +import { PieceTreeBase, StringBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; import { IIdentifiedSingleEditOperation, EndOfLinePreference, ITextBuffer, ApplyEditsResult, IInternalModelContentChange } from 'vs/editor/common/model'; -export class PieceTreeTextBuffer extends PieceTreeBase implements ITextBuffer { +export class PieceTreeTextBuffer implements ITextBuffer { + private _pieceTree: PieceTreeBase; private _BOM: string; private _EOL: string; private _mightContainRTL: boolean; private _mightContainNonBasicASCII: boolean; constructor(chunks: StringBuffer[], BOM: string, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) { - super(chunks); this._BOM = BOM; this._EOL = eol; this._mightContainNonBasicASCII = !isBasicASCII; this._mightContainRTL = containsRTL; + this._pieceTree = new PieceTreeBase(chunks); } // #region TextBuffer - public getLinesContent(): string[] { - return this.getContentOfSubTree(this.root).split(/\r\n|\r|\n/); + public equals(other: ITextBuffer): boolean { + if (!(other instanceof PieceTreeTextBuffer)) { + return false; + } + if (this._BOM !== other._BOM) { + return false; + } + if (this._EOL !== other._EOL) { + return false; + } + if (this.getLength() !== other.getLength()) { + return false; + } + if (this.getLineCount() !== other.getLineCount()) { + return false; + } + return this._pieceTree.equal(other._pieceTree); + } + 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 getLinesContent2(): string { - return this.getContentOfSubTree(this.root); + public getOffsetAt(lineNumber: number, column: number): number { + return this._pieceTree.getOffsetAt(lineNumber, column); } - public getLineCount(): number { - return this._lineCnt; + public getPositionAt(offset: number): Position { + return this._pieceTree.getPositionAt(offset); + } + + public getRangeAt(start: number, length: number): Range { + let end = start + length; + const startPosition = this.getPositionAt(start); + const endPosition = this.getPositionAt(end); + return new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column); + } + + public getValueInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { + if (range.isEmpty()) { + return ''; + } + + const lineEnding = this._getEndOfLine(eol); + const text = this._pieceTree.getValueInRange(range, eol); + return text.replace(/\r\n|\r|\n/g, lineEnding); + } + + public getValueLengthInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): 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 getLength(): number { - return this._length; + return this._pieceTree.getLength(); + } + + public getLineCount(): number { + return this._pieceTree.getLineCount(); + } + + public getLinesContent(): string[] { + return this._pieceTree.getLinesContent(); + } + + public getLineContent(lineNumber: number): string { + return this._pieceTree.getLineContent(lineNumber); + } + + public getLineCharCode(lineNumber: number, index: number): number { + return this._pieceTree.getLineCharCode(lineNumber, index); + } + + public getLineLength(lineNumber: number): number { + return this._pieceTree.getLineLength(lineNumber); + } + + public getLineMinColumn(lineNumber: number): number { + return this._pieceTree.getLineMinColumn(lineNumber); + } + + public getLineMaxColumn(lineNumber: number): number { + return this._pieceTree.getLineMaxColumn(lineNumber); + } + + public getLineFirstNonWhitespaceColumn(lineNumber: number): number { + return this._pieceTree.getLineFirstNonWhitespaceColumn(lineNumber); + } + + public getLineLastNonWhitespaceColumn(lineNumber: number): number { + return this._pieceTree.getLineLastNonWhitespaceColumn(lineNumber); } private _getEndOfLine(eol: EndOfLinePreference): string { @@ -54,157 +149,9 @@ export class PieceTreeTextBuffer extends PieceTreeBase implements ITextBuffer { throw new Error('Unknown EOL preference'); } - public getValueInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { - if (range.isEmpty()) { - return ''; - } - - const lineEnding = this._getEndOfLine(eol); - const text = this.getValueInRange2(range, eol); - return text.replace(/\r\n|\r|\n/g, lineEnding); - } - - public getValueInRange2(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string { - if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) { - return ''; - } - - let startPosition = this.nodeAt2(new Position(range.startLineNumber, range.startColumn)); - let endPosition = this.nodeAt2(new Position(range.endLineNumber, range.endColumn)); - - if (startPosition.node === endPosition.node) { - let node = startPosition.node; - let buffer = this._buffers[node.piece.bufferIndex].buffer; - let startOffset = this.getStartOffset(node); - return buffer.substring(startOffset + startPosition.remainder, startOffset + endPosition.remainder); - } - - let x = startPosition.node; - let buffer = this._buffers[x.piece.bufferIndex].buffer; - let startOffset = this.getStartOffset(x); - let ret = buffer.substring(startOffset + startPosition.remainder, startOffset + x.piece.length); - - x = x.next(); - while (x !== SENTINEL) { - let buffer = this._buffers[x.piece.bufferIndex].buffer; - let startOffset = this.getStartOffset(x); - - if (x === endPosition.node) { - ret += buffer.substring(startOffset, startOffset + endPosition.remainder); - break; - } else { - ret += buffer.substr(startOffset, x.piece.length); - } - - x = x.next(); - } - - return ret; - } - - public getLineContent(lineNumber: number): string { - return this.getLineRawContent(lineNumber).replace(/(\r\n|\r|\n)$/, ''); - } - - public getOffsetAt(lineNumber: number, column: number): number { - let leftLen = 0; // inorder - - let x = this.root; - - while (x !== SENTINEL) { - if (x.left !== SENTINEL && x.lf_left + 1 >= lineNumber) { - x = x.left; - } else if (x.lf_left + x.piece.lineFeedCnt + 1 >= lineNumber) { - leftLen += x.size_left; - // lineNumber >= 2 - let accumualtedValInCurrentIndex = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2); - return leftLen += accumualtedValInCurrentIndex + column - 1; - } else { - lineNumber -= x.lf_left + x.piece.lineFeedCnt; - leftLen += x.size_left + x.piece.length; - x = x.right; - } - } - - return leftLen; - } - - public getPositionAt(offset: number): Position { - offset = Math.floor(offset); - offset = Math.max(0, offset); - - let x = this.root; - let lfCnt = 0; - let originalOffset = offset; - - while (x !== SENTINEL) { - if (x.size_left !== 0 && x.size_left >= offset) { - x = x.left; - } else if (x.size_left + x.piece.length >= offset) { - let out = this.getIndexOf(x, offset - x.size_left); - - lfCnt += x.lf_left + out.index; - - if (out.index === 0) { - let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); - let column = originalOffset - lineStartOffset; - return new Position(lfCnt + 1, column + 1); - } - - return new Position(lfCnt + 1, out.remainder + 1); - } else { - offset -= x.size_left + x.piece.length; - lfCnt += x.lf_left + x.piece.lineFeedCnt; - - if (x.right === SENTINEL) { - // last node - let lineStartOffset = this.getOffsetAt(lfCnt + 1, 1); - let column = originalOffset - offset - lineStartOffset; - return new Position(lfCnt + 1, column + 1); - } else { - x = x.right; - } - } - } - - return new Position(1, 1); - } - - public equals(other: ITextBuffer): boolean { - if (!(other instanceof PieceTreeTextBuffer)) { - return false; - } - if (this._BOM !== other._BOM) { - return false; - } - if (this._EOL !== other._EOL) { - return false; - } - if (this.getLinesContent2() !== other.getLinesContent2()) { - 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 setEOL(newEOL: '\r\n' | '\n'): void { this._EOL = newEOL; - this.normalizeEOL(newEOL); + this._pieceTree.normalizeEOL(newEOL); } public applyEdits(rawOperations: IIdentifiedSingleEditOperation[], recordTrimAutoWhitespace: boolean): ApplyEditsResult { @@ -354,12 +301,12 @@ export class PieceTreeTextBuffer extends PieceTreeBase implements ITextBuffer { if (text) { // replacement - this.delete(op.rangeOffset, op.rangeLength); - this.insert(op.rangeOffset, text); + this._pieceTree.delete(op.rangeOffset, op.rangeLength); + this._pieceTree.insert(op.rangeOffset, text); } else { // deletion - this.delete(op.rangeOffset, op.rangeLength); + this._pieceTree.delete(op.rangeOffset, op.rangeLength); } if (editingLinesCnt < insertingLinesCnt) { @@ -384,62 +331,13 @@ export class PieceTreeTextBuffer extends PieceTreeBase implements ITextBuffer { return contentChanges; } - public getValueLengthInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): 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 getLineCharCode(lineNumber: number, index: number): number { - return this.getLineContent(lineNumber).charCodeAt(index); - } - - public getLineLength(lineNumber: number): number { - return this.getLineContent(lineNumber).length; - } - - public getLineMinColumn(lineNumber: number): number { - return 1; - } - - public getLineMaxColumn(lineNumber: number): number { - return this.getLineLength(lineNumber) + 1; - } - - public getLineFirstNonWhitespaceColumn(lineNumber: number): number { - const result = strings.firstNonWhitespaceIndex(this.getLineContent(lineNumber)); - if (result === -1) { - return 0; - } - return result + 1; - } - - public getLineLastNonWhitespaceColumn(lineNumber: number): number { - const result = strings.lastNonWhitespaceIndex(this.getLineContent(lineNumber)); - if (result === -1) { - return 0; - } - return result + 2; - } - - public getRangeAt(start: number, length: number): Range { - let end = start + length; - const startPosition = this.getPositionAt(start); - const endPosition = this.getPositionAt(end); - return new Range(startPosition.lineNumber, startPosition.column, endPosition.lineNumber, endPosition.column); - } - // #endregion // #region helper + // testing purpose. + public getPieceTree(): PieceTreeBase { + return this._pieceTree; + } /** * Assumes `operations` are validated and sorted ascending */ 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 a25871a0507..f0884b60114 100644 --- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts +++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts @@ -5,12 +5,12 @@ 'use strict'; import * as assert from 'assert'; -import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer'; import { Position } from 'vs/editor/common/core/position'; import { Range } from 'vs/editor/common/core/range'; import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder'; import { DefaultEndOfLine } from 'vs/editor/common/model'; -import { getNodeColor, SENTINEL, NodeColor, PieceTreeBase, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; +import { PieceTreeBase, getNodeColor, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase'; +import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer'; const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n'; @@ -71,7 +71,7 @@ function trimLineFeed(text: string): string { //#region Assertion -function testLinesContent(str: string, pieceTable: PieceTreeTextBuffer) { +function testLinesContent(str: string, pieceTable: PieceTreeBase) { let lines = str.split(/\r\n|\r|\n/); assert.equal(pieceTable.getLineCount(), lines.length); assert.equal(pieceTable.getLinesRawContent(), str); @@ -93,7 +93,7 @@ function testLinesContent(str: string, pieceTable: PieceTreeTextBuffer) { } } -function testLineStarts(str: string, pieceTable: PieceTreeTextBuffer) { +function testLineStarts(str: string, pieceTable: PieceTreeBase) { let lineStarts = [0]; // Reset regex to search from the beginning @@ -148,13 +148,13 @@ function testLineStarts(str: string, pieceTable: PieceTreeTextBuffer) { } } -function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTreeTextBuffer { +function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTreeBase { let bufferBuilder = new PieceTreeTextBufferBuilder(); for (let i = 0; i < val.length; i++) { bufferBuilder.acceptChunk(val[i]); } let factory = bufferBuilder.finish(normalizeEOL); - return factory.create(DefaultEndOfLine.LF); + return (factory.create(DefaultEndOfLine.LF)).getPieceTree(); } function assertTreeInvariants(T: PieceTreeBase): void { From 01be00034927b2d986d5eebe80c8119a9aaea603 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 17 Jan 2018 11:28:13 -0800 Subject: [PATCH 333/710] Update to work with latest xterm.js --- src/typings/vscode-xterm.d.ts | 6 ++++++ .../parts/terminal/common/terminal.ts | 5 +++++ .../terminal/electron-browser/media/xterm.css | 8 +++++-- .../electron-browser/terminal.contribution.ts | 6 +++++- .../electron-browser/terminalActions.ts | 21 +++++++++++++++++++ .../electron-browser/terminalInstance.ts | 9 ++++++++ 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts index a8000eec916..84d9593b9d4 100644 --- a/src/typings/vscode-xterm.d.ts +++ b/src/typings/vscode-xterm.d.ts @@ -332,6 +332,12 @@ declare module 'vscode-xterm' { */ deregisterLinkMatcher(matcherId: number): void; + /** + * Enters screen reader navigation mode. This will only work when + * the screenReaderMode option is true. + */ + enterNavigationMode(): void; + /** * Gets whether the terminal has an active selection. */ diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index cd837dd9be5..b594dac62d2 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -388,4 +388,9 @@ export interface ITerminalInstance { * Sets the title of the terminal instance. */ setTitle(title: string, eventFromProcess: boolean): void; + + /** + * Enter screen reader navigation mode. + */ + enterNavigationMode(): void; } diff --git a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css index aadbf436fc4..6068c9445bd 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css +++ b/src/vs/workbench/parts/terminal/electron-browser/media/xterm.css @@ -127,7 +127,7 @@ cursor: text; } -.xterm .accessibility { +.xterm .xterm-accessibility { position: absolute; left: 0; top: 0; @@ -136,10 +136,14 @@ z-index: 100; } -.xterm .accessibility-tree { +.xterm .xterm-accessibility-tree { color: transparent; } +.xterm .xterm-accessibility-tree:focus [id^="xterm-active-item-"] { + outline: 1px solid #F80; +} + .xterm .live-region { position: absolute; left: -9999px; 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 e4b726a6c83..7ba6919d03d 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 { TERMINAL_DEFAULT_SHELL_UNIX_LIKE, TERMINAL_DEFAULT_SHELL_WINDOWS } 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 } from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; +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, EnterLineNavigationModeTerminalAction } 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'; @@ -204,6 +204,7 @@ configurationRegistry.registerConfiguration({ FocusActiveTerminalAction.ID, FocusPreviousTerminalAction.ID, FocusNextTerminalAction.ID, + EnterLineNavigationModeTerminalAction.ID, 'workbench.action.tasks.build', 'workbench.action.tasks.restartTask', 'workbench.action.tasks.runTask', @@ -386,6 +387,9 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordRightT primary: KeyMod.CtrlCmd | KeyCode.Delete, mac: { primary: KeyMod.Alt | KeyCode.Delete } }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Delete Word Right', category); +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(EnterLineNavigationModeTerminalAction, EnterLineNavigationModeTerminalAction.ID, EnterLineNavigationModeTerminalAction.LABEL, { + primary: KeyMod.CtrlCmd | KeyCode.KEY_L +}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Line Navigation Mode', category); terminalCommands.setup(); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 8ab6467d691..5b1f7a658bd 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -196,6 +196,27 @@ export class DeleteWordRightTerminalAction extends Action { } } +export class EnterLineNavigationModeTerminalAction extends Action { + + public static readonly ID = 'workbench.action.terminal.enterLineNavigationMode'; + public static readonly LABEL = nls.localize('workbench.action.terminal.enterLineNavigationMode', "Enter Line Navigation Mode"); + + constructor( + id: string, label: string, + @ITerminalService private terminalService: ITerminalService + ) { + super(id, label); + } + + public run(event?: any): TPromise { + let terminalInstance = this.terminalService.getActiveInstance(); + if (terminalInstance) { + terminalInstance.enterNavigationMode(); + } + return TPromise.as(void 0); + } +} + export class CreateNewTerminalAction extends Action { public static readonly ID = 'workbench.action.terminal.new'; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index d9b982340fb..812dc8feb60 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -1123,6 +1123,15 @@ export class TerminalInstance implements ITerminalInstance { private _updateTheme(theme?: ITheme): void { this._xterm.setOption('theme', this._getXtermTheme(theme)); } + + public enterNavigationMode(): void { + // Perform this asynchronously as entering navigation mode will override + // the key event handlers which seemed to mess with the keybindings + // system + setTimeout(() => { + this._xterm.enterNavigationMode(); + }, 100); + } } registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { From 5cfe3b3f2b0cdf7d905b11a0980b90b08767113c Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 17 Jan 2018 11:35:19 -0800 Subject: [PATCH 334/710] Use ctrl+n when terminalFocus to enter nav mode --- .../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 7ba6919d03d..254865eeb6b 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 { TERMINAL_DEFAULT_SHELL_UNIX_LIKE, TERMINAL_DEFAULT_SHELL_WINDOWS } 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, EnterLineNavigationModeTerminalAction } from 'vs/workbench/parts/terminal/electron-browser/terminalActions'; +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, EnterNavigationModeTerminalAction } 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'; @@ -204,7 +204,7 @@ configurationRegistry.registerConfiguration({ FocusActiveTerminalAction.ID, FocusPreviousTerminalAction.ID, FocusNextTerminalAction.ID, - EnterLineNavigationModeTerminalAction.ID, + EnterNavigationModeTerminalAction.ID, 'workbench.action.tasks.build', 'workbench.action.tasks.restartTask', 'workbench.action.tasks.runTask', @@ -387,9 +387,9 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordRightT primary: KeyMod.CtrlCmd | KeyCode.Delete, mac: { primary: KeyMod.Alt | KeyCode.Delete } }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Delete Word Right', category); -actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(EnterLineNavigationModeTerminalAction, EnterLineNavigationModeTerminalAction.ID, EnterLineNavigationModeTerminalAction.LABEL, { - primary: KeyMod.CtrlCmd | KeyCode.KEY_L -}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Line Navigation Mode', category); +actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(EnterNavigationModeTerminalAction, EnterNavigationModeTerminalAction.ID, EnterNavigationModeTerminalAction.LABEL, { + primary: KeyMod.CtrlCmd | KeyCode.KEY_N +}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Navigation Mode', category); terminalCommands.setup(); diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts index 5b1f7a658bd..4e9752cafa3 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts @@ -196,7 +196,7 @@ export class DeleteWordRightTerminalAction extends Action { } } -export class EnterLineNavigationModeTerminalAction extends Action { +export class EnterNavigationModeTerminalAction extends Action { public static readonly ID = 'workbench.action.terminal.enterLineNavigationMode'; public static readonly LABEL = nls.localize('workbench.action.terminal.enterLineNavigationMode', "Enter Line Navigation Mode"); From d07a4b9eeee251978ce199b69c40cdbcac740fb6 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Mon, 18 Dec 2017 16:18:14 -0800 Subject: [PATCH 335/710] Issue Reporetr - CLI flag & platform service --- src/vs/code/electron-main/app.ts | 6 +++ src/vs/code/electron-main/launch.ts | 2 +- src/vs/code/electron-main/main.ts | 9 +++++ src/vs/code/node/cli.ts | 5 +++ src/vs/code/node/cliProcessMain.ts | 3 ++ .../environment/common/environment.ts | 1 + src/vs/platform/environment/node/argv.ts | 2 + .../environment/node/environmentService.ts | 1 + src/vs/platform/issue/common/issue.ts | 17 ++++++++ src/vs/platform/issue/common/issueIpc.ts | 40 +++++++++++++++++++ .../issue/electron-main/issueService.ts | 24 +++++++++++ src/vs/workbench/electron-browser/main.ts | 5 +++ 12 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/vs/platform/issue/common/issue.ts create mode 100644 src/vs/platform/issue/common/issueIpc.ts create mode 100644 src/vs/platform/issue/electron-main/issueService.ts diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index faffd00b753..3cbc950a267 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -52,6 +52,8 @@ import URI from 'vs/base/common/uri'; import { WorkspacesChannel } from 'vs/platform/workspaces/common/workspacesIpc'; import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces'; import { getMachineId } from 'vs/base/node/id'; +import { IIssueService } from 'vs/platform/issue/common/issue'; +import { IssueChannel } from 'vs/platform/issue/common/issueIpc'; export class CodeApplication { @@ -352,6 +354,10 @@ export class CodeApplication { const urlChannel = appInstantiationService.createInstance(URLChannel, urlService); this.electronIpcServer.registerChannel('url', urlChannel); + const issueService = accessor.get(IIssueService); + const issueChannel = new IssueChannel(issueService); + this.electronIpcServer.registerChannel('issue', issueChannel); + const workspacesService = accessor.get(IWorkspacesMainService); const workspacesChannel = appInstantiationService.createInstance(WorkspacesChannel, workspacesService); this.electronIpcServer.registerChannel('workspaces', workspacesChannel); diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts index 22f9d83c99b..17f5ac6ffde 100644 --- a/src/vs/code/electron-main/launch.ts +++ b/src/vs/code/electron-main/launch.ts @@ -214,4 +214,4 @@ export class LaunchService implements ILaunchService { folders } as IWindowInfo; } -} \ No newline at end of file +} diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index ea7bf733406..ed67565282d 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -45,6 +45,8 @@ import { mnemonicButtonLabel } from 'vs/base/common/labels'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { printDiagnostics } from 'vs/code/electron-main/diagnostics'; import { BufferLogService } from 'vs/platform/log/common/bufferLog'; +import { IIssueService } from 'vs/platform/issue/common/issue'; +import { IssueService } from 'vs/platform/issue/electron-main/issueService'; function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService { const services = new ServiceCollection(); @@ -67,6 +69,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); services.set(IRequestService, new SyncDescriptor(RequestService)); services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : [])); + services.set(IIssueService, new SyncDescriptor(IssueService)); services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); return new InstantiationService(services, true); @@ -103,6 +106,7 @@ class ExpectedError extends Error { function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); + const issueService = accessor.get(IIssueService); const environmentService = accessor.get(IEnvironmentService); const requestService = accessor.get(IRequestService); @@ -127,6 +131,11 @@ function setupIPC(accessor: ServicesAccessor): TPromise { function setup(retry: boolean): TPromise { return serve(environmentService.mainIPCHandle).then(server => { + console.log(environmentService.args); + + if (environmentService.args.issue) { + issueService.openReporter().then(() => TPromise.as(null)); + } // Print --status usage info if (environmentService.args.status) { diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index b47a0015178..399a5bd8338 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -222,6 +222,11 @@ export async function main(argv: string[]): TPromise { } } + // If --issue is specified, launch BrowserWindow + if (args.issue) { + argv.push(`--inspect-brk=1235`); + } + // If we are started with --wait create a random temporary file // and pass it over to the starting instance. We can use this file // to wait for it to be deleted to monitor that the edited file diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 0d99eadec4f..8de1cf553ad 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -76,6 +76,8 @@ class Main { const arg = argv['uninstall-extension']; const ids: string[] = typeof arg === 'string' ? [arg] : arg; return this.uninstallExtension(ids); + } else if (argv['issue']) { + console.log('here'); } return undefined; } @@ -193,6 +195,7 @@ class Main { const eventPrefix = 'monacoworkbench'; export function main(argv: ParsedArgs): TPromise { + const services = new ServiceCollection(); const environmentService = new EnvironmentService(argv, process.execPath); diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index d75fdae4684..3296b628490 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -13,6 +13,7 @@ export interface ParsedArgs { help?: boolean; version?: boolean; status?: boolean; + issue?: boolean; wait?: boolean; waitMarkerFilePath?: string; diff?: boolean; diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 21a2f2d16c0..6b982d48d18 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -49,6 +49,7 @@ const options: minimist.Opts = { 'list-extensions', 'show-versions', 'nolazy', + 'issue', 'skip-getting-started', 'skip-release-notes', 'sticky-quickopen', @@ -166,6 +167,7 @@ const troubleshootingHelp: { [name: string]: string; } = { '--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."), '--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."), '--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint.") + '-i, --issue': localize('issue', "Report an issue."), }; export function formatOptions(options: { [name: string]: string; }, columns: number): string { diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index b5e01b791cc..f50aa30396f 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -184,6 +184,7 @@ export class EnvironmentService implements IEnvironmentService { get performance(): boolean { return this._args.performance; } get status(): boolean { return this._args.status; } + get issue(): boolean { return this._args.issue; } @memoize get mainIPCHandle(): string { return getIPCHandle(this.userDataPath, 'main'); } diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts new file mode 100644 index 00000000000..3b824f9bb45 --- /dev/null +++ b/src/vs/platform/issue/common/issue.ts @@ -0,0 +1,17 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { TPromise } from 'vs/base/common/winjs.base'; +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; + +export const ID = 'issueService'; +export const IIssueService = createDecorator(ID); + +export interface IIssueService { + _serviceBrand: any; + openReporter(): TPromise; +} \ No newline at end of file diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts new file mode 100644 index 00000000000..d31c88559d6 --- /dev/null +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { TPromise } from 'vs/base/common/winjs.base'; +import { IChannel } from 'vs/base/parts/ipc/common/ipc'; +import { IIssueService } from './issue'; + +export interface IIssueChannel extends IChannel { + call(command: 'openIssueReporter'): TPromise; + call(command: string, arg?: any): TPromise; +} + +export class IssueChannel implements IIssueChannel { + + constructor(private service: IIssueService) { } + + call(command: string, arg?: any): TPromise { + switch (command) { + case 'openIssueReporter': + return this.service.openReporter(); + } + return undefined; + } +} + +export class IssueChannelClient implements IIssueService { + + _serviceBrand: any; + + constructor(private channel: IChannel) { } + + openReporter(): TPromise { + console.log(this.channel); + return TPromise.as(null); + } +} \ No newline at end of file diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts new file mode 100644 index 00000000000..e976c3dcfbb --- /dev/null +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -0,0 +1,24 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { TPromise } from 'vs/base/common/winjs.base'; +import { IIssueService } from 'vs/platform/issue/common/issue'; +import { BrowserWindow } from 'electron'; + +export class IssueService implements IIssueService { + _serviceBrand: any; + + _issueWindow: BrowserWindow; + + constructor() {} + + openReporter(): TPromise { + this._issueWindow = new BrowserWindow({}); + this._issueWindow.loadURL('https://vscode-perf-issue.surge.sh/'); + return TPromise.as(null); + } +} diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index 9e75b4e4cfa..f1480a1d691 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -44,6 +44,8 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import fs = require('fs'); import { ConsoleLogService, MultiplexLogService } from 'vs/platform/log/common/log'; +import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; +import { IIssueService } from 'vs/platform/issue/common/issue'; gracefulFs.gracefulify(fs); // enable gracefulFs export function startup(configuration: IWindowConfiguration): TPromise { @@ -202,6 +204,9 @@ function createMainProcessServices(mainProcessClient: ElectronIPCClient, configu const urlChannel = mainProcessClient.getChannel('url'); serviceCollection.set(IURLService, new SyncDescriptor(URLChannelClient, urlChannel, configuration.windowId)); + const issueChannel = mainProcessClient.getChannel('issue'); + serviceCollection.set(IIssueService, new SyncDescriptor(IssueChannelClient, issueChannel)); + const workspacesChannel = mainProcessClient.getChannel('workspaces'); serviceCollection.set(IWorkspacesService, new WorkspacesChannelClient(workspacesChannel)); From 4b33f91fe30d336015a0d83cf56bab88d1495bf8 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Tue, 19 Dec 2017 09:59:38 -0800 Subject: [PATCH 336/710] Basic Issue Service and renderer --- .vscode/launch.json | 4 +- src/vs/code/electron-main/app.ts | 9 ++ src/vs/code/electron-main/diagnostics.ts | 54 ++++++++++++ src/vs/code/electron-main/main.ts | 8 +- src/vs/code/node/cli.ts | 9 +- src/vs/issue/electron-browser/index.html | 82 +++++++++++++++++++ src/vs/issue/electron-browser/index.js | 62 ++++++++++++++ src/vs/platform/issue/common/issue.ts | 1 + src/vs/platform/issue/common/issueIpc.ts | 8 ++ .../issue/electron-main/issueService.ts | 48 +++++++++-- 10 files changed, 264 insertions(+), 21 deletions(-) create mode 100644 src/vs/issue/electron-browser/index.html create mode 100644 src/vs/issue/electron-browser/index.js diff --git a/.vscode/launch.json b/.vscode/launch.json index 37898b81577..c5f3e958edc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -49,7 +49,7 @@ "request": "attach", "name": "Attach to CLI Process", "protocol": "inspector", - "port": 5874, + "port": 1236, "outFiles": [ "${workspaceFolder}/out/**/*.js" ] @@ -59,7 +59,7 @@ "request": "attach", "name": "Attach to Main Process", "protocol": "inspector", - "port": 5875, + "port": 1237, "outFiles": [ "${workspaceFolder}/out/**/*.js" ] diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 3cbc950a267..6cca20acc13 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -54,6 +54,7 @@ import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces import { getMachineId } from 'vs/base/node/id'; import { IIssueService } from 'vs/platform/issue/common/issue'; import { IssueChannel } from 'vs/platform/issue/common/issueIpc'; +import { IssueService } from 'vs/platform/issue/electron-main/issueService'; export class CodeApplication { @@ -310,6 +311,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)); // Telemtry if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) { @@ -357,6 +359,7 @@ export class CodeApplication { const issueService = accessor.get(IIssueService); const issueChannel = new IssueChannel(issueService); this.electronIpcServer.registerChannel('issue', issueChannel); + // this.sharedProcessClient.done(client => client.registerChannel('issue', issueChannel)); const workspacesService = accessor.get(IWorkspacesMainService); const workspacesChannel = appInstantiationService.createInstance(WorkspacesChannel, workspacesService); @@ -435,6 +438,12 @@ export class CodeApplication { // Start shared process here this.sharedProcess.spawn(); + + // Launch Issue BrowserWindow if --issue is specified + if (this.environmentService.args.issue) { + const issueService = accessor.get(IIssueService); + issueService.openReporter(); + } } private dispose(): void { diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index a1720cc0568..b9d5bca2f67 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -17,6 +17,60 @@ import { isWindows } from 'vs/base/common/platform'; import { app } from 'electron'; import { basename } from 'path'; +export interface DiagnosticInfo { + systemInfo?: string; + processInfo?: string; + workspaceInfo?: string; +} + +export function buildDiagnostics(info: IMainProcessInfo): Promise { + return listProcesses(info.mainPID).then(rootProcess => { + const diagnosticInfo: DiagnosticInfo = {}; + + diagnosticInfo.systemInfo = formatEnvironment(info); + diagnosticInfo.processInfo = formatProcessList(info, rootProcess); + diagnosticInfo.workspaceInfo = ''; + + const workspaceInfoMessages = []; + + // Workspace Stats + if (info.windows.some(window => window.folders && window.folders.length > 0)) { + info.windows.forEach(window => { + if (window.folders.length === 0) { + return; + } + + workspaceInfoMessages.push(`| Window (${window.title})`); + + window.folders.forEach(folder => { + try { + const stats = collectWorkspaceStats(folder, ['node_modules', '.git']); + let countMessage = `${stats.fileCount} files`; + if (stats.maxFilesReached) { + countMessage = `more than ${countMessage}`; + } + workspaceInfoMessages.push(`| Folder (${basename(folder)}): ${countMessage}`); + workspaceInfoMessages.push(formatWorkspaceStats(stats)); + + const launchConfigs = collectLaunchConfigs(folder); + if (launchConfigs.length > 0) { + workspaceInfoMessages.push(formatLaunchConfigs(launchConfigs)); + } + } catch (error) { + workspaceInfoMessages.push(`| Error: Unable to collect workpsace stats for folder ${folder} (${error.toString()})`); + } + }); + }); + } + + return { + systemInfo: formatEnvironment(info), + processInfo: formatProcessList(info, rootProcess), + workspaceInfo: workspaceInfoMessages.join('\n') + }; + }); +} + export function printDiagnostics(info: IMainProcessInfo): Promise { return listProcesses(info.mainPID).then(rootProcess => { diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index ed67565282d..9d5992124b8 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -106,7 +106,7 @@ class ExpectedError extends Error { function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); - const issueService = accessor.get(IIssueService); + // const issueService = accessor.get(IIssueService); const environmentService = accessor.get(IEnvironmentService); const requestService = accessor.get(IRequestService); @@ -131,12 +131,6 @@ function setupIPC(accessor: ServicesAccessor): TPromise { function setup(retry: boolean): TPromise { return serve(environmentService.mainIPCHandle).then(server => { - console.log(environmentService.args); - - if (environmentService.args.issue) { - issueService.openReporter().then(() => TPromise.as(null)); - } - // Print --status usage info if (environmentService.args.status) { logService.warn('Warning: The --status argument can only be used if Code is already running. Please run it again after Code has started.'); diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 399a5bd8338..146e2ef0824 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -222,11 +222,6 @@ export async function main(argv: string[]): TPromise { } } - // If --issue is specified, launch BrowserWindow - if (args.issue) { - argv.push(`--inspect-brk=1235`); - } - // If we are started with --wait create a random temporary file // and pass it over to the starting instance. We can use this file // to wait for it to be deleted to monitor that the edited file @@ -320,7 +315,9 @@ export async function main(argv: string[]): TPromise { options['stdio'] = 'ignore'; } - const child = spawn(process.execPath, argv.slice(2), options); + const childArgs = argv.slice(2); + childArgs.push('--inspect-brk=1237'); + const child = spawn(process.execPath, childArgs, options); if (args.wait && waitMarkerFilePath) { return new TPromise(c => { diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html new file mode 100644 index 00000000000..0d7c9710535 --- /dev/null +++ b/src/vs/issue/electron-browser/index.html @@ -0,0 +1,82 @@ + + + + + + + + +
    +

    VS Code Issue Reporter

    +
    +
    +

    + System Info +

    + 
    +						
+
    +
    +
    +

    + Processes +

    + 
    +						
+
    +
    +
    +

    + Workspace Stats +

    + 
    +						
+
    +
    +
    +

    + Extension Info +

    +
    + +
    +
    +
    +

    + Repro Steps +

    +
    + +
    +
    +
    + + +
    + + + + + + \ No newline at end of file diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js new file mode 100644 index 00000000000..430a00d28cc --- /dev/null +++ b/src/vs/issue/electron-browser/index.js @@ -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. + *--------------------------------------------------------------------------------------------*/ + +const electron = require('electron'); + +let diagnosticInfo = { }; + +electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { + const { systemInfo, processInfo, workspaceInfo } = arg; + + document.querySelector('.block-system .block-info code').textContent = '\n' + systemInfo; + document.querySelector('.block-process .block-info code').textContent = '\n' + processInfo; + document.querySelector('.block-workspace .block-info code').textContent = '\n' + workspaceInfo; + + diagnosticInfo = { + systemInfo, + processInfo, + workspaceInfo + }; +}); + +electron.ipcRenderer.send('issueInfoRequest'); + +setInterval(() => { + electron.ipcRenderer.send('issueInfoRequest'); +}, 1000); + +window.renderExtensionsInfo = () => { + electron.ipcRenderer.on('extensionInfoResponse', (event, arg) => { + document.querySelector('.block-extensions .block-info-table').textContent = arg; + }); + electron.ipcRenderer.send('extensionInfoRequest'); +}; + +window.submit = () => { + const baseUrl = 'https://github.com/microsoft/vscode/issues/new?body='; + const reproSteps = document.querySelector('.block-repro .block-info-text textarea').value; + + const issueBody = `### System Info +\`\`\` +${diagnosticInfo.systemInfo} +\`\`\` + +### Process Info +\`\`\` +${diagnosticInfo.processInfo} +\`\`\` + +### Workspace Info +\`\`\` +${diagnosticInfo.workspaceInfo}; +\`\`\` + +### Repro Steps + +${reproSteps} +`; + + electron.shell.openExternal(baseUrl + encodeURIComponent(issueBody)); +}; \ No newline at end of file diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index 3b824f9bb45..3bf1f6b5b02 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -14,4 +14,5 @@ export const IIssueService = createDecorator(ID); export interface IIssueService { _serviceBrand: any; openReporter(): TPromise; + getRunningExtensions(): TPromise; } \ No newline at end of file diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts index d31c88559d6..dc554aa6536 100644 --- a/src/vs/platform/issue/common/issueIpc.ts +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -11,6 +11,7 @@ import { IIssueService } from './issue'; export interface IIssueChannel extends IChannel { call(command: 'openIssueReporter'): TPromise; + call(command: 'getRunningExtensions'): TPromise; call(command: string, arg?: any): TPromise; } @@ -22,6 +23,8 @@ export class IssueChannel implements IIssueChannel { switch (command) { case 'openIssueReporter': return this.service.openReporter(); + case 'getRunningExtensions': + return this.service.getRunningExtensions(); } return undefined; } @@ -37,4 +40,9 @@ export class IssueChannelClient implements IIssueService { console.log(this.channel); return TPromise.as(null); } + + getRunningExtensions(): TPromise { + console.log(this.channel); + return TPromise.as(null); + } } \ No newline at end of file diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index e976c3dcfbb..6d598b724bc 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -5,20 +5,56 @@ 'use strict'; -import { TPromise } from 'vs/base/common/winjs.base'; +import { TPromise, Promise } from 'vs/base/common/winjs.base'; import { IIssueService } from 'vs/platform/issue/common/issue'; -import { BrowserWindow } from 'electron'; +import { BrowserWindow, ipcMain } from 'electron'; +import { ILaunchService } from 'vs/code/electron-main/launch'; +import { buildDiagnostics, DiagnosticInfo } from 'vs/code/electron-main/diagnostics'; export class IssueService implements IIssueService { _serviceBrand: any; - _issueWindow: BrowserWindow; - constructor() {} + constructor(@ILaunchService private launchService: ILaunchService) { } openReporter(): TPromise { - this._issueWindow = new BrowserWindow({}); - this._issueWindow.loadURL('https://vscode-perf-issue.surge.sh/'); + ipcMain.on('issueInfoRequest', event => { + this.getStatusInfo().then(msg => { + event.sender.send('issueInfoResponse', msg); + }); + }); + ipcMain.on('extensionInfoRequest', event => { + // this.getExtensions().then(extensions => { + // event.sender.send('extensionInfoResponse', extensions); + // }); + }); + this._issueWindow = new BrowserWindow({ }); + this._issueWindow.loadURL(this.getIssueReporeterPath()); + this._issueWindow.webContents.openDevTools(); + return TPromise.as(null); } + + getStatusInfo(): Promise { + return new Promise((resolve, reject) => { + this.launchService.getMainProcessInfo().then(info => { + buildDiagnostics(info) + .then(diagnosticInfo => { + resolve(diagnosticInfo); + }) + .catch(err => { + reject(err); + }); + }); + }); + } + + getRunningExtensions(): TPromise { + return Promise.as(null); + // return this.extManagementService.getInstalled(); + } + + private getIssueReporeterPath() { + return `${require.toUrl('vs/issue/electron-browser/index.html')}`; + } } From 8c032915d156a54db5a5b017b6dc5180252da036 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Tue, 19 Dec 2017 13:22:27 -0800 Subject: [PATCH 337/710] Return diagnostic information as structured objects instead of strings --- src/vs/code/electron-main/diagnostics.ts | 90 +++++++++++++++--------- 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index b9d5bca2f67..b6f934d0595 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -12,14 +12,32 @@ import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; import * as os from 'os'; import { virtualMachineHint } from 'vs/base/node/id'; -import { repeat, pad } from 'vs/base/common/strings'; +import { repeat } from 'vs/base/common/strings'; import { isWindows } from 'vs/base/common/platform'; import { app } from 'electron'; import { basename } from 'path'; +export interface SystemInfo { + Version: string; + 'OS Version': string; + CPUs?: string; + 'Memory (System)': string; + 'Load (avg)'?: string; + VM: string; + 'Screen Reader': string; + 'Process Argv': string; +} + +export interface ProcessInfo { + cpu: number; + memory: number; + pid: number; + name: string; +} + export interface DiagnosticInfo { - systemInfo?: string; - processInfo?: string; + systemInfo?: SystemInfo; + processInfo?: ProcessInfo[]; workspaceInfo?: string; } @@ -27,8 +45,8 @@ export function buildDiagnostics(info: IMainProcessInfo): Promise { const diagnosticInfo: DiagnosticInfo = {}; - diagnosticInfo.systemInfo = formatEnvironment(info); - diagnosticInfo.processInfo = formatProcessList(info, rootProcess); + diagnosticInfo.systemInfo = getSystemInfo(info); + diagnosticInfo.processInfo = getProcessList(info, rootProcess); diagnosticInfo.workspaceInfo = ''; const workspaceInfoMessages = []; @@ -64,8 +82,8 @@ export function buildDiagnostics(info: IMainProcessInfo): Promise { // Environment Info console.log(''); - console.log(formatEnvironment(info)); + console.log(getSystemInfo(info)); // Process List console.log(''); - console.log(formatProcessList(info, rootProcess)); + console.log(getProcessList(info, rootProcess)); // Workspace Stats if (info.windows.some(window => window.folders && window.folders.length > 0)) { @@ -172,44 +190,47 @@ function formatLaunchConfigs(configs: WorkspaceStatItem[]): string { return output.join('\n'); } -function formatEnvironment(info: IMainProcessInfo): string { +function getSystemInfo(info: IMainProcessInfo): SystemInfo { const MB = 1024 * 1024; const GB = 1024 * MB; - const output: string[] = []; - output.push(`Version: ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`); - output.push(`OS Version: ${os.type()} ${os.arch()} ${os.release()}`); + const systemInfo: SystemInfo = { + Version: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, + 'OS Version': `${os.type()} ${os.arch()} ${os.release()}`, + '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(' ')}` + }; + const cpus = os.cpus(); if (cpus && cpus.length > 0) { - output.push(`CPUs: ${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`); + systemInfo.CPUs = `${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`; } - output.push(`Memory (System): ${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`); - if (!isWindows) { - output.push(`Load (avg): ${os.loadavg().map(l => Math.round(l)).join(', ')}`); // only provided on Linux/macOS - } - output.push(`VM: ${Math.round((virtualMachineHint.value() * 100))}%`); - output.push(`Screen Reader: ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`); - output.push(`Process Argv: ${info.mainArguments.join(' ')}`); - return output.join('\n'); + if (!isWindows) { + systemInfo['Load (avg'] = `${os.loadavg().map(l => Math.round(l)).join(', ')}`; + } + + + return systemInfo; } -function formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): string { +function getProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): ProcessInfo[] { const mapPidToWindowTitle = new Map(); info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title)); - const output: string[] = []; - - output.push('CPU %\tMem MB\t PID\tProcess'); + const processes: ProcessInfo[] = []; + getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); if (rootProcess) { - formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0); + getProcessItem(mapPidToWindowTitle, output, rootProcess, 0); } - return output.join('\n'); + return processes; } -function formatProcessItem(mapPidToWindowTitle: Map, output: string[], item: ProcessItem, indent: number): void { +function getProcessItem(mapPidToWindowTitle: Map, processes: ProcessInfo[], item: ProcessItem, indent: number): void { const isRoot = (indent === 0); const MB = 1024 * 1024; @@ -226,10 +247,15 @@ function formatProcessItem(mapPidToWindowTitle: Map, output: str } } const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100)); - output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${name}`); + processes.push({ + cpu: Number(item.load.toFixed(0)), + memory: Number((memory / MB).toFixed(0)), + pid: Number((item.pid).toFixed(0)), + name + }); // Recurse into children if any if (Array.isArray(item.children)) { - item.children.forEach(child => formatProcessItem(mapPidToWindowTitle, output, child, indent + 1)); + item.children.forEach(child => getProcessItem(mapPidToWindowTitle, processes, child, indent + 1)); } -} \ No newline at end of file +} From 1c8e7da0eb79caa9e135c79f917fc01da36470f2 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Tue, 19 Dec 2017 13:23:38 -0800 Subject: [PATCH 338/710] Some basic polish to the Issue Reporter View --- src/vs/issue/electron-browser/index.html | 79 +++++++++--------------- src/vs/issue/electron-browser/index.js | 37 +++++++++-- src/vs/issue/media/style.css | 57 +++++++++++++++++ 3 files changed, 119 insertions(+), 54 deletions(-) create mode 100644 src/vs/issue/media/style.css diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 0d7c9710535..93422aa7a5e 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -3,68 +3,47 @@ - +

    VS Code Issue Reporter

    + +
    + Bug + Performance Issue + Feature Request +
    +
    -

    - System Info -

    - 
    -						
-
    +
    + System Info + 
    +							
+
    +
    -

    - Processes -

    - 
    -						
-
    +
    + Processes + 
    +							
+
    +
    -

    - Workspace Stats -

    - 
    -						
-
    -
    -
    -

    - Extension Info -

    -
    - -
    +
    + Workspace Stats + 
    +							
+
    +
    -

    - Repro Steps -

    +

    + Description (Repro Steps, Behaviors) +

    diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 430a00d28cc..62267b38e35 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -5,14 +5,27 @@ const electron = require('electron'); +const state = { + +}; + +const render = (state) => { + +}; + +const rendererBlocks = (state) => { + +}; + let diagnosticInfo = { }; electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { const { systemInfo, processInfo, workspaceInfo } = arg; + state.systemInfo = systemInfo; + state.processInfo = processInfo; + state.workspaceInfo = workspaceInfo; - document.querySelector('.block-system .block-info code').textContent = '\n' + systemInfo; - document.querySelector('.block-process .block-info code').textContent = '\n' + processInfo; - document.querySelector('.block-workspace .block-info code').textContent = '\n' + workspaceInfo; + updateAllBlocks(state); diagnosticInfo = { systemInfo, @@ -59,4 +72,20 @@ ${reproSteps} `; electron.shell.openExternal(baseUrl + encodeURIComponent(issueBody)); -}; \ No newline at end of file +}; + +function updateAllBlocks(state) { + updateSystemInfo(state); + updateProcessInfo(state); + updateWorkspaceInfo(state); +} + +const updateSystemInfo = (state) => { + document.querySelector('.block-system .block-info code').textContent = '\n' + state.systemInfo; +}; +const updateProcessInfo = (state) => { + document.querySelector('.block-process .block-info code').textContent = '\n' + state.processInfo; +}; +const updateWorkspaceInfo = (state) => { + document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; +}; diff --git a/src/vs/issue/media/style.css b/src/vs/issue/media/style.css new file mode 100644 index 00000000000..917814fdf32 --- /dev/null +++ b/src/vs/issue/media/style.css @@ -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. + *--------------------------------------------------------------------------------------------*/ + +* { + box-sizing: border-box; + font-family: 'Helvetica Neue', 'Helvetica', sans-serif; +} +html { + padding: 40px 40px 80px 40px; +} + +pre code { + font-family: 'Menlo', 'Courier New', 'Courier', monospace; + font-size: 14px; +} + +#block-container { + margin-top: 20px; +} + +.block { + margin-bottom: 20px; +} +.block summary { + font-size: 1.25rem; +} + +#issue-reporter { + max-width: 80vw; + margin-left: auto; + margin-right: auto; +} +.block-info { + width: 100%; + overflow: auto; + overflow-wrap: break-word; +} +#github-submit-btn { + margin-top: 4rem; +} + +button { + display: inline-block; + font-weight: 400; + line-height: 1.25; + text-align: center; + white-space: nowrap; + vertical-align: middle; + user-select: none; + border: 1px solid transparent; + padding: .5rem 1rem; + font-size: 1rem; + border-radius: .25rem; + transition: all .2s ease-in-out; +} \ No newline at end of file From e60d23ed271baac206b6985180a068e3d91bdaed Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Tue, 19 Dec 2017 14:01:27 -0800 Subject: [PATCH 339/710] Add command for opening issue reporter --- src/vs/platform/issue/common/issueIpc.ts | 5 ++--- src/vs/workbench/electron-browser/actions.ts | 20 +++++++++++++++++++ .../electron-browser/main.contribution.ts | 3 ++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts index dc554aa6536..003827e7aa4 100644 --- a/src/vs/platform/issue/common/issueIpc.ts +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -34,11 +34,10 @@ export class IssueChannelClient implements IIssueService { _serviceBrand: any; - constructor(private channel: IChannel) { } + constructor(private channel: IIssueChannel) { } openReporter(): TPromise { - console.log(this.channel); - return TPromise.as(null); + return this.channel.call('openIssueReporter'); } getRunningExtensions(): TPromise { diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index f0a5ba05fad..26fedb0d58b 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -46,6 +46,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IExtensionService, ActivationTimes } from 'vs/platform/extensions/common/extensions'; import { getEntries } from 'vs/base/common/performance'; import { IEditor } from 'vs/platform/editor/common/editor'; +import { IIssueService } from 'vs/platform/issue/common/issue'; // --- actions @@ -859,6 +860,25 @@ export class CloseMessagesAction extends Action { } } +export class OpenIssueReporterAction extends Action { + public static readonly ID = 'workbench.action.openIssueReporter'; + public static readonly LABEL = nls.localize('openIssueReporter', "Open Issue Reporter"); + + constructor( + id: string, + label: string, + @IIssueService private issueService: IIssueService + ) { + super(id, label); + } + + public run(): TPromise { + return this.issueService.openReporter().then(() => { + return TPromise.as(true); + }); + } +} + export class ReportIssueAction extends Action { public static readonly ID = 'workbench.action.reportIssues'; diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts index c4c44281642..6bcbf87b95d 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -14,7 +14,7 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'v import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform'; -import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, ReportIssueAction, ReportPerformanceIssueAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, CloseMessagesAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ConfigureLocaleAction } from 'vs/workbench/electron-browser/actions'; +import { KeybindingsReferenceAction, OpenDocumentationUrlAction, OpenIntroductoryVideosUrlAction, OpenTipsAndTricksUrlAction, OpenIssueReporterAction, ReportIssueAction, ReportPerformanceIssueAction, ZoomResetAction, ZoomOutAction, ZoomInAction, ToggleFullScreenAction, ToggleMenuBarAction, CloseWorkspaceAction, CloseCurrentWindowAction, SwitchWindow, NewWindowAction, CloseMessagesAction, NavigateUpAction, NavigateDownAction, NavigateLeftAction, NavigateRightAction, IncreaseViewSizeAction, DecreaseViewSizeAction, ShowStartupPerformance, ToggleSharedProcessAction, QuickSwitchWindow, QuickOpenRecentAction, inRecentFilesPickerContextKey, ConfigureLocaleAction } from 'vs/workbench/electron-browser/actions'; import { MessagesVisibleContext } from 'vs/workbench/electron-browser/workbench'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerCommands } from 'vs/workbench/electron-browser/commands'; @@ -46,6 +46,7 @@ if (isMacintosh) { } workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(CloseWorkspaceAction, CloseWorkspaceAction.ID, CloseWorkspaceAction.LABEL, { primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_F) }), 'File: Close Workspace', fileCategory); +workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(OpenIssueReporterAction, OpenIssueReporterAction.ID, OpenIssueReporterAction.LABEL), 'Help: Open Issue Reporter', helpCategory); if (!!product.reportIssueUrl) { workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ReportIssueAction, ReportIssueAction.ID, ReportIssueAction.LABEL), 'Help: Report Issues', helpCategory); workbenchActionsRegistry.registerWorkbenchAction(new SyncActionDescriptor(ReportPerformanceIssueAction, ReportPerformanceIssueAction.ID, ReportPerformanceIssueAction.LABEL), 'Help: Report Performance Issue', helpCategory); From f8a6ed6828b02bb772e927cba4ef61510d8abdc0 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Tue, 19 Dec 2017 14:03:10 -0800 Subject: [PATCH 340/710] Get new diagnostic info and render them --- src/vs/code/electron-main/diagnostics.ts | 2 +- src/vs/issue/electron-browser/index.html | 18 ++++--- src/vs/issue/electron-browser/index.js | 54 +++++++++++++------ .../{media => electron-browser}/style.css | 26 +++++---- 4 files changed, 63 insertions(+), 37 deletions(-) rename src/vs/issue/{media => electron-browser}/style.css (92%) diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index b6f934d0595..23047157b4a 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -240,7 +240,7 @@ function getProcessItem(mapPidToWindowTitle: Map, processes: Pro if (isRoot) { name = `${product.applicationName} main`; } else { - name = `${repeat(' ', indent)} ${item.name}`; + name = `${repeat('--', indent)} ${item.name}`; if (item.name === 'window') { name = `${name} (${mapPidToWindowTitle.get(item.pid)})`; diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 93422aa7a5e..6623335fe42 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -3,7 +3,7 @@ - +
    @@ -19,24 +19,26 @@
    System Info - 
    -							
-
    +
    + +
    Processes - 
    -							
-
    +
    + +
    Workspace Stats 
    -							
+							
+								
+
    diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 62267b38e35..6a2613e50c3 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -9,15 +9,13 @@ const state = { }; -const render = (state) => { +// const render = (state) => { -}; +// }; -const rendererBlocks = (state) => { +// const rendererBlocks = (state) => { -}; - -let diagnosticInfo = { }; +// }; electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { const { systemInfo, processInfo, workspaceInfo } = arg; @@ -26,12 +24,6 @@ electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { state.workspaceInfo = workspaceInfo; updateAllBlocks(state); - - diagnosticInfo = { - systemInfo, - processInfo, - workspaceInfo - }; }); electron.ipcRenderer.send('issueInfoRequest'); @@ -53,17 +45,17 @@ window.submit = () => { const issueBody = `### System Info \`\`\` -${diagnosticInfo.systemInfo} +${state.systemInfo} \`\`\` ### Process Info \`\`\` -${diagnosticInfo.processInfo} +${state.processInfo} \`\`\` ### Workspace Info \`\`\` -${diagnosticInfo.workspaceInfo}; +${state.workspaceInfo}; \`\`\` ### Repro Steps @@ -81,10 +73,38 @@ function updateAllBlocks(state) { } const updateSystemInfo = (state) => { - document.querySelector('.block-system .block-info code').textContent = '\n' + state.systemInfo; + const target = document.querySelector('.block-system .block-info'); + let tableHtml = ''; + Object.keys(state.systemInfo).forEach(k => { + tableHtml += ` + + ${k} + ${state.systemInfo[k]} +`; + }); + target.innerHTML = `${tableHtml}
    `; }; const updateProcessInfo = (state) => { - document.querySelector('.block-process .block-info code').textContent = '\n' + state.processInfo; + const target = document.querySelector('.block-process .block-info'); + + let tableHtml = ` + + pid + CPU % + Memory (MB) + Name + +`; + state.processInfo.forEach(p => { + tableHtml += ` + + ${p.pid} + ${p.cpu} + ${p.memory} + ${p.name} +`; + }); + target.innerHTML = `${tableHtml}
    `; }; const updateWorkspaceInfo = (state) => { document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; diff --git a/src/vs/issue/media/style.css b/src/vs/issue/electron-browser/style.css similarity index 92% rename from src/vs/issue/media/style.css rename to src/vs/issue/electron-browser/style.css index 917814fdf32..04393a33fb4 100644 --- a/src/vs/issue/media/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -5,15 +5,10 @@ * { box-sizing: border-box; - font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } html { padding: 40px 40px 80px 40px; -} - -pre code { - font-family: 'Menlo', 'Courier New', 'Courier', monospace; - font-size: 14px; + font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } #block-container { @@ -27,16 +22,25 @@ pre code { font-size: 1.25rem; } +.block .block-info { + width: 100%; + font-family: 'Menlo', 'Courier New', 'Courier', monospace; + font-size: 14px; + overflow: auto; + overflow-wrap: break-word; +} +pre { + margin: 0; +} +pre code { + font-family: 'Menlo', 'Courier New', 'Courier', monospace; +} + #issue-reporter { max-width: 80vw; margin-left: auto; margin-right: auto; } -.block-info { - width: 100%; - overflow: auto; - overflow-wrap: break-word; -} #github-submit-btn { margin-top: 4rem; } From 352148a27faa05f91243bf1daad63f720d16423e Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Tue, 19 Dec 2017 16:51:53 -0800 Subject: [PATCH 341/710] Some styling update --- src/vs/code/electron-main/diagnostics.ts | 2 +- src/vs/issue/electron-browser/bootstrap.css | 84 +++++++++ src/vs/issue/electron-browser/index.html | 28 ++- src/vs/issue/electron-browser/index.js | 199 ++++++++++++++++---- src/vs/issue/electron-browser/style.css | 39 ++-- 5 files changed, 291 insertions(+), 61 deletions(-) create mode 100644 src/vs/issue/electron-browser/bootstrap.css diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 23047157b4a..0c16348e065 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -209,7 +209,7 @@ function getSystemInfo(info: IMainProcessInfo): SystemInfo { } if (!isWindows) { - systemInfo['Load (avg'] = `${os.loadavg().map(l => Math.round(l)).join(', ')}`; + systemInfo['Load (avg)'] = `${os.loadavg().map(l => Math.round(l)).join(', ')}`; } diff --git a/src/vs/issue/electron-browser/bootstrap.css b/src/vs/issue/electron-browser/bootstrap.css new file mode 100644 index 00000000000..2edeb3417a9 --- /dev/null +++ b/src/vs/issue/electron-browser/bootstrap.css @@ -0,0 +1,84 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +/** + * Table + */ + +table { + width: 100%; + max-width: 100%; + margin-bottom: 1rem; + background-color: transparent; + border-collapse: collapse; +} +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; +} + +/** + * Forms + */ +input, textarea { + display: block; + width: 100%; + padding: .375rem .75rem; + margin: 0; + font-size: 1rem; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-image: none; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: .25rem; + transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; +} +textarea { + overflow: auto; + resize: vertical; +} +small { + color: #868e96; + display: block; + margin-top: .25rem; + font-size: 80%; + font-weight: 400; +} + +/** + * Button + */ +button { + display: inline-block; + font-weight: 400; + line-height: 1.25; + text-align: center; + white-space: nowrap; + vertical-align: middle; + user-select: none; + border: 1px solid transparent; + padding: .5rem 1rem; + font-size: 1rem; + border: 1px solid #ddd; + border-radius: .25rem; + background: none; + transition: all .2s ease-in-out; +} +button:focus { + outline: 0; +} diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 6623335fe42..acf5b35a213 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -3,19 +3,27 @@ +

    VS Code Issue Reporter

    +

    Issue Type

    - Bug - Performance Issue - Feature Request + + + +
    + +
    +

    Issue Title

    +
    +

    VS Code Info

    System Info @@ -42,17 +50,21 @@
    -
    -

    +
    +

    Description (Repro Steps, Behaviors) -

    +

    - + + + GitHub-flavored Markdown is supported. + After submitting, you will still be able to edit your issue. +
    - +
    diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 6a2613e50c3..4fa3dd8c6ac 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -6,66 +6,180 @@ const electron = require('electron'); const state = { - + issueType: 0 }; -// const render = (state) => { +const render = (state) => { + renderIssueType(state); + renderBlocks(state); +}; -// }; +const renderIssueType = ({ issueType }) => { + const issueTypes = document.getElementById('issue-type').children; + issueTypes[0].className = issueType === 0 ? 'active': ''; + issueTypes[1].className = issueType === 1 ? 'active': ''; + issueTypes[2].className = issueType === 2 ? 'active': ''; +}; -// const rendererBlocks = (state) => { +const renderBlocks = (state) => { + // Depending on Issue Type, we render different blocks -// }; + const systemBlock = document.querySelector('.block-system'); + const processBlock = document.querySelector('.block-process'); + const workspaceBlock = document.querySelector('.block-workspace'); -electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { - const { systemInfo, processInfo, workspaceInfo } = arg; - state.systemInfo = systemInfo; - state.processInfo = processInfo; - state.workspaceInfo = workspaceInfo; + // 1 - Bug + if (state.issueType === 0) { + show(systemBlock); + hide(processBlock); + hide(workspaceBlock); + } + // 2 - Perf Issue + else if (state.issueType === 1) { + show(systemBlock); + show(processBlock); + show(workspaceBlock); + } + // 3 - Feature Request + else { + show(systemBlock); + hide(processBlock); + hide(workspaceBlock); + } +}; - updateAllBlocks(state); -}); +function setup() { + render(state); -electron.ipcRenderer.send('issueInfoRequest'); + electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { + const { systemInfo, processInfo, workspaceInfo } = arg; + state.systemInfo = systemInfo; + state.processInfo = processInfo; + state.workspaceInfo = workspaceInfo; -setInterval(() => { - electron.ipcRenderer.send('issueInfoRequest'); -}, 1000); - -window.renderExtensionsInfo = () => { - electron.ipcRenderer.on('extensionInfoResponse', (event, arg) => { - document.querySelector('.block-extensions .block-info-table').textContent = arg; + updateAllBlocks(state); }); - electron.ipcRenderer.send('extensionInfoRequest'); -}; + + // Initial get info + electron.ipcRenderer.send('issueInfoRequest'); + + // Get newest info every second + // setInterval(() => { + // electron.ipcRenderer.send('issueInfoRequest'); + // }, 4000); + + const children = Array.from(document.getElementById('issue-type').children); + children.forEach((child, i) => { + child.addEventListener('click', () => { + state.issueType = i; + render(state); + }); + }); +} +// window.renderExtensionsInfo = () => { +// electron.ipcRenderer.on('extensionInfoResponse', (event, arg) => { +// document.querySelector('.block-extensions .block-info-table').textContent = arg; +// }); +// electron.ipcRenderer.send('extensionInfoRequest'); +// }; + +/** + * GitHub issue generation + */ window.submit = () => { - const baseUrl = 'https://github.com/microsoft/vscode/issues/new?body='; - const reproSteps = document.querySelector('.block-repro .block-info-text textarea').value; + document.getElementById('github-submit-btn').classList.add('active'); + const issueTitle = document.querySelector('#issue-title input').value; + const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`; + const description = document.querySelector('.block-description .block-info-text textarea').value; - const issueBody = `### System Info -\`\`\` -${state.systemInfo} -\`\`\` + let issueBody = ''; -### Process Info -\`\`\` -${state.processInfo} -\`\`\` + issueBody += ` +### Issue Type +`; + + if (state.issueType === 0) { + issueBody += 'Bug\n'; + } else if (state.issueType === 1) { + issueBody += 'Performance Issue\n'; + } else { + issueBody += 'Feature Request'; + } + + issueBody += ` +### Description + +${description} +`; + + issueBody += ` +### VS Code Info +`; + + issueBody += `
    +System Info + +${generateSystemInfoMd()} + +
    +`; + + // For perf issue, add process info and workspace info too + if (state.issueType === 1) { + + issueBody += `
    +Process Info + +${generateProcessInfoMd()} + +
    +`; + + issueBody += `
    +Workspace Info -### Workspace Info \`\`\` ${state.workspaceInfo}; \`\`\` -### Repro Steps - -${reproSteps} +
    `; + } + + issueBody += '\n\n'; electron.shell.openExternal(baseUrl + encodeURIComponent(issueBody)); }; +function generateSystemInfoMd() { + let md = ` +|Item|Value| +|---|---|`; + + Object.keys(state.systemInfo).forEach(k => { + md += `|${k}|${state.systemInfo[k]}|\n`; + }); + + return md; +} +function generateProcessInfoMd() { + let md = ` +|pid|CPU|Memory (MB)|Name| +|---|---|---|---| +`; + + state.processInfo.forEach(p => { + md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; + }); + + return md; +} + +/** + * Update blocks + */ + function updateAllBlocks(state) { updateSystemInfo(state); updateProcessInfo(state); @@ -109,3 +223,16 @@ const updateProcessInfo = (state) => { const updateWorkspaceInfo = (state) => { document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; }; + +// helper functions + +function hide(el) { + el.classList.add('hidden'); +} +function show(el) { + el.classList.remove('hidden'); +} + +// go + +setup(); diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index 04393a33fb4..6c37109bc15 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -11,6 +11,10 @@ html { font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } +.hidden { + display: none; +} + #block-container { margin-top: 20px; } @@ -20,6 +24,7 @@ html { } .block summary { font-size: 1.25rem; + margin-bottom: 16px; } .block .block-info { @@ -36,26 +41,28 @@ pre code { font-family: 'Menlo', 'Courier New', 'Courier', monospace; } +#issue-type button { + margin-right: 16px; +} +button:hover, +button.active { + border: 1px solid #5cb85c; + background: #5cb85c; + color: #fff; +} +button:hover { + opacity: .5; +} +button.active { + opacity: 1; +} + #issue-reporter { max-width: 80vw; margin-left: auto; margin-right: auto; } #github-submit-btn { - margin-top: 4rem; + float: right; + margin-top: 14px; } - -button { - display: inline-block; - font-weight: 400; - line-height: 1.25; - text-align: center; - white-space: nowrap; - vertical-align: middle; - user-select: none; - border: 1px solid transparent; - padding: .5rem 1rem; - font-size: 1rem; - border-radius: .25rem; - transition: all .2s ease-in-out; -} \ No newline at end of file From f811259af84cf3b3a19860a083d49edc12021914 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Wed, 20 Dec 2017 12:01:39 -0800 Subject: [PATCH 342/710] Move VSCode version and OS info out of System info, styling updates --- src/vs/code/electron-main/diagnostics.ts | 24 +++++---- src/vs/issue/electron-browser/bootstrap.css | 24 +++++++++ src/vs/issue/electron-browser/index.html | 52 +++++++++++++------ src/vs/issue/electron-browser/index.js | 49 +++++++++++++---- src/vs/issue/electron-browser/style.css | 35 ++++++++++++- .../issue/electron-main/issueService.ts | 10 ++-- 6 files changed, 150 insertions(+), 44 deletions(-) diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 0c16348e065..657e6040647 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -17,9 +17,12 @@ import { isWindows } from 'vs/base/common/platform'; import { app } from 'electron'; import { basename } from 'path'; +export interface VersionInfo { + vscodeVersion: string; + os: string; +} + export interface SystemInfo { - Version: string; - 'OS Version': string; CPUs?: string; 'Memory (System)': string; 'Load (avg)'?: string; @@ -36,6 +39,7 @@ export interface ProcessInfo { } export interface DiagnosticInfo { + versionInfo?: VersionInfo; systemInfo?: SystemInfo; processInfo?: ProcessInfo[]; workspaceInfo?: string; @@ -43,12 +47,6 @@ export interface DiagnosticInfo { export function buildDiagnostics(info: IMainProcessInfo): Promise { return listProcesses(info.mainPID).then(rootProcess => { - const diagnosticInfo: DiagnosticInfo = {}; - - diagnosticInfo.systemInfo = getSystemInfo(info); - diagnosticInfo.processInfo = getProcessList(info, rootProcess); - diagnosticInfo.workspaceInfo = ''; - const workspaceInfoMessages = []; // Workspace Stats @@ -82,6 +80,7 @@ export function buildDiagnostics(info: IMainProcessInfo): Promise +
    + VS Code Issue Reporter +
    -

    VS Code Issue Reporter

    -

    Issue Type

    -
    - - - + +
    + +
    -
    -

    Issue Title

    - +
    + + +
    + +
    +
    + + +
    +
    + + +
    -

    VS Code Info

    System Info @@ -51,15 +66,18 @@
    -

    - Description (Repro Steps, Behaviors) -

    + + + +
    - - GitHub-flavored Markdown is supported. - After submitting, you will still be able to edit your issue. - + GitHub-flavored Markdown is supported. + After submitting, you will still be able to edit your issue. + +
    diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 4fa3dd8c6ac..f28f2e4d46b 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -22,29 +22,43 @@ const renderIssueType = ({ issueType }) => { }; const renderBlocks = (state) => { - // Depending on Issue Type, we render different blocks + // Depending on Issue Type, we render different blocks and text const systemBlock = document.querySelector('.block-system'); const processBlock = document.querySelector('.block-process'); const workspaceBlock = document.querySelector('.block-workspace'); + const descriptionTitle = document.querySelector('.block-description .block-title'); + const descriptionSubtitle = document.querySelector('.block-description .block-subtitle'); + // 1 - Bug if (state.issueType === 0) { show(systemBlock); hide(processBlock); hide(workspaceBlock); + + descriptionTitle.innerHTML = 'Steps to reproduce'; + show(descriptionSubtitle); + descriptionSubtitle.innerHTML = 'Please explain how to reproduce the problem. What was expected and what actually happened?'; } // 2 - Perf Issue else if (state.issueType === 1) { show(systemBlock); show(processBlock); show(workspaceBlock); + + descriptionTitle.innerHTML = 'Steps to reproduce'; + show(descriptionSubtitle); + descriptionSubtitle.innerHTML = 'When does the performance issue occur?'; } // 3 - Feature Request else { - show(systemBlock); + hide(systemBlock); hide(processBlock); hide(workspaceBlock); + + descriptionTitle.innerHTML = 'Description'; + hide(descriptionSubtitle); } }; @@ -52,7 +66,8 @@ function setup() { render(state); electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { - const { systemInfo, processInfo, workspaceInfo } = arg; + const { versionInfo, systemInfo, processInfo, workspaceInfo } = arg; + state.versionInfo = versionInfo; state.systemInfo = systemInfo; state.processInfo = processInfo; state.workspaceInfo = workspaceInfo; @@ -68,12 +83,9 @@ function setup() { // electron.ipcRenderer.send('issueInfoRequest'); // }, 4000); - const children = Array.from(document.getElementById('issue-type').children); - children.forEach((child, i) => { - child.addEventListener('click', () => { - state.issueType = i; - render(state); - }); + document.getElementById('issue-type').addEventListener('change', () => { + state.issueType = parseInt(event.target.value); + render(state); }); } // window.renderExtensionsInfo = () => { @@ -89,7 +101,7 @@ function setup() { window.submit = () => { document.getElementById('github-submit-btn').classList.add('active'); - const issueTitle = document.querySelector('#issue-title input').value; + const issueTitle = document.getElementById('issue-title').value; const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`; const description = document.querySelector('.block-description .block-info-text textarea').value; @@ -115,6 +127,11 @@ ${description} issueBody += ` ### VS Code Info +`; + + issueBody += ` +VS Code version: ${state.versionInfo.vscodeVersion} +OS version: ${state.versionInfo.os} `; issueBody += `
    @@ -155,7 +172,8 @@ ${state.workspaceInfo}; function generateSystemInfoMd() { let md = ` |Item|Value| -|---|---|`; +|---|---| +`; Object.keys(state.systemInfo).forEach(k => { md += `|${k}|${state.systemInfo[k]}|\n`; @@ -181,11 +199,20 @@ function generateProcessInfoMd() { */ function updateAllBlocks(state) { + updateVersionInfo(state); updateSystemInfo(state); updateProcessInfo(state); updateWorkspaceInfo(state); } +const updateVersionInfo = (state) => { + const version = document.getElementById('vscode-version'); + version.value = state.versionInfo.vscodeVersion; + + const osversion = document.getElementById('os'); + osversion.value = state.versionInfo.os; +}; + const updateSystemInfo = (state) => { const target = document.querySelector('.block-system .block-info'); let tableHtml = ''; diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index 6c37109bc15..5794ca852d2 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -7,10 +7,13 @@ box-sizing: border-box; } html { - padding: 40px 40px 80px 40px; font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } +body { + margin: 0; +} + .hidden { display: none; } @@ -23,7 +26,6 @@ html { margin-bottom: 20px; } .block summary { - font-size: 1.25rem; margin-bottom: 16px; } @@ -57,6 +59,14 @@ button.active { opacity: 1; } +header { + position: relative; + background-color: #24292e; + color: rgba(255,255,255,0.75); + padding: 1em; + margin-bottom: 1em; +} + #issue-reporter { max-width: 80vw; margin-left: auto; @@ -66,3 +76,24 @@ button.active { float: right; margin-top: 14px; } + +.two-col { + display: inline-block; + width: 49%; +} + +#vscode-version { + width: 90%; +} + +.input-group { + margin-bottom: 1em; +} + +label { + display: block; +} + +select, input, textarea { + margin-top: 10px; +} diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 6d598b724bc..631a584c1af 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -15,7 +15,9 @@ export class IssueService implements IIssueService { _serviceBrand: any; _issueWindow: BrowserWindow; - constructor(@ILaunchService private launchService: ILaunchService) { } + constructor( + @ILaunchService private launchService: ILaunchService + ) { } openReporter(): TPromise { ipcMain.on('issueInfoRequest', event => { @@ -28,8 +30,8 @@ export class IssueService implements IIssueService { // event.sender.send('extensionInfoResponse', extensions); // }); }); - this._issueWindow = new BrowserWindow({ }); - this._issueWindow.loadURL(this.getIssueReporeterPath()); + this._issueWindow = new BrowserWindow({}); + this._issueWindow.loadURL(this.getIssueReporterPath()); this._issueWindow.webContents.openDevTools(); return TPromise.as(null); @@ -54,7 +56,7 @@ export class IssueService implements IIssueService { // return this.extManagementService.getInstalled(); } - private getIssueReporeterPath() { + private getIssueReporterPath() { return `${require.toUrl('vs/issue/electron-browser/index.html')}`; } } From 948e220c1ec13ec20a526e71fb47fcfe80050752 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Wed, 20 Dec 2017 16:57:46 -0800 Subject: [PATCH 343/710] Search github for issue title and display first ten results --- src/vs/issue/electron-browser/index.html | 4 +++- src/vs/issue/electron-browser/index.js | 25 +++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 9fd0a38c7c7..848158f27e6 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -12,7 +12,6 @@
    -
    diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index f28f2e4d46b..086aeea27c3 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -83,11 +83,34 @@ function setup() { // electron.ipcRenderer.send('issueInfoRequest'); // }, 4000); - document.getElementById('issue-type').addEventListener('change', () => { + document.getElementById('issue-type').addEventListener('change', (event) => { state.issueType = parseInt(event.target.value); render(state); }); + + document.getElementById('issue-title').addEventListener('blur', (event) => { + const query = `is:issue+repo:microsoft/vscode+${event.target.value}`; + window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => { + response.json().then(result => { + if (result.items.length) { + const similarIssues = document.getElementById('similar-issues'); + let issues = ''; + similarIssues.innerHTML = issues; + } + }).catch((error) => { + console.log(error); + }); + }).catch((error) => { + console.log(error); + }); + }); } + // window.renderExtensionsInfo = () => { // electron.ipcRenderer.on('extensionInfoResponse', (event, arg) => { // document.querySelector('.block-extensions .block-info-table').textContent = arg; From 63ddae0f9dcd0503bf5a891d8b97c76c5d448f34 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Thu, 4 Jan 2018 12:59:44 -0800 Subject: [PATCH 344/710] Some refactoring, form validation, and ability to opt out of sending system info --- src/vs/issue/electron-browser/index.html | 43 +- src/vs/issue/electron-browser/index.js | 308 ++------------ .../issue/electron-browser/issueReporter.ts | 376 ++++++++++++++++++ src/vs/issue/electron-browser/style.css | 45 ++- src/vs/platform/issue/common/issue.ts | 2 +- src/vs/platform/issue/common/issueIpc.ts | 11 +- .../issue/electron-main/issueService.ts | 34 +- 7 files changed, 501 insertions(+), 318 deletions(-) create mode 100644 src/vs/issue/electron-browser/issueReporter.ts diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 848158f27e6..c64c37c4c0a 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -22,28 +22,33 @@
    - - - - - + + + + + +
    - +
    - - + +
    - System Info + System Info + + + +
    @@ -51,7 +56,11 @@
    - Processes + Processes + + + +
    @@ -59,7 +68,11 @@
    - Workspace Stats + Workspace Stats + + + + 
     							
 								
@@ -79,17 +92,15 @@
 								GitHub-flavored Markdown is supported.
 								After submitting, you will still be able to edit your issue.
 							
-						
+						
+
    - +
    - - \ No newline at end of file diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 086aeea27c3..86898c8dc84 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -3,286 +3,60 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -const electron = require('electron'); +const path = require('path'); -const state = { - issueType: 0 -}; +function parseURLQueryArgs() { + const search = window.location.search || ''; -const render = (state) => { - renderIssueType(state); - renderBlocks(state); -}; + return search.split(/[?&]/) + .filter(function (param) { return !!param; }) + .map(function (param) { return param.split('='); }) + .filter(function (param) { return param.length === 2; }) + .reduce(function (r, param) { r[param[0]] = decodeURIComponent(param[1]); return r; }, {}); +} -const renderIssueType = ({ issueType }) => { - const issueTypes = document.getElementById('issue-type').children; - issueTypes[0].className = issueType === 0 ? 'active': ''; - issueTypes[1].className = issueType === 1 ? 'active': ''; - issueTypes[2].className = issueType === 2 ? 'active': ''; -}; +function createScript(src, onload) { + const script = document.createElement('script'); + script.src = src; + script.addEventListener('load', onload); -const renderBlocks = (state) => { - // Depending on Issue Type, we render different blocks and text + const head = document.getElementsByTagName('head')[0]; + head.insertBefore(script, head.lastChild); +} - const systemBlock = document.querySelector('.block-system'); - const processBlock = document.querySelector('.block-process'); - const workspaceBlock = document.querySelector('.block-workspace'); - - const descriptionTitle = document.querySelector('.block-description .block-title'); - const descriptionSubtitle = document.querySelector('.block-description .block-subtitle'); - - // 1 - Bug - if (state.issueType === 0) { - show(systemBlock); - hide(processBlock); - hide(workspaceBlock); - - descriptionTitle.innerHTML = 'Steps to reproduce'; - show(descriptionSubtitle); - descriptionSubtitle.innerHTML = 'Please explain how to reproduce the problem. What was expected and what actually happened?'; +function uriFromPath(_path) { + var pathName = path.resolve(_path).replace(/\\/g, '/'); + if (pathName.length > 0 && pathName.charAt(0) !== '/') { + pathName = '/' + pathName; } - // 2 - Perf Issue - else if (state.issueType === 1) { - show(systemBlock); - show(processBlock); - show(workspaceBlock); - descriptionTitle.innerHTML = 'Steps to reproduce'; - show(descriptionSubtitle); - descriptionSubtitle.innerHTML = 'When does the performance issue occur?'; - } - // 3 - Feature Request - else { - hide(systemBlock); - hide(processBlock); - hide(workspaceBlock); + return encodeURI('file://' + pathName); +} - descriptionTitle.innerHTML = 'Description'; - hide(descriptionSubtitle); - } -}; +function main() { + const args = parseURLQueryArgs(); + const configuration = JSON.parse(args['config'] || '{}') || {}; + const rootUrl = uriFromPath(configuration.appRoot) + '/out'; -function setup() { - render(state); + // In the bundled version the nls plugin is packaged with the loader so the NLS Plugins + // loads as soon as the loader loads. To be able to have pseudo translation + createScript(rootUrl + '/vs/loader.js', function () { + define('fs', ['original-fs'], function (originalFS) { return originalFS; }); // replace the patched electron fs with the original node fs for all AMD code - electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { - const { versionInfo, systemInfo, processInfo, workspaceInfo } = arg; - state.versionInfo = versionInfo; - state.systemInfo = systemInfo; - state.processInfo = processInfo; - state.workspaceInfo = workspaceInfo; + window.MonacoEnvironment = {}; - updateAllBlocks(state); - }); + var nlsConfig = { availableLanguages: {} }; + require.config({ + baseUrl: rootUrl, + 'vs/nls': nlsConfig, + nodeCachedDataDir: configuration.nodeCachedDataDir, + nodeModules: [/*BUILD->INSERT_NODE_MODULES*/] + }); - // Initial get info - electron.ipcRenderer.send('issueInfoRequest'); - - // Get newest info every second - // setInterval(() => { - // electron.ipcRenderer.send('issueInfoRequest'); - // }, 4000); - - document.getElementById('issue-type').addEventListener('change', (event) => { - state.issueType = parseInt(event.target.value); - render(state); - }); - - document.getElementById('issue-title').addEventListener('blur', (event) => { - const query = `is:issue+repo:microsoft/vscode+${event.target.value}`; - window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => { - response.json().then(result => { - if (result.items.length) { - const similarIssues = document.getElementById('similar-issues'); - let issues = ''; - similarIssues.innerHTML = issues; - } - }).catch((error) => { - console.log(error); - }); - }).catch((error) => { - console.log(error); + require(['vs/issue/electron-browser/issueReporter'], (issueReporter) => { + issueReporter.startup(configuration); }); }); } -// window.renderExtensionsInfo = () => { -// electron.ipcRenderer.on('extensionInfoResponse', (event, arg) => { -// document.querySelector('.block-extensions .block-info-table').textContent = arg; -// }); -// electron.ipcRenderer.send('extensionInfoRequest'); -// }; - -/** - * GitHub issue generation - */ - -window.submit = () => { - document.getElementById('github-submit-btn').classList.add('active'); - const issueTitle = document.getElementById('issue-title').value; - const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`; - const description = document.querySelector('.block-description .block-info-text textarea').value; - - let issueBody = ''; - - issueBody += ` -### Issue Type -`; - - if (state.issueType === 0) { - issueBody += 'Bug\n'; - } else if (state.issueType === 1) { - issueBody += 'Performance Issue\n'; - } else { - issueBody += 'Feature Request'; - } - - issueBody += ` -### Description - -${description} -`; - - issueBody += ` -### VS Code Info -`; - - issueBody += ` -VS Code version: ${state.versionInfo.vscodeVersion} -OS version: ${state.versionInfo.os} -`; - - issueBody += `
    -System Info - -${generateSystemInfoMd()} - -
    -`; - - // For perf issue, add process info and workspace info too - if (state.issueType === 1) { - - issueBody += `
    -Process Info - -${generateProcessInfoMd()} - -
    -`; - - issueBody += `
    -Workspace Info - -\`\`\` -${state.workspaceInfo}; -\`\`\` - -
    -`; - } - - issueBody += '\n\n'; - - electron.shell.openExternal(baseUrl + encodeURIComponent(issueBody)); -}; - -function generateSystemInfoMd() { - let md = ` -|Item|Value| -|---|---| -`; - - Object.keys(state.systemInfo).forEach(k => { - md += `|${k}|${state.systemInfo[k]}|\n`; - }); - - return md; -} -function generateProcessInfoMd() { - let md = ` -|pid|CPU|Memory (MB)|Name| -|---|---|---|---| -`; - - state.processInfo.forEach(p => { - md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; - }); - - return md; -} - -/** - * Update blocks - */ - -function updateAllBlocks(state) { - updateVersionInfo(state); - updateSystemInfo(state); - updateProcessInfo(state); - updateWorkspaceInfo(state); -} - -const updateVersionInfo = (state) => { - const version = document.getElementById('vscode-version'); - version.value = state.versionInfo.vscodeVersion; - - const osversion = document.getElementById('os'); - osversion.value = state.versionInfo.os; -}; - -const updateSystemInfo = (state) => { - const target = document.querySelector('.block-system .block-info'); - let tableHtml = ''; - Object.keys(state.systemInfo).forEach(k => { - tableHtml += ` - - ${k} - ${state.systemInfo[k]} -`; - }); - target.innerHTML = `${tableHtml}
    `; -}; -const updateProcessInfo = (state) => { - const target = document.querySelector('.block-process .block-info'); - - let tableHtml = ` - - pid - CPU % - Memory (MB) - Name - -`; - state.processInfo.forEach(p => { - tableHtml += ` - - ${p.pid} - ${p.cpu} - ${p.memory} - ${p.name} -`; - }); - target.innerHTML = `${tableHtml}
    `; -}; -const updateWorkspaceInfo = (state) => { - document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; -}; - -// helper functions - -function hide(el) { - el.classList.add('hidden'); -} -function show(el) { - el.classList.remove('hidden'); -} - -// go - -setup(); +main(); diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts new file mode 100644 index 00000000000..4e64fe20634 --- /dev/null +++ b/src/vs/issue/electron-browser/issueReporter.ts @@ -0,0 +1,376 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { shell } from 'electron'; +import { $ } from 'vs/base/browser/dom'; +import { IIssueService } from 'vs/platform/issue/common/issue'; +import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; +import { IWindowConfiguration } from 'vs/platform/windows/common/windows'; +import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser'; + +interface IssueReporterState { + issueType?: number; + versionInfo?: any; + systemInfo?: any; + processInfo?: any; + workspaceInfo?: any; + includeSystemInfo?: boolean; + includeWorkspaceInfo?: boolean; + includeProcessInfo?: boolean; +} + +export function startup(configuration: IWindowConfiguration) { + const issueReporter = new IssueReporter(configuration); + issueReporter.render(); +} + +export class IssueReporter { + private issueService: IIssueService; + private state: IssueReporterState; + + constructor(configuration: IWindowConfiguration) { + this.state = { + issueType: 0, + includeSystemInfo: true, + includeWorkspaceInfo: true, + includeProcessInfo: true + }; + + this.initServices(configuration); + this.setEventHandlers(); + + // Fetch and display status data + this.issueService.getStatusInfo().then((info) => { + const { versionInfo, systemInfo, processInfo, workspaceInfo } = info; + this.state.versionInfo = versionInfo; + this.state.systemInfo = systemInfo; + this.state.processInfo = processInfo; + this.state.workspaceInfo = workspaceInfo; + + updateAllBlocks(this.state); + + const submitButton = document.getElementById('github-submit-btn'); + submitButton.disabled = false; + submitButton.textContent = 'Preview on GitHub'; + }); + } + + initServices(configuration: IWindowConfiguration) { + const mainProcessClient = new ElectronIPCClient(String(`window${configuration.windowId}`)); + this.issueService = new IssueChannelClient(mainProcessClient.getChannel('issue')); + } + + setEventHandlers() { + document.getElementById('issue-type').addEventListener('change', (event: Event) => { + this.state.issueType = parseInt((event.target).value); + this.render(); + }); + + document.getElementById('includeSystemInfo').addEventListener('click', (event: Event) => { + this.state.includeSystemInfo = !this.state.includeSystemInfo; + }); + + document.getElementById('includeProcessInfo').addEventListener('click', (event: Event) => { + this.state.includeProcessInfo = !this.state.includeProcessInfo; + }); + + document.getElementById('includeWorkspaceInfo').addEventListener('click', (event: Event) => { + this.state.includeWorkspaceInfo = !this.state.includeWorkspaceInfo; + }); + + function addIssuesToList(list, issueJSON) { + for (let i = 0; i < 5; i++) { + const link = $('a', { href: issueJSON[i].html_url }); + link.textContent = issueJSON[i].title; + link.addEventListener('click', (event) => { + shell.openExternal((event.target).href); + }); + + const item = $('li', {}, link); + list.appendChild(item); + } + } + + document.getElementById('issue-title').addEventListener('blur', (event) => { + const title = (event.target).value; + const similarIssues = document.getElementById('similar-issues'); + similarIssues.innerHTML = ''; + + if (title) { + const query = `is:issue+repo:microsoft/vscode+${title}`; + window.fetch(`https://api.github.com/search/issues?q=${query}&per_page=5`).then((response) => { + response.json().then(result => { + if (result.items.length) { + let issues = document.createElement('ul'); + issues.id = 'issues-list'; + addIssuesToList(issues, result.items); + similarIssues.appendChild(issues); + } + }).catch((error) => { + console.log(error); + }); + }).catch((error) => { + console.log(error); + }); + } + }); + + document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue()); + } + + render() { + this.renderIssueType(); + this.renderBlocks(); + } + + renderIssueType() { + const { issueType } = this.state; + const issueTypes = document.getElementById('issue-type').children; + issueTypes[0].className = issueType === 0 ? 'active' : ''; + issueTypes[1].className = issueType === 1 ? 'active' : ''; + issueTypes[2].className = issueType === 2 ? 'active' : ''; + } + + renderBlocks() { + // Depending on Issue Type, we render different blocks and text + const { issueType } = this.state; + const systemBlock = document.querySelector('.block-system'); + const processBlock = document.querySelector('.block-process'); + const workspaceBlock = document.querySelector('.block-workspace'); + + const descriptionTitle = document.querySelector('.block-description .block-title'); + const descriptionSubtitle = document.querySelector('.block-description .block-subtitle'); + + // 1 - Bug + if (issueType === 0) { + show(systemBlock); + hide(processBlock); + hide(workspaceBlock); + + descriptionTitle.innerHTML = 'Steps to reproduce *'; + show(descriptionSubtitle); + descriptionSubtitle.innerHTML = 'Please explain how to reproduce the problem. What was expected and what actually happened?'; + } + // 2 - Perf Issue + else if (issueType === 1) { + show(systemBlock); + show(processBlock); + show(workspaceBlock); + + descriptionTitle.innerHTML = 'Steps to reproduce *'; + show(descriptionSubtitle); + descriptionSubtitle.innerHTML = 'When does the performance issue occur?'; + } + // 3 - Feature Request + else { + hide(systemBlock); + hide(processBlock); + hide(workspaceBlock); + + descriptionTitle.innerHTML = 'Description *'; + hide(descriptionSubtitle); + } + } + + private validateInputs() { + let hasErrors = false; + + const issueTitle = (document.getElementById('issue-title')).value; + if (!issueTitle) { + hasErrors = true; + show(document.getElementsByClassName('validation-error')[0]); + document.getElementById('issue-title').classList.add('invalid-input'); + } + + const description = (document.querySelector('.block-description .block-info-text textarea')).value; + if (!description) { + hasErrors = true; + show(document.getElementsByClassName('validation-error')[1]); + document.getElementById('description').classList.add('invalid-input'); + } + + return !hasErrors; + } + + private getIssueTypeTitle() { + if (this.state.issueType === 0) { + return 'Bug'; + } else if (this.state.issueType === 1) { + return 'Performance Issue\n'; + } else { + return 'Feature Request'; + } + } + + private createIssue() { + if (!this.validateInputs()) { + (document.getElementsByClassName('invalid-input')[0]).focus(); + return; + } + + document.getElementById('github-submit-btn').classList.add('active'); + const issueTitle = (document.getElementById('issue-title')).value; + const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`; + const description = (document.querySelector('.block-description .block-info-text textarea')).value; + + let issueBody = ''; + + issueBody += ` +### Issue Type +${this.getIssueTypeTitle()} + +### Description + +${description} + +### VS Code Info + +VS Code version: ${this.state.versionInfo.vscodeVersion} +OS version: ${this.state.versionInfo.os} + +${this.getInfos()} + + +`; + + document.getElementById('github-submit-btn').classList.remove('active'); + shell.openExternal(baseUrl + encodeURIComponent(issueBody)); + } + + private getInfos() { + let info = ''; + + if (this.state.includeSystemInfo) { + info += this.generateSystemInfoMd(); + } + + // For perf issue, add process info and workspace info too + if (this.state.issueType === 1) { + + if (this.state.includeProcessInfo) { + info += this.generateProcessInfoMd(); + } + + if (this.state.includeWorkspaceInfo) { + info += this.generateWorkspaceInfoMd(); + } + } + + return info; + } + + private generateSystemInfoMd() { + let md = `
    +System Info + +|Item|Value| +|---|---| +`; + + Object.keys(this.state.systemInfo).forEach(k => { + md += `|${k}|${this.state.systemInfo[k]}|\n`; + }); + + md += '\n
    '; + + return md; + } + + private generateProcessInfoMd() { + let md = `
    +Process Info + +|pid|CPU|Memory (MB)|Name| +|---|---|---|---| +`; + + this.state.processInfo.forEach(p => { + md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; + }); + + md += '\n
    '; + + return md; + } + + private generateWorkspaceInfoMd() { + return `
    +Workspace Info + +\`\`\` +${this.state.workspaceInfo}; +\`\`\` + +
    +`; + } +} + +/** + * Update blocks + */ + +function updateAllBlocks(state) { + updateVersionInfo(state); + updateSystemInfo(state); + updateProcessInfo(state); + updateWorkspaceInfo(state); +} + +const updateVersionInfo = (state: IssueReporterState) => { + const version = document.getElementById('vscode-version'); + (version).value = state.versionInfo.vscodeVersion; + + const osversion = document.getElementById('os'); + (osversion).value = state.versionInfo.os; +}; + +const updateSystemInfo = (state) => { + const target = document.querySelector('.block-system .block-info'); + let tableHtml = ''; + Object.keys(state.systemInfo).forEach(k => { + tableHtml += ` + + ${k} + ${state.systemInfo[k]} +`; + }); + target.innerHTML = `${tableHtml}
    `; +}; +const updateProcessInfo = (state) => { + const target = document.querySelector('.block-process .block-info'); + + let tableHtml = ` + + pid + CPU % + Memory (MB) + Name + +`; + state.processInfo.forEach(p => { + tableHtml += ` + + ${p.pid} + ${p.cpu} + ${p.memory} + ${p.name} +`; + }); + target.innerHTML = `${tableHtml}
    `; +}; + +const updateWorkspaceInfo = (state) => { + document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; +}; + +// helper functions + +function hide(el) { + el.classList.add('hidden'); +} +function show(el) { + el.classList.remove('hidden'); +} diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index 5794ca852d2..50c24c2bbd1 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -8,10 +8,12 @@ } html { font-family: 'Helvetica Neue', 'Helvetica', sans-serif; + color: #CCCCCC; } body { margin: 0; + background-color: #1E1E1E; } .hidden { @@ -46,19 +48,24 @@ pre code { #issue-type button { margin-right: 16px; } -button:hover, -button.active { +#github-submit-btn:hover:enabled, +#github-submit-btn.active { border: 1px solid #5cb85c; - background: #5cb85c; + background-color: #5cb85c; color: #fff; } -button:hover { +button:hover:enabled { opacity: .5; + cursor: pointer; } button.active { opacity: 1; } +button:disabled { + cursor: auto; +} + header { position: relative; background-color: #24292e; @@ -75,6 +82,7 @@ header { #github-submit-btn { float: right; margin-top: 14px; + background-color: #fff } .two-col { @@ -90,10 +98,31 @@ header { margin-bottom: 1em; } -label { - display: block; -} - select, input, textarea { margin-top: 10px; } + +.required-input { + color: red; +} + +.invalid-input { + border: 1px solid red; +} + +.validation-error { + font-size: 12px; + font-weight: bold; + margin-top: 1em; +} + +.caption { + display: inline-block; + font-size: 12px; +} + +input[type="checkbox"] { + margin-left: 1em; + width: auto; + display: inline-block; +} diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index 3bf1f6b5b02..8a7a25a8242 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -14,5 +14,5 @@ export const IIssueService = createDecorator(ID); export interface IIssueService { _serviceBrand: any; openReporter(): TPromise; - getRunningExtensions(): TPromise; + getStatusInfo(): TPromise; } \ No newline at end of file diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts index 003827e7aa4..a3489bbde2e 100644 --- a/src/vs/platform/issue/common/issueIpc.ts +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -11,7 +11,7 @@ import { IIssueService } from './issue'; export interface IIssueChannel extends IChannel { call(command: 'openIssueReporter'): TPromise; - call(command: 'getRunningExtensions'): TPromise; + call(command: 'getStatusInfo'): TPromise; call(command: string, arg?: any): TPromise; } @@ -23,8 +23,8 @@ export class IssueChannel implements IIssueChannel { switch (command) { case 'openIssueReporter': return this.service.openReporter(); - case 'getRunningExtensions': - return this.service.getRunningExtensions(); + case 'getStatusInfo': + return this.service.getStatusInfo(); } return undefined; } @@ -40,8 +40,7 @@ export class IssueChannelClient implements IIssueService { return this.channel.call('openIssueReporter'); } - getRunningExtensions(): TPromise { - console.log(this.channel); - return TPromise.as(null); + getStatusInfo(): TPromise { + return this.channel.call('getStatusInfo'); } } \ No newline at end of file diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 631a584c1af..8dd1527b63d 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -7,37 +7,31 @@ import { TPromise, Promise } from 'vs/base/common/winjs.base'; import { IIssueService } from 'vs/platform/issue/common/issue'; -import { BrowserWindow, ipcMain } from 'electron'; +import { BrowserWindow } from 'electron'; import { ILaunchService } from 'vs/code/electron-main/launch'; import { buildDiagnostics, DiagnosticInfo } from 'vs/code/electron-main/diagnostics'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; export class IssueService implements IIssueService { _serviceBrand: any; _issueWindow: BrowserWindow; constructor( - @ILaunchService private launchService: ILaunchService + @ILaunchService private launchService: ILaunchService, + @IEnvironmentService private environmentService: IEnvironmentService ) { } openReporter(): TPromise { - ipcMain.on('issueInfoRequest', event => { - this.getStatusInfo().then(msg => { - event.sender.send('issueInfoResponse', msg); - }); + this._issueWindow = new BrowserWindow({ + width: 800, + height: 900 }); - ipcMain.on('extensionInfoRequest', event => { - // this.getExtensions().then(extensions => { - // event.sender.send('extensionInfoResponse', extensions); - // }); - }); - this._issueWindow = new BrowserWindow({}); this._issueWindow.loadURL(this.getIssueReporterPath()); - this._issueWindow.webContents.openDevTools(); return TPromise.as(null); } - getStatusInfo(): Promise { + getStatusInfo(): TPromise { return new Promise((resolve, reject) => { this.launchService.getMainProcessInfo().then(info => { buildDiagnostics(info) @@ -51,12 +45,12 @@ export class IssueService implements IIssueService { }); } - getRunningExtensions(): TPromise { - return Promise.as(null); - // return this.extManagementService.getInstalled(); - } - private getIssueReporterPath() { - return `${require.toUrl('vs/issue/electron-browser/index.html')}`; + const config = { + appRoot: this.environmentService.appRoot, + nodeCachedDataDir: this.environmentService.nodeCachedDataDir, + windowId: this._issueWindow.id + }; + return `${require.toUrl('vs/issue/electron-browser/index.html')}?config=${encodeURIComponent(JSON.stringify(config))}`; } } From faa735b1f4bf46d8ff85128d3043b3e2b1c98a7c Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Mon, 8 Jan 2018 17:27:47 -0800 Subject: [PATCH 345/710] Add TelemetryService to reporter --- src/vs/issue/electron-browser/index.html | 4 +- .../issue/electron-browser/issueReporter.ts | 183 +++++++++++------- src/vs/issue/electron-browser/style.css | 6 +- .../issue/electron-main/issueService.ts | 1 + 4 files changed, 123 insertions(+), 71 deletions(-) diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index c64c37c4c0a..b7aa0637882 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -23,7 +23,7 @@
    - + @@ -92,7 +92,7 @@ GitHub-flavored Markdown is supported. After submitting, you will still be able to edit your issue. - +
    diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts index 4e64fe20634..e029015d130 100644 --- a/src/vs/issue/electron-browser/issueReporter.ts +++ b/src/vs/issue/electron-browser/issueReporter.ts @@ -7,8 +7,22 @@ import { shell } from 'electron'; import { $ } from 'vs/base/browser/dom'; import { IIssueService } from 'vs/platform/issue/common/issue'; import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; -import { IWindowConfiguration } from 'vs/platform/windows/common/windows'; +import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows'; import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser'; +import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; +import product from 'vs/platform/node/product'; +import pkg from 'vs/platform/node/package'; +import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; +import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService'; +import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc'; +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; +import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc'; +import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net'; +import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties'; +import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; +import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; interface IssueReporterState { issueType?: number; @@ -28,6 +42,8 @@ export function startup(configuration: IWindowConfiguration) { export class IssueReporter { private issueService: IIssueService; + private environmentService: IEnvironmentService; + private telemetryService: ITelemetryService; private state: IssueReporterState; constructor(configuration: IWindowConfiguration) { @@ -49,7 +65,7 @@ export class IssueReporter { this.state.processInfo = processInfo; this.state.workspaceInfo = workspaceInfo; - updateAllBlocks(this.state); + this.updateAllBlocks(this.state); const submitButton = document.getElementById('github-submit-btn'); submitButton.disabled = false; @@ -57,12 +73,37 @@ export class IssueReporter { }); } - initServices(configuration: IWindowConfiguration) { + // TODO: Properly dispose of services + initServices(configuration: IWindowConfiguration): void { + const serviceCollection = new ServiceCollection(); const mainProcessClient = new ElectronIPCClient(String(`window${configuration.windowId}`)); this.issueService = new IssueChannelClient(mainProcessClient.getChannel('issue')); + + const windowsChannel = mainProcessClient.getChannel('windows'); + serviceCollection.set(IWindowsService, new WindowsChannelClient(windowsChannel)); + this.environmentService = new EnvironmentService(configuration, configuration.execPath); + + const sharedProcess = (serviceCollection.get(IWindowsService)).whenSharedProcessReady() + .then(() => connectNet(this.environmentService.sharedIPCHandle, `window:${configuration.windowId}`)); + + const instantiationService = new InstantiationService(serviceCollection, true); + if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) { + const channel = getDelayedChannel(sharedProcess.then(c => c.getChannel('telemetryAppender'))); + const appender = new TelemetryAppenderClient(channel); + const commonProperties = resolveCommonProperties(product.commit, pkg.version, configuration.machineId, this.environmentService.installSourcePath); + const piiPaths = [this.environmentService.appRoot, this.environmentService.extensionsPath]; + const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths }; + + const telemetryService = instantiationService.createInstance(TelemetryService, config); + this.telemetryService = telemetryService; + } else { + this.telemetryService = NullTelemetryService; + } + + console.log(this.telemetryService); } - setEventHandlers() { + setEventHandlers(): void { document.getElementById('issue-type').addEventListener('change', (event: Event) => { this.state.issueType = parseInt((event.target).value); this.render(); @@ -120,12 +161,12 @@ export class IssueReporter { document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue()); } - render() { + render(): void { this.renderIssueType(); this.renderBlocks(); } - renderIssueType() { + private renderIssueType(): void { const { issueType } = this.state; const issueTypes = document.getElementById('issue-type').children; issueTypes[0].className = issueType === 0 ? 'active' : ''; @@ -133,7 +174,7 @@ export class IssueReporter { issueTypes[2].className = issueType === 2 ? 'active' : ''; } - renderBlocks() { + private renderBlocks(): void { // Depending on Issue Type, we render different blocks and text const { issueType } = this.state; const systemBlock = document.querySelector('.block-system'); @@ -174,39 +215,46 @@ export class IssueReporter { } } - private validateInputs() { - let hasErrors = false; - - const issueTitle = (document.getElementById('issue-title')).value; - if (!issueTitle) { - hasErrors = true; - show(document.getElementsByClassName('validation-error')[0]); - document.getElementById('issue-title').classList.add('invalid-input'); + private validateInput(inputId: string): boolean { + const issueTitleElement = (document.getElementById(inputId)); + if (!issueTitleElement.value) { + show(document.getElementById(`${inputId}-validation-error`)); + issueTitleElement.classList.add('invalid-input'); + return false; + } else { + hide(document.getElementById(`${inputId}-validation-error`)); + issueTitleElement.classList.remove('invalid-input'); + return true; } - - const description = (document.querySelector('.block-description .block-info-text textarea')).value; - if (!description) { - hasErrors = true; - show(document.getElementsByClassName('validation-error')[1]); - document.getElementById('description').classList.add('invalid-input'); - } - - return !hasErrors; } - private getIssueTypeTitle() { + private validateInputs(): boolean { + return this.validateInput('issue-title') && this.validateInput('description'); + } + + private getIssueTypeTitle(): string { if (this.state.issueType === 0) { return 'Bug'; } else if (this.state.issueType === 1) { - return 'Performance Issue\n'; + return 'Performance Issue'; } else { return 'Feature Request'; } } - private createIssue() { + private createIssue(): void { if (!this.validateInputs()) { + // If inputs are invalid, set focus to the first one and add listeners on them + // to detect further changes (document.getElementsByClassName('invalid-input')[0]).focus(); + + document.getElementById('issue-title').addEventListener('input', (event) => { + this.validateInput('issue-title'); + }); + + document.getElementById('description').addEventListener('input', (event) => { + this.validateInput('description'); + }); return; } @@ -239,7 +287,7 @@ ${this.getInfos()} shell.openExternal(baseUrl + encodeURIComponent(issueBody)); } - private getInfos() { + private getInfos(): string { let info = ''; if (this.state.includeSystemInfo) { @@ -261,7 +309,7 @@ ${this.getInfos()} return info; } - private generateSystemInfoMd() { + private generateSystemInfoMd(): string { let md = `
    System Info @@ -278,7 +326,7 @@ ${this.getInfos()} return md; } - private generateProcessInfoMd() { + private generateProcessInfoMd(): string { let md = `
    Process Info @@ -295,7 +343,7 @@ ${this.getInfos()} return md; } - private generateWorkspaceInfoMd() { + private generateWorkspaceInfoMd(): string { return `
    Workspace Info @@ -306,43 +354,43 @@ ${this.state.workspaceInfo};
    `; } -} -/** - * Update blocks - */ + /** + * Update blocks + */ -function updateAllBlocks(state) { - updateVersionInfo(state); - updateSystemInfo(state); - updateProcessInfo(state); - updateWorkspaceInfo(state); -} + private updateAllBlocks(state) { + this.updateVersionInfo(state); + this.updateSystemInfo(state); + this.updateProcessInfo(state); + this.updateWorkspaceInfo(state); + } -const updateVersionInfo = (state: IssueReporterState) => { - const version = document.getElementById('vscode-version'); - (version).value = state.versionInfo.vscodeVersion; + private updateVersionInfo = (state: IssueReporterState) => { + const version = document.getElementById('vscode-version'); + (version).value = state.versionInfo.vscodeVersion; - const osversion = document.getElementById('os'); - (osversion).value = state.versionInfo.os; -}; + const osversion = document.getElementById('os'); + (osversion).value = state.versionInfo.os; + } -const updateSystemInfo = (state) => { - const target = document.querySelector('.block-system .block-info'); - let tableHtml = ''; - Object.keys(state.systemInfo).forEach(k => { - tableHtml += ` + private updateSystemInfo = (state) => { + const target = document.querySelector('.block-system .block-info'); + let tableHtml = ''; + Object.keys(state.systemInfo).forEach(k => { + tableHtml += ` ${k} ${state.systemInfo[k]} `; - }); - target.innerHTML = `${tableHtml}
    `; -}; -const updateProcessInfo = (state) => { - const target = document.querySelector('.block-process .block-info'); + }); + target.innerHTML = `${tableHtml}
    `; + } - let tableHtml = ` + private updateProcessInfo = (state) => { + const target = document.querySelector('.block-process .block-info'); + + let tableHtml = ` pid CPU % @@ -350,21 +398,24 @@ const updateProcessInfo = (state) => { Name `; - state.processInfo.forEach(p => { - tableHtml += ` + state.processInfo.forEach(p => { + tableHtml += ` ${p.pid} ${p.cpu} ${p.memory} ${p.name} `; - }); - target.innerHTML = `${tableHtml}
    `; -}; + }); + target.innerHTML = `${tableHtml}
    `; + } + + private updateWorkspaceInfo = (state) => { + document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; + } +} + -const updateWorkspaceInfo = (state) => { - document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; -}; // helper functions diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index 50c24c2bbd1..7efdf502a0c 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -7,7 +7,7 @@ box-sizing: border-box; } html { - font-family: 'Helvetica Neue', 'Helvetica', sans-serif; + font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif; color: #CCCCCC; } @@ -68,8 +68,8 @@ button:disabled { header { position: relative; - background-color: #24292e; - color: rgba(255,255,255,0.75); + background-color: #333; + color: #ADADAD; padding: 1em; margin-bottom: 1em; } diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 8dd1527b63d..8051103c93f 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -27,6 +27,7 @@ export class IssueService implements IIssueService { height: 900 }); this._issueWindow.loadURL(this.getIssueReporterPath()); + this._issueWindow.webContents.openDevTools(); return TPromise.as(null); } From 94e68b7c46d5b37793801ac8c33cb0a799a82a09 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Wed, 10 Jan 2018 12:54:45 -0800 Subject: [PATCH 346/710] Correctly pass machineId, some text and styling updates --- src/vs/code/electron-main/app.ts | 2 +- src/vs/issue/electron-browser/index.html | 7 ++----- src/vs/issue/electron-browser/issueReporter.ts | 10 +++++++--- src/vs/issue/electron-browser/style.css | 18 ++++++++---------- .../issue/electron-main/issueService.ts | 9 ++++++--- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 6cca20acc13..e9f4d650dea 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -311,7 +311,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)); + services.set(IIssueService, new SyncDescriptor(IssueService, machineId)); // Telemtry if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) { diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index b7aa0637882..1d2602d2930 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -7,9 +7,6 @@ -
    - VS Code Issue Reporter -
    @@ -44,7 +41,7 @@
    - System Info + My System Info @@ -68,7 +65,7 @@
    - Workspace Stats + My Workspace Stats diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts index e029015d130..561b26f74dd 100644 --- a/src/vs/issue/electron-browser/issueReporter.ts +++ b/src/vs/issue/electron-browser/issueReporter.ts @@ -23,6 +23,7 @@ import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net'; import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties'; import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; +import { Disposable } from 'vs/base/common/lifecycle'; interface IssueReporterState { issueType?: number; @@ -40,13 +41,14 @@ export function startup(configuration: IWindowConfiguration) { issueReporter.render(); } -export class IssueReporter { +export class IssueReporter extends Disposable { private issueService: IIssueService; private environmentService: IEnvironmentService; private telemetryService: ITelemetryService; private state: IssueReporterState; constructor(configuration: IWindowConfiguration) { + super(); this.state = { issueType: 0, includeSystemInfo: true, @@ -95,6 +97,8 @@ export class IssueReporter { const config: ITelemetryServiceConfig = { appender, commonProperties, piiPaths }; const telemetryService = instantiationService.createInstance(TelemetryService, config); + this._register(telemetryService); + this.telemetryService = telemetryService; } else { this.telemetryService = NullTelemetryService; @@ -192,7 +196,7 @@ export class IssueReporter { descriptionTitle.innerHTML = 'Steps to reproduce *'; show(descriptionSubtitle); - descriptionSubtitle.innerHTML = 'Please explain how to reproduce the problem. What was expected and what actually happened?'; + descriptionSubtitle.innerHTML = 'How did you encounter this problem? Clear steps to reproduce the problem help our investigation. What did you expect to happen and what actually happened?'; } // 2 - Perf Issue else if (issueType === 1) { @@ -202,7 +206,7 @@ export class IssueReporter { descriptionTitle.innerHTML = 'Steps to reproduce *'; show(descriptionSubtitle); - descriptionSubtitle.innerHTML = 'When does the performance issue occur?'; + descriptionSubtitle.innerHTML = 'When did this performance issue happen? For examples, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.'; } // 3 - Feature Request else { diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index 7efdf502a0c..a2551d9eac5 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -55,7 +55,7 @@ pre code { color: #fff; } button:hover:enabled { - opacity: .5; + opacity: .8; cursor: pointer; } button.active { @@ -66,22 +66,16 @@ button:disabled { cursor: auto; } -header { - position: relative; - background-color: #333; - color: #ADADAD; - padding: 1em; - margin-bottom: 1em; -} - #issue-reporter { max-width: 80vw; margin-left: auto; margin-right: auto; + margin-top: 2em; } #github-submit-btn { float: right; - margin-top: 14px; + margin-top: 10px; + margin-bottom: 10px; background-color: #fff } @@ -126,3 +120,7 @@ input[type="checkbox"] { width: auto; display: inline-block; } + +a { + color: #CCCCCC +} diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 8051103c93f..bb285b39fde 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -18,13 +18,15 @@ export class IssueService implements IIssueService { constructor( @ILaunchService private launchService: ILaunchService, - @IEnvironmentService private environmentService: IEnvironmentService + @IEnvironmentService private environmentService: IEnvironmentService, + private machineId: string ) { } openReporter(): TPromise { this._issueWindow = new BrowserWindow({ width: 800, - height: 900 + height: 900, + title: 'Issue Reporter' }); this._issueWindow.loadURL(this.getIssueReporterPath()); this._issueWindow.webContents.openDevTools(); @@ -50,7 +52,8 @@ export class IssueService implements IIssueService { const config = { appRoot: this.environmentService.appRoot, nodeCachedDataDir: this.environmentService.nodeCachedDataDir, - windowId: this._issueWindow.id + windowId: this._issueWindow.id, + machineId: this.machineId }; return `${require.toUrl('vs/issue/electron-browser/index.html')}?config=${encodeURIComponent(JSON.stringify(config))}`; } From 19b8e74e033004d78881138b906d99f7b42f57ad Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Thu, 11 Jan 2018 10:59:33 -0800 Subject: [PATCH 347/710] Add a unit test --- src/vs/issue/electron-browser/index.html | 4 +- .../issue/electron-browser/issueReporter.ts | 165 +++--------------- .../electron-browser/issueReporterModel.ts | 132 ++++++++++++++ src/vs/issue/test/testReporterModel.test.ts | 32 ++++ 4 files changed, 194 insertions(+), 139 deletions(-) create mode 100644 src/vs/issue/electron-browser/issueReporterModel.ts create mode 100644 src/vs/issue/test/testReporterModel.test.ts diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 1d2602d2930..a49aad9067e 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -20,7 +20,7 @@
    - + @@ -89,7 +89,7 @@ GitHub-flavored Markdown is supported. After submitting, you will still be able to edit your issue. - +
    diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts index 561b26f74dd..8d1e0c4cf48 100644 --- a/src/vs/issue/electron-browser/issueReporter.ts +++ b/src/vs/issue/electron-browser/issueReporter.ts @@ -24,17 +24,7 @@ import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProper import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { Disposable } from 'vs/base/common/lifecycle'; - -interface IssueReporterState { - issueType?: number; - versionInfo?: any; - systemInfo?: any; - processInfo?: any; - workspaceInfo?: any; - includeSystemInfo?: boolean; - includeWorkspaceInfo?: boolean; - includeProcessInfo?: boolean; -} +import { IssueReporterModel, IssueReporterData } from 'vs/issue/electron-browser/issueReporterModel'; export function startup(configuration: IWindowConfiguration) { const issueReporter = new IssueReporter(configuration); @@ -45,29 +35,26 @@ export class IssueReporter extends Disposable { private issueService: IIssueService; private environmentService: IEnvironmentService; private telemetryService: ITelemetryService; - private state: IssueReporterState; + private issueReporterModel: IssueReporterModel; constructor(configuration: IWindowConfiguration) { super(); - this.state = { + + this.issueReporterModel = new IssueReporterModel({ issueType: 0, includeSystemInfo: true, includeWorkspaceInfo: true, includeProcessInfo: true - }; + }); this.initServices(configuration); this.setEventHandlers(); // Fetch and display status data this.issueService.getStatusInfo().then((info) => { - const { versionInfo, systemInfo, processInfo, workspaceInfo } = info; - this.state.versionInfo = versionInfo; - this.state.systemInfo = systemInfo; - this.state.processInfo = processInfo; - this.state.workspaceInfo = workspaceInfo; + this.issueReporterModel.update(info); - this.updateAllBlocks(this.state); + this.updateAllBlocks(this.issueReporterModel.getData()); const submitButton = document.getElementById('github-submit-btn'); submitButton.disabled = false; @@ -109,20 +96,24 @@ export class IssueReporter extends Disposable { setEventHandlers(): void { document.getElementById('issue-type').addEventListener('change', (event: Event) => { - this.state.issueType = parseInt((event.target).value); + this.issueReporterModel.update({ issueType: parseInt((event.target).value) }); this.render(); }); document.getElementById('includeSystemInfo').addEventListener('click', (event: Event) => { - this.state.includeSystemInfo = !this.state.includeSystemInfo; + this.issueReporterModel.update({ includeSystemInfo: !this.issueReporterModel.getData().includeSystemInfo }); }); document.getElementById('includeProcessInfo').addEventListener('click', (event: Event) => { - this.state.includeProcessInfo = !this.state.includeProcessInfo; + this.issueReporterModel.update({ includeProcessInfo: !this.issueReporterModel.getData().includeSystemInfo }); }); document.getElementById('includeWorkspaceInfo').addEventListener('click', (event: Event) => { - this.state.includeWorkspaceInfo = !this.state.includeWorkspaceInfo; + this.issueReporterModel.update({ includeWorkspaceInfo: !this.issueReporterModel.getData().includeWorkspaceInfo }); + }); + + document.getElementById('description').addEventListener('blur', (event: Event) => { + this.issueReporterModel.update({ issueDescription: (event.target).value }); }); function addIssuesToList(list, issueJSON) { @@ -166,21 +157,12 @@ export class IssueReporter extends Disposable { } render(): void { - this.renderIssueType(); this.renderBlocks(); } - private renderIssueType(): void { - const { issueType } = this.state; - const issueTypes = document.getElementById('issue-type').children; - issueTypes[0].className = issueType === 0 ? 'active' : ''; - issueTypes[1].className = issueType === 1 ? 'active' : ''; - issueTypes[2].className = issueType === 2 ? 'active' : ''; - } - private renderBlocks(): void { // Depending on Issue Type, we render different blocks and text - const { issueType } = this.state; + const { issueType } = this.issueReporterModel.getData(); const systemBlock = document.querySelector('.block-system'); const processBlock = document.querySelector('.block-process'); const workspaceBlock = document.querySelector('.block-workspace'); @@ -220,30 +202,26 @@ export class IssueReporter extends Disposable { } private validateInput(inputId: string): boolean { - const issueTitleElement = (document.getElementById(inputId)); - if (!issueTitleElement.value) { + const inputElement = (document.getElementById(inputId)); + if (!inputElement.value) { show(document.getElementById(`${inputId}-validation-error`)); - issueTitleElement.classList.add('invalid-input'); + inputElement.classList.add('invalid-input'); return false; } else { hide(document.getElementById(`${inputId}-validation-error`)); - issueTitleElement.classList.remove('invalid-input'); + inputElement.classList.remove('invalid-input'); return true; } } private validateInputs(): boolean { - return this.validateInput('issue-title') && this.validateInput('description'); - } + let isValid = true; + ['issue-title', 'description'].forEach(elementId => { + isValid = this.validateInput(elementId) && isValid; - private getIssueTypeTitle(): string { - if (this.state.issueType === 0) { - return 'Bug'; - } else if (this.state.issueType === 1) { - return 'Performance Issue'; - } else { - return 'Feature Request'; - } + }); + + return isValid; } private createIssue(): void { @@ -265,100 +243,13 @@ export class IssueReporter extends Disposable { document.getElementById('github-submit-btn').classList.add('active'); const issueTitle = (document.getElementById('issue-title')).value; const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`; - const description = (document.querySelector('.block-description .block-info-text textarea')).value; - let issueBody = ''; - - issueBody += ` -### Issue Type -${this.getIssueTypeTitle()} - -### Description - -${description} - -### VS Code Info - -VS Code version: ${this.state.versionInfo.vscodeVersion} -OS version: ${this.state.versionInfo.os} - -${this.getInfos()} - - -`; + const issueBody = this.issueReporterModel.serialize(); document.getElementById('github-submit-btn').classList.remove('active'); shell.openExternal(baseUrl + encodeURIComponent(issueBody)); } - private getInfos(): string { - let info = ''; - - if (this.state.includeSystemInfo) { - info += this.generateSystemInfoMd(); - } - - // For perf issue, add process info and workspace info too - if (this.state.issueType === 1) { - - if (this.state.includeProcessInfo) { - info += this.generateProcessInfoMd(); - } - - if (this.state.includeWorkspaceInfo) { - info += this.generateWorkspaceInfoMd(); - } - } - - return info; - } - - private generateSystemInfoMd(): string { - let md = `
    -System Info - -|Item|Value| -|---|---| -`; - - Object.keys(this.state.systemInfo).forEach(k => { - md += `|${k}|${this.state.systemInfo[k]}|\n`; - }); - - md += '\n
    '; - - return md; - } - - private generateProcessInfoMd(): string { - let md = `
    -Process Info - -|pid|CPU|Memory (MB)|Name| -|---|---|---|---| -`; - - this.state.processInfo.forEach(p => { - md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; - }); - - md += '\n
    '; - - return md; - } - - private generateWorkspaceInfoMd(): string { - return `
    -Workspace Info - -\`\`\` -${this.state.workspaceInfo}; -\`\`\` - -
    -`; - } - /** * Update blocks */ @@ -370,7 +261,7 @@ ${this.state.workspaceInfo}; this.updateWorkspaceInfo(state); } - private updateVersionInfo = (state: IssueReporterState) => { + private updateVersionInfo = (state: IssueReporterData) => { const version = document.getElementById('vscode-version'); (version).value = state.versionInfo.vscodeVersion; diff --git a/src/vs/issue/electron-browser/issueReporterModel.ts b/src/vs/issue/electron-browser/issueReporterModel.ts new file mode 100644 index 00000000000..2389cbea151 --- /dev/null +++ b/src/vs/issue/electron-browser/issueReporterModel.ts @@ -0,0 +1,132 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { assign } from 'vs/base/common/objects'; + +export interface IssueReporterData { + issueType?: number; + issueDescription?: string; + versionInfo?: any; + systemInfo?: any; + processInfo?: any; + workspaceInfo?: any; + includeSystemInfo?: boolean; + includeWorkspaceInfo?: boolean; + includeProcessInfo?: boolean; +} + +export class IssueReporterModel { + private _data: IssueReporterData; + + constructor(initialData?: IssueReporterData) { + this._data = initialData || {}; + } + + getData(): IssueReporterData { + return this._data; + } + + update(newData: IssueReporterData): void { + assign(this._data, newData); + } + + serialize(): string { + return ` +### Issue Type +${this.getIssueTypeTitle()} + +### Description + +${this._data.issueDescription} + +### VS Code Info + +VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} +OS version: ${this._data.versionInfo && this._data.versionInfo.os} + +${this.getInfos()} + + +`; + } + + private getIssueTypeTitle(): string { + if (this._data.issueType === 0) { + return 'Bug'; + } else if (this._data.issueType === 1) { + return 'Performance Issue'; + } else { + return 'Feature Request'; + } + } + + private getInfos(): string { + let info = ''; + + if (this._data.includeSystemInfo) { + info += this.generateSystemInfoMd(); + } + + // For perf issue, add process info and workspace info too + if (this._data.issueType === 1) { + + if (this._data.includeProcessInfo) { + info += this.generateProcessInfoMd(); + } + + if (this._data.includeWorkspaceInfo) { + info += this.generateWorkspaceInfoMd(); + } + } + + return info; + } + + private generateSystemInfoMd(): string { + let md = `
    +System Info + +|Item|Value| +|---|---| +`; + + Object.keys(this._data.systemInfo).forEach(k => { + md += `|${k}|${this._data.systemInfo[k]}|\n`; + }); + + md += '\n
    '; + + return md; + } + + private generateProcessInfoMd(): string { + let md = `
    +Process Info + +|pid|CPU|Memory (MB)|Name| +|---|---|---|---| +`; + + this._data.processInfo.forEach(p => { + md += `|${p.pid}|${p.cpu}|${p.memory}|${p.name}|\n`; + }); + + md += '\n
    '; + + return md; + } + + private generateWorkspaceInfoMd(): string { + return `
    +Workspace Info + +\`\`\` +${this._data.workspaceInfo}; +\`\`\` + +
    +`; + } +} \ No newline at end of file diff --git a/src/vs/issue/test/testReporterModel.test.ts b/src/vs/issue/test/testReporterModel.test.ts new file mode 100644 index 00000000000..f159fa48466 --- /dev/null +++ b/src/vs/issue/test/testReporterModel.test.ts @@ -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. + *--------------------------------------------------------------------------------------------*/ + +import * as assert from 'assert'; +import { IssueReporterModel } from 'vs/issue/electron-browser/issueReporterModel'; + +suite('IssueReporter', () => { + + test('serializes model', () => { + const issueReporterModel = new IssueReporterModel(); + assert.equal(issueReporterModel.serialize(), + ` +### Issue Type +Feature Request + +### Description + +undefined + +### VS Code Info + +VS Code version: undefined +OS version: undefined + + + + +`); + }); +}); From 6ad1f72dfcca4054e10b00158a289a6316bb55ff Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Tue, 16 Jan 2018 07:54:46 -0800 Subject: [PATCH 348/710] Use theme information to style the reporter --- src/vs/issue/electron-browser/bootstrap.css | 24 +---- .../issue/electron-browser/issueReporter.ts | 88 +++++++++++++++---- src/vs/issue/electron-browser/style.css | 49 ++++++----- src/vs/platform/environment/node/argv.ts | 2 +- src/vs/platform/issue/common/issue.ts | 17 +++- src/vs/platform/issue/common/issueIpc.ts | 16 ++-- .../issue/electron-main/issueService.ts | 22 ++++- src/vs/workbench/electron-browser/actions.ts | 22 ++++- 8 files changed, 158 insertions(+), 82 deletions(-) diff --git a/src/vs/issue/electron-browser/bootstrap.css b/src/vs/issue/electron-browser/bootstrap.css index e748cced9e9..0189cc3f96a 100644 --- a/src/vs/issue/electron-browser/bootstrap.css +++ b/src/vs/issue/electron-browser/bootstrap.css @@ -45,8 +45,6 @@ input, textarea { background-image: none; background-clip: padding-box; border: 1px solid #ced4da; - border-radius: .25rem; - transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; } textarea { overflow: auto; @@ -71,19 +69,14 @@ button { white-space: nowrap; vertical-align: middle; user-select: none; - border: 1px solid transparent; padding: .5rem 1rem; font-size: 1rem; - border: 1px solid #ddd; - border-radius: .25rem; background: none; transition: all .2s ease-in-out; } -button:focus { - outline: 0; -} -.form-control { +select { + height: calc(2.25rem + 2px); display: block; width: 100%; padding: 0.375rem 0.75rem; @@ -93,16 +86,5 @@ button:focus { background-color: #fff; background-image: none; background-clip: padding-box; - border: 1px solid #ced4da; - border-radius: 0.25rem; - transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; -} - -select.form-control { - height: calc(2.25rem + 2px); -} - -select.form-control:focus::-ms-value { - color: #1e1e1e; - background-color: #cccccc; + border: none; } diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts index 8d1e0c4cf48..fa4565e4b38 100644 --- a/src/vs/issue/electron-browser/issueReporter.ts +++ b/src/vs/issue/electron-browser/issueReporter.ts @@ -3,10 +3,8 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { shell } from 'electron'; +import { shell, ipcRenderer } from 'electron'; import { $ } from 'vs/base/browser/dom'; -import { IIssueService } from 'vs/platform/issue/common/issue'; -import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows'; import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; @@ -25,6 +23,7 @@ import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { Disposable } from 'vs/base/common/lifecycle'; import { IssueReporterModel, IssueReporterData } from 'vs/issue/electron-browser/issueReporterModel'; +import { IssueReporterStyles } from 'vs/platform/issue/common/issue'; export function startup(configuration: IWindowConfiguration) { const issueReporter = new IssueReporter(configuration); @@ -32,7 +31,6 @@ export function startup(configuration: IWindowConfiguration) { } export class IssueReporter extends Disposable { - private issueService: IIssueService; private environmentService: IEnvironmentService; private telemetryService: ITelemetryService; private issueReporterModel: IssueReporterModel; @@ -47,11 +45,11 @@ export class IssueReporter extends Disposable { includeProcessInfo: true }); - this.initServices(configuration); - this.setEventHandlers(); + ipcRenderer.on('issueStyleResponse', (event, styles: IssueReporterStyles) => { + this.applyStyles(styles); + }); - // Fetch and display status data - this.issueService.getStatusInfo().then((info) => { + ipcRenderer.on('issueInfoResponse', (event, info) => { this.issueReporterModel.update(info); this.updateAllBlocks(this.issueReporterModel.getData()); @@ -60,13 +58,75 @@ export class IssueReporter extends Disposable { submitButton.disabled = false; submitButton.textContent = 'Preview on GitHub'; }); + + ipcRenderer.send('issueInfoRequest'); + ipcRenderer.send('issueStyleRequest'); + + this.initServices(configuration); + this.setEventHandlers(); + } + + render(): void { + this.renderBlocks(); + } + + private applyStyles(styles: IssueReporterStyles) { + const styleTag = document.createElement('style'); + const content: string[] = []; + + if (styles.inputBackground) { + content.push(`input, textarea, select { background-color: ${styles.inputBackground}; }`); + } + + if (styles.inputBorder) { + content.push(`input, textarea, select { border: 1px solid ${styles.inputBorder}; }`); + } else { + content.push(`input, textarea, select { border: none; }`); + } + + if (styles.inputForeground) { + content.push(`input, textarea, select { color: ${styles.inputForeground}; }`); + } + + if (styles.inputErrorBorder) { + content.push(`.invalid-input, .invalid-input:focus { border: 1px solid ${styles.inputErrorBorder}; }`); + } + + if (styles.inputActiveBorder) { + content.push(`input:focus, textarea:focus, select:focus, summary:focus { border: 1px solid ${styles.inputActiveBorder}; outline-style: none; }`); + } + + if (styles.textLinkColor) { + content.push(`a { color: ${styles.textLinkColor}; }`); + } + + if (styles.buttonBackground) { + content.push(`button { background-color: ${styles.buttonBackground}; }`); + } + + if (styles.buttonForeground) { + content.push(`button { color: ${styles.buttonForeground}; }`); + } + + if (styles.buttonHoverBackground) { + content.push(`button:hover:enabled { background-color: ${styles.buttonHoverBackground}; }`); + } + + if (styles.textLinkColor) { + content.push(`a { color: ${styles.textLinkColor}; }`); + } + + styleTag.innerHTML = content.join('\n'); + document.head.appendChild(styleTag); + + document.body.style.backgroundColor = styles.backgroundColor; + document.body.style.color = styles.color; } // TODO: Properly dispose of services - initServices(configuration: IWindowConfiguration): void { + private initServices(configuration: IWindowConfiguration): void { const serviceCollection = new ServiceCollection(); const mainProcessClient = new ElectronIPCClient(String(`window${configuration.windowId}`)); - this.issueService = new IssueChannelClient(mainProcessClient.getChannel('issue')); const windowsChannel = mainProcessClient.getChannel('windows'); serviceCollection.set(IWindowsService, new WindowsChannelClient(windowsChannel)); @@ -94,7 +154,7 @@ export class IssueReporter extends Disposable { console.log(this.telemetryService); } - setEventHandlers(): void { + private setEventHandlers(): void { document.getElementById('issue-type').addEventListener('change', (event: Event) => { this.issueReporterModel.update({ issueType: parseInt((event.target).value) }); this.render(); @@ -156,10 +216,6 @@ export class IssueReporter extends Disposable { document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue()); } - render(): void { - this.renderBlocks(); - } - private renderBlocks(): void { // Depending on Issue Type, we render different blocks and text const { issueType } = this.issueReporterModel.getData(); @@ -310,8 +366,6 @@ export class IssueReporter extends Disposable { } } - - // helper functions function hide(el) { diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css index a2551d9eac5..92b99520053 100644 --- a/src/vs/issue/electron-browser/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -45,22 +45,9 @@ pre code { font-family: 'Menlo', 'Courier New', 'Courier', monospace; } -#issue-type button { - margin-right: 16px; -} -#github-submit-btn:hover:enabled, -#github-submit-btn.active { - border: 1px solid #5cb85c; - background-color: #5cb85c; - color: #fff; -} button:hover:enabled { - opacity: .8; cursor: pointer; } -button.active { - opacity: 1; -} button:disabled { cursor: auto; @@ -72,11 +59,12 @@ button:disabled { margin-right: auto; margin-top: 2em; } + #github-submit-btn { float: right; margin-top: 10px; margin-bottom: 10px; - background-color: #fff + } .two-col { @@ -96,14 +84,6 @@ select, input, textarea { margin-top: 10px; } -.required-input { - color: red; -} - -.invalid-input { - border: 1px solid red; -} - .validation-error { font-size: 12px; font-weight: bold; @@ -121,6 +101,27 @@ input[type="checkbox"] { display: inline-block; } -a { - color: #CCCCCC +/* Default styles, overwritten if a theme is provided */ +input, select, textarea { + background-color: #3c3c3c; + border: none; + color: #cccccc; } + +a { + color: #CCCCCC; +} + +.invalid-input { + border: 1px solid #be1100; +} + +.required-input { + color: #be1100; +} + +button { + background-color: #007ACC; + color: #fff; + border: none; +} \ No newline at end of file diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 6b982d48d18..a09207e24e9 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -166,7 +166,7 @@ const troubleshootingHelp: { [name: string]: string; } = { '--inspect-extensions': localize('inspect-extensions', "Allow debugging and profiling of extensions. Check the developer tools for the connection uri."), '--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."), '--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."), - '--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint.") + '--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."), '-i, --issue': localize('issue', "Report an issue."), }; diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index 8a7a25a8242..dc60cf38abe 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -11,8 +11,21 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' export const ID = 'issueService'; export const IIssueService = createDecorator(ID); +export interface IssueReporterStyles { + backgroundColor: string; + color: string; + textLinkColor: string; + inputBackground: string; + inputForeground: string; + inputBorder: string; + inputErrorBorder: string; + inputActiveBorder: string; + buttonBackground: string; + buttonForeground: string; + buttonHoverBackground: string; +} + export interface IIssueService { _serviceBrand: any; - openReporter(): TPromise; - getStatusInfo(): TPromise; + openReporter(theme?: IssueReporterStyles): TPromise; } \ No newline at end of file diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts index a3489bbde2e..f9f05c05ede 100644 --- a/src/vs/platform/issue/common/issueIpc.ts +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -7,10 +7,10 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IChannel } from 'vs/base/parts/ipc/common/ipc'; -import { IIssueService } from './issue'; +import { IIssueService, IssueReporterStyles } from './issue'; export interface IIssueChannel extends IChannel { - call(command: 'openIssueReporter'): TPromise; + call(command: 'openIssueReporter', arg: IssueReporterStyles): TPromise; call(command: 'getStatusInfo'): TPromise; call(command: string, arg?: any): TPromise; } @@ -22,9 +22,7 @@ export class IssueChannel implements IIssueChannel { call(command: string, arg?: any): TPromise { switch (command) { case 'openIssueReporter': - return this.service.openReporter(); - case 'getStatusInfo': - return this.service.getStatusInfo(); + return this.service.openReporter(arg); } return undefined; } @@ -36,11 +34,7 @@ export class IssueChannelClient implements IIssueService { constructor(private channel: IIssueChannel) { } - openReporter(): TPromise { - return this.channel.call('openIssueReporter'); - } - - getStatusInfo(): TPromise { - return this.channel.call('getStatusInfo'); + openReporter(theme: IssueReporterStyles): TPromise { + return this.channel.call('openIssueReporter', theme); } } \ No newline at end of file diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index bb285b39fde..656c75c56d6 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -6,8 +6,8 @@ 'use strict'; import { TPromise, Promise } from 'vs/base/common/winjs.base'; -import { IIssueService } from 'vs/platform/issue/common/issue'; -import { BrowserWindow } from 'electron'; +import { IIssueService, IssueReporterStyles } from 'vs/platform/issue/common/issue'; +import { BrowserWindow, ipcMain } from 'electron'; import { ILaunchService } from 'vs/code/electron-main/launch'; import { buildDiagnostics, DiagnosticInfo } from 'vs/code/electron-main/diagnostics'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; @@ -22,19 +22,33 @@ export class IssueService implements IIssueService { private machineId: string ) { } - openReporter(): TPromise { + openReporter(theme?: IssueReporterStyles): TPromise { + ipcMain.on('issueInfoRequest', event => { + this.getStatusInfo().then(msg => { + event.sender.send('issueInfoResponse', msg); + }); + }); + + // When launching from cli, no theme is provided. Match theme if passed from workbench. + if (theme) { + ipcMain.on('issueStyleRequest', event => { + event.sender.send('issueStyleResponse', theme); + }); + } + this._issueWindow = new BrowserWindow({ width: 800, height: 900, title: 'Issue Reporter' }); + this._issueWindow.loadURL(this.getIssueReporterPath()); this._issueWindow.webContents.openDevTools(); return TPromise.as(null); } - getStatusInfo(): TPromise { + private getStatusInfo(): TPromise { return new Promise((resolve, reject) => { this.launchService.getMainProcessInfo().then(info => { buildDiagnostics(info) diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 26fedb0d58b..0a005512438 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -47,6 +47,9 @@ import { IExtensionService, ActivationTimes } from 'vs/platform/extensions/commo import { getEntries } from 'vs/base/common/performance'; import { IEditor } from 'vs/platform/editor/common/editor'; import { IIssueService } from 'vs/platform/issue/common/issue'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder } from 'vs/platform/theme/common/colorRegistry'; +import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; // --- actions @@ -867,13 +870,28 @@ export class OpenIssueReporterAction extends Action { constructor( id: string, label: string, - @IIssueService private issueService: IIssueService + @IIssueService private issueService: IIssueService, + @IThemeService private themeService: IThemeService ) { super(id, label); } public run(): TPromise { - return this.issueService.openReporter().then(() => { + const theme = this.themeService.getTheme(); + const style = { + backgroundColor: theme.getColor(SIDE_BAR_BACKGROUND) && theme.getColor(SIDE_BAR_BACKGROUND).toString(), + color: theme.getColor(foreground).toString(), + textLinkColor: theme.getColor(textLinkForeground) && theme.getColor(textLinkForeground).toString(), + inputBackground: theme.getColor(inputBackground) && theme.getColor(inputBackground).toString(), + inputForeground: theme.getColor(inputForeground) && theme.getColor(inputForeground).toString(), + inputBorder: theme.getColor(inputBorder) && theme.getColor(inputBorder).toString(), + inputActiveBorder: theme.getColor(inputActiveOptionBorder) && theme.getColor(inputActiveOptionBorder).toString(), + inputErrorBorder: theme.getColor(inputValidationErrorBorder) && theme.getColor(inputValidationErrorBorder).toString(), + buttonBackground: theme.getColor(buttonBackground) && theme.getColor(buttonBackground).toString(), + buttonForeground: theme.getColor(buttonForeground) && theme.getColor(buttonForeground).toString(), + buttonHoverBackground: theme.getColor(buttonHoverBackground) && theme.getColor(buttonHoverBackground).toString() + }; + return this.issueService.openReporter(style).then(() => { return TPromise.as(true); }); } From 104dbb9e0aab2475148220eb9f76352fa07f82bf Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Tue, 16 Jan 2018 07:59:06 -0800 Subject: [PATCH 349/710] Fix merge conflict from rebase --- src/vs/code/electron-main/diagnostics.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 657e6040647..924b2c2be7c 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -228,7 +228,7 @@ function getProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): Proce getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); if (rootProcess) { - getProcessItem(mapPidToWindowTitle, output, rootProcess, 0); + getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); } return processes; From 90a6e533dd4653f936b21c2f37b547eae1ffbc19 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Tue, 16 Jan 2018 17:23:59 -0800 Subject: [PATCH 350/710] Some more styling tweaks and bit of code cleanup --- .vscode/launch.json | 4 +- src/vs/code/electron-main/diagnostics.ts | 69 +++++++++++++++++-- src/vs/code/electron-main/main.ts | 4 -- src/vs/code/node/cli.ts | 4 +- src/vs/code/node/cliProcessMain.ts | 3 - src/vs/issue/electron-browser/bootstrap.css | 3 + src/vs/issue/electron-browser/index.html | 26 +++---- .../issue/electron-browser/issueReporter.ts | 49 ++++++++----- src/vs/issue/electron-browser/style.css | 4 ++ src/vs/platform/issue/common/issue.ts | 1 + .../issue/electron-main/issueService.ts | 3 +- src/vs/workbench/electron-browser/actions.ts | 3 +- 12 files changed, 126 insertions(+), 47 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index c5f3e958edc..37898b81577 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -49,7 +49,7 @@ "request": "attach", "name": "Attach to CLI Process", "protocol": "inspector", - "port": 1236, + "port": 5874, "outFiles": [ "${workspaceFolder}/out/**/*.js" ] @@ -59,7 +59,7 @@ "request": "attach", "name": "Attach to Main Process", "protocol": "inspector", - "port": 1237, + "port": 5875, "outFiles": [ "${workspaceFolder}/out/**/*.js" ] diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 924b2c2be7c..8a3fb1445fd 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -12,7 +12,7 @@ import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; import * as os from 'os'; import { virtualMachineHint } from 'vs/base/node/id'; -import { repeat } from 'vs/base/common/strings'; +import { repeat, pad } from 'vs/base/common/strings'; import { isWindows } from 'vs/base/common/platform'; import { app } from 'electron'; import { basename } from 'path'; @@ -93,11 +93,11 @@ export function printDiagnostics(info: IMainProcessInfo): Promise { // Environment Info console.log(''); - console.log(getSystemInfo(info)); + console.log(formatEnvironment(info)); // Process List console.log(''); - console.log(getProcessList(info, rootProcess)); + console.log(formatProcessList(info, rootProcess)); // Workspace Stats if (info.windows.some(window => window.folders && window.folders.length > 0)) { @@ -154,7 +154,6 @@ function formatWorkspaceStats(workspaceStats: WorkspaceStats): string { line += item; }; - // File Types let line = '| File types:'; const maxShown = 10; @@ -263,3 +262,65 @@ function getProcessItem(mapPidToWindowTitle: Map, processes: Pro item.children.forEach(child => getProcessItem(mapPidToWindowTitle, processes, child, indent + 1)); } } + +function formatEnvironment(info: IMainProcessInfo): string { + const MB = 1024 * 1024; + const GB = 1024 * MB; + + const output: string[] = []; + output.push(`Version: ${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`); + output.push(`OS Version: ${os.type()} ${os.arch()} ${os.release()}`); + const cpus = os.cpus(); + if (cpus && cpus.length > 0) { + output.push(`CPUs: ${cpus[0].model} (${cpus.length} x ${cpus[0].speed})`); + } + output.push(`Memory (System): ${(os.totalmem() / GB).toFixed(2)}GB (${(os.freemem() / GB).toFixed(2)}GB free)`); + if (!isWindows) { + output.push(`Load (avg): ${os.loadavg().map(l => Math.round(l)).join(', ')}`); // only provided on Linux/macOS + } + output.push(`VM: ${Math.round((virtualMachineHint.value() * 100))}%`); + output.push(`Screen Reader: ${app.isAccessibilitySupportEnabled() ? 'yes' : 'no'}`); + output.push(`Process Argv: ${info.mainArguments.join(' ')}`); + + return output.join('\n'); +} + +function formatProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): string { + const mapPidToWindowTitle = new Map(); + info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title)); + + const output: string[] = []; + + output.push('CPU %\tMem MB\t PID\tProcess'); + + if (rootProcess) { + formatProcessItem(mapPidToWindowTitle, output, rootProcess, 0); + } + + return output.join('\n'); +} + +function formatProcessItem(mapPidToWindowTitle: Map, output: string[], item: ProcessItem, indent: number): void { + const isRoot = (indent === 0); + + const MB = 1024 * 1024; + + // Format name with indent + let name: string; + if (isRoot) { + name = `${product.applicationName} main`; + } else { + name = `${repeat(' ', indent)} ${item.name}`; + + if (item.name === 'window') { + name = `${name} (${mapPidToWindowTitle.get(item.pid)})`; + } + } + const memory = process.platform === 'win32' ? item.mem : (os.totalmem() * (item.mem / 100)); + output.push(`${pad(Number(item.load.toFixed(0)), 5, ' ')}\t${pad(Number((memory / MB).toFixed(0)), 6, ' ')}\t${pad(Number((item.pid).toFixed(0)), 6, ' ')}\t${name}`); + + // Recurse into children if any + if (Array.isArray(item.children)) { + item.children.forEach(child => formatProcessItem(mapPidToWindowTitle, output, child, indent + 1)); + } +} diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 9d5992124b8..6ab6a690829 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -45,8 +45,6 @@ import { mnemonicButtonLabel } from 'vs/base/common/labels'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import { printDiagnostics } from 'vs/code/electron-main/diagnostics'; import { BufferLogService } from 'vs/platform/log/common/bufferLog'; -import { IIssueService } from 'vs/platform/issue/common/issue'; -import { IssueService } from 'vs/platform/issue/electron-main/issueService'; function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService { const services = new ServiceCollection(); @@ -69,7 +67,6 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I services.set(IConfigurationService, new SyncDescriptor(ConfigurationService)); services.set(IRequestService, new SyncDescriptor(RequestService)); services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : [])); - services.set(IIssueService, new SyncDescriptor(IssueService)); services.set(IBackupMainService, new SyncDescriptor(BackupMainService)); return new InstantiationService(services, true); @@ -106,7 +103,6 @@ class ExpectedError extends Error { function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); - // const issueService = accessor.get(IIssueService); const environmentService = accessor.get(IEnvironmentService); const requestService = accessor.get(IRequestService); diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 146e2ef0824..b47a0015178 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -315,9 +315,7 @@ export async function main(argv: string[]): TPromise { options['stdio'] = 'ignore'; } - const childArgs = argv.slice(2); - childArgs.push('--inspect-brk=1237'); - const child = spawn(process.execPath, childArgs, options); + const child = spawn(process.execPath, argv.slice(2), options); if (args.wait && waitMarkerFilePath) { return new TPromise(c => { diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 8de1cf553ad..0d99eadec4f 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -76,8 +76,6 @@ class Main { const arg = argv['uninstall-extension']; const ids: string[] = typeof arg === 'string' ? [arg] : arg; return this.uninstallExtension(ids); - } else if (argv['issue']) { - console.log('here'); } return undefined; } @@ -195,7 +193,6 @@ class Main { const eventPrefix = 'monacoworkbench'; export function main(argv: ParsedArgs): TPromise { - const services = new ServiceCollection(); const environmentService = new EnvironmentService(argv, process.execPath); diff --git a/src/vs/issue/electron-browser/bootstrap.css b/src/vs/issue/electron-browser/bootstrap.css index 0189cc3f96a..75aac33cdea 100644 --- a/src/vs/issue/electron-browser/bootstrap.css +++ b/src/vs/issue/electron-browser/bootstrap.css @@ -44,6 +44,7 @@ input, textarea { background-color: #fff; background-image: none; background-clip: padding-box; + border-radius: .25rem; border: 1px solid #ced4da; } textarea { @@ -71,6 +72,7 @@ button { user-select: none; padding: .5rem 1rem; font-size: 1rem; + border-radius: .25rem; background: none; transition: all .2s ease-in-out; } @@ -86,5 +88,6 @@ select { background-color: #fff; background-image: none; background-clip: padding-box; + border-radius: 0.25rem; border: none; } diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index a49aad9067e..5e09fc23894 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -12,14 +12,14 @@
    - + @@ -29,12 +29,12 @@
    - - + +
    - +
    @@ -43,7 +43,7 @@
    My System Info - +
    @@ -53,9 +53,9 @@
    - Processes + Currently Running Processes - +
    @@ -67,7 +67,7 @@
    My Workspace Stats - + 
    @@ -86,8 +86,8 @@
 					
 					
    
 						
-								GitHub-flavored Markdown is supported.
-								After submitting, you will still be able to edit your issue.
+								We support GitHub-flavored Markdown.
+								After submitting, you will still be able to edit your issue on GitHub.
 							
 						
 						
diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts
index fa4565e4b38..51a95565080 100644
--- a/src/vs/issue/electron-browser/issueReporter.ts
+++ b/src/vs/issue/electron-browser/issueReporter.ts
@@ -3,25 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { shell, ipcRenderer } from 'electron';
+import { shell, ipcRenderer, webFrame } from 'electron';
 import { $ } from 'vs/base/browser/dom';
-import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
-import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
-import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import * as browser from 'vs/base/browser/browser';
 import product from 'vs/platform/node/product';
 import pkg from 'vs/platform/node/package';
+import { Disposable } from 'vs/base/common/lifecycle';
+import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
+import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
+import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
+import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
+import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
-import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { Disposable } from 'vs/base/common/lifecycle';
 import { IssueReporterModel, IssueReporterData } from 'vs/issue/electron-browser/issueReporterModel';
 import { IssueReporterStyles } from 'vs/platform/issue/common/issue';
 
@@ -46,6 +47,7 @@ export class IssueReporter extends Disposable {
 		});
 
 		ipcRenderer.on('issueStyleResponse', (event, styles: IssueReporterStyles) => {
+			this.applyZoom(styles.zoomLevel);
 			this.applyStyles(styles);
 		});
 
@@ -70,6 +72,15 @@ export class IssueReporter extends Disposable {
 		this.renderBlocks();
 	}
 
+	private applyZoom(zoomLevel: number) {
+		webFrame.setZoomLevel(zoomLevel);
+		browser.setZoomFactor(webFrame.getZoomFactor());
+		// See https://github.com/Microsoft/vscode/issues/26151
+		// Cannot be trusted because the webFrame might take some time
+		// until it really applies the new zoom level
+		browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
+	}
+
 	private applyStyles(styles: IssueReporterStyles) {
 		const styleTag = document.createElement('style');
 		const content: string[] = [];
@@ -93,7 +104,7 @@ export class IssueReporter extends Disposable {
 		}
 
 		if (styles.inputActiveBorder) {
-			content.push(`input:focus, textarea:focus, select:focus, summary:focus  { border: 1px solid ${styles.inputActiveBorder}; outline-style: none; }`);
+			content.push(`input[type='text']:focus, textarea:focus, select:focus, summary:focus  { border: 1px solid ${styles.inputActiveBorder}; outline-style: none; }`);
 		}
 
 		if (styles.textLinkColor) {
@@ -123,7 +134,6 @@ export class IssueReporter extends Disposable {
 		document.body.style.color = styles.color;
 	}
 
-	// TODO: Properly dispose of services
 	private initServices(configuration: IWindowConfiguration): void {
 		const serviceCollection = new ServiceCollection();
 		const mainProcessClient = new ElectronIPCClient(String(`window${configuration.windowId}`));
@@ -150,8 +160,6 @@ export class IssueReporter extends Disposable {
 		} else {
 			this.telemetryService = NullTelemetryService;
 		}
-
-		console.log(this.telemetryService);
 	}
 
 	private setEventHandlers(): void {
@@ -161,14 +169,17 @@ export class IssueReporter extends Disposable {
 		});
 
 		document.getElementById('includeSystemInfo').addEventListener('click', (event: Event) => {
+			event.stopPropagation();
 			this.issueReporterModel.update({ includeSystemInfo: !this.issueReporterModel.getData().includeSystemInfo });
 		});
 
 		document.getElementById('includeProcessInfo').addEventListener('click', (event: Event) => {
+			event.stopPropagation();
 			this.issueReporterModel.update({ includeProcessInfo: !this.issueReporterModel.getData().includeSystemInfo });
 		});
 
 		document.getElementById('includeWorkspaceInfo').addEventListener('click', (event: Event) => {
+			event.stopPropagation();
 			this.issueReporterModel.update({ includeWorkspaceInfo: !this.issueReporterModel.getData().includeWorkspaceInfo });
 		});
 
@@ -244,7 +255,7 @@ export class IssueReporter extends Disposable {
 
 			descriptionTitle.innerHTML = 'Steps to reproduce *';
 			show(descriptionSubtitle);
-			descriptionSubtitle.innerHTML = 'When did this performance issue happen? For examples, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.';
+			descriptionSubtitle.innerHTML = 'When did this performance issue happen? For example, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.';
 		}
 		// 3 - Feature Request
 		else {
@@ -296,13 +307,19 @@ export class IssueReporter extends Disposable {
 			return;
 		}
 
-		document.getElementById('github-submit-btn').classList.add('active');
+		if (this.telemetryService) {
+			/* __GDPR__
+				"issueReporterSubmit" : {
+					"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+
+			this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType });
+		}
+
 		const issueTitle = (document.getElementById('issue-title')).value;
 		const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`;
-
 		const issueBody = this.issueReporterModel.serialize();
-
-		document.getElementById('github-submit-btn').classList.remove('active');
 		shell.openExternal(baseUrl + encodeURIComponent(issueBody));
 	}
 
diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/style.css
index 92b99520053..c6019f8da3d 100644
--- a/src/vs/issue/electron-browser/style.css
+++ b/src/vs/issue/electron-browser/style.css
@@ -101,6 +101,10 @@ input[type="checkbox"] {
 	display: inline-block;
 }
 
+input:disabled {
+	opacity: 0.6;
+}
+
 /* Default styles, overwritten if a theme is provided */
 input, select, textarea {
 	background-color: #3c3c3c;
diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts
index dc60cf38abe..5d43f4e5c4a 100644
--- a/src/vs/platform/issue/common/issue.ts
+++ b/src/vs/platform/issue/common/issue.ts
@@ -23,6 +23,7 @@ export interface IssueReporterStyles {
 	buttonBackground: string;
 	buttonForeground: string;
 	buttonHoverBackground: string;
+	zoomLevel: number;
 }
 
 export interface IIssueService {
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 656c75c56d6..c9cab08afb4 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -39,7 +39,8 @@ export class IssueService implements IIssueService {
 		this._issueWindow = new BrowserWindow({
 			width: 800,
 			height: 900,
-			title: 'Issue Reporter'
+			title: 'Issue Reporter',
+			alwaysOnTop: true
 		});
 
 		this._issueWindow.loadURL(this.getIssueReporterPath());
diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index 0a005512438..10bdcb3482b 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -889,7 +889,8 @@ export class OpenIssueReporterAction extends Action {
 			inputErrorBorder: theme.getColor(inputValidationErrorBorder) && theme.getColor(inputValidationErrorBorder).toString(),
 			buttonBackground: theme.getColor(buttonBackground) && theme.getColor(buttonBackground).toString(),
 			buttonForeground: theme.getColor(buttonForeground) && theme.getColor(buttonForeground).toString(),
-			buttonHoverBackground: theme.getColor(buttonHoverBackground) && theme.getColor(buttonHoverBackground).toString()
+			buttonHoverBackground: theme.getColor(buttonHoverBackground) && theme.getColor(buttonHoverBackground).toString(),
+			zoomLevel: webFrame.getZoomLevel()
 		};
 		return this.issueService.openReporter(style).then(() => {
 			return TPromise.as(true);

From 69c27976416a7ef8b141e0aa6f82d1fe33db3608 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Wed, 17 Jan 2018 12:45:49 -0800
Subject: [PATCH 351/710] Fix test and rename css file

---
 src/vs/code/electron-main/app.ts                         | 1 -
 src/vs/issue/electron-browser/bootstrap.css              | 5 -----
 src/vs/issue/electron-browser/index.html                 | 6 +++---
 .../electron-browser/{style.css => issueReporter.css}    | 5 +++++
 src/vs/issue/electron-browser/issueReporter.ts           | 9 ++++-----
 src/vs/platform/environment/node/argv.ts                 | 1 +
 src/vs/platform/issue/electron-main/issueService.ts      | 5 ++---
 7 files changed, 15 insertions(+), 17 deletions(-)
 rename src/vs/issue/electron-browser/{style.css => issueReporter.css} (97%)

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index e9f4d650dea..46fbe9ce0b2 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -359,7 +359,6 @@ export class CodeApplication {
 		const issueService = accessor.get(IIssueService);
 		const issueChannel = new IssueChannel(issueService);
 		this.electronIpcServer.registerChannel('issue', issueChannel);
-		// this.sharedProcessClient.done(client => client.registerChannel('issue', issueChannel));
 
 		const workspacesService = accessor.get(IWorkspacesMainService);
 		const workspacesChannel = appInstantiationService.createInstance(WorkspacesChannel, workspacesService);
diff --git a/src/vs/issue/electron-browser/bootstrap.css b/src/vs/issue/electron-browser/bootstrap.css
index 75aac33cdea..07e8df4786f 100644
--- a/src/vs/issue/electron-browser/bootstrap.css
+++ b/src/vs/issue/electron-browser/bootstrap.css
@@ -42,8 +42,6 @@ input, textarea {
 	line-height: 1.5;
 	color: #495057;
 	background-color: #fff;
-	background-image: none;
-	background-clip: padding-box;
 	border-radius: .25rem;
 	border: 1px solid #ced4da;
 }
@@ -74,7 +72,6 @@ button {
 	font-size: 1rem;
 	border-radius: .25rem;
 	background: none;
-	transition: all .2s ease-in-out;
 }
 
 select {
@@ -86,8 +83,6 @@ select {
 	line-height: 1.5;
 	color: #495057;
 	background-color: #fff;
-	background-image: none;
-	background-clip: padding-box;
 	border-radius: 0.25rem;
 	border: none;
 }
diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html
index 5e09fc23894..986c49abcf7 100644
--- a/src/vs/issue/electron-browser/index.html
+++ b/src/vs/issue/electron-browser/index.html
@@ -4,7 +4,7 @@
 	
 		
 		
-		
+		
 	
 	
 		
    
@@ -30,11 +30,11 @@
 			
    
 				
    
 					
-					
+					
 				
    
 				
    
 					
-					
+					
 				
    
 			
    
 
diff --git a/src/vs/issue/electron-browser/style.css b/src/vs/issue/electron-browser/issueReporter.css
similarity index 97%
rename from src/vs/issue/electron-browser/style.css
rename to src/vs/issue/electron-browser/issueReporter.css
index c6019f8da3d..2d9c3f5274d 100644
--- a/src/vs/issue/electron-browser/style.css
+++ b/src/vs/issue/electron-browser/issueReporter.css
@@ -105,6 +105,11 @@ input:disabled {
 	opacity: 0.6;
 }
 
+.list-title {
+	margin-top: 1em;
+	margin-left: 1em;
+}
+
 /* Default styles, overwritten if a theme is provided */
 input, select, textarea {
 	background-color: #3c3c3c;
diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/issue/electron-browser/issueReporter.ts
index 51a95565080..0fad9b980e1 100644
--- a/src/vs/issue/electron-browser/issueReporter.ts
+++ b/src/vs/issue/electron-browser/issueReporter.ts
@@ -210,13 +210,13 @@ export class IssueReporter extends Disposable {
 				window.fetch(`https://api.github.com/search/issues?q=${query}&per_page=5`).then((response) => {
 					response.json().then(result => {
 						if (result.items.length) {
-							let issues = document.createElement('ul');
-							issues.id = 'issues-list';
+							const issues = $('ul');
+							const issuesText = $('div.list-title');
+							issuesText.textContent = 'Similar issues:';
 							addIssuesToList(issues, result.items);
+							similarIssues.appendChild(issuesText);
 							similarIssues.appendChild(issues);
 						}
-					}).catch((error) => {
-						console.log(error);
 					});
 				}).catch((error) => {
 					console.log(error);
@@ -313,7 +313,6 @@ export class IssueReporter extends Disposable {
 					"issueType" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
-
 			this.telemetryService.publicLog('issueReporterSubmit', { issueType: this.issueReporterModel.getData().issueType });
 		}
 
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index a09207e24e9..fade5e83e1a 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -74,6 +74,7 @@ const options: minimist.Opts = {
 		'new-window': 'n',
 		'reuse-window': 'r',
 		performance: 'p',
+		'issue': 'i',
 		'disable-extensions': 'disableExtensions',
 		'extensions-dir': 'extensionHomePath',
 		'debugPluginHost': 'inspect-extensions',
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index c9cab08afb4..26f91282f77 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -17,9 +17,9 @@ export class IssueService implements IIssueService {
 	_issueWindow: BrowserWindow;
 
 	constructor(
-		@ILaunchService private launchService: ILaunchService,
+		private machineId: string,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		private machineId: string
+		@ILaunchService private launchService: ILaunchService
 	) { }
 
 	openReporter(theme?: IssueReporterStyles): TPromise {
@@ -44,7 +44,6 @@ export class IssueService implements IIssueService {
 		});
 
 		this._issueWindow.loadURL(this.getIssueReporterPath());
-		this._issueWindow.webContents.openDevTools();
 
 		return TPromise.as(null);
 	}

From a236cf03f1b02d499de11552feea610962f6da43 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Wed, 17 Jan 2018 13:36:33 -0800
Subject: [PATCH 352/710] Fix settings editor telemetry to send one
 defaultSettings.filter message per search, including counts per result group

---
 src/vs/base/common/async.ts                   |   2 +-
 .../preferences/browser/preferencesEditor.ts  | 116 +++++++++---------
 2 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts
index dee1ce7c360..93c6dda80c2 100644
--- a/src/vs/base/common/async.ts
+++ b/src/vs/base/common/async.ts
@@ -255,7 +255,7 @@ export class ThrottledDelayer extends Delayer> {
 		this.throttler = new Throttler();
 	}
 
-	trigger(promiseFactory: ITask>, delay?: number): Promise {
+	trigger(promiseFactory: ITask>, delay?: number): TPromise {
 		return super.trigger(() => this.throttler.queue(promiseFactory), delay);
 	}
 }
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 1eb818aa04b..58ab3cc4da6 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -57,6 +57,7 @@ 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';
 
 export class PreferencesEditorInput extends SideBySideEditorInput {
 	public static ID: string = 'workbench.editorinputs.preferencesEditorInput';
@@ -110,9 +111,8 @@ export class PreferencesEditor extends BaseEditor {
 	private preferencesRenderers: PreferencesRenderersController;
 
 	private delayedFilterLogging: Delayer;
-	private remoteSearchThrottle: ThrottledDelayer;
+	private remoteSearchThrottle: ThrottledDelayer;
 
-	private latestEmptyFilters: string[] = [];
 	private lastFocusedWidget: SearchWidget | SideBySidePreferencesWidget = null;
 
 	constructor(
@@ -237,16 +237,28 @@ export class PreferencesEditor extends BaseEditor {
 	}
 
 	private onInputChanged(): void {
-		this.triggerThrottledSearch();
-		this.localFilterPreferences();
+		const query = this.searchWidget.getValue().trim();
+		this.delayedFilterLogging.cancel();
+		TPromise.join([
+			this.preferencesRenderers.localFilterPreferences(query),
+			this.triggerThrottledSearch(query)
+		]).then(results => {
+			if (results) {
+				const [localResult, remoteResult] = results;
+				this.delayedFilterLogging.trigger(() => this.reportFilteringUsed(
+					query,
+					remoteResult ? remoteResult.defaultSettingsGroupCounts : localResult.defaultSettingsGroupCounts,
+					remoteResult && remoteResult.metadata));
+			}
+		});
 	}
 
-	private triggerThrottledSearch(): void {
-		if (this.searchWidget.getValue()) {
-			this.remoteSearchThrottle.trigger(() => this.remoteSearchPreferences());
+	private triggerThrottledSearch(query: string): TPromise {
+		if (query) {
+			return this.remoteSearchThrottle.trigger(() => this.preferencesRenderers.localFilterPreferences(query));
 		} else {
 			// When clearing the input, update immediately to clear it
-			this.remoteSearchPreferences();
+			return this.preferencesRenderers.remoteSearchPreferences(query);
 		}
 	}
 
@@ -267,31 +279,6 @@ export class PreferencesEditor extends BaseEditor {
 		});
 	}
 
-	private remoteSearchPreferences(): TPromise {
-		const query = this.searchWidget.getValue().trim();
-		return this.preferencesRenderers.remoteSearchPreferences(query).then(result => {
-			this.onSearchResult(query, result);
-		}, onUnexpectedError);
-	}
-
-	private localFilterPreferences(): TPromise {
-		const query = this.searchWidget.getValue().trim();
-		return this.preferencesRenderers.localFilterPreferences(query).then(result => {
-			this.onSearchResult(query, result);
-		}, onUnexpectedError);
-	}
-
-	private onSearchResult(filter: string, result: { count: number, metadata: IFilterMetadata }): void {
-		if (result) {
-			this.showSearchResultsMessage(result.count);
-			if (result.count === 0) {
-				this.latestEmptyFilters.push(filter);
-			}
-
-			this.delayedFilterLogging.trigger(() => this.reportFilteringUsed(filter, result.metadata));
-		}
-	}
-
 	private showSearchResultsMessage(count: number): void {
 		if (this.searchWidget.getValue()) {
 			if (count === 0) {
@@ -306,38 +293,28 @@ export class PreferencesEditor extends BaseEditor {
 		}
 	}
 
-	private reportFilteringUsed(filter: string, metadata?: IFilterMetadata): void {
+	private reportFilteringUsed(filter: string, counts: IStringDictionary, metadata?: IFilterMetadata): void {
 		if (filter) {
 			let data = {
 				filter,
-				emptyFilters: this.getLatestEmptyFiltersForTelemetry(),
 				fuzzy: !!metadata,
 				duration: metadata ? metadata.duration : undefined,
-				context: metadata ? metadata.context : undefined
+				context: metadata ? metadata.context : undefined,
+				counts
 			};
 
-			this.latestEmptyFilters = [];
 			/* __GDPR__
 				"defaultSettings.filter" : {
 					"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"emptyFilters" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"fuzzy" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"context" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					"context" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+					"counts" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 				}
 			*/
 			this.telemetryService.publicLog('defaultSettings.filter', data);
 		}
 	}
-
-	/**
-	 * Put a rough limit on the size of the telemetry data, since otherwise it could be an unbounded large amount
-	 * of data. 8192 is the max size of a property value. This is rough since that probably includes ""s, etc.
-	 */
-	private getLatestEmptyFiltersForTelemetry(): string[] {
-		let cumulativeSize = 0;
-		return this.latestEmptyFilters.filter(filterText => (cumulativeSize += filterText.length) <= 8192);
-	}
 }
 
 class SettingsNavigator implements INavigator {
@@ -374,7 +351,7 @@ class SettingsNavigator implements INavigator {
 }
 
 interface IFilterOrSearchResult {
-	count: number;
+	defaultSettingsGroupCounts: IStringDictionary;
 	metadata: IFilterMetadata;
 }
 
@@ -387,7 +364,7 @@ class PreferencesRenderersController extends Disposable {
 	private _editablePreferencesRendererDisposables: IDisposable[] = [];
 
 	private _settingsNavigator: SettingsNavigator;
-	private _filtersInProgress: TPromise[];
+	private _filtersInProgress: TPromise[];
 
 	private _currentLocalSearchProvider: ISearchProvider;
 	private _currentRemoteSearchProvider: ISearchProvider;
@@ -466,8 +443,19 @@ class PreferencesRenderersController extends Disposable {
 			this._filtersInProgress = null;
 			const [defaultFilterResult, editableFilterResult] = results;
 
-			const count = this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
-			return { count, metadata: defaultFilterResult && defaultFilterResult.metadata };
+			this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
+			const result = {
+				metadata: defaultFilterResult && defaultFilterResult.metadata,
+				defaultSettingsGroupCounts: defaultFilterResult && this._countById(defaultFilterResult.filteredGroups)
+			};
+
+			return result;
+		}, err => {
+			if (isPromiseCanceledError(err)) {
+				return null;
+			} else {
+				onUnexpectedError(err);
+			}
 		});
 	}
 
@@ -488,7 +476,7 @@ class PreferencesRenderersController extends Disposable {
 			return searchP
 				.then(null, err => {
 					if (isPromiseCanceledError(err)) {
-						return null;
+						return TPromise.wrapError(err);
 					} else {
 						/* __GDPR__
 							"defaultSettings.searchError" : {
@@ -521,15 +509,14 @@ class PreferencesRenderersController extends Disposable {
 		return TPromise.wrap(null);
 	}
 
-	private consolidateAndUpdate(defaultFilterResult: IFilterResult, editableFilterResult: IFilterResult): number {
+	private consolidateAndUpdate(defaultFilterResult: IFilterResult, editableFilterResult: IFilterResult): void {
 		const defaultPreferencesFilteredGroups = defaultFilterResult ? defaultFilterResult.filteredGroups : this._getAllPreferences(this._defaultPreferencesRenderer);
 		const editablePreferencesFilteredGroups = editableFilterResult ? editableFilterResult.filteredGroups : this._getAllPreferences(this._editablePreferencesRenderer);
 		const consolidatedSettings = this._consolidateSettings(editablePreferencesFilteredGroups, defaultPreferencesFilteredGroups);
 
 		this._settingsNavigator = new SettingsNavigator(this._lastQuery ? consolidatedSettings : []);
-		const count = consolidatedSettings.length;
-		this._onDidFilterResultsCountChange.fire(count);
-		return count;
+		const totalCount = consolidatedSettings.length;
+		this._onDidFilterResultsCountChange.fire(totalCount);
 	}
 
 	private _getAllPreferences(preferencesRenderer: IPreferencesRenderer): ISettingsGroup[] {
@@ -571,6 +558,21 @@ class PreferencesRenderersController extends Disposable {
 		return settings;
 	}
 
+	private _countById(settingsGroups: ISettingsGroup[]): IStringDictionary {
+		const result = {};
+
+		for (const group of settingsGroups) {
+			let i = 0;
+			for (const section of group.sections) {
+				i += section.settings.length;
+			}
+
+			result[group.id] = i;
+		}
+
+		return result;
+	}
+
 	public dispose(): void {
 		dispose(this._defaultPreferencesRendererDisposables);
 		dispose(this._editablePreferencesRendererDisposables);

From ff970fa1e92e89f9bf702d7d0ca068f1332d6a1f Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Wed, 17 Jan 2018 13:42:16 -0800
Subject: [PATCH 353/710] Fix build

---
 .../electron-browser/terminalConfigHelper.test.ts | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
index 62a853a848f..ebd9dbfcdaa 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
@@ -6,26 +6,11 @@
 'use strict';
 
 import * as assert from 'assert';
-import { IConfigurationService, getConfigurationValue, IConfigurationOverrides } from 'vs/platform/configuration/common/configuration';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 
-class MockConfigurationService implements IConfigurationService {
-	public _serviceBrand: any;
-	public serviceId = IConfigurationService;
-	public constructor(private configuration: any = {}) { }
-	public inspect(key: string, overrides?: IConfigurationOverrides): any { return { value: getConfigurationValue(this.getValue(), key), default: getConfigurationValue(this.getValue(), key), user: getConfigurationValue(this.getValue(), key), workspace: void 0, workspaceFolder: void 0 }; }
-	public keys() { return { default: [] as string[], user: [] as string[], workspace: [] as string[], workspaceFolder: [] as string[] }; }
-	public getValue(): any { return this.configuration; }
-	public updateValue(): TPromise { return null; }
-	public getConfigurationData(): any { return null; }
-	public onDidChangeConfiguration() { return { dispose() { } }; }
-	public reloadConfiguration(): TPromise { return null; }
-}
-
 suite('Workbench - TerminalConfigHelper', () => {
 	let fixture: HTMLElement;
 

From 1c07451dd16a92c6399d2c1907cb150e53dcd803 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 13:44:38 -0800
Subject: [PATCH 354/710] Memoize TS API version checks

---
 extensions/typescript/src/utils/api.ts     | 15 ++++++++++
 extensions/typescript/src/utils/memoize.ts | 34 ++++++++++++++++++++++
 extensions/typescript/tsconfig.json        |  3 +-
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 extensions/typescript/src/utils/memoize.ts

diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript/src/utils/api.ts
index 6e13c01a574..5b2e98f7372 100644
--- a/extensions/typescript/src/utils/api.ts
+++ b/extensions/typescript/src/utils/api.ts
@@ -7,6 +7,9 @@ import * as semver from 'semver';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
+import { memoize } from './memoize';
+
+
 export default class API {
 	public static readonly defaultVersion = new API('1.0.0', '1.0.0');
 
@@ -29,50 +32,62 @@ export default class API {
 		private readonly version: string
 	) { }
 
+	@memoize
 	public has203Features(): boolean {
 		return semver.gte(this.version, '2.0.3');
 	}
 
+	@memoize
 	public has206Features(): boolean {
 		return semver.gte(this.version, '2.0.6');
 	}
 
+	@memoize
 	public has208Features(): boolean {
 		return semver.gte(this.version, '2.0.8');
 	}
 
+	@memoize
 	public has213Features(): boolean {
 		return semver.gte(this.version, '2.1.3');
 	}
 
+	@memoize
 	public has220Features(): boolean {
 		return semver.gte(this.version, '2.2.0');
 	}
 
+	@memoize
 	public has222Features(): boolean {
 		return semver.gte(this.version, '2.2.2');
 	}
 
+	@memoize
 	public has230Features(): boolean {
 		return semver.gte(this.version, '2.3.0');
 	}
 
+	@memoize
 	public has234Features(): boolean {
 		return semver.gte(this.version, '2.3.4');
 	}
 
+	@memoize
 	public has240Features(): boolean {
 		return semver.gte(this.version, '2.4.0');
 	}
 
+	@memoize
 	public has250Features(): boolean {
 		return semver.gte(this.version, '2.5.0');
 	}
 
+	@memoize
 	public has260Features(): boolean {
 		return semver.gte(this.version, '2.6.0');
 	}
 
+	@memoize
 	public has262Features(): boolean {
 		return semver.gte(this.version, '2.6.2');
 	}
diff --git a/extensions/typescript/src/utils/memoize.ts b/extensions/typescript/src/utils/memoize.ts
new file mode 100644
index 00000000000..beeb0035b89
--- /dev/null
+++ b/extensions/typescript/src/utils/memoize.ts
@@ -0,0 +1,34 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+export function memoize(_target: any, key: string, descriptor: any) {
+	let fnKey: string | undefined = undefined;
+	let fn: Function | undefined = undefined;
+
+	if (typeof descriptor.value === 'function') {
+		fnKey = 'value';
+		fn = descriptor.value;
+	} else if (typeof descriptor.get === 'function') {
+		fnKey = 'get';
+		fn = descriptor.get;
+	} else {
+		throw new Error('not supported');
+	}
+
+	const memoizeKey = `$memoize$${key}`;
+
+	descriptor[fnKey] = function (...args: any[]) {
+		if (!this.hasOwnProperty(memoizeKey)) {
+			Object.defineProperty(this, memoizeKey, {
+				configurable: false,
+				enumerable: false,
+				writable: false,
+				value: fn!.apply(this, args)
+			});
+		}
+
+		return this[memoizeKey];
+	};
+}
diff --git a/extensions/typescript/tsconfig.json b/extensions/typescript/tsconfig.json
index 56de6915ae5..e9800fa4b00 100644
--- a/extensions/typescript/tsconfig.json
+++ b/extensions/typescript/tsconfig.json
@@ -12,7 +12,8 @@
 		"noUnusedLocals": true,
 		"noUnusedParameters": true,
 		"strict": true,
-		"alwaysStrict": true
+		"alwaysStrict": true,
+		"experimentalDecorators": true
 	},
 	"include": [
 		"src/**/*"

From b99e537a5506629aeedbac26dd2d18d84b564804 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Wed, 17 Jan 2018 13:54:43 -0800
Subject: [PATCH 355/710] Better implementation for buffer equals and
 charCodeAt.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 103 +++++++++---------
 .../pieceTreeTextBuffer.ts                    |  21 ++--
 .../pieceTreeTextBuffer.test.ts               |  21 ++--
 3 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 8f47a88dc80..3a5404faf03 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -6,7 +6,6 @@
 
 import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
-import { EndOfLinePreference } from 'vs/editor/common/model';
 import { Range } from 'vs/editor/common/core/range';
 import * as strings from 'vs/base/common/strings';
 
@@ -326,7 +325,7 @@ export class PieceTreeBase {
 			if (tempChunkLen <= min || tempChunkLen + len < max) {
 				tempChunk += str;
 				tempChunkLen += len;
-				return;
+				return true;
 			}
 
 			// flush anyways
@@ -334,7 +333,7 @@ export class PieceTreeBase {
 			chunks.push(new StringBuffer(text, createLineStartsFast(text)));
 			tempChunk = str;
 			tempChunkLen = len;
-			return;
+			return true;
 		});
 
 		if (tempChunkLen > 0) {
@@ -347,10 +346,24 @@ export class PieceTreeBase {
 
 	// #region Buffer API
 	public equal(other: PieceTreeBase): boolean {
-		if (this.getLinesRawContent() !== other.getLinesRawContent()) {
+		if (this.getLength() !== other.getLength()) {
 			return false;
 		}
-		return true;
+		if (this.getLineCount() !== other.getLineCount()) {
+			return false;
+		}
+
+		let offset = 0;
+		let ret = this.iterate(this.root, str => {
+			let len = str.length;
+			let startPosition = other.nodeAt(offset);
+			let endPosition = other.nodeAt(offset + len);
+			let val = other.getValueInRange2(startPosition, endPosition);
+
+			return str === val;
+		});
+
+		return ret;
 	}
 
 	public getOffsetAt(lineNumber: number, column: number): number {
@@ -417,7 +430,7 @@ export class PieceTreeBase {
 		return new Position(1, 1);
 	}
 
-	public getValueInRange(range: Range, eol: EndOfLinePreference = EndOfLinePreference.TextDefined): string {
+	public getValueInRange(range: Range): string {
 		if (range.startLineNumber === range.endLineNumber && range.startColumn === range.endColumn) {
 			return '';
 		}
@@ -425,22 +438,26 @@ export class PieceTreeBase {
 		let startPosition = this.nodeAt2(new Position(range.startLineNumber, range.startColumn));
 		let endPosition = this.nodeAt2(new Position(range.endLineNumber, range.endColumn));
 
+		return this.getValueInRange2(startPosition, endPosition);
+	}
+
+	public getValueInRange2(startPosition: NodePosition, endPosition: NodePosition): string {
 		if (startPosition.node === endPosition.node) {
 			let node = startPosition.node;
 			let buffer = this._buffers[node.piece.bufferIndex].buffer;
-			let startOffset = this.getStartOffset(node);
+			let startOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start);
 			return buffer.substring(startOffset + startPosition.remainder, startOffset + endPosition.remainder);
 		}
 
 		let x = startPosition.node;
 		let buffer = this._buffers[x.piece.bufferIndex].buffer;
-		let startOffset = this.getStartOffset(x);
+		let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 		let ret = buffer.substring(startOffset + startPosition.remainder, startOffset + x.piece.length);
 
 		x = x.next();
 		while (x !== SENTINEL) {
 			let buffer = this._buffers[x.piece.bufferIndex].buffer;
-			let startOffset = this.getStartOffset(x);
+			let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 
 			if (x === endPosition.node) {
 				ret += buffer.substring(startOffset, startOffset + endPosition.remainder);
@@ -472,19 +489,12 @@ export class PieceTreeBase {
 	}
 
 	public getLineCharCode(lineNumber: number, index: number): number {
-		return this.getLineContent(lineNumber).charCodeAt(index);
-	}
+		let nodePos = this.nodeAt2(new Position(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;
 
-	public getLineLength(lineNumber: number): number {
-		return this.getLineContent(lineNumber).length;
-	}
-
-	public getLineMinColumn(lineNumber: number): number {
-		return 1;
-	}
-
-	public getLineMaxColumn(lineNumber: number): number {
-		return this.getLineLength(lineNumber) + 1;
+		return buffer.buffer.charCodeAt(targetOffset);
 	}
 
 	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
@@ -697,14 +707,9 @@ export class PieceTreeBase {
 		let lineStarts = this._buffers[bufferIndex].lineStarts;
 
 		let startOffset = lineStarts[piece.start.line] + piece.start.column;
-		// let endOffset = lineStarts[piece.end.line] + piece.end.column;
 
 		let offset = startOffset + remainder;
 
-		// if (offset > endOffset) {
-		// 	throw ('this should not happen');
-		// }
-
 		// binary search offset between startOffset and endOffset
 		let low = piece.start.line;
 		let high = piece.end.line;
@@ -739,25 +744,20 @@ export class PieceTreeBase {
 	}
 
 	getLineFeedCnt(bufferIndex: number, start: BufferCursor, end: BufferCursor): number {
-		// we don't need to worry about start
-		// abc\r|\n, or abc|\r, or abc|\n, or abc|\r\n doesn't change the fact that, there is one line break after start.
-
-		// now let's take care of end
-		// abc\r|\n, if end is in between \r and \n, we need to add line feed count by 1
+		// we don't need to worry about start: abc\r|\n, or abc|\r, or abc|\n, or abc|\r\n doesn't change the fact that, there is one line break after start.
+		// now let's take care of end: abc\r|\n, if end is in between \r and \n, we need to add line feed count by 1
 		if (end.column === 0) {
 			return end.line - start.line;
 		}
 
 		let lineStarts = this._buffers[bufferIndex].lineStarts;
-		if (end.line === lineStarts.length - 1) {
-			// it means, there is no \n after end, otherwise, there will be one more lineStart.
+		if (end.line === lineStarts.length - 1) { // it means, there is no \n after end, otherwise, there will be one more lineStart.
 			return end.line - start.line;
 		}
 
 		let nextLineStartOffset = lineStarts[end.line + 1];
 		let endOffset = lineStarts[end.line] + end.column;
-		if (nextLineStartOffset > endOffset + 1) {
-			// there are more than 1 character after end, which means it can't be \n
+		if (nextLineStartOffset > endOffset + 1) { // there are more than 1 character after end, which means it can't be \n
 			return end.line - start.line;
 		}
 		// endOffset + 1 === nextLineStartOffset
@@ -842,12 +842,12 @@ export class PieceTreeBase {
 				let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2);
 				let accumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 1);
 				let buffer = this._buffers[x.piece.bufferIndex].buffer;
-				let startOffset = this.getStartOffset(x);
+				let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 				return buffer.substring(startOffset + prevAccumualtedValue, startOffset + accumualtedValue);
 			} else if (x.lf_left + x.piece.lineFeedCnt === lineNumber - 1) {
 				let prevAccumualtedValue = this.getAccumulatedValue(x, lineNumber - x.lf_left - 2);
 				let buffer = this._buffers[x.piece.bufferIndex].buffer;
-				let startOffset = this.getStartOffset(x);
+				let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 
 				ret = buffer.substring(startOffset + prevAccumualtedValue, startOffset + x.piece.length);
 				break;
@@ -864,12 +864,12 @@ export class PieceTreeBase {
 
 			if (x.piece.lineFeedCnt > 0) {
 				let accumualtedValue = this.getAccumulatedValue(x, 0);
-				let startOffset = this.getStartOffset(x);
+				let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 
 				ret += buffer.substring(startOffset, startOffset + accumualtedValue);
 				return ret;
 			} else {
-				let startOffset = this.getStartOffset(x);
+				let startOffset = this.offsetInBuffer(x.piece.bufferIndex, x.piece.start);
 				ret += buffer.substr(startOffset, x.piece.length);
 			}
 
@@ -1005,9 +1005,8 @@ export class PieceTreeBase {
 			this._lastChangeBufferPos = { line: this._lastChangeBufferPos.line - 1, column: startOffset - prevStartOffset };
 		}
 		(this._buffers[0].lineStarts).push(...lineStarts.slice(1));
-		const endOffset = this._buffers[0].buffer.length;
 		let endIndex = this._buffers[0].lineStarts.length - 1;
-		let endColumn = endOffset - this._buffers[0].lineStarts[endIndex];
+		let endColumn = this._buffers[0].buffer.length - this._buffers[0].lineStarts[endIndex];
 		let endPos = { line: endIndex, column: endColumn };
 		node.piece.end = endPos;
 		node.piece.length += value.length;
@@ -1137,13 +1136,6 @@ export class PieceTreeBase {
 		return pos;
 	}
 
-	getNodeContent(node: TreeNode): string {
-		let buffer = this._buffers[node.piece.bufferIndex];
-		let startOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.start);
-		let endOffset = this.offsetInBuffer(node.piece.bufferIndex, node.piece.end);
-		return buffer.buffer.substring(startOffset, endOffset);
-	}
-
 	// #endregion
 
 	// #region CRLF
@@ -1275,21 +1267,23 @@ export class PieceTreeBase {
 	// #endregion
 
 	// #region Red Black Tree
-	iterate(node: TreeNode, callback: (str: string) => void): void {
+	iterate(node: TreeNode, callback: (str: string) => boolean): boolean {
 		if (node === SENTINEL) {
-			callback('');
-			return;
+			return callback('');
+		}
+
+		let leftRet = this.iterate(node.left, callback);
+		if (!leftRet) {
+			return leftRet;
 		}
 
-		this.iterate(node.left, callback);
 		let buffer = this._buffers[node.piece.bufferIndex];
 		let currentContent;
 		let piece = node.piece;
 		let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start);
 		let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end);
 		currentContent = buffer.buffer.substring(startOffset, endOffset);
-		callback(currentContent);
-		this.iterate(node.right, callback);
+		return callback(currentContent) && this.iterate(node.right, callback);
 	}
 
 	leftRotate(x: TreeNode) {
@@ -1665,6 +1659,7 @@ export class PieceTreeBase {
 
 		this.iterate(node, (newStr) => {
 			str += newStr;
+			return true;
 		});
 
 		return str;
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index 0b748f7abbe..d3efdbdb15e 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -15,12 +15,14 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 	private _pieceTree: PieceTreeBase;
 	private _BOM: string;
 	private _EOL: string;
+	private _EOLLength: number;
 	private _mightContainRTL: boolean;
 	private _mightContainNonBasicASCII: boolean;
 
 	constructor(chunks: StringBuffer[], BOM: string, eol: '\r\n' | '\n', containsRTL: boolean, isBasicASCII: boolean) {
 		this._BOM = BOM;
 		this._EOL = eol;
+		this._EOLLength = this._EOL.length;
 		this._mightContainNonBasicASCII = !isBasicASCII;
 		this._mightContainRTL = containsRTL;
 		this._pieceTree = new PieceTreeBase(chunks);
@@ -37,12 +39,6 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 		if (this._EOL !== other._EOL) {
 			return false;
 		}
-		if (this.getLength() !== other.getLength()) {
-			return false;
-		}
-		if (this.getLineCount() !== other.getLineCount()) {
-			return false;
-		}
 		return this._pieceTree.equal(other._pieceTree);
 	}
 	public mightContainRTL(): boolean {
@@ -79,7 +75,7 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 		}
 
 		const lineEnding = this._getEndOfLine(eol);
-		const text = this._pieceTree.getValueInRange(range, eol);
+		const text = this._pieceTree.getValueInRange(range);
 		return text.replace(/\r\n|\r|\n/g, lineEnding);
 	}
 
@@ -118,15 +114,19 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 	}
 
 	public getLineLength(lineNumber: number): number {
-		return this._pieceTree.getLineLength(lineNumber);
+		if (lineNumber === this.getLineCount()) {
+			let startOffset = this.getOffsetAt(lineNumber, 1);
+			return this.getLength() - startOffset;
+		}
+		return this.getOffsetAt(lineNumber + 1, 1) - this.getOffsetAt(lineNumber, 1) - this._EOLLength;
 	}
 
 	public getLineMinColumn(lineNumber: number): number {
-		return this._pieceTree.getLineMinColumn(lineNumber);
+		return 1;
 	}
 
 	public getLineMaxColumn(lineNumber: number): number {
-		return this._pieceTree.getLineMaxColumn(lineNumber);
+		return this.getLineLength(lineNumber) + 1;
 	}
 
 	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
@@ -151,6 +151,7 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 
 	public setEOL(newEOL: '\r\n' | '\n'): void {
 		this._EOL = newEOL;
+		this._EOLLength = this._EOL.length;
 		this._pieceTree.normalizeEOL(newEOL);
 	}
 
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 f0884b60114..a58c8aa8c2b 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1439,14 +1439,6 @@ suite('centralized lineStarts with CRLF', () => {
 	});
 });
 
-suite('test case from vscode', () => {
-	let str = 'line one\nline two';
-	let pieceTable = createTextBuffer([str], false);
-
-	assert.deepEqual(pieceTable.getPositionAt(20), new Position(2, 9));
-	assertTreeInvariants(pieceTable);
-});
-
 suite('random is unsupervised', () => {
 	test('random insert delete', () => {
 		let str = '';
@@ -1512,3 +1504,16 @@ suite('random is unsupervised', () => {
 		assertTreeInvariants(pieceTable);
 	});
 });
+
+suite('buffer api', () => {
+	test('equal', () => {
+		let a = createTextBuffer(['abc']);
+		let b = createTextBuffer(['ab', 'c']);
+		let c = createTextBuffer(['abd']);
+		let d = createTextBuffer(['abcd']);
+
+		assert(a.equal(b));
+		assert(!a.equal(c));
+		assert(!a.equal(d));
+	});
+});
\ No newline at end of file

From 5c26abe75c2ea793dda302df865e7b10c2b303ed Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 13:58:59 -0800
Subject: [PATCH 356/710] Pick up new TS version

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

diff --git a/extensions/package.json b/extensions/package.json
index ad30699b786..8b5e2927d40 100644
--- a/extensions/package.json
+++ b/extensions/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.1",
   "description": "Dependencies shared by all extensions",
   "dependencies": {
-    "typescript": "2.7.0-insiders.20180108"
+    "typescript": "2.7.0-insiders.20180117"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
   }
-}
+}
\ No newline at end of file
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index 64815a3eb3f..bb38c8b58be 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.7.0-insiders.20180108:
-  version "2.7.0-insiders.20180108"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.0-insiders.20180108.tgz#b9230ca5a0020e92133f63e6a4272f8c1b301bdb"
+typescript@2.7.0-insiders.20180117:
+  version "2.7.0-insiders.20180117"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.0-insiders.20180117.tgz#01761dd795e6ad1d6a11a1e898c9b14d068d0097"

From a8376ea2427a6cc5ec804ae483f248aed4db02f4 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Wed, 17 Jan 2018 14:47:20 -0800
Subject: [PATCH 357/710] implement operations reduce and correct search and
 replace benchmark.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 22 -----
 .../pieceTreeTextBuffer.ts                    | 90 ++++++++++++++++++-
 .../benchmark/searchNReplace.benchmark.ts     |  4 +-
 .../textBufferAutoTestUtils.ts                |  3 +-
 4 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 3a5404faf03..47222990f21 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -7,7 +7,6 @@
 import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
 import { Range } from 'vs/editor/common/core/range';
-import * as strings from 'vs/base/common/strings';
 
 export const enum NodeColor {
 	Black = 0,
@@ -497,22 +496,6 @@ export class PieceTreeBase {
 		return buffer.buffer.charCodeAt(targetOffset);
 	}
 
-	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.firstNonWhitespaceIndex(this.getLineContent(lineNumber));
-		if (result === -1) {
-			return 0;
-		}
-		return result + 1;
-	}
-
-	public getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		const result = strings.lastNonWhitespaceIndex(this.getLineContent(lineNumber));
-		if (result === -1) {
-			return 0;
-		}
-		return result + 2;
-	}
-
 	// #endregion
 
 	// #region Piece Table
@@ -775,7 +758,6 @@ export class PieceTreeBase {
 
 	offsetInBuffer(bufferIndex: number, cursor: BufferCursor): number {
 		let lineStarts = this._buffers[bufferIndex].lineStarts;
-
 		return lineStarts[cursor.line] + cursor.column;
 	}
 
@@ -896,10 +878,6 @@ export class PieceTreeBase {
 	}
 
 	// #region node operations
-	getStartOffset(node: TreeNode) {
-		return this.offsetInBuffer(node.piece.bufferIndex, node.piece.start);
-	}
-
 	getIndexOf(node: TreeNode, accumulatedValue: number): { index: number, remainder: number } {
 		let piece = node.piece;
 		let pos = this.positionInBuffer(node, accumulatedValue);
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index d3efdbdb15e..c5dcfc58f7c 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -130,11 +130,19 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 	}
 
 	public getLineFirstNonWhitespaceColumn(lineNumber: number): number {
-		return this._pieceTree.getLineFirstNonWhitespaceColumn(lineNumber);
+		const result = strings.firstNonWhitespaceIndex(this.getLineContent(lineNumber));
+		if (result === -1) {
+			return 0;
+		}
+		return result + 1;
 	}
 
 	public getLineLastNonWhitespaceColumn(lineNumber: number): number {
-		return this._pieceTree.getLineLastNonWhitespaceColumn(lineNumber);
+		const result = strings.lastNonWhitespaceIndex(this.getLineContent(lineNumber));
+		if (result === -1) {
+			return 0;
+		}
+		return result + 2;
 	}
 
 	private _getEndOfLine(eol: EndOfLinePreference): string {
@@ -200,7 +208,7 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 		}
 
 		if (canReduceOperations) {
-			// operations = this._reduceOperations(operations);
+			operations = this._reduceOperations(operations);
 		}
 
 		// Delta encode operations
@@ -275,6 +283,82 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 		);
 	}
 
+	/**
+ * 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[] {
 		operations.sort(PieceTreeTextBuffer._sortOpsDescending);
 
diff --git a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
index e02ead30070..e8131268dc1 100644
--- a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
@@ -12,9 +12,7 @@ import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtil
 
 let appyEditsBenchmark = function (id: string, buffers: ITextBuffer[], edits: IIdentifiedSingleEditOperation[]) {
 	doBenchmark(id, buffers, buffer => {
-		for (let i = 0, len = edits.length; i < len; i++) {
-			buffer.applyEdits([edits[i]], false);
-		}
+		buffer.applyEdits(edits, false);
 	});
 };
 
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
index 0a95c1dfcf3..f5c1e69c424 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
@@ -67,7 +67,7 @@ export function generateSequentialInserts(str: string, editCnt: number): IIdenti
 			text = '\n';
 			lines.push('');
 		} else {
-			text = getRandomString(50, 100);
+			text = getRandomString(5, 10);
 			lines[line - 1] += text;
 		}
 
@@ -100,6 +100,7 @@ export function generateRandomReplaces(str: string, editCnt: number, searchStrin
 			text: replaceString,
 			range: new Range(line, startColumn, line, endColumn)
 		});
+		previousChunksLength = endLine;
 	}
 
 	return ops;

From 2f2bfea2075d716c60847ae4263423283843995c Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Wed, 17 Jan 2018 15:21:03 -0800
Subject: [PATCH 358/710] Preferences search - fix local/remote typo

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

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 58ab3cc4da6..b6bc981673c 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -255,7 +255,7 @@ export class PreferencesEditor extends BaseEditor {
 
 	private triggerThrottledSearch(query: string): TPromise {
 		if (query) {
-			return this.remoteSearchThrottle.trigger(() => this.preferencesRenderers.localFilterPreferences(query));
+			return this.remoteSearchThrottle.trigger(() => this.preferencesRenderers.remoteSearchPreferences(query));
 		} else {
 			// When clearing the input, update immediately to clear it
 			return this.preferencesRenderers.remoteSearchPreferences(query);

From 44d1107612930840c5b84940521fb299da30d438 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 14:30:06 -0800
Subject: [PATCH 359/710] Make a code action request for each diagnostic

Fixes #27392

**Bug**
We currently only make a single code action request for all diagnostics, with a range the covers the span of all diagnostics. However the TS Server API actually expects a code action request for each diagnostic (both the code and range of the code action request has to exactly match that of the diagnostic it aims to fix).

The result is that for overlapping diagnotics where there are multiple fixes, we only  would get code actions for the outermost diagnostic

**Fix**
Make a code action request per diagnostic
---
 .../src/features/quickFixProvider.ts          | 34 ++++++++++++-------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/extensions/typescript/src/features/quickFixProvider.ts b/extensions/typescript/src/features/quickFixProvider.ts
index 21b7dabe37e..502e8048c04 100644
--- a/extensions/typescript/src/features/quickFixProvider.ts
+++ b/extensions/typescript/src/features/quickFixProvider.ts
@@ -34,11 +34,9 @@ class SupportedCodeActionProvider {
 		private readonly client: ITypeScriptServiceClient
 	) { }
 
-	public async getSupportedActionsForContext(context: vscode.CodeActionContext): Promise> {
+	public async getFixableDiagnosticsForContext(context: vscode.CodeActionContext): Promise {
 		const supportedActions = await this.supportedCodeActions;
-		return new Set(context.diagnostics
-			.map(diagnostic => +diagnostic.code)
-			.filter(code => supportedActions.has(code)));
+		return context.diagnostics.filter(diagnostic => supportedActions.has(+diagnostic.code));
 	}
 
 	private get supportedCodeActions(): Thenable> {
@@ -80,23 +78,33 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 			return [];
 		}
 
-		const supportedActions = await this.supportedCodeActionProvider.getSupportedActionsForContext(context);
-		if (!supportedActions.size) {
+		const fixableDiagnostics = await this.supportedCodeActionProvider.getFixableDiagnosticsForContext(context);
+		if (!fixableDiagnostics.length) {
 			return [];
 		}
 
 		await this.formattingConfigurationManager.ensureFormatOptionsForDocument(document, token);
 
-		const args: Proto.CodeFixRequestArgs = {
-			...vsRangeToTsFileRange(file, range),
-			errorCodes: Array.from(supportedActions)
-		};
-		const response = await this.client.execute('getCodeFixes', args, token);
-		return (response.body || []).map(action => this.getCommandForAction(action));
+		const results: vscode.CodeAction[] = [];
+		for (const diagnostic of fixableDiagnostics) {
+			const args: Proto.CodeFixRequestArgs = {
+				...vsRangeToTsFileRange(file, diagnostic.range),
+				errorCodes: [+diagnostic.code]
+			};
+			const response = await this.client.execute('getCodeFixes', args, token);
+			if (response.body) {
+				results.push(...response.body.map(action => this.getCommandForAction(diagnostic, action)));
+			}
+		}
+		return results;
 	}
 
-	private getCommandForAction(tsAction: Proto.CodeAction): vscode.CodeAction {
+	private getCommandForAction(
+		diagnostic: vscode.Diagnostic,
+		tsAction: Proto.CodeAction
+	): vscode.CodeAction {
 		const codeAction = new vscode.CodeAction(tsAction.description, getEditForCodeAction(this.client, tsAction));
+		codeAction.diagnostics = [diagnostic];
 		if (tsAction.commands) {
 			codeAction.command = {
 				command: ApplyCodeActionCommand.ID,

From 88f535500d1948985739b033c2012a417fda88d5 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 15:37:59 -0800
Subject: [PATCH 360/710] Fix build error caused by ts api change

---
 extensions/html/server/src/modes/javascriptMode.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/html/server/src/modes/javascriptMode.ts b/extensions/html/server/src/modes/javascriptMode.ts
index a1d0c2850fc..7255840e3cf 100644
--- a/extensions/html/server/src/modes/javascriptMode.ts
+++ b/extensions/html/server/src/modes/javascriptMode.ts
@@ -85,7 +85,7 @@ export function getJavascriptMode(documentRegions: LanguageModelCache
Date: Wed, 17 Jan 2018 15:38:25 -0800
Subject: [PATCH 361/710] Remove unused param

---
 extensions/typescript/src/features/quickFixProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/typescript/src/features/quickFixProvider.ts b/extensions/typescript/src/features/quickFixProvider.ts
index 502e8048c04..a91b0eb40a6 100644
--- a/extensions/typescript/src/features/quickFixProvider.ts
+++ b/extensions/typescript/src/features/quickFixProvider.ts
@@ -65,7 +65,7 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 
 	public async provideCodeActions(
 		document: vscode.TextDocument,
-		range: vscode.Range,
+		_range: vscode.Range,
 		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
 	): Promise {

From 1eab70bbda98278c8886a81697b1761af4aaee7d Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Wed, 17 Jan 2018 15:58:12 -0800
Subject: [PATCH 362/710] if we disable folding model for large file, we do not
 save view state as well.

---
 src/vs/editor/contrib/folding/folding.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/contrib/folding/folding.ts b/src/vs/editor/contrib/folding/folding.ts
index 21e8d35f4ce..d898a618ca4 100644
--- a/src/vs/editor/contrib/folding/folding.ts
+++ b/src/vs/editor/contrib/folding/folding.ts
@@ -101,7 +101,7 @@ export class FoldingController implements IEditorContribution {
 	 */
 	public saveViewState(): { collapsedRegions?: CollapseMemento, lineCount?: number } {
 		let model = this.editor.getModel();
-		if (!model || !this._isEnabled) {
+		if (!model || !this._isEnabled || model.isTooLargeForTokenization()) {
 			return {};
 		}
 		return { collapsedRegions: this.foldingModel.getMemento(), lineCount: model.getLineCount() };
@@ -112,7 +112,7 @@ export class FoldingController implements IEditorContribution {
 	 */
 	public restoreViewState(state: { collapsedRegions?: CollapseMemento, lineCount?: number }): void {
 		let model = this.editor.getModel();
-		if (!model || !this._isEnabled) {
+		if (!model || !this._isEnabled || model.isTooLargeForTokenization()) {
 			return;
 		}
 		if (!state || !state.collapsedRegions || state.lineCount !== model.getLineCount()) {

From eacad2d56f8e6a231f6492e8508d993e71af31a5 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Wed, 17 Jan 2018 17:16:25 -0800
Subject: [PATCH 363/710] Avoid comma due to array, put tags under quotes as
 they can be multi worded

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

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 8f6cb11fba0..9fa2d2ff226 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -237,7 +237,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 				const languageTag = languageName ? ` tag:"${languageName}"` : '';
 
 				// Construct a rich query
-				return `tag:"__ext_${ext}"${keywords.map(tag => ` tag:${tag}`)}${languageTag}`;
+				return `tag:"__ext_${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
 			});
 
 			if (names.length) {

From a00d9092bcc448be417df3c5706ce59a803d0939 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 17:10:46 -0800
Subject: [PATCH 364/710] Remove any cast for completion items now that we've
 picked up TS 2.7

---
 extensions/typescript/src/features/completionItemProvider.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index f58134b67bd..75c44273c7d 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -53,7 +53,7 @@ class MyCompletionItem extends CompletionItem {
 			this.range = tsTextSpanToVsRange(tsEntry.replacementSpan);
 		}
 
-		if (typeof (tsEntry as any).insertText === 'string') {
+		if (typeof tsEntry.insertText === 'string') {
 			this.insertText = (tsEntry as any).insertText as string;
 
 			if (tsEntry.replacementSpan) {

From 2d79f9da3ca330ad7ebeb7dc3f538a0cf1634fa3 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Wed, 17 Jan 2018 19:07:35 -0800
Subject: [PATCH 365/710] Show single prompt even if file matches multiple
 important recommendations

---
 .../electron-browser/extensionTipsService.ts  | 140 +++++++++---------
 1 file changed, 69 insertions(+), 71 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index d097b862e8e..274849811f9 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -283,90 +283,88 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 			const config = this.configurationService.getValue(ConfigurationKey);
 			const importantRecommendationsIgnoreList = JSON.parse(this.storageService.get('extensionsAssistant/importantRecommendationsIgnore', StorageScope.GLOBAL, '[]'));
-
-			if (config.ignoreRecommendations || !product.extensionImportantTips) {
+			let recommendationsToSuggest = Object.keys(product.extensionImportantTips || [])
+				.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && match(product.extensionImportantTips[id]['pattern'], uri.fsPath));
+			if (config.ignoreRecommendations || !recommendationsToSuggest.length) {
 				return;
 			}
 
 			this.extensionsService.getInstalled(LocalExtensionType.User).done(local => {
-				Object.keys(product.extensionImportantTips)
-					.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1)
-					.filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id))
-					.forEach(id => {
-						const { pattern, name } = product.extensionImportantTips[id];
+				recommendationsToSuggest = recommendationsToSuggest.filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id));
+				if (!recommendationsToSuggest.length) {
+					return;
+				}
+				const id = recommendationsToSuggest[0];
+				const name = product.extensionImportantTips[id]['name'];
 
-						if (!match(pattern, uri.fsPath)) {
-							return;
-						}
+				let message = localize('reallyRecommended2', "The '{0}' extension is recommended for this file type.", name);
+				// Temporary fix for the only extension pack we recommend. See https://github.com/Microsoft/vscode/issues/35364
+				if (id === 'vscjava.vscode-java-pack') {
+					message = localize('reallyRecommendedExtensionPack', "The '{0}' extension pack is recommended for this file type.", name);
+				}
 
-						let message = localize('reallyRecommended2', "The '{0}' extension is recommended for this file type.", name);
-						// Temporary fix for the only extension pack we recommend. See https://github.com/Microsoft/vscode/issues/35364
-						if (id === 'vscjava.vscode-java-pack') {
-							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 = [
+					localize('install', 'Install'),
+					recommendationsAction.label,
+					localize('neverShowAgain', "Don't Show Again"),
+					localize('close', "Close")
+				];
 
-						const recommendationsAction = this.instantiationService.createInstance(ShowRecommendedExtensionsAction, ShowRecommendedExtensionsAction.ID, localize('showRecommendations', "Show Recommendations"));
-						const installAction = this.instantiationService.createInstance(InstallRecommendedExtensionAction, id);
-						const options = [
-							localize('install', 'Install'),
-							recommendationsAction.label,
-							localize('neverShowAgain', "Don't Show Again"),
-							localize('close', "Close")
-						];
-
-						this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
-							switch (choice) {
-								case 0:
-									/* __GDPR__
-										"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:
-									/* __GDPR__
-										"extensionRecommendations:popup" : {
-											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-										}
-									*/
-									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
-									return recommendationsAction.run();
-								case 2: importantRecommendationsIgnoreList.push(id);
-									this.storageService.store(
-										'extensionsAssistant/importantRecommendationsIgnore',
-										JSON.stringify(importantRecommendationsIgnoreList),
-										StorageScope.GLOBAL
-									);
-									/* __GDPR__
-										"extensionRecommendations:popup" : {
-											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-										}
-									*/
-									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
-									return this.ignoreExtensionRecommendations();
-								case 3:
-									/* __GDPR__
-										"extensionRecommendations:popup" : {
-											"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-											"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
-										}
-									*/
-									this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'close', extensionId: name });
-							}
-						}, () => {
+				this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
+					switch (choice) {
+						case 0:
 							/* __GDPR__
 								"extensionRecommendations:popup" : {
 									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
 								}
 							*/
-							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
-						});
-					});
+							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'install', extensionId: name });
+							return installAction.run();
+						case 1:
+							/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'show', extensionId: name });
+							return recommendationsAction.run();
+						case 2: importantRecommendationsIgnoreList.push(id);
+							this.storageService.store(
+								'extensionsAssistant/importantRecommendationsIgnore',
+								JSON.stringify(importantRecommendationsIgnoreList),
+								StorageScope.GLOBAL
+							);
+							/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'neverShowAgain', extensionId: name });
+							return this.ignoreExtensionRecommendations();
+						case 3:
+							/* __GDPR__
+								"extensionRecommendations:popup" : {
+									"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+									"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+								}
+							*/
+							this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'close', extensionId: name });
+					}
+				}, () => {
+					/* __GDPR__
+						"extensionRecommendations:popup" : {
+							"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+							"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+						}
+					*/
+					this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
+				});
+
 			});
 		});
 	}

From 531d713432c82e4ffe341f35d03a461713f96660 Mon Sep 17 00:00:00 2001
From: SteVen Batten <6561887+sbatten@users.noreply.github.com>
Date: Wed, 17 Jan 2018 21:38:25 -0800
Subject: [PATCH 366/710] adding suggestion to search for extension for files
 are of unknown mime type (#40269)

* adding suggestion to search for extension when files are of unknown mime type

* delaying file based suggestions to allow mime types to be populated

* adding telemetry and responding to ramya's feedback

* Fix rebase errors, duplicate key error, tests & prompt only once for file type
---
 .../electron-browser/extensionTipsService.ts  | 111 ++++++++++++++++--
 .../extensionsTipsService.test.ts             |   3 +-
 2 files changed, 102 insertions(+), 12 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 274849811f9..619aace599d 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -29,6 +29,9 @@ import * as pfs from 'vs/base/node/pfs';
 import * as os from 'os';
 import { flatten, distinct } from 'vs/base/common/arrays';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { guessMimeTypes, MIME_UNKNOWN } from 'vs/base/common/mime';
+import { ShowLanguageExtensionsAction } from 'vs/workbench/browser/parts/editor/editorStatus';
+import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 
 interface IExtensionsContent {
 	recommendations: string[];
@@ -36,6 +39,8 @@ interface IExtensionsContent {
 
 const empty: { [key: string]: any; } = Object.create(null);
 const milliSecondsInADay = 1000 * 60 * 60 * 24;
+const choiceNever = localize('neverShowAgain', "Don't show again");
+const choiceClose = localize('close', "Close");
 
 export class ExtensionTipsService extends Disposable implements IExtensionTipsService {
 
@@ -61,7 +66,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IMessageService private messageService: IMessageService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IEnvironmentService private environmentService: IEnvironmentService
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ILifecycleService private lifecycleService: ILifecycleService
 	) {
 		super();
 
@@ -69,7 +75,10 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			return;
 		}
 
-		this._suggestFileBasedRecommendations();
+		this.lifecycleService.when(LifecyclePhase.Eventually).then(() => {
+			this._suggestFileBasedRecommendations();
+		});
+
 		this.promptWorkspaceRecommendationsPromise = this._suggestWorkspaceRecommendations();
 
 		// Executable based recommendations carry out a lot of file stats, so run them after 10 secs
@@ -256,6 +265,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 
 	private _suggest(model: ITextModel): void {
 		const uri = model.uri;
+		let hasSuggestion = false;
 
 		if (!uri || uri.scheme !== Schemas.file) {
 			return;
@@ -282,14 +292,15 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 			);
 
 			const config = this.configurationService.getValue(ConfigurationKey);
-			const importantRecommendationsIgnoreList = JSON.parse(this.storageService.get('extensionsAssistant/importantRecommendationsIgnore', StorageScope.GLOBAL, '[]'));
-			let recommendationsToSuggest = Object.keys(product.extensionImportantTips || [])
-				.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && match(product.extensionImportantTips[id]['pattern'], uri.fsPath));
-			if (config.ignoreRecommendations || !recommendationsToSuggest.length) {
+			if (config.ignoreRecommendations) {
 				return;
 			}
 
-			this.extensionsService.getInstalled(LocalExtensionType.User).done(local => {
+			const importantRecommendationsIgnoreList = JSON.parse(this.storageService.get('extensionsAssistant/importantRecommendationsIgnore', StorageScope.GLOBAL, '[]'));
+			let recommendationsToSuggest = Object.keys(product.extensionImportantTips || [])
+				.filter(id => importantRecommendationsIgnoreList.indexOf(id) === -1 && match(product.extensionImportantTips[id]['pattern'], uri.fsPath));
+
+			const importantTipsPromise = recommendationsToSuggest.length === 0 ? TPromise.as(null) : this.extensionsService.getInstalled(LocalExtensionType.User).then(local => {
 				recommendationsToSuggest = recommendationsToSuggest.filter(id => local.every(local => `${local.manifest.publisher}.${local.manifest.name}` !== id));
 				if (!recommendationsToSuggest.length) {
 					return;
@@ -297,6 +308,9 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				const id = recommendationsToSuggest[0];
 				const name = product.extensionImportantTips[id]['name'];
 
+				// Indicates we have a suggested extension via the whitelist
+				hasSuggestion = true;
+
 				let message = localize('reallyRecommended2', "The '{0}' extension is recommended for this file type.", name);
 				// Temporary fix for the only extension pack we recommend. See https://github.com/Microsoft/vscode/issues/35364
 				if (id === 'vscjava.vscode-java-pack') {
@@ -308,8 +322,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				const options = [
 					localize('install', 'Install'),
 					recommendationsAction.label,
-					localize('neverShowAgain', "Don't Show Again"),
-					localize('close', "Close")
+					choiceNever,
+					choiceClose
 				];
 
 				this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
@@ -364,7 +378,82 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 					*/
 					this.telemetryService.publicLog('extensionRecommendations:popup', { userReaction: 'cancelled', extensionId: name });
 				});
+			});
 
+			importantTipsPromise.then(() => {
+				const fileExtensionSuggestionIgnoreList = JSON.parse(this.storageService.get
+					('extensionsAssistant/fileExtensionsSuggestionIgnore', StorageScope.GLOBAL, '[]'));
+				let mimeTypes = guessMimeTypes(uri.fsPath);
+				let fileExtension = paths.extname(uri.fsPath);
+				if (fileExtension) {
+					fileExtension = fileExtension.substr(1); // Strip the dot
+				}
+
+				if (hasSuggestion ||
+					!fileExtension ||
+					mimeTypes.length !== 1 ||
+					mimeTypes[0] !== MIME_UNKNOWN ||
+					fileExtensionSuggestionIgnoreList.indexOf(fileExtension) > -1
+				) {
+					return;
+				}
+
+				const keywords = this.getKeywordsForExtension(fileExtension);
+				this._galleryService.query({ text: `tag:"__ext_${fileExtension}" ${keywords.map(tag => `tag:"${tag}"`)}` }).then(pager => {
+					if (!pager || !pager.firstPage || !pager.firstPage.length) {
+						return;
+					}
+
+					// Suggest the search only once as this is not a strong recommendation
+					fileExtensionSuggestionIgnoreList.push(fileExtension);
+					this.storageService.store(
+						'extensionsAssistant/fileExtensionsSuggestionIgnore',
+						JSON.stringify(fileExtensionSuggestionIgnoreList),
+						StorageScope.GLOBAL
+					);
+
+
+					const message = localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension);
+
+					const searchMarketplaceAction = this.instantiationService.createInstance(ShowLanguageExtensionsAction, fileExtension);
+
+					const options = [
+						localize('searchMarketplace', "Search Marketplace"),
+						choiceClose
+					];
+
+					this.choiceService.choose(Severity.Info, message, options, 1).done(choice => {
+						switch (choice) {
+							case 0:
+								/* __GDPR__
+									"fileExtensionSuggestion:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'ok', fileExtension: fileExtension });
+								searchMarketplaceAction.run();
+								break;
+							case 1:
+								/* __GDPR__
+									"fileExtensionSuggestion:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'close', fileExtension: fileExtension });
+								break;
+						}
+					}, () => {
+						/* __GDPR__
+							"fileExtensionSuggestion:popup" : {
+								"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+								"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+							}
+						*/
+						this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'cancelled', fileExtension: fileExtension });
+					});
+				});
 			});
 		});
 	}
@@ -393,8 +482,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 				const options = [
 					installAllAction.label,
 					showAction.label,
-					localize('neverShowAgain', "Don't Show Again"),
-					localize('close', "Close")
+					choiceNever,
+					choiceClose
 				];
 
 				return this.choiceService.choose(Severity.Info, message, options, 3).done(choice => {
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 a46d4cb2361..b37b3533a57 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
@@ -46,6 +46,7 @@ import { IChoiceService } from 'vs/platform/message/common/message';
 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';
 
 const mockExtensionGallery: IGalleryExtension[] = [
 	aGalleryExtension('MockExtension1', {
@@ -179,7 +180,7 @@ suite('ExtensionsTipsService Test', () => {
 		uninstallEvent = new Emitter();
 		didUninstallEvent = new Emitter();
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
-
+		instantiationService.stub(ILifecycleService, new TestLifecycleService());
 		testConfigurationService = new TestConfigurationService();
 		instantiationService.stub(IConfigurationService, testConfigurationService);
 		instantiationService.stub(IExtensionManagementService, ExtensionManagementService);

From 567bf6ed97366ff400bfc8eb5dee0662d8d967a4 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Wed, 17 Jan 2018 23:22:17 -0800
Subject: [PATCH 367/710] Refactor benchmark utilies.

---
 .../common/model/benchmark/benchmarkUtils.ts  |  58 ++++++-
 .../model/benchmark/operations.benchmark.ts   | 164 +++++++++++++-----
 .../benchmark/searchNReplace.benchmark.ts     |  56 ++++--
 .../textBufferAutoTestUtils.ts                |  48 ++++-
 4 files changed, 251 insertions(+), 75 deletions(-)

diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index e6047266767..50c0516109b 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -2,7 +2,10 @@
  *  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 { 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(id: string, ts: T[], fn: (t: T) => void) {
 	let columns: string[] = [id];
@@ -13,4 +16,55 @@ export function doBenchmark(id: string, ts: T[], fn: (t: T) => void) {
 		columns.push(`${(diff[0] * 1000 + diff[1] / 1000000).toFixed(3)} ms`);
 	}
 	console.log('|' + columns.join('\t|') + '|');
-}
\ No newline at end of file
+}
+
+export interface IBenchmark {
+	name: string;
+	/**
+	 * Before each cycle, this function will be called to create TextBufferFactory
+	 */
+	buildBuffer: (textBufferBuilder: ITextBufferBuilder) => ITextBufferFactory;
+	/**
+	 * Before each cycle, this function will be called to do pre-work for text buffer.
+	 * This will be called onece `buildBuffer` is finished.
+	 */
+	preCycle: (textBuffer: ITextBuffer) => void;
+	/**
+	 * The function we are benchmarking
+	 */
+	fn: (textBuffer: ITextBuffer) => void;
+}
+
+export class BenchmarkSuite {
+	name: string;
+	benchmarks: IBenchmark[];
+
+	constructor(suiteOptions: { name: string }) {
+		this.name = suiteOptions.name;
+		this.benchmarks = [];
+	}
+
+	add(benchmark: IBenchmark) {
+		this.benchmarks.push(benchmark);
+	}
+
+	run() {
+		console.log(`|${this.name}\t|line buffer\t|piece table\t|`);
+		console.log('|---|---|---|');
+		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) => {
+				let factory = benchmark.buildBuffer(builder);
+				let buffer = factory.create(DefaultEndOfLine.LF);
+				benchmark.preCycle(buffer);
+				var start = process.hrtime();
+				benchmark.fn(buffer);
+				var diff = process.hrtime(start);
+				columns.push(`${(diff[0] * 1000 + diff[1] / 1000000).toFixed(3)} ms`);
+			});
+			console.log('|' + columns.join('\t|') + '|');
+		}
+		console.log('\n');
+	}
+}
diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
index 53d8754b04c..02c7e90958e 100644
--- a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
@@ -2,45 +2,14 @@
  *  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 { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { ITextBuffer, IIdentifiedSingleEditOperation, EndOfLinePreference } from 'vs/editor/common/model';
-import { generateRandomEdits, createMockBuffer, createMockText, generateSequentialInserts } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
+import { ITextBufferBuilder, EndOfLinePreference } from 'vs/editor/common/model';
+import { BenchmarkSuite } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
+import { generateRandomChunkWithLF, generateRandomEdits, generateSequentialInserts, getRandomInt } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
 import { Range } from 'vs/editor/common/core/range';
-import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
 
-let readLinesBenchmark = function (id: string, buffers: ITextBuffer[]) {
-	doBenchmark(id, buffers, (buffer) => {
-		for (let j = 0, len = buffer.getLineCount(); j < len; j++) {
-			var str = buffer.getLineContent(j + 1);
-			let firstChar = str.charCodeAt(0);
-			let lastChar = str.charCodeAt(str.length - 1);
-			firstChar = firstChar - lastChar;
-			lastChar = firstChar + lastChar;
-			firstChar = lastChar - firstChar;
-		}
-	});
-};
-
-let appyEditsBenchmark = function (id: string, buffers: ITextBuffer[], edits: IIdentifiedSingleEditOperation[]) {
-	doBenchmark(id, buffers, (buffer) => {
-		for (let j = 0; j < edits.length; j++) {
-			buffer.applyEdits([edits[j]], false);
-		}
-	});
-};
-
-let getValueBenchmark = function (id: string, buffers: ITextBuffer[], eol: EndOfLinePreference = EndOfLinePreference.LF): void {
-	doBenchmark(id, buffers, (buffer) => {
-		const lineCount = buffer.getLineCount();
-		const fullModelRange = new Range(1, 1, lineCount, buffer.getLineLength(lineCount) + 1);
-		buffer.getValueInRange(fullModelRange, eol);
-	});
-};
-
-let suites = [
+let fileSizes = [1, 1000, 64 * 1000, 32 * 1000 * 1000];
+let editTypes = [
 	{
 		id: 'random edits',
 		generateEdits: generateRandomEdits
@@ -51,18 +20,119 @@ let suites = [
 	}
 ];
 
-let text = createMockText(1000, 0, 50);
+for (let fileSize of fileSizes) {
+	let chunks = [];
 
-for (let i = 0, len = suites.length; i < len; i++) {
-	console.log(`\n|${suites[i].id}\t|line buffer\t|piece table\t|`);
-	console.log('|---|---|---|');
-	for (let j of [10, 100, 1000]) {
-		let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder());
-		let pieceTreeTextBuffer = createMockBuffer(text, new PieceTreeTextBufferBuilder());
-		let edits = suites[i].generateEdits(text, j);
+	let chunkCnt = Math.floor(fileSize / (64 * 1000));
+	if (chunkCnt === 0) {
+		chunks.push(generateRandomChunkWithLF(fileSize, fileSize));
+	} else {
+		let chunk = generateRandomChunkWithLF(64 * 1000, 64 * 1000);
+		// try to avoid OOM
+		for (let j = 0; j < chunkCnt; j++) {
+			chunks.push(Buffer.from(chunk + j).toString());
+		}
+	}
 
-		appyEditsBenchmark(`apply ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer], edits);
-		readLinesBenchmark(`getLineContent after ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer]);
-		getValueBenchmark(`save after ${j} edits`, [linesTextBuffer, pieceTreeTextBuffer]);
+	for (let editType of editTypes) {
+		const edits = editType.generateEdits(chunks, 1000);
+
+		let editsSuite = new BenchmarkSuite({
+			name: `File Size: ${fileSize}Byte, ${editType.id}`,
+		});
+
+		for (let i of [10, 100, 1000]) {
+			editsSuite.add({
+				name: `apply ${i} edits`,
+				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+					return textBufferBuilder.finish();
+				},
+				preCycle: (textBuffer) => {
+					return textBuffer;
+				},
+				fn: (textBuffer) => {
+					// for line model, this loop doesn't reflect the real situation.
+					for (let k = 0; k < edits.length && k < i; k++) {
+						textBuffer.applyEdits([edits[k]], false);
+					}
+				}
+			});
+
+			editsSuite.add({
+				name: `Read all lines after ${i} edits`,
+				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+					return textBufferBuilder.finish();
+				},
+				preCycle: (textBuffer) => {
+					for (let k = 0; k < edits.length && k < i; k++) {
+						textBuffer.applyEdits([edits[k]], false);
+					}
+					return textBuffer;
+				},
+				fn: (textBuffer) => {
+					for (let j = 0, len = textBuffer.getLineCount(); j < len; j++) {
+						var str = textBuffer.getLineContent(j + 1);
+						let firstChar = str.charCodeAt(0);
+						let lastChar = str.charCodeAt(str.length - 1);
+						firstChar = firstChar - lastChar;
+						lastChar = firstChar + lastChar;
+						firstChar = lastChar - firstChar;
+					}
+				}
+			});
+
+			editsSuite.add({
+				name: `Read 10 random windows after ${i} edits`,
+				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+					return textBufferBuilder.finish();
+				},
+				preCycle: (textBuffer) => {
+					for (let k = 0; k < edits.length && k < i; k++) {
+						textBuffer.applyEdits([edits[k]], false);
+					}
+					return textBuffer;
+				},
+				fn: (textBuffer) => {
+					for (let i = 0; i < 10; i++) {
+						let minLine = 1;
+						let maxLine = textBuffer.getLineCount();
+						let startLine = getRandomInt(minLine, Math.max(minLine, maxLine - 100));
+						let endLine = Math.min(maxLine, startLine + 100);
+						for (let j = startLine; j < endLine; j++) {
+							var str = textBuffer.getLineContent(j + 1);
+							let firstChar = str.charCodeAt(0);
+							let lastChar = str.charCodeAt(str.length - 1);
+							firstChar = firstChar - lastChar;
+							lastChar = firstChar + lastChar;
+							firstChar = lastChar - firstChar;
+						}
+					}
+				}
+			});
+
+			editsSuite.add({
+				name: `save file after ${i} edits`,
+				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+					return textBufferBuilder.finish();
+				},
+				preCycle: (textBuffer) => {
+					for (let k = 0; k < edits.length && k < i; k++) {
+						textBuffer.applyEdits([edits[k]], false);
+					}
+					return textBuffer;
+				},
+				fn: (textBuffer) => {
+					const lineCount = textBuffer.getLineCount();
+					const fullModelRange = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
+					textBuffer.getValueInRange(fullModelRange, EndOfLinePreference.LF);
+				}
+			});
+		}
+
+		editsSuite.run();
 	}
 }
\ No newline at end of file
diff --git a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
index e8131268dc1..b805c477637 100644
--- a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
@@ -4,25 +4,47 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
-import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
-import { IIdentifiedSingleEditOperation, ITextBuffer } from 'vs/editor/common/model';
-import { createMockText, createMockBuffer, generateRandomReplaces } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
-import { doBenchmark } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
+import { ITextBufferBuilder } from 'vs/editor/common/model';
+import { generateRandomReplaces, generateRandomChunkWithLF } from 'vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils';
+import { BenchmarkSuite } from 'vs/editor/test/common/model/benchmark/benchmarkUtils';
 
-let appyEditsBenchmark = function (id: string, buffers: ITextBuffer[], edits: IIdentifiedSingleEditOperation[]) {
-	doBenchmark(id, buffers, buffer => {
-		buffer.applyEdits(edits, false);
+let fileSizes = [1, 1000, 64 * 1000, 32 * 1000 * 1000];
+
+for (let fileSize of fileSizes) {
+	let chunks = [];
+
+	let chunkCnt = Math.floor(fileSize / (64 * 1000));
+	if (chunkCnt === 0) {
+		chunks.push(generateRandomChunkWithLF(fileSize, fileSize));
+	} else {
+		let chunk = generateRandomChunkWithLF(64 * 1000, 64 * 1000);
+		// try to avoid OOM
+		for (let j = 0; j < chunkCnt; j++) {
+			chunks.push(Buffer.from(chunk + j).toString());
+		}
+	}
+
+	let replaceSuite = new BenchmarkSuite({
+		name: `File Size: ${fileSize}Byte`,
 	});
-};
 
-let text = createMockText(1000, 50, 100);
+	let edits = generateRandomReplaces(chunks, 500, 5, 10);
 
-console.log(`\n|replace all\t|line buffer\t|piece table\t|`);
-console.log('|---|---|---|');
-for (let i of [10, 100, 500, 1000]) {
-	let linesTextBuffer = createMockBuffer(text, new LinesTextBufferBuilder());
-	let pieceTreeTextBuffer = createMockBuffer(text, new PieceTreeTextBufferBuilder());
-	let edits = generateRandomReplaces(text, i, 5, 10);
-	appyEditsBenchmark(`replace ${i} occurrences`, [linesTextBuffer, pieceTreeTextBuffer], edits);
+	for (let i of [10, 100, 500]) {
+		replaceSuite.add({
+			name: `replace ${i} occurrences`,
+			buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+				chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+				return textBufferBuilder.finish();
+			},
+			preCycle: (textBuffer) => {
+				return textBuffer;
+			},
+			fn: (textBuffer) => {
+				textBuffer.applyEdits(edits.slice(0, i), false);
+			}
+		});
+	}
+
+	replaceSuite.run();
 }
\ No newline at end of file
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
index f5c1e69c424..b8ea951b318 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
@@ -32,14 +32,24 @@ export function getRandomString(minLength: number, maxLength: number): string {
 	return r;
 }
 
-export function generateRandomEdits(str: string, editCnt: number): IIdentifiedSingleEditOperation[] {
-	let lines = str.split(/\r\n|\r|\n/);
+export function generateRandomEdits(chunks: string[], editCnt: number): IIdentifiedSingleEditOperation[] {
+	let lines = [];
+	for (let i = 0; i < chunks.length; i++) {
+		let newLines = chunks[i].split(/\r\n|\r|\n/);
+		if (lines.length === 0) {
+			lines.push(...newLines);
+		} else {
+			newLines[0] = lines[lines.length - 1] + newLines[0];
+			lines.splice(lines.length - 1, 1, ...newLines);
+		}
+	}
+
 	let ops: IIdentifiedSingleEditOperation[] = [];
 
 	for (let i = 0; i < editCnt; i++) {
 		let line = getRandomInt(1, lines.length);
-		let startColumn = getRandomInt(1, lines[line - 1].length + 1);
-		let endColumn = getRandomInt(startColumn, lines[line - 1].length + 1);
+		let startColumn = getRandomInt(1, Math.max(lines[line - 1].length, 1));
+		let endColumn = getRandomInt(startColumn, Math.max(lines[line - 1].length, startColumn));
 		let text: string = '';
 		if (Math.random() < .5) {
 			text = getRandomString(5, 10);
@@ -55,8 +65,18 @@ export function generateRandomEdits(str: string, editCnt: number): IIdentifiedSi
 	return ops;
 }
 
-export function generateSequentialInserts(str: string, editCnt: number): IIdentifiedSingleEditOperation[] {
-	let lines = str.split(/\r\n|\r|\n/);
+export function generateSequentialInserts(chunks: string[], editCnt: number): IIdentifiedSingleEditOperation[] {
+	let lines = [];
+	for (let i = 0; i < chunks.length; i++) {
+		let newLines = chunks[i].split(/\r\n|\r|\n/);
+		if (lines.length === 0) {
+			lines.push(...newLines);
+		} else {
+			newLines[0] = lines[lines.length - 1] + newLines[0];
+			lines.splice(lines.length - 1, 1, ...newLines);
+		}
+	}
+
 	let ops: IIdentifiedSingleEditOperation[] = [];
 
 	for (let i = 0; i < editCnt; i++) {
@@ -67,7 +87,7 @@ export function generateSequentialInserts(str: string, editCnt: number): IIdenti
 			text = '\n';
 			lines.push('');
 		} else {
-			text = getRandomString(5, 10);
+			text = getRandomString(1, 2);
 			lines[line - 1] += text;
 		}
 
@@ -80,8 +100,18 @@ export function generateSequentialInserts(str: string, editCnt: number): IIdenti
 	return ops;
 }
 
-export function generateRandomReplaces(str: string, editCnt: number, searchStringLen: number, replaceStringLen: number): IIdentifiedSingleEditOperation[] {
-	let lines = str.split(/\r\n|\r|\n/);
+export function generateRandomReplaces(chunks: string[], editCnt: number, searchStringLen: number, replaceStringLen: number): IIdentifiedSingleEditOperation[] {
+	let lines = [];
+	for (let i = 0; i < chunks.length; i++) {
+		let newLines = chunks[i].split(/\r\n|\r|\n/);
+		if (lines.length === 0) {
+			lines.push(...newLines);
+		} else {
+			newLines[0] = lines[lines.length - 1] + newLines[0];
+			lines.splice(lines.length - 1, 1, ...newLines);
+		}
+	}
+
 	let ops: IIdentifiedSingleEditOperation[] = [];
 	let chunkSize = Math.max(1, Math.floor(lines.length / editCnt));
 	let chunkCnt = Math.floor(lines.length / chunkSize);

From 460e00c5756596858d2a2038a4cc225b836562a4 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Thu, 18 Jan 2018 08:59:43 +0100
Subject: [PATCH 368/710] update inno

---
 build/win32/code.iss         |  64 +++++++++++++++++++++++++++++++----
 build/win32/inno_updater.exe | Bin 0 -> 178176 bytes
 2 files changed, 57 insertions(+), 7 deletions(-)
 create mode 100644 build/win32/inno_updater.exe

diff --git a/build/win32/code.iss b/build/win32/code.iss
index f4374ee099d..ed747315c63 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -18,7 +18,7 @@ OutputDir={#OutputDir}
 OutputBaseFilename=VSCodeSetup
 Compression=lzma
 SolidCompression=yes
-AppMutex={#AppMutex}
+AppMutex={code:GetAppMutex}
 SetupMutex={#AppMutex}setup
 WizardImageFile={#RepoDir}\resources\win32\inno-big.bmp
 WizardSmallImageFile={#RepoDir}\resources\win32\inno-small.bmp
@@ -47,11 +47,15 @@ Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}
 
 [InstallDelete]
-Type: filesandordirs; Name: {app}\resources\app\out
-Type: filesandordirs; Name: {app}\resources\app\plugins
-Type: filesandordirs; Name: {app}\resources\app\extensions
-Type: filesandordirs; Name: {app}\resources\app\node_modules
-Type: files; Name: {app}\resources\app\Credits_45.0.2454.85.html
+Type: filesandordirs; Name: "{app}\resources\app\out"
+Type: filesandordirs; Name: "{app}\resources\app\plugins"
+Type: filesandordirs; Name: "{app}\resources\app\extensions"
+Type: filesandordirs; Name: "{app}\resources\app\node_modules"
+Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"
+
+[UninstallDelete]
+Type: filesandordirs; Name: "{app}\_"
+Type: filesandordirs; Name: "{app}\old"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
@@ -63,7 +67,8 @@ Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
 [Files]
-Source: "*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#RepoDir}\build\win32\inno_updater.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"
@@ -955,6 +960,51 @@ begin
   Result := not WizardSilent();
 end;
 
+// Updates
+function IsUpdate(): Boolean;
+begin
+  Result := ExpandConstant('{param:update|false}') = 'true';
+end;
+
+function GetAppMutex(Value: string): string;
+begin
+  if IsUpdate() then
+    Result := ''
+  else
+    Result := '{#AppMutex}';
+end;
+
+function GetDestDir(Value: string): string;
+begin
+  if IsUpdate() then
+    Result := ExpandConstant('{app}\_')
+  else
+    Result := ExpandConstant('{app}');
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+var
+  UpdateResultCode: Integer;
+begin
+  if (CurStep = ssPostInstall) and (ExpandConstant('{param:update|false}') = 'true') then
+  begin
+    CreateMutex('{#AppMutex}-ready');
+
+    while (CheckForMutexes('{#AppMutex}')) do
+    begin
+      Log('Application is still running, waiting');
+      Sleep(1000);
+    end;
+
+    Sleep(1000);
+
+    if Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('--apply-update _ "{app}\unins000.dat"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode) then
+      Log('Update applied successfully!')
+    else
+      Log('Failed to apply update!');
+  end;
+end;
+
 // http://stackoverflow.com/a/23838239/261019
 procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
 var
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
new file mode 100644
index 0000000000000000000000000000000000000000..3dd7e34c20ba4a75f6dd9b6f593ec183293658fc
GIT binary patch
literal 178176
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
Date: Thu, 18 Jan 2018 09:39:12 +0100
Subject: [PATCH 369/710] Fixes #41573: Allow cursor to recover from markers
 even if the view model line mapping changes

---
 src/vs/editor/common/controller/cursor.ts     | 19 ++++++++++--
 .../test/browser/controller/cursor.test.ts    | 30 +++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts
index 88d2f566d95..bf3193748a5 100644
--- a/src/vs/editor/common/controller/cursor.ts
+++ b/src/vs/editor/common/controller/cursor.ts
@@ -92,6 +92,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 
 	private readonly _configuration: editorCommon.IConfiguration;
 	private readonly _model: ITextModel;
+	private _knownModelVersionId: number;
 	private readonly _viewModel: IViewModel;
 	public context: CursorContext;
 	private _cursors: CursorCollection;
@@ -105,6 +106,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 		super();
 		this._configuration = configuration;
 		this._model = model;
+		this._knownModelVersionId = this._model.getVersionId();
 		this._viewModel = viewModel;
 		this.context = new CursorContext(this._configuration, this._model, this._viewModel);
 		this._cursors = new CursorCollection(this.context);
@@ -115,6 +117,7 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 		this._prevEditOperationType = EditOperationType.Other;
 
 		this._register(this._model.onDidChangeRawContent((e) => {
+			this._knownModelVersionId = e.versionId;
 			if (this._isHandling) {
 				return;
 			}
@@ -128,6 +131,16 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 				return;
 			}
 
+			if (this._knownModelVersionId !== this._model.getVersionId()) {
+				// There are model change events that I didn't yet receive.
+				//
+				// This can happen when editing the model, and the view model receives the change events first,
+				// and the view model emits line mapping changed events, all before the cursor gets a chance to
+				// recover from markers.
+				//
+				// The model change listener above will be called soon and we'll ensure a valid cursor state there.
+				return;
+			}
 			// Ensure valid state
 			this.setStates('viewModel', CursorChangeReason.NotSet, this.getAll());
 		}));
@@ -136,13 +149,13 @@ export class Cursor extends viewEvents.ViewEventEmitter implements ICursors {
 			this.context = new CursorContext(this._configuration, this._model, this._viewModel);
 			this._cursors.updateContext(this.context);
 		};
-		this._register(model.onDidChangeLanguage((e) => {
+		this._register(this._model.onDidChangeLanguage((e) => {
 			updateCursorContext();
 		}));
-		this._register(model.onDidChangeLanguageConfiguration(() => {
+		this._register(this._model.onDidChangeLanguageConfiguration(() => {
 			updateCursorContext();
 		}));
-		this._register(model.onDidChangeOptions(() => {
+		this._register(this._model.onDidChangeOptions(() => {
 			updateCursorContext();
 		}));
 		this._register(this._configuration.onDidChange((e) => {
diff --git a/src/vs/editor/test/browser/controller/cursor.test.ts b/src/vs/editor/test/browser/controller/cursor.test.ts
index 1ccd43194a1..87e6d2d6ea6 100644
--- a/src/vs/editor/test/browser/controller/cursor.test.ts
+++ b/src/vs/editor/test/browser/controller/cursor.test.ts
@@ -1852,6 +1852,36 @@ suite('Editor Controller - Regression tests', () => {
 			assertCursor(cursor, new Selection(1, 12, 1, 12));
 		});
 	});
+
+	test('issue #41573 - delete across multiple lines does not shrink the selection when word wraps', () => {
+		const model = TextModel.createFromString([
+			'Authorization: \'Bearer pHKRfCTFSnGxs6akKlb9ddIXcca0sIUSZJutPHYqz7vEeHdMTMh0SGN0IGU3a0n59DXjTLRsj5EJ2u33qLNIFi9fk5XF8pK39PndLYUZhPt4QvHGLScgSkK0L4gwzkzMloTQPpKhqiikiIOvyNNSpd2o8j29NnOmdTUOKi9DVt74PD2ohKxyOrWZ6oZprTkb3eKajcpnS0LABKfaw2rmv4\','
+		].join('\n'));
+		const config = new TestConfiguration({
+			wordWrap: 'wordWrapColumn',
+			wordWrapColumn: 100
+		});
+		const viewModel = new ViewModel(0, config, model, null);
+		const cursor = new Cursor(config, model, viewModel);
+
+		console.log(viewModel.getLineCount());
+
+		moveTo(cursor, 1, 43, false);
+		moveTo(cursor, 1, 147, true);
+		assertCursor(cursor, new Selection(1, 43, 1, 147));
+
+		model.applyEdits([{
+			range: new Range(1, 1, 1, 43),
+			text: ''
+		}]);
+
+		assertCursor(cursor, new Selection(1, 1, 1, 105));
+
+		cursor.dispose();
+		viewModel.dispose();
+		config.dispose();
+		model.dispose();
+	});
 });
 
 suite('Editor Controller - Cursor Configuration', () => {

From 0bddf58ab12619c49cfb0cac3b24f0fa23bfe91c Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 10:33:39 +0100
Subject: [PATCH 370/710] fix #41738

---
 .../workbench/parts/markers/browser/markersTreeController.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/markers/browser/markersTreeController.ts b/src/vs/workbench/parts/markers/browser/markersTreeController.ts
index 4bcde1d43f1..07e688331c8 100644
--- a/src/vs/workbench/parts/markers/browser/markersTreeController.ts
+++ b/src/vs/workbench/parts/markers/browser/markersTreeController.ts
@@ -75,7 +75,9 @@ export class Controller extends treedefaults.DefaultController {
 
 	private _getMenuActions(tree: WorkbenchTree): IAction[] {
 		const result: IAction[] = [];
-		const groups = this.menuService.createMenu(MenuId.ProblemsPanelContext, tree.contextKeyService).getActions();
+		const menu = this.menuService.createMenu(MenuId.ProblemsPanelContext, tree.contextKeyService);
+		const groups = menu.getActions();
+		menu.dispose();
 
 		for (let group of groups) {
 			const [, actions] = group;

From de25fa00bd02e6454afaaebb8c07eae32f51dc4c Mon Sep 17 00:00:00 2001
From: isidor 
Date: Thu, 18 Jan 2018 11:24:09 +0100
Subject: [PATCH 371/710] debug: no need to open config file on failure to
 resolve configuration provider anymore

fixes #41778
---
 src/vs/workbench/parts/debug/electron-browser/debugService.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 26eadcb5141..b2434227ac5 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -728,9 +728,6 @@ export class DebugService implements debug.IDebugService {
 							if (config && config.type) {
 								return this.createProcess(root, config, sessionId);
 							}
-							if (launch) {
-								return launch.openConfigFile(false, type).then(() => undefined);
-							}
 
 							return undefined;
 						})

From f3b9d48db361d1f7e8e6c2bf1a0d8cc132659b49 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 11:26:08 +0100
Subject: [PATCH 372/710] Fix #41788

---
 .../parts/output/electron-browser/outputServices.ts   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/output/electron-browser/outputServices.ts b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
index dd6381475e9..ce87ed605a3 100644
--- a/src/vs/workbench/parts/output/electron-browser/outputServices.ts
+++ b/src/vs/workbench/parts/output/electron-browser/outputServices.ts
@@ -128,7 +128,8 @@ abstract class AbstractFileOutputChannel extends Disposable {
 	protected modelUpdater: RunOnceScheduler;
 	protected model: ITextModel;
 	readonly file: URI;
-	protected startOffset: number = 0;
+
+	private startOffset: number = 0;
 	protected endOffset: number = 0;
 
 	constructor(
@@ -201,7 +202,6 @@ abstract class AbstractFileOutputChannel extends Disposable {
 			const lastLine = this.model.getLineCount();
 			const lastLineMaxColumn = this.model.getLineMaxColumn(lastLine);
 			this.model.applyEdits([EditOperation.insert(new Position(lastLine, lastLineMaxColumn), content)]);
-			this.endOffset = this.endOffset + new Buffer(content).byteLength;
 			this._onDidAppendedContent.fire();
 		}
 	}
@@ -245,6 +245,8 @@ class OutputChannelBackedByFile extends AbstractFileOutputChannel implements Out
 	}
 
 	append(message: string): void {
+		// update end offset always as message is read
+		this.endOffset = this.endOffset + new Buffer(message).byteLength;
 		if (this.loadingFromFileInProgress) {
 			this.appendedMessage += message;
 		} else {
@@ -371,7 +373,10 @@ class FileOutputChannel extends AbstractFileOutputChannel implements OutputChann
 		if (this.model) {
 			this.fileService.resolveContent(this.file, { position: this.endOffset })
 				.then(content => {
-					this.appendToModel(content.value);
+					if (content.value) {
+						this.endOffset = this.endOffset + new Buffer(content.value).byteLength;
+						this.appendToModel(content.value);
+					}
 					this.updateInProgress = false;
 				}, () => this.updateInProgress = false);
 		} else {

From 680f9b19a94a23eeb5dbb5fe61f4b405e542ecca Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 11:50:31 +0100
Subject: [PATCH 373/710] Fix #41759

---
 .../extensions/browser/extensionsStatus.ts    | 61 -------------------
 .../extensions.contribution.ts                |  8 +--
 .../node/extensionsWorkbenchService.ts        | 10 ++-
 3 files changed, 9 insertions(+), 70 deletions(-)
 delete mode 100644 src/vs/workbench/parts/extensions/browser/extensionsStatus.ts

diff --git a/src/vs/workbench/parts/extensions/browser/extensionsStatus.ts b/src/vs/workbench/parts/extensions/browser/extensionsStatus.ts
deleted file mode 100644
index 78d5f7be002..00000000000
--- a/src/vs/workbench/parts/extensions/browser/extensionsStatus.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.
- *--------------------------------------------------------------------------------------------*/
-
-import * as DOM from 'vs/base/browser/dom';
-import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { Disposable, toDisposable, IDisposable } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, InstallExtensionEvent, DidInstallExtensionEvent } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { localize } from 'vs/nls';
-import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-
-export class InstallingStatusItem extends Disposable implements IStatusbarItem {
-
-	private statusElement: HTMLElement;
-	private installingExtensions: string[] = [];
-
-	constructor(
-		@IExtensionManagementService extensionManagementService: IExtensionManagementService
-	) {
-		super();
-		this.statusElement = DOM.$('div');
-		this.statusElement.style.display = 'none';
-
-		this._register(extensionManagementService.onInstallExtension(e => this.onInstallingExtension(e)));
-		this._register(extensionManagementService.onDidInstallExtension(e => this.onDidInstallExtension(e)));
-	}
-
-	render(parent: HTMLElement): IDisposable {
-		parent.appendChild(this.statusElement);
-		return toDisposable(() => this.dispose());
-	}
-
-	private onInstallingExtension(e: InstallExtensionEvent): void {
-		this.statusElement.style.display = 'block';
-		this.installingExtensions.push(getIdFromLocalExtensionId(e.identifier.id));
-
-		if (this.installingExtensions.length === 1) {
-			this.statusElement.textContent = localize('installingExtension', "Installing {0}", this.installingExtensions[0]);
-		} else {
-			this.statusElement.textContent = localize('installingExtensions', "Installing {0} extensions", this.installingExtensions.length);
-		}
-	}
-
-	private onDidInstallExtension(e: DidInstallExtensionEvent): void {
-		const index = this.installingExtensions.indexOf(getIdFromLocalExtensionId(e.identifier.id));
-		if (index !== -1) {
-			this.installingExtensions.splice(index, 1);
-			if (this.installingExtensions.length === 0) {
-				this.statusElement.textContent = '';
-				this.statusElement.style.display = 'none';
-			} else if (this.installingExtensions.length === 1) {
-				this.statusElement.textContent = localize('installingExtension', "Installing {0}", this.installingExtensions[0]);
-			} else {
-				this.statusElement.textContent = localize('installingExtensions', "Installing {0} extensions", this.installingExtensions.length);
-			}
-
-		}
-	}
-
-}
\ No newline at end of file
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 52a5da3d7a4..c5e6add7d77 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts
@@ -43,8 +43,6 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { RuntimeExtensionsEditor, RuntimeExtensionsInput, ShowRuntimeExtensionsAction, IExtensionHostProfileService } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor';
 import { EditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorInputExtensions } from 'vs/workbench/common/editor';
 import { ExtensionHostProfileService } from 'vs/workbench/parts/extensions/electron-browser/extensionProfileService';
-import { IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { InstallingStatusItem } from 'vs/workbench/parts/extensions/browser/extensionsStatus';
 
 // Singletons
 registerSingleton(IExtensionGalleryService, ExtensionGalleryService);
@@ -224,8 +222,4 @@ CommandsRegistry.registerCommand('_extensions.manage', (accessor: ServicesAccess
 	if (extension.length === 1) {
 		extensionService.open(extension[0]).done(null, errors.onUnexpectedError);
 	}
-});
-
-
-let statusbarRegistry = Registry.as(StatusbarExtensions.Statusbar);
-statusbarRegistry.registerStatusbarItem(new StatusbarItemDescriptor(InstallingStatusItem, StatusbarAlignment.LEFT, 50 /* Medium Priority */));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index 2c9ffe5c97f..aa3991b96ba 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -35,6 +35,7 @@ import { IURLService } from 'vs/platform/url/common/url';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import product from 'vs/platform/node/product';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
 
 interface IExtensionStateProvider {
 	(extension: Extension): ExtensionState;
@@ -345,7 +346,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		@IURLService urlService: IURLService,
 		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService,
 		@IWindowService private windowService: IWindowService,
-		@ILogService private logService: ILogService
+		@ILogService private logService: ILogService,
+		@IProgressService2 private progressService: IProgressService2
 	) {
 		this.stateProvider = ext => this.getExtensionState(ext);
 
@@ -536,7 +538,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 
 	install(extension: string | IExtension): TPromise {
 		if (typeof extension === 'string') {
-			return this.extensionService.install(extension);
+			return this.progressService.withProgress({
+				location: ProgressLocation.Window,
+				title: nls.localize('installingExtension', 'Installing extension from VSIX...'),
+				tooltip: `${extension}`
+			}, () => this.extensionService.install(extension));
 		}
 
 		if (!(extension instanceof Extension)) {

From a010ff7484a7ab7c8bfb5b327518cd06837f6ce2 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Thu, 18 Jan 2018 13:03:06 +0100
Subject: [PATCH 374/710] Add TextModel.createSnapshot (#32503)

---
 src/vs/editor/common/model.ts                 | 10 ++++
 .../model/linesTextBuffer/linesTextBuffer.ts  | 44 +++++++++++++++
 src/vs/editor/common/model/textModel.ts       | 48 +++++++++++++++-
 .../test/common/model/textModel.test.ts       | 56 +++++++++++++++++++
 src/vs/platform/files/common/files.ts         |  9 +++
 5 files changed, 166 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index 6c208408ba3..a84ce2a5bca 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -14,6 +14,7 @@ import { Range, IRange } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { ModelRawContentChangedEvent, IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelOptionsChangedEvent, IModelLanguageConfigurationChangedEvent, IModelTokensChangedEvent, IModelContentChange } from 'vs/editor/common/model/textModelEvents';
 import { ThemeColor } from 'vs/platform/theme/common/themeService';
+import { ITextSnapshot } from 'vs/platform/files/common/files';
 
 /**
  * Vertical Lane in the overview ruler of the editor.
@@ -499,6 +500,14 @@ export interface ITextModel {
 	 */
 	getValue(eol?: EndOfLinePreference, preserveBOM?: boolean): string;
 
+	/**
+	 * Get the text stored in this model.
+	 * @param preserverBOM Preserve a BOM character if it was detected when the model was constructed.
+	 * @return The text snapshot (it is safe to consume it asynchronously).
+	 * @internal
+	 */
+	createSnapshot(preserveBOM?: boolean): ITextSnapshot;
+
 	/**
 	 * Get the length of the text stored in this model.
 	 */
@@ -1078,6 +1087,7 @@ export interface ITextBuffer {
 	getRangeAt(offset: number, length: number): Range;
 
 	getValueInRange(range: Range, eol: EndOfLinePreference): string;
+	createSnapshot(preserveBOM: boolean): ITextSnapshot;
 	getValueLengthInRange(range: Range, eol: EndOfLinePreference): number;
 	getLength(): number;
 	getLineCount(): number;
diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
index af20bfb5ade..3121969026a 100644
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
+++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
@@ -10,6 +10,7 @@ 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;
@@ -48,6 +49,45 @@ export interface ITextSource {
 	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[];
@@ -176,6 +216,10 @@ export class LinesTextBuffer implements ITextBuffer {
 		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;
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index d597c795dcb..d0d5cd7d1fd 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -32,7 +32,7 @@ import { guessIndentation } from 'vs/editor/common/model/indentationGuesser';
 import { EDITOR_MODEL_DEFAULTS } from 'vs/editor/common/config/editorOptions';
 import { TextModelSearch, SearchParams } from 'vs/editor/common/model/textModelSearch';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IStringStream } from 'vs/platform/files/common/files';
+import { IStringStream, ITextSnapshot } from 'vs/platform/files/common/files';
 import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 
 // Here is the master switch for the text buffer implementation:
@@ -96,6 +96,48 @@ function singleLetter(result: number): string {
 const LIMIT_FIND_COUNT = 999;
 export const LONG_LINE_BOUNDARY = 10000;
 
+class TextModelSnapshot implements ITextSnapshot {
+
+	private readonly _source: ITextSnapshot;
+	private _eos: boolean;
+
+	constructor(source: ITextSnapshot) {
+		this._source = source;
+		this._eos = false;
+	}
+
+	public read(): string {
+		if (this._eos) {
+			return null;
+		}
+
+		let result: string[] = [], resultCnt = 0, resultLength = 0;
+
+		do {
+			let tmp = this._source.read();
+
+			if (tmp === null) {
+				// end-of-stream
+				this._eos = true;
+				if (resultCnt === 0) {
+					return null;
+				} else {
+					return result.join('');
+				}
+			}
+
+			if (tmp.length > 0) {
+				result[resultCnt++] = tmp;
+				resultLength += tmp.length;
+			}
+
+			if (resultLength >= 64 * 1024) {
+				return result.join('');
+			}
+		} while (true);
+	}
+}
+
 export class TextModel extends Disposable implements model.ITextModel {
 
 	private static readonly MODEL_SYNC_LIMIT = 50 * 1024 * 1024; // 50 MB
@@ -665,6 +707,10 @@ export class TextModel extends Disposable implements model.ITextModel {
 		return fullModelValue;
 	}
 
+	public createSnapshot(preserveBOM: boolean = false): ITextSnapshot {
+		return new TextModelSnapshot(this._buffer.createSnapshot(preserveBOM));
+	}
+
 	public getValueLength(eol?: model.EndOfLinePreference, preserveBOM: boolean = false): number {
 		this._assertNotDisposed();
 		const fullModelRange = this.getFullModelRange();
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index 0994bbe7c32..be2fd30bd13 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -9,6 +9,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
+import { UTF8_BOM_CHARACTER } from 'vs/base/common/strings';
 
 function testGuessIndentation(defaultInsertSpaces: boolean, defaultTabSize: number, expectedInsertSpaces: boolean, expectedTabSize: number, text: string[], msg?: string): void {
 	var m = TextModel.createFromString(
@@ -852,3 +853,58 @@ suite('TextModel.mightContainRTL', () => {
 	});
 
 });
+
+suite('TextModel.createSnapshot', () => {
+
+	test('empty file', () => {
+		let model = TextModel.createFromString('');
+		let snapshot = model.createSnapshot();
+		assert.equal(snapshot.read(), null);
+		model.dispose();
+	});
+
+	test('file with BOM', () => {
+		let model = TextModel.createFromString(UTF8_BOM_CHARACTER + 'Hello');
+		assert.equal(model.getLineContent(1), 'Hello');
+		let snapshot = model.createSnapshot(true);
+		assert.equal(snapshot.read(), UTF8_BOM_CHARACTER + 'Hello');
+		assert.equal(snapshot.read(), null);
+		model.dispose();
+	});
+
+	test('regular file', () => {
+		let model = TextModel.createFromString('My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
+		let snapshot = model.createSnapshot();
+		assert.equal(snapshot.read(), 'My First Line\n\t\tMy Second Line\n    Third Line\n\n1');
+		assert.equal(snapshot.read(), null);
+		model.dispose();
+	});
+
+	test('large file', () => {
+		let lines: string[] = [];
+		for (let i = 0; i < 1000; i++) {
+			lines[i] = 'Just some text that is a bit long such that it can consume some memory';
+		}
+		const text = lines.join('\n');
+
+		let model = TextModel.createFromString(text);
+		let snapshot = model.createSnapshot();
+		let actual = '';
+
+		// 70999 length => 2 read calls are necessary
+		let tmp1 = snapshot.read();
+		assert.ok(tmp1);
+		actual += tmp1;
+
+		let tmp2 = snapshot.read();
+		assert.ok(tmp2);
+		actual += tmp2;
+
+		assert.equal(snapshot.read(), null);
+
+		assert.equal(actual, text);
+
+		model.dispose();
+	});
+
+});
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index ef95e1af1ec..af89c431ab6 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -459,6 +459,15 @@ export interface IStringStream {
 	on(event: string, callback: any): void;
 }
 
+/**
+ * Text snapshot that works like an iterator.
+ * Will try to return chunks of roughly ~64KB size.
+ * Will return null when finished.
+ */
+export interface ITextSnapshot {
+	read(): string;
+}
+
 /**
  * Streamable content and meta information of a file.
  */

From 67051d019ce1f84a926842137235b1a6a55a887c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Thu, 18 Jan 2018 13:41:45 +0100
Subject: [PATCH 375/710] log some localStorage perf counters (for #18439)

---
 .../platform/storage/common/storageService.ts |  3 ++
 src/vs/workbench/electron-browser/main.ts     | 14 +++++--
 src/vs/workbench/electron-browser/shell.ts    | 38 +++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/storage/common/storageService.ts b/src/vs/platform/storage/common/storageService.ts
index f891309651f..7cf9aa4f4ba 100644
--- a/src/vs/platform/storage/common/storageService.ts
+++ b/src/vs/platform/storage/common/storageService.ts
@@ -8,6 +8,7 @@ import types = require('vs/base/common/types');
 import errors = require('vs/base/common/errors');
 import strings = require('vs/base/common/strings');
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+import * as perf from 'vs/base/common/performance';
 
 // Browser localStorage interface
 export interface IStorage {
@@ -89,7 +90,9 @@ export class StorageService implements IStorageService {
 	private cleanupWorkspaceScope(workspaceUid: number): void {
 
 		// Get stored identifier from storage
+		perf.mark('willReadWorkspaceIdentifier');
 		const id = this.getInteger(StorageService.WORKSPACE_IDENTIFIER, StorageScope.WORKSPACE);
+		perf.mark('didReadWorkspaceIdentifier');
 
 		// If identifier differs, assume the workspace got recreated and thus clean all storage for this workspace
 		if (types.isNumber(id) && workspaceUid !== id) {
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 9e75b4e4cfa..ca5e0b5057d 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -31,7 +31,7 @@ import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/commo
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { StorageService, inMemoryLocalStorageInstance } from 'vs/platform/storage/common/storageService';
+import { StorageService, inMemoryLocalStorageInstance, IStorage } from 'vs/platform/storage/common/storageService';
 import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
 import { webFrame } from 'electron';
 import { UpdateChannelClient } from 'vs/platform/update/common/updateIpc';
@@ -82,7 +82,6 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise {
 	// Since the configuration service is one of the core services that is used in so many places, we initialize it
 	// right before startup of the workbench shell to have its data ready for consumers
 	return createAndInitializeWorkspaceService(configuration, environmentService).then(workspaceService => {
-
 		const timerService = new TimerService((window).MonacoEnvironment.timers as IInitData, workspaceService.getWorkbenchState() === WorkbenchState.EMPTY);
 		const storageService = createStorageService(workspaceService, environmentService);
 
@@ -185,7 +184,16 @@ function createStorageService(workspaceService: IWorkspaceContextService, enviro
 	}
 
 	const disableStorage = !!environmentService.extensionTestsPath; // never keep any state when running extension tests!
-	const storage = disableStorage ? inMemoryLocalStorageInstance : window.localStorage;
+
+	let storage: IStorage;
+	if (disableStorage) {
+		storage = inMemoryLocalStorageInstance;
+	} else {
+		// TODO@Ben remove me after a while
+		perf.mark('willAccessLocalStorage');
+		storage = window.localStorage;
+		perf.mark('didAccessLocalStorage');
+	}
 
 	return new StorageService(storage, storage, workspaceId, secondaryWorkspaceId);
 }
diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts
index 04cd7a48b26..cc86097415f 100644
--- a/src/vs/workbench/electron-browser/shell.ts
+++ b/src/vs/workbench/electron-browser/shell.ts
@@ -87,6 +87,8 @@ import { IBroadcastService, BroadcastService } from 'vs/platform/broadcast/elect
 import { HashService } from 'vs/workbench/services/hash/node/hashService';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { ILogService } from 'vs/platform/log/common/log';
+import { stat } from 'fs';
+import { join } from 'path';
 
 /**
  * Services that we require for the Shell
@@ -206,6 +208,11 @@ export class WorkbenchShell {
 						}
 					}
 				});
+
+				// localStorage metrics (TODO@Ben remove me later)
+				if (!this.environmentService.extensionTestsPath && this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
+					this.logLocalStorageMetrics();
+				}
 			});
 
 			return workbench;
@@ -274,6 +281,37 @@ export class WorkbenchShell {
 		});
 	}
 
+	private logLocalStorageMetrics(): void {
+		perf.mark('willReadLocalStorage');
+		if (!this.storageService.getBoolean('localStorageMetricsSent')) {
+			perf.mark('didReadLocalStorage');
+
+			perf.mark('willWriteLocalStorage');
+			this.storageService.store('localStorageMetricsSent', true);
+
+			stat(join(this.environmentService.userDataPath, 'Local Storage', 'file__0.localstorage'), (error, stat) => {
+				/* __GDPR__
+					"localStorageMetrics" : {
+						"accessTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"firstReadTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"subsequentReadTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"writeTime" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"keys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+						"size": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+				*/
+				this.telemetryService.publicLog('localStorageMetrics', {
+					'accessTime': perf.getDuration('willAccessLocalStorage', 'didAccessLocalStorage'),
+					'firstReadTime': perf.getDuration('willReadWorkspaceIdentifier', 'didReadWorkspaceIdentifier'),
+					'subsequentReadTime': perf.getDuration('willReadLocalStorage', 'didReadLocalStorage'),
+					'writeTime': perf.getDuration('willWriteLocalStorage', 'willComputeLocalStorageSize'),
+					'keys': window.localStorage.length,
+					'size': stat ? stat.size : -1
+				});
+			});
+		}
+	}
+
 	private initServiceCollection(container: HTMLElement): [IInstantiationService, ServiceCollection] {
 		const serviceCollection = new ServiceCollection();
 		serviceCollection.set(IWorkspaceContextService, this.contextService);

From 011c4f9b15c3d69e09377b64abebdffe150e71cd Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Thu, 18 Jan 2018 14:56:13 +0100
Subject: [PATCH 376/710] update inno updater, selectively launch code after
 update

---
 build/win32/code.iss         |  39 ++++++++++++++++++++++-------------
 build/win32/inno_updater.exe | Bin 178176 -> 180224 bytes
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/build/win32/code.iss b/build/win32/code.iss
index ed747315c63..7e8326e4313 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -47,11 +47,11 @@ Name: "simplifiedChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh
 Name: "traditionalChinese"; MessagesFile: "{#RepoDir}\build\win32\i18n\Default.zh-tw.isl,{#RepoDir}\build\win32\i18n\messages.zh-tw.isl" {#LocalizedLanguageFile("cht")}
 
 [InstallDelete]
-Type: filesandordirs; Name: "{app}\resources\app\out"
-Type: filesandordirs; Name: "{app}\resources\app\plugins"
-Type: filesandordirs; Name: "{app}\resources\app\extensions"
-Type: filesandordirs; Name: "{app}\resources\app\node_modules"
-Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"
+Type: filesandordirs; Name: "{app}\resources\app\out"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\plugins"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\extensions"; Check: IsNotUpdate
+Type: filesandordirs; Name: "{app}\resources\app\node_modules"; Check: IsNotUpdate
+Type: files; Name: "{app}\resources\app\Credits_45.0.2454.85.html"; Check: IsNotUpdate
 
 [UninstallDelete]
 Type: filesandordirs; Name: "{app}\_"
@@ -76,7 +76,7 @@ Name: "{commondesktop}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; Tasks: quicklaunchicon; AppUserModelID: "{#AppUserId}"
 
 [Run]
-Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Tasks: runcode; Flags: nowait postinstall; Check: WizardSilent
+Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Tasks: runcode; Flags: nowait postinstall; Check: ShouldRunAfterUpdate
 Filename: "{app}\{#ExeBasename}.exe"; Description: "{cm:LaunchProgram,{#NameLong}}"; Flags: nowait postinstall; Check: WizardNotSilent
 
 [Registry]
@@ -963,7 +963,23 @@ end;
 // Updates
 function IsUpdate(): Boolean;
 begin
-  Result := ExpandConstant('{param:update|false}') = 'true';
+  Result := ExpandConstant('{param:update|false}') <> 'false';
+end;
+
+function IsNotUpdate(): Boolean;
+begin
+  Result := not IsUpdate();
+end;
+
+// VS Code will create a flag file before the update starts (/update=C:\foo\bar)
+// - if the file exists at this point, the user quit Code before the update finished, so don't start Code after update
+// - otherwise, the user has accepted to apply the update and Code should start
+function ShouldRunAfterUpdate(): Boolean;
+begin
+  if IsUpdate() then
+    Result := not FileExists(ExpandConstant('{param:update}'))
+  else
+    Result := False;
 end;
 
 function GetAppMutex(Value: string): string;
@@ -986,7 +1002,7 @@ procedure CurStepChanged(CurStep: TSetupStep);
 var
   UpdateResultCode: Integer;
 begin
-  if (CurStep = ssPostInstall) and (ExpandConstant('{param:update|false}') = 'true') then
+  if IsUpdate() and (CurStep = ssPostInstall) then
   begin
     CreateMutex('{#AppMutex}-ready');
 
@@ -996,12 +1012,7 @@ begin
       Sleep(1000);
     end;
 
-    Sleep(1000);
-
-    if Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('--apply-update _ "{app}\unins000.dat"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode) then
-      Log('Update applied successfully!')
-    else
-      Log('Failed to apply update!');
+    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('--apply-update _ "{app}\unins000.dat"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
   end;
 end;
 
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index 3dd7e34c20ba4a75f6dd9b6f593ec183293658fc..d82b1430c6407c1bf6a21418629564ddd599956e 100644
GIT binary patch
delta 50555
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
    _^WXMXCW-uUssGnLfudb3yA@%)fJ%&sWmCHY_U
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

delta 48210
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�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	NZ?55h^5Y1S61h(V-22$#)hVb^rOrU#}sbu
z8{JLrW_OD_p*+1jvplAc6X`U?e>&6mNz-d8><7=O?9nxk@fBdZ-c)f@@N7Iupf0Eb&1R_V(Wn%cL_3;
zxjpX2@<4g8ytO>CBB3I^BD12jGO{Y6D!s~DWvVsTdTX0%1GUYy!P*d-YC4jB#DbB`
z!8itv1Tl{Ox
Date: Thu, 18 Jan 2018 11:43:03 +0100
Subject: [PATCH 377/710] node-debug@1.20.3

---
 build/gulpfile.vscode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 78a09a2db01..efa5e9cde74 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -45,7 +45,7 @@ const nodeModules = ['electron', 'original-fs']
 // Build
 
 const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.20.2' },
+	{ name: 'ms-vscode.node-debug', version: '1.20.3' },
 	{ name: 'ms-vscode.node-debug2', version: '1.20.0' }
 ];
 

From 8062caad7e6b50ff07641d5c7ccdc890dcada48c Mon Sep 17 00:00:00 2001
From: isidor 
Date: Thu, 18 Jan 2018 15:43:32 +0100
Subject: [PATCH 378/710] fixes #41796

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

diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index c1222e825b2..e3eed8c4310 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -194,7 +194,7 @@ export class SuggestController implements IEditorContribution {
 	}
 
 	protected _onDidSelectItem(event: ISelectedSuggestion): void {
-		if (!event.item) {
+		if (!event || !event.item) {
 			this._model.cancel();
 			return;
 		}

From 2404eeaf2e7b35c7ccf13ce0320959d5ba57b9a7 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Thu, 18 Jan 2018 15:52:50 +0100
Subject: [PATCH 379/710] copy/print factory times as csv, #41712

---
 .../performance.contribution.ts               |   1 +
 .../performance/electron-browser/stats.ts     | 119 ++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 src/vs/workbench/parts/performance/electron-browser/stats.ts

diff --git a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
index 4850d22984f..dcff24f801f 100644
--- a/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/performance.contribution.ts
@@ -6,3 +6,4 @@
 'use strict';
 
 import './startupProfiler';
+import './stats';
diff --git a/src/vs/workbench/parts/performance/electron-browser/stats.ts b/src/vs/workbench/parts/performance/electron-browser/stats.ts
new file mode 100644
index 00000000000..252eab924dc
--- /dev/null
+++ b/src/vs/workbench/parts/performance/electron-browser/stats.ts
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+
+
+interface IRequire {
+	(...a: any[]): any;
+	getStats(): ILoaderEvent[];
+}
+
+declare var require: IRequire;
+
+/* Copied from loader.ts */
+enum LoaderEventType {
+	LoaderAvailable = 1,
+
+	BeginLoadingScript = 10,
+	EndLoadingScriptOK = 11,
+	EndLoadingScriptError = 12,
+
+	BeginInvokeFactory = 21,
+	EndInvokeFactory = 22,
+
+	NodeBeginEvaluatingScript = 31,
+	NodeEndEvaluatingScript = 32,
+
+	NodeBeginNativeRequire = 33,
+	NodeEndNativeRequire = 34
+}
+
+interface ILoaderEvent {
+	type: LoaderEventType;
+	timestamp: number;
+	detail: string;
+}
+
+class Tick {
+
+	public readonly duration: number;
+	public readonly detail: string;
+
+	constructor(public readonly start: ILoaderEvent, public readonly end: ILoaderEvent) {
+		console.assert(start.detail === end.detail);
+
+		this.duration = this.end.timestamp - this.start.timestamp;
+		this.detail = start.detail;
+	}
+
+	static compareUsingStartTimestamp(a: Tick, b: Tick): number {
+		if (a.start.timestamp < b.start.timestamp) {
+			return -1;
+		} else if (a.start.timestamp > b.start.timestamp) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+}
+
+function getStats(): Map {
+
+	const stats = require.getStats().slice(0).sort((a: ILoaderEvent, b: ILoaderEvent) => {
+		if (a.detail < b.detail) {
+			return -1;
+		} else if (a.detail > b.detail) {
+			return 1;
+		} else if (a.type < b.type) {
+			return -1;
+		} else if (a.type > b.type) {
+			return 1;
+		} else {
+			return 0;
+		}
+	});
+
+	const ticks = new Map();
+	ticks.set(LoaderEventType.BeginLoadingScript, []);
+	ticks.set(LoaderEventType.BeginInvokeFactory, []);
+	ticks.set(LoaderEventType.NodeBeginEvaluatingScript, []);
+	ticks.set(LoaderEventType.NodeBeginNativeRequire, []);
+
+	for (let i = 1; i < stats.length - 1; i++) {
+		const stat = stats[i];
+		const nextStat = stats[i + 1];
+
+		if (nextStat.type - stat.type > 2) {
+			//bad?!
+			break;
+		}
+
+		i += 1;
+		ticks.get(stat.type).push(new Tick(stat, nextStat));
+	}
+
+	ticks.get(LoaderEventType.BeginLoadingScript).sort(Tick.compareUsingStartTimestamp);
+	ticks.get(LoaderEventType.BeginInvokeFactory).sort(Tick.compareUsingStartTimestamp);
+	ticks.get(LoaderEventType.NodeBeginEvaluatingScript).sort(Tick.compareUsingStartTimestamp);
+	ticks.get(LoaderEventType.NodeBeginNativeRequire).sort(Tick.compareUsingStartTimestamp);
+
+	return ticks;
+}
+
+CommandsRegistry.registerCommand('dev.stats.loader', accessor => {
+
+	const clipboard = accessor.get(IClipboardService);
+
+	let value = `Name\tDuration\n`;
+	for (let tick of getStats().get(LoaderEventType.BeginInvokeFactory)) {
+		value += `${tick.detail}\t${tick.duration.toPrecision(2)}\n`;
+	}
+	console.log(value);
+	clipboard.writeText(value);
+});

From 12b19739cb6a149f4b3c155cfca9d271b981bef6 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Thu, 18 Jan 2018 16:18:25 +0100
Subject: [PATCH 380/710] publish windows builds as supporting fast updates

---
 build/tfs/common/publish.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts
index e4cbdc80f0e..8e25b630c3e 100644
--- a/build/tfs/common/publish.ts
+++ b/build/tfs/common/publish.ts
@@ -69,6 +69,7 @@ interface Asset {
 	hash: string;
 	sha256hash: string;
 	size: number;
+	supportsFastUpdate?: boolean;
 }
 
 function createOrUpdate(commit: string, quality: string, platform: string, type: string, release: NewDocument, asset: Asset, isUpdate: boolean): Promise {
@@ -234,6 +235,11 @@ async function publish(commit: string, quality: string, platform: string, type:
 		size
 	};
 
+	// Remove this if we ever need to rollback fast updates for windows
+	if (/win32/.test(platform)) {
+		asset.supportsFastUpdate = true;
+	}
+
 	const release = {
 		id: commit,
 		timestamp: (new Date()).getTime(),

From f3a9380c481f8ce218bebe9a67125523a1c42de7 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Thu, 18 Jan 2018 16:20:28 +0100
Subject: [PATCH 381/710] reduce hacks in getMultiSelectedEditorContexts

---
 .../browser/parts/editor/editorCommands.ts    | 12 ++++----
 .../parts/files/common/explorerModel.ts       | 14 +++++-----
 .../electron-browser/views/openEditorsView.ts | 28 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index d8c491c64e7..42d2ed951c4 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -13,7 +13,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IEditor, Position, POSITIONS, Direction, IEditorInput } from 'vs/platform/editor/common/editor';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
-import { EditorStacksModel } from 'vs/workbench/common/editor/editorStacksModel';
+import { EditorStacksModel, EditorGroup } from 'vs/workbench/common/editor/editorStacksModel';
 import { KeyMod, KeyCode, KeyChord } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
 import URI from 'vs/base/common/uri';
@@ -496,21 +496,21 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService
 }
 
 export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier, listService: IListService): IEditorIdentifier[] {
-	// TODO@Isidor this method is not nice since it assumes it is working on open editors view and maps elements on top of that
 	const list = listService.lastFocusedList;
 	// Mapping for open editors view
-	const elementToContext = element => element && element.editorGroup && element.editorInput ? { group: element.editorGroup, editor: element.editorInput } : { group: element, editor: undefined };
+	const isEditorIdentifier = (element: any) => 'group' in element && 'editor' in element;
+	const elementToContext = (element: IEditorIdentifier | EditorGroup) => element instanceof EditorGroup ? { group: element, editor: undefined } : element;
 
 	if (list instanceof List && list.isDOMFocused()) {
 		const selection = list.getSelectedElements();
 		const focus = list.getFocusedElements();
 		// Only respect selection if it contains focused element
 		if (focus.length && selection && selection.indexOf(focus[0]) >= 0) {
-			return list.getSelectedElements().map(elementToContext);
+			return list.getSelectedElements().filter(e => e instanceof EditorGroup || isEditorIdentifier(e)).map(elementToContext);
 		}
 
-		if (focus) {
-			return focus.map(elementToContext);
+		if (focus.length) {
+			return focus.filter(e => e instanceof EditorGroup || isEditorIdentifier(e)).map(elementToContext);
 		}
 	}
 
diff --git a/src/vs/workbench/parts/files/common/explorerModel.ts b/src/vs/workbench/parts/files/common/explorerModel.ts
index 14a2a7a7489..1b5c744e122 100644
--- a/src/vs/workbench/parts/files/common/explorerModel.ts
+++ b/src/vs/workbench/parts/files/common/explorerModel.ts
@@ -12,7 +12,7 @@ import { isLinux } from 'vs/base/common/platform';
 import { IFileStat, isParent } from 'vs/platform/files/common/files';
 import { IEditorInput } from 'vs/platform/editor/common/editor';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { IEditorGroup, toResource } from 'vs/workbench/common/editor';
+import { IEditorGroup, toResource, IEditorIdentifier } from 'vs/workbench/common/editor';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { getPathLabel } from 'vs/base/common/labels';
 
@@ -369,18 +369,18 @@ export class NewStatPlaceholder extends FileStat {
 	}
 }
 
-export class OpenEditor {
+export class OpenEditor implements IEditorIdentifier {
 
-	constructor(private editor: IEditorInput, private group: IEditorGroup) {
+	constructor(private _editor: IEditorInput, private _group: IEditorGroup) {
 		// noop
 	}
 
-	public get editorInput() {
-		return this.editor;
+	public get editor() {
+		return this._editor;
 	}
 
-	public get editorGroup() {
-		return this.group;
+	public get group() {
+		return this._group;
 	}
 
 	public getId(): string {
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index fb55f5d1ce7..fa163df1bb8 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -276,8 +276,8 @@ export class OpenEditorsView extends ViewsViewletPanel {
 		}
 
 		if (event.browserEvent && event.browserEvent.button === 1 /* Middle Button */) {
-			const position = this.model.positionOfGroup(element.editorGroup);
-			this.editorService.closeEditor(position, element.editorInput).done(null, errors.onUnexpectedError);
+			const position = this.model.positionOfGroup(element.group);
+			this.editorService.closeEditor(position, element.editor).done(null, errors.onUnexpectedError);
 		} else {
 			this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: event.browserEvent.altKey });
 		}
@@ -292,12 +292,12 @@ export class OpenEditorsView extends ViewsViewletPanel {
 				}
 			*/
 			this.telemetryService.publicLog('workbenchActionExecuted', { id: 'workbench.files.openFile', from: 'openEditors' });
-			let position = this.model.positionOfGroup(element.editorGroup);
+			let position = this.model.positionOfGroup(element.group);
 			if (options.sideBySide && position !== Position.THREE) {
 				position++;
 			}
 			this.editorGroupService.activateGroup(this.model.groupAt(position));
-			this.editorService.openEditor(element.editorInput, options, position)
+			this.editorService.openEditor(element.editor, options, position)
 				.done(() => this.editorGroupService.activateGroup(this.model.groupAt(position)), errors.onUnexpectedError);
 		}
 	}
@@ -308,10 +308,10 @@ export class OpenEditorsView extends ViewsViewletPanel {
 			getAnchor: () => e.anchor,
 			getActions: () => {
 				const actions = [];
-				fillInActions(this.contributedContextMenu, { shouldForwardArgs: true, arg: element instanceof OpenEditor ? element.editorInput.getResource() : {} }, actions, this.contextMenuService);
+				fillInActions(this.contributedContextMenu, { shouldForwardArgs: true, arg: element instanceof OpenEditor ? element.editor.getResource() : {} }, actions, this.contextMenuService);
 				return TPromise.as(actions);
 			},
-			getActionsContext: () => element instanceof OpenEditor ? { group: element.editorGroup, editor: element.editorInput } : { group: element }
+			getActionsContext: () => element instanceof OpenEditor ? { group: element.group, editor: element.editor } : { group: element }
 		});
 	}
 
@@ -482,7 +482,7 @@ class EditorGroupRenderer implements IRenderer
-					this.editorGroupService.moveEditor(oe.editorInput, model.positionOfGroup(oe.editorGroup), positionOfTargetGroup, { preserveFocus: true }));
+					this.editorGroupService.moveEditor(oe.editor, model.positionOfGroup(oe.group), positionOfTargetGroup, { preserveFocus: true }));
 				this.editorGroupService.activateGroup(positionOfTargetGroup);
 			}
 		}));
@@ -539,7 +539,7 @@ class OpenEditorRenderer implements IRenderer document.body.removeChild(dragImage), 0);
@@ -547,7 +547,7 @@ class OpenEditorRenderer implements IRendererthis.getSelectedElements().filter(e => e instanceof OpenEditor);
 			OpenEditorRenderer.DRAGGED_OPEN_EDITORS = dragged;
 
-			if (editorTemplate.openEditor && editorTemplate.openEditor.editorInput) {
+			if (editorTemplate.openEditor && editorTemplate.openEditor.editor) {
 				// enables dropping editor resource path into text controls
 				e.dataTransfer.setData(DataTransfers.TEXT, dragged.map(d => d.getResource()).map(resource => resource.scheme === 'file' ? getPathLabel(resource) : resource.toString()).join('\n'));
 
@@ -574,11 +574,11 @@ class OpenEditorRenderer implements IRenderer
-					this.editorGroupService.moveEditor(oe.editorInput, model.positionOfGroup(oe.editorGroup), positionOfTargetGroup, { index, preserveFocus: true }));
+					this.editorGroupService.moveEditor(oe.editor, model.positionOfGroup(oe.group), positionOfTargetGroup, { index, preserveFocus: true }));
 				this.editorGroupService.activateGroup(positionOfTargetGroup);
 			}
 		}));
@@ -592,12 +592,12 @@ class OpenEditorRenderer implements IRenderer().explorer.decorations
 		});
-		templateData.actionBar.context = { group: editor.editorGroup, editor: editor.editorInput };
+		templateData.actionBar.context = { group: editor.group, editor: editor.editor };
 	}
 
 	disposeTemplate(templateData: IOpenEditorTemplateData): void {

From 7d343c6bdb8e281857795b88d9b582d37355343b Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Thu, 18 Jan 2018 16:42:52 +0100
Subject: [PATCH 382/710] state - persist pinned views/panels when they change

---
 .../browser/parts/activitybar/activitybarPart.ts     |  8 --------
 .../browser/parts/compositebar/compositeBar.ts       | 12 +++++++++++-
 src/vs/workbench/browser/parts/panel/panelPart.ts    |  8 --------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 9d52f097832..627be4bee34 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -217,12 +217,4 @@ export class ActivitybarPart extends Part {
 
 		super.dispose();
 	}
-
-	public shutdown(): void {
-		// Persist Hidden State
-		this.compositeBar.store();
-
-		// Pass to super
-		super.shutdown();
-	}
 }
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
index 3cd5c0e3e77..b08ad7ef369 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts
@@ -371,6 +371,7 @@ export class CompositeBar implements ICompositeBar {
 		const visibleComposites = this.getVisibleComposites();
 
 		let unpinPromise: TPromise;
+
 		// remove from pinned
 		const index = this.pinnedComposites.indexOf(compositeId);
 		this.pinnedComposites.splice(index, 1);
@@ -402,6 +403,9 @@ export class CompositeBar implements ICompositeBar {
 		unpinPromise.then(() => {
 			this.updateCompositeSwitcher();
 		});
+
+		// Persist
+		this.savePinnedComposites();
 	}
 
 	public isPinned(compositeId: string): boolean {
@@ -420,6 +424,9 @@ export class CompositeBar implements ICompositeBar {
 			if (update) {
 				this.updateCompositeSwitcher();
 			}
+
+			// Persist
+			this.savePinnedComposites();
 		});
 	}
 
@@ -449,6 +456,9 @@ export class CompositeBar implements ICompositeBar {
 		setTimeout(() => {
 			this.updateCompositeSwitcher();
 		}, 0);
+
+		// Persist
+		this.savePinnedComposites();
 	}
 
 	public layout(dimension: Dimension): void {
@@ -472,7 +482,7 @@ export class CompositeBar implements ICompositeBar {
 		this.updateCompositeSwitcher();
 	}
 
-	public store(): void {
+	private savePinnedComposites(): void {
 		this.storageService.store(this.options.storageId, JSON.stringify(this.pinnedComposites), StorageScope.GLOBAL);
 	}
 
diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts
index 17228613cdd..1162557713b 100644
--- a/src/vs/workbench/browser/parts/panel/panelPart.ts
+++ b/src/vs/workbench/browser/parts/panel/panelPart.ts
@@ -250,14 +250,6 @@ export class PanelPart extends CompositePart implements IPanelService {
 
 		return this.toolbarWidth.get(activePanel.getId());
 	}
-
-	public shutdown(): void {
-		// Persist Hidden State
-		this.compositeBar.store();
-
-		// Pass to super
-		super.shutdown();
-	}
 }
 
 registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {

From 439ca2e841847eeafa33023541c7524b92dad2bd Mon Sep 17 00:00:00 2001
From: isidor 
Date: Thu, 18 Jan 2018 16:56:08 +0100
Subject: [PATCH 383/710] debug: launch schema in workspace settings

---
 .../debug/electron-browser/debugConfigurationManager.ts  | 9 ++++-----
 .../services/configuration/common/configuration.ts       | 3 ++-
 .../configuration/common/configurationExtensionPoint.ts  | 8 +++++++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 3a779ea68b0..14329c56bf2 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -33,6 +33,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 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';
 
 // debuggers extension point
 export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint('debuggers', [], {
@@ -147,14 +148,12 @@ const breakpointsExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtens
 });
 
 // debug general schema
-
-export const schemaId = 'vscode://schemas/launch';
 const defaultCompound: ICompound = { name: 'Compound', configurations: [] };
 const schema: IJSONSchema = {
-	id: schemaId,
+	id: launchSchemaId,
 	type: 'object',
 	title: nls.localize('app.launch.json.title', "Launch"),
-	required: ['version', 'configurations'],
+	required: [],
 	default: { version: '0.2.0', configurations: [], compounds: [] },
 	properties: {
 		version: {
@@ -201,7 +200,7 @@ const schema: IJSONSchema = {
 };
 
 const jsonRegistry = Registry.as(JSONExtensions.JSONContribution);
-jsonRegistry.registerSchema(schemaId, schema);
+jsonRegistry.registerSchema(launchSchemaId, schema);
 const DEBUG_SELECTED_CONFIG_NAME_KEY = 'debug.selectedconfigname';
 const DEBUG_SELECTED_ROOT = 'debug.selectedroot';
 
diff --git a/src/vs/workbench/services/configuration/common/configuration.ts b/src/vs/workbench/services/configuration/common/configuration.ts
index 4ca66967670..3bdae770e7a 100644
--- a/src/vs/workbench/services/configuration/common/configuration.ts
+++ b/src/vs/workbench/services/configuration/common/configuration.ts
@@ -23,10 +23,11 @@ export const defaultSettingsSchemaId = 'vscode://schemas/settings/default';
 export const userSettingsSchemaId = 'vscode://schemas/settings/user';
 export const workspaceSettingsSchemaId = 'vscode://schemas/settings/workspace';
 export const folderSettingsSchemaId = 'vscode://schemas/settings/folder';
+export const launchSchemaId = 'vscode://schemas/launch';
 
 export const TASKS_CONFIGURATION_KEY = 'tasks';
 export const LAUNCH_CONFIGURATION_KEY = 'launch';
 
 export const WORKSPACE_STANDALONE_CONFIGURATIONS = Object.create(null);
 WORKSPACE_STANDALONE_CONFIGURATIONS[TASKS_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/tasks.json`;
-WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/launch.json`;
\ No newline at end of file
+WORKSPACE_STANDALONE_CONFIGURATIONS[LAUNCH_CONFIGURATION_KEY] = `${FOLDER_CONFIG_FOLDER_NAME}/launch.json`;
diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index bdd9c346c22..7386395fbc5 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -10,7 +10,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { ExtensionsRegistry, IExtensionPointUser } from 'vs/platform/extensions/common/extensionsRegistry';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, editorConfigurationSchemaId, IDefaultConfigurationExtension, validateProperty, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
-import { workspaceSettingsSchemaId } from 'vs/workbench/services/configuration/common/configuration';
+import { workspaceSettingsSchemaId, launchSchemaId } from 'vs/workbench/services/configuration/common/configuration';
 
 const configurationRegistry = Registry.as(Extensions.Configuration);
 
@@ -201,6 +201,12 @@ jsonRegistry.registerSchema('vscode://schemas/workspaceConfig', {
 			description: nls.localize('workspaceConfig.settings.description', "Workspace settings"),
 			$ref: workspaceSettingsSchemaId
 		},
+		'launch': {
+			type: 'object',
+			default: { configurations: [], compounds: [] },
+			description: nls.localize('workspaceConfig.launch.description', "Workspace launch configurations"),
+			$ref: launchSchemaId
+		},
 		'extensions': {
 			type: 'object',
 			default: {},

From 50ac47da3d9ba4351e3a32e0f54a71821a0ee5b0 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 16:28:33 +0100
Subject: [PATCH 384/710] Fix #41755

---
 .../common/extensionEnablementService.ts      |   18 +-
 .../common/extensionManagement.ts             |   13 +-
 .../common/extensionEnablementService.test.ts |  177 +--
 .../extensions/browser/extensionsActions.ts   |    8 +-
 .../parts/extensions/common/extensions.ts     |    3 +-
 .../electron-browser/extensionsUtils.ts       |    2 +-
 .../node/extensionsWorkbenchService.ts        |    2 +-
 .../extensionsActions.test.ts                 | 1206 +++++++++--------
 .../extensionsWorkbenchService.test.ts        |  439 +++---
 9 files changed, 1008 insertions(+), 860 deletions(-)

diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 1f475504c98..990894ef862 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { distinct, coalesce } from 'vs/base/common/arrays';
 import Event, { Emitter } from 'vs/base/common/event';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IExtensionManagementService, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState, ILocalExtension, isIExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { adoptToGalleryExtensionId, getIdFromLocalExtensionId, areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
@@ -77,13 +77,19 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 		return EnablementState.Enabled;
 	}
 
-	canChangeEnablement(): boolean {
-		return !this.environmentService.disableExtensions;
+	canChangeEnablement(extension: ILocalExtension): boolean {
+		return !this.environmentService.disableExtensions && !(extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length);
 	}
 
-	setEnablement(identifier: IExtensionIdentifier, newState: EnablementState): TPromise {
-		if (this.environmentService.disableExtensions) {
-			return TPromise.wrap(false);
+	setEnablement(arg: ILocalExtension | IExtensionIdentifier, newState: EnablementState): TPromise {
+		let identifier;
+		if (isIExtensionIdentifier(arg)) {
+			identifier = arg;
+		} else {
+			if (!this.canChangeEnablement(arg)) {
+				return TPromise.wrap(false);
+			}
+			identifier = { id: getIdFromLocalExtensionId(arg.identifier.id), uuid: arg.identifier.uuid };
 		}
 
 		const workspace = newState === EnablementState.WorkspaceDisabled || newState === EnablementState.WorkspaceEnabled;
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 288d9d42531..28f19aa05df 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -142,6 +142,13 @@ export interface IGalleryExtensionAssets {
 	repository: IGalleryExtensionAsset;
 }
 
+export function isIExtensionIdentifier(thing: any): thing is IExtensionIdentifier {
+	return thing
+		&& typeof thing === 'object'
+		&& typeof thing.id === 'string'
+		&& (!thing.uuid || typeof thing.uuid === 'string');
+}
+
 export interface IExtensionIdentifier {
 	id: string;
 	uuid?: string;
@@ -301,7 +308,7 @@ export interface IExtensionEnablementService {
 	/**
 	 * Returns `true` if the enablement can be changed.
 	 */
-	canChangeEnablement(): boolean;
+	canChangeEnablement(extension: ILocalExtension): boolean;
 
 	/**
 	 * Returns `true` if the given extension identifier is enabled.
@@ -317,6 +324,10 @@ export interface IExtensionEnablementService {
 	 *
 	 * Throws error if enablement is requested for workspace and there is no workspace
 	 */
+	setEnablement(extension: ILocalExtension, state: EnablementState): TPromise;
+	/**
+	 * TODO: @Sandy. Use setEnablement(extension: ILocalExtension, state: EnablementState): TPromise. Use one model for extension management and runtime
+	 */
 	setEnablement(identifier: IExtensionIdentifier, state: EnablementState): TPromise;
 
 	migrateToIdentifiers(installed: IExtensionIdentifier[]): void;
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index 93bfae02c16..4ccb6691229 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 } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IExtensionManagementService, IExtensionEnablementService, DidUninstallExtensionEvent, EnablementState, IExtensionContributions, ILocalExtension } 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';
@@ -39,7 +39,7 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
 	}
 
 	public reset(): TPromise {
-		return this.getDisabledExtensions().then(extensions => extensions.forEach(d => this.setEnablement(d, EnablementState.Enabled)));
+		return this.getDisabledExtensions().then(extensions => extensions.forEach(d => this.setEnablement(aLocalExtension(d.id), EnablementState.Enabled)));
 	}
 }
 
@@ -52,7 +52,7 @@ suite('ExtensionEnablementService Test', () => {
 
 	setup(() => {
 		instantiationService = new TestInstantiationService();
-		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event, });
+		instantiationService.stub(IExtensionManagementService, { onDidUninstallExtension: didUninstallEvent.event });
 		testObject = new TestExtensionEnablementService(instantiationService);
 	});
 
@@ -65,7 +65,7 @@ suite('ExtensionEnablementService Test', () => {
 	});
 
 	test('test when no extensions are disabled for workspace when there is no workspace', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => {
 				instantiationService.stub(IWorkspaceContextService, 'getWorkbenchState', WorkbenchState.EMPTY);
 				return testObject.getDisabledExtensions().then(extensions => assert.deepEqual([], extensions));
@@ -73,255 +73,268 @@ suite('ExtensionEnablementService Test', () => {
 	});
 
 	test('test disable an extension globally', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([{ id: 'pub.a' }], extensions));
 	});
 
 	test('test disable an extension globally should return truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(value => assert.ok(value));
 	});
 
 	test('test disable an extension globally triggers the change event', () => {
 		const target = sinon.spy();
 		testObject.onEnablementChanged(target);
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a' })));
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a', uuid: void 0 })));
 	});
 
 	test('test disable an extension globally again should return a falsy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(value => assert.ok(!value));
 	});
 
 	test('test state of globally disabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Disabled));
 	});
 
 	test('test state of globally enabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Enabled));
 	});
 
 	test('test disable an extension for workspace', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([{ id: 'pub.a' }], extensions));
 	});
 
 	test('test disable an extension for workspace returns a truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(value => assert.ok(value));
 	});
 
 	test('test disable an extension for workspace again should return a falsy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
 			.then(value => assert.ok(!value));
 	});
 
 	test('test state of workspace disabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.WorkspaceDisabled));
 	});
 
 	test('test state of workspace and globally disabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.WorkspaceDisabled));
 	});
 
 	test('test state of workspace enabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.WorkspaceEnabled));
 	});
 
 	test('test state of globally disabled and workspace enabled extension', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.WorkspaceEnabled));
 	});
 
 	test('test state of an extension when disabled for workspace from workspace enabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.WorkspaceDisabled));
 	});
 
 	test('test state of an extension when disabled globally from workspace enabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Disabled));
 	});
 
 	test('test state of an extension when disabled globally from workspace disabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Disabled));
 	});
 
 	test('test state of an extension when enabled globally from workspace enabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Enabled));
 	});
 
 	test('test state of an extension when enabled globally from workspace disabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(() => assert.equal(testObject.getEnablementState({ id: 'pub.a' }), EnablementState.Enabled));
 	});
 
 	test('test disable an extension for workspace and then globally', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([{ id: 'pub.a' }], extensions));
 	});
 
 	test('test disable an extension for workspace and then globally return a truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(value => assert.ok(value));
 	});
 
 	test('test disable an extension for workspace and then globally trigger the change event', () => {
 		const target = sinon.spy();
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => testObject.onEnablementChanged(target))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
-			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a' })));
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
+			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a', uuid: void 0 })));
 	});
 
 	test('test disable an extension globally and then for workspace', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([{ id: 'pub.a' }], extensions));
 	});
 
 	test('test disable an extension globally and then for workspace return a truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
 			.then(value => assert.ok(value));
 	});
 
 	test('test disable an extension globally and then for workspace triggers the change event', () => {
 		const target = sinon.spy();
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(() => testObject.onEnablementChanged(target))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled))
-			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a' })));
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled))
+			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a', uuid: void 0 })));
 	});
 
 	test('test disable an extension for workspace when there is no workspace throws error', (done) => {
 		instantiationService.stub(IWorkspaceContextService, 'getWorkbenchState', WorkbenchState.EMPTY);
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => assert.fail('should throw an error'), error => assert.ok(error))
 			.then(done, done);
 	});
 
 	test('test enable an extension globally', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([], extensions));
 	});
 
 	test('test enable an extension globally return truthy promise', (done) => {
-		testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(value => assert.ok(value))
 			.then(done, done);
 	});
 
 	test('test enable an extension globally triggers change event', (done) => {
 		const target = sinon.spy();
-		testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(() => testObject.onEnablementChanged(target))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
-			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a' })))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
+			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.a', uuid: void 0 })))
 			.then(done, done);
 	});
 
 	test('test enable an extension globally when already enabled return falsy promise', (done) => {
-		testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled)
+		testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled)
 			.then(value => assert.ok(!value))
 			.then(done, done);
 	});
 
 	test('test enable an extension for workspace', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([], extensions));
 	});
 
 	test('test enable an extension for workspace return truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
 			.then(value => assert.ok(value));
 	});
 
 	test('test enable an extension for workspace triggers change event', () => {
 		const target = sinon.spy();
-		return testObject.setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.b'), EnablementState.WorkspaceDisabled)
 			.then(() => testObject.onEnablementChanged(target))
-			.then(() => testObject.setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceEnabled))
-			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.b' })));
+			.then(() => testObject.setEnablement(aLocalExtension('pub.b'), EnablementState.WorkspaceEnabled))
+			.then(() => assert.ok(target.calledWithExactly({ id: 'pub.b', uuid: void 0 })));
 	});
 
 	test('test enable an extension for workspace when already enabled return truthy promise', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled)
 			.then(value => assert.ok(value));
 	});
 
 	test('test enable an extension for workspace when disabled in workspace and gloablly', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceEnabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceEnabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([], extensions));
 	});
 
 	test('test enable an extension globally when disabled in workspace and gloablly', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Enabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Enabled))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([], extensions));
 	});
 
 	test('test remove an extension from disablement list when uninstalled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled))
 			.then(() => didUninstallEvent.fire({ identifier: { id: 'pub.a-1.0.0' } }))
 			.then(() => testObject.getDisabledExtensions())
 			.then(extensions => assert.deepEqual([], extensions));
 	});
 
 	test('test isEnabled return false extension is disabled globally', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.Disabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.Disabled)
 			.then(() => assert.ok(!testObject.isEnabled({ id: 'pub.a' })));
 	});
 
 	test('test isEnabled return false extension is disabled in workspace', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
 			.then(() => assert.ok(!testObject.isEnabled({ id: 'pub.a' })));
 	});
 
 	test('test isEnabled return true extension is not disabled', () => {
-		return testObject.setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled)
-			.then(() => testObject.setEnablement({ id: 'pub.c' }, EnablementState.Disabled))
+		return testObject.setEnablement(aLocalExtension('pub.a'), EnablementState.WorkspaceDisabled)
+			.then(() => testObject.setEnablement(aLocalExtension('pub.c'), EnablementState.Disabled))
 			.then(() => assert.ok(testObject.isEnabled({ id: 'pub.b' })));
 	});
-});
\ No newline at end of file
+
+	test('test canChangeEnablement return false for language packs', () => {
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { locales: [{ locale: 'gr', path: 'somepath' }] })), false);
+	});
+});
+
+function aLocalExtension(id: string, contributes?: IExtensionContributions): ILocalExtension {
+	return Object.create({
+		identifier: { id },
+		manifest: {
+			contributes
+		}
+	});
+}
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index fa54bc803d7..159b42c26c9 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -437,7 +437,7 @@ export class EnableForWorkspaceAction extends Action implements IExtensionAction
 	private update(): void {
 		this.enabled = false;
 		if (this.extension) {
-			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extensionEnablementService.canChangeEnablement();
+			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 
@@ -475,7 +475,7 @@ export class EnableGloballyAction extends Action implements IExtensionAction {
 	private update(): void {
 		this.enabled = false;
 		if (this.extension) {
-			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extensionEnablementService.canChangeEnablement();
+			this.enabled = (this.extension.enablementState === EnablementState.Disabled || this.extension.enablementState === EnablementState.WorkspaceDisabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 
@@ -1633,7 +1633,7 @@ export class EnableAllAction extends Action {
 	}
 
 	private update(): void {
-		this.enabled = this.extensionsWorkbenchService.local.some(e => this.extensionEnablementService.canChangeEnablement() && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
+		this.enabled = this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
 	}
 
 	run(): TPromise {
@@ -1666,7 +1666,7 @@ export class EnableAllWorkpsaceAction extends Action {
 	}
 
 	private update(): void {
-		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => this.extensionEnablementService.canChangeEnablement() && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
+		this.enabled = this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY && this.extensionsWorkbenchService.local.some(e => e.local && this.extensionEnablementService.canChangeEnablement(e.local) && (e.enablementState === EnablementState.Disabled || e.enablementState === EnablementState.WorkspaceDisabled));
 	}
 
 	run(): TPromise {
diff --git a/src/vs/workbench/parts/extensions/common/extensions.ts b/src/vs/workbench/parts/extensions/common/extensions.ts
index b836148a1b7..d90719c48f0 100644
--- a/src/vs/workbench/parts/extensions/common/extensions.ts
+++ b/src/vs/workbench/parts/extensions/common/extensions.ts
@@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import Event from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IPager } from 'vs/base/common/paging';
-import { IQueryOptions, IExtensionManifest, LocalExtensionType, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { IQueryOptions, IExtensionManifest, LocalExtensionType, EnablementState, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 
 export const VIEWLET_ID = 'workbench.view.extensions';
 
@@ -51,6 +51,7 @@ export interface IExtension {
 	getManifest(): TPromise;
 	getReadme(): TPromise;
 	getChangelog(): TPromise;
+	local?: ILocalExtension;
 }
 
 export interface IExtensionDependencies {
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
index de679af9945..ac45a445b75 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsUtils.ts
@@ -90,7 +90,7 @@ export class KeymapExtensions implements IWorkbenchContribution {
 				this.telemetryService.publicLog('disableOtherKeymaps', telemetryData);
 				if (confirmed) {
 					return TPromise.join(oldKeymaps.map(keymap => {
-						return this.extensionEnablementService.setEnablement(keymap.local.identifier, EnablementState.Disabled);
+						return this.extensionEnablementService.setEnablement(keymap.local, EnablementState.Disabled);
 					}));
 				}
 				return undefined;
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index aa3991b96ba..6769d246ae5 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -715,7 +715,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 	}
 
 	private doSetEnablement(extension: IExtension, enablementState: EnablementState): TPromise {
-		return this.extensionEnablementService.setEnablement(extension, enablementState);
+		return this.extensionEnablementService.setEnablement(extension.local, enablementState);
 	}
 
 	get allowedBadgeProviders(): string[] {
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
index 0e697f0d9ef..ec79e302d8c 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
@@ -92,78 +92,79 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test Install action when state is installed', (done) => {
+	test('Test Install action when state is installed', () => {
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.InstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(() => {
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier })));
-			workbenchService.queryGallery().done((paged) => {
-				testObject.extension = paged.firstPage[0];
-				assert.ok(!testObject.enabled);
-				assert.equal('Install', testObject.label);
-				assert.equal('extension-action prominent install', testObject.class);
-				done();
+		return workbenchService.queryLocal()
+			.then(() => {
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier })));
+				return workbenchService.queryGallery()
+					.then((paged) => {
+						testObject.extension = paged.firstPage[0];
+						assert.ok(!testObject.enabled);
+						assert.equal('Install', testObject.label);
+						assert.equal('extension-action prominent install', testObject.class);
+					});
 			});
-		});
 	});
 
-	test('Test Install action when state is installing', (done) => {
+	test('Test Install action when state is installing', () => {
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.InstallAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		workbenchService.queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			installEvent.fire({ identifier: gallery.identifier, gallery });
+		return workbenchService.queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				installEvent.fire({ identifier: gallery.identifier, gallery });
 
-			assert.ok(!testObject.enabled);
-			assert.equal('Installing', testObject.label);
-			assert.equal('extension-action install installing', testObject.class);
-			done();
-		});
+				assert.ok(!testObject.enabled);
+				assert.equal('Installing', testObject.label);
+				assert.equal('extension-action install installing', testObject.class);
+			});
 	});
 
-	test('Test Install action when state is uninstalled', (done) => {
+	test('Test Install action when state is uninstalled', () => {
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.InstallAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		workbenchService.queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			assert.ok(testObject.enabled);
-			assert.equal('Install', testObject.label);
-			done();
-		});
+		return workbenchService.queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				assert.ok(testObject.enabled);
+				assert.equal('Install', testObject.label);
+			});
 	});
 
-	test('Test Install action when extension is system action', (done) => {
+	test('Test Install action when extension is system action', () => {
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.InstallAction);
 		const local = aLocalExtension('a', {}, { type: LocalExtensionType.System });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			uninstallEvent.fire(local.identifier);
-			didUninstallEvent.fire({ identifier: local.identifier });
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				uninstallEvent.fire(local.identifier);
+				didUninstallEvent.fire({ identifier: local.identifier });
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test Install action when extension doesnot has gallery', (done) => {
+	test('Test Install action when extension doesnot has gallery', () => {
 		const testObject: ExtensionsActions.InstallAction = instantiationService.createInstance(ExtensionsActions.InstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			uninstallEvent.fire(local.identifier);
-			didUninstallEvent.fire({ identifier: local.identifier });
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				uninstallEvent.fire(local.identifier);
+				didUninstallEvent.fire({ identifier: local.identifier });
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
 	test('Uninstall action is disabled when there is no extension', () => {
@@ -172,65 +173,65 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test Uninstall action when state is uninstalling', (done) => {
+	test('Test Uninstall action when state is uninstalling', () => {
 		const testObject: ExtensionsActions.UninstallAction = instantiationService.createInstance(ExtensionsActions.UninstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			assert.ok(!testObject.enabled);
-			assert.equal('Uninstalling', testObject.label);
-			assert.equal('extension-action uninstall uninstalling', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				assert.ok(!testObject.enabled);
+				assert.equal('Uninstalling', testObject.label);
+				assert.equal('extension-action uninstall uninstalling', testObject.class);
+			});
 	});
 
-	test('Test Uninstall action when state is installed and is user extension', (done) => {
+	test('Test Uninstall action when state is installed and is user extension', () => {
 		const testObject: ExtensionsActions.UninstallAction = instantiationService.createInstance(ExtensionsActions.UninstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			assert.equal('Uninstall', testObject.label);
-			assert.equal('extension-action uninstall', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+				assert.equal('Uninstall', testObject.label);
+				assert.equal('extension-action uninstall', testObject.class);
+			});
 	});
 
-	test('Test Uninstall action when state is installed and is system extension', (done) => {
+	test('Test Uninstall action when state is installed and is system extension', () => {
 		const testObject: ExtensionsActions.UninstallAction = instantiationService.createInstance(ExtensionsActions.UninstallAction);
 		const local = aLocalExtension('a', {}, { type: LocalExtensionType.System });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			assert.equal('Uninstall', testObject.label);
-			assert.equal('extension-action uninstall', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+				assert.equal('Uninstall', testObject.label);
+				assert.equal('extension-action uninstall', testObject.class);
+			});
 	});
 
-	test('Test Uninstall action after extension is installed', (done) => {
+	test('Test Uninstall action after extension is installed', () => {
 		const testObject: ExtensionsActions.UninstallAction = instantiationService.createInstance(ExtensionsActions.UninstallAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(paged => {
-			testObject.extension = paged.firstPage[0];
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(paged => {
+				testObject.extension = paged.firstPage[0];
 
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
 
-			assert.ok(testObject.enabled);
-			assert.equal('Uninstall', testObject.label);
-			assert.equal('extension-action uninstall', testObject.class);
-			done();
-		});
+				assert.ok(testObject.enabled);
+				assert.equal('Uninstall', testObject.label);
+				assert.equal('extension-action uninstall', testObject.class);
+			});
 	});
 
 	test('Test CombinedInstallAction when there is no extension', () => {
@@ -240,77 +241,77 @@ suite('ExtensionsActions Test', () => {
 		assert.equal('extension-action prominent install no-extension', testObject.class);
 	});
 
-	test('Test CombinedInstallAction when extension is system extension', (done) => {
+	test('Test CombinedInstallAction when extension is system extension', () => {
 		const testObject: ExtensionsActions.CombinedInstallAction = instantiationService.createInstance(ExtensionsActions.CombinedInstallAction);
 		const local = aLocalExtension('a', {}, { type: LocalExtensionType.System });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			assert.equal('extension-action prominent install no-extension', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+				assert.equal('extension-action prominent install no-extension', testObject.class);
+			});
 	});
 
-	test('Test CombinedInstallAction when installAction is enabled', (done) => {
+	test('Test CombinedInstallAction when installAction is enabled', () => {
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const testObject: ExtensionsActions.CombinedInstallAction = instantiationService.createInstance(ExtensionsActions.CombinedInstallAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		workbenchService.queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			assert.ok(testObject.enabled);
-			assert.equal('Install', testObject.label);
-			assert.equal('extension-action prominent install', testObject.class);
-			done();
-		});
+		return workbenchService.queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				assert.ok(testObject.enabled);
+				assert.equal('Install', testObject.label);
+				assert.equal('extension-action prominent install', testObject.class);
+			});
 	});
 
-	test('Test CombinedInstallAction when unInstallAction is enabled', (done) => {
+	test('Test CombinedInstallAction when unInstallAction is enabled', () => {
 		const testObject: ExtensionsActions.CombinedInstallAction = instantiationService.createInstance(ExtensionsActions.CombinedInstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			assert.equal('Uninstall', testObject.label);
-			assert.equal('extension-action uninstall', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+				assert.equal('Uninstall', testObject.label);
+				assert.equal('extension-action uninstall', testObject.class);
+			});
 	});
 
-	test('Test CombinedInstallAction when state is installing', (done) => {
+	test('Test CombinedInstallAction when state is installing', () => {
 		const testObject: ExtensionsActions.CombinedInstallAction = instantiationService.createInstance(ExtensionsActions.CombinedInstallAction);
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		workbenchService.queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			installEvent.fire({ identifier: gallery.identifier, gallery });
+		return workbenchService.queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				installEvent.fire({ identifier: gallery.identifier, gallery });
 
-			assert.ok(!testObject.enabled);
-			assert.equal('Installing', testObject.label);
-			assert.equal('extension-action install installing', testObject.class);
-			done();
-		});
+				assert.ok(!testObject.enabled);
+				assert.equal('Installing', testObject.label);
+				assert.equal('extension-action install installing', testObject.class);
+			});
 	});
 
-	test('Test CombinedInstallAction when state is uninstalling', (done) => {
+	test('Test CombinedInstallAction when state is uninstalling', () => {
 		const testObject: ExtensionsActions.CombinedInstallAction = instantiationService.createInstance(ExtensionsActions.CombinedInstallAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			assert.ok(!testObject.enabled);
-			assert.equal('Uninstalling', testObject.label);
-			assert.equal('extension-action uninstall uninstalling', testObject.class);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				assert.ok(!testObject.enabled);
+				assert.equal('Uninstalling', testObject.label);
+				assert.equal('extension-action uninstall uninstalling', testObject.class);
+			});
 	});
 
 	test('Test UpdateAction when there is no extension', () => {
@@ -319,77 +320,75 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test UpdateAction when extension is uninstalled', (done) => {
+	test('Test UpdateAction when extension is uninstalled', () => {
 		const testObject: ExtensionsActions.UpdateAction = instantiationService.createInstance(ExtensionsActions.UpdateAction);
 		const gallery = aGalleryExtension('a', { version: '1.0.0' });
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test UpdateAction when extension is installed and not outdated', (done) => {
+	test('Test UpdateAction when extension is installed and not outdated', () => {
 		const testObject: ExtensionsActions.UpdateAction = instantiationService.createInstance(ExtensionsActions.UpdateAction);
 		const local = aLocalExtension('a', { version: '1.0.0' });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: local.manifest.version })));
-			instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(extensions => {
-				assert.ok(!testObject.enabled);
-				done();
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: local.manifest.version })));
+				return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+					.then(extensions => assert.ok(!testObject.enabled));
 			});
-		});
 	});
 
-	test('Test UpdateAction when extension is installed outdated and system extension', (done) => {
+	test('Test UpdateAction when extension is installed outdated and system extension', () => {
 		const testObject: ExtensionsActions.UpdateAction = instantiationService.createInstance(ExtensionsActions.UpdateAction);
 		const local = aLocalExtension('a', { version: '1.0.0' }, { type: LocalExtensionType.System });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' })));
-			instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(extensions => {
-				assert.ok(!testObject.enabled);
-				done();
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' })));
+				return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+					.then(extensions => assert.ok(!testObject.enabled));
 			});
-		});
 	});
 
-	test('Test UpdateAction when extension is installed outdated and user extension', (done) => {
+	test('Test UpdateAction when extension is installed outdated and user extension', () => {
 		const testObject: ExtensionsActions.UpdateAction = instantiationService.createInstance(ExtensionsActions.UpdateAction);
 		const local = aLocalExtension('a', { version: '1.0.0' });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' })));
-			instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(extensions => {
-				assert.ok(testObject.enabled);
-				done();
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' })));
+				return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+					.then(extensions => assert.ok(testObject.enabled));
 			});
-		});
 	});
 
-	test('Test UpdateAction when extension is installing and outdated and user extension', (done) => {
+	test('Test UpdateAction when extension is installing and outdated and user extension', () => {
 		const testObject: ExtensionsActions.UpdateAction = instantiationService.createInstance(ExtensionsActions.UpdateAction);
 		const local = aLocalExtension('a', { version: '1.0.0' });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' });
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-			instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(extensions => {
-				installEvent.fire({ identifier: local.identifier, gallery });
-				assert.ok(!testObject.enabled);
-				done();
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.1' });
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
+				return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+					.then(extensions => {
+						installEvent.fire({ identifier: local.identifier, gallery });
+						assert.ok(!testObject.enabled);
+					});
 			});
-		});
 	});
 
 	test('Test ManageExtensionAction when there is no extension', () => {
@@ -398,101 +397,95 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ManageExtensionAction when extension is installed', (done) => {
+	test('Test ManageExtensionAction when extension is installed', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			assert.equal('extension-action manage', testObject.class);
-			assert.equal('', testObject.tooltip);
-
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+				assert.equal('extension-action manage', testObject.class);
+				assert.equal('', testObject.tooltip);
+			});
 	});
 
-	test('Test ManageExtensionAction when extension is uninstalled', (done) => {
+	test('Test ManageExtensionAction when extension is uninstalled', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
-			assert.ok(!testObject.enabled);
-			assert.equal('extension-action manage hide', testObject.class);
-			assert.equal('', testObject.tooltip);
-
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
+				assert.ok(!testObject.enabled);
+				assert.equal('extension-action manage hide', testObject.class);
+				assert.equal('', testObject.tooltip);
+			});
 	});
 
-	test('Test ManageExtensionAction when extension is installing', (done) => {
+	test('Test ManageExtensionAction when extension is installing', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
 
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			assert.ok(!testObject.enabled);
-			assert.equal('extension-action manage hide', testObject.class);
-			assert.equal('', testObject.tooltip);
-
-			done();
-		});
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				assert.ok(!testObject.enabled);
+				assert.equal('extension-action manage hide', testObject.class);
+				assert.equal('', testObject.tooltip);
+			});
 	});
 
-	test('Test ManageExtensionAction when extension is queried from gallery and installed', (done) => {
+	test('Test ManageExtensionAction when extension is queried from gallery and installed', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
 
-			assert.ok(testObject.enabled);
-			assert.equal('extension-action manage', testObject.class);
-			assert.equal('', testObject.tooltip);
-
-			done();
-		});
+				assert.ok(testObject.enabled);
+				assert.equal('extension-action manage', testObject.class);
+				assert.equal('', testObject.tooltip);
+			});
 	});
 
-	test('Test ManageExtensionAction when extension is system extension', (done) => {
+	test('Test ManageExtensionAction when extension is system extension', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const local = aLocalExtension('a', {}, { type: LocalExtensionType.System });
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			assert.equal('extension-action manage hide', testObject.class);
-			assert.equal('', testObject.tooltip);
-
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+				assert.equal('extension-action manage hide', testObject.class);
+				assert.equal('', testObject.tooltip);
+			});
 	});
 
-	test('Test ManageExtensionAction when extension is uninstalling', (done) => {
+	test('Test ManageExtensionAction when extension is uninstalling', () => {
 		const testObject: ExtensionsActions.ManageExtensionAction = instantiationService.createInstance(ExtensionsActions.ManageExtensionAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
 
-			assert.ok(!testObject.enabled);
-			assert.equal('extension-action manage', testObject.class);
-			assert.equal('Uninstalling', testObject.tooltip);
-
-			done();
-		});
+				assert.ok(!testObject.enabled);
+				assert.equal('extension-action manage', testObject.class);
+				assert.equal('Uninstalling', testObject.tooltip);
+			});
 	});
 
 	test('Test EnableForWorkspaceAction when there is no extension', () => {
@@ -501,20 +494,7 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test EnableForWorkspaceAction when there extension is not disabled', (done) => {
-		const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
-		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
-	});
-
-	test('Test EnableForWorkspaceAction when the extension is disabled globally', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
+	test('Test EnableForWorkspaceAction when there extension is not disabled', () => {
 		const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
@@ -522,34 +502,53 @@ suite('ExtensionsActions Test', () => {
 		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
 			.then(extensions => {
 				testObject.extension = extensions[0];
-				assert.ok(testObject.enabled);
+				assert.ok(!testObject.enabled);
+			});
+	});
+
+	test('Test EnableForWorkspaceAction when the extension is disabled globally', () => {
+		const local = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
 			});
 	});
 
 	test('Test EnableForWorkspaceAction when extension is disabled for workspace', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
-			.then(extensions => {
-				testObject.extension = extensions[0];
-				assert.ok(testObject.enabled);
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
 			});
 	});
 
 	test('Test EnableForWorkspaceAction when the extension is disabled globally and workspace', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled))
+			.then(() => {
+				const testObject: ExtensionsActions.EnableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.EnableForWorkspaceAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
-			.then(extensions => {
-				testObject.extension = extensions[0];
-				assert.ok(testObject.enabled);
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
 			});
 	});
 
@@ -559,56 +558,62 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test EnableGloballyAction when the extension is not disabled', (done) => {
-		const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+	test('Test EnableGloballyAction when the extension is not disabled', () => {
 		const local = aLocalExtension('a');
+		const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test EnableGloballyAction when the extension is disabled for workspace', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+	test('Test EnableGloballyAction when the extension is disabled for workspace', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
+			});
 	});
 
-	test('Test EnableGloballyAction when the extension is disabled globally', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+	test('Test EnableGloballyAction when the extension is disabled globally', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
+			});
 	});
 
-	test('Test EnableGloballyAction when the extension is disabled in both', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+	test('Test EnableGloballyAction when the extension is disabled in both', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled))
+			.then(() => {
+				const testObject: ExtensionsActions.EnableGloballyAction = instantiationService.createInstance(ExtensionsActions.EnableGloballyAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
+			});
 	});
 
 	test('Test EnableAction when there is no extension', () => {
@@ -617,82 +622,85 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test EnableAction when extension is installed and enabled', (done) => {
+	test('Test EnableAction when extension is installed and enabled', () => {
 		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test EnableAction when extension is installed and disabled globally', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
+	test('Test EnableAction when extension is installed and disabled globally', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
+			});
 	});
 
-	test('Test EnableAction when extension is installed and disabled for workspace', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
+	test('Test EnableAction when extension is installed and disabled for workspace', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(testObject.enabled);
+					});
+			});
 	});
 
-	test('Test EnableAction when extension is uninstalled', (done) => {
+	test('Test EnableAction when extension is uninstalled', () => {
 		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test EnableAction when extension is installing', (done) => {
+	test('Test EnableAction when extension is installing', () => {
 		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
 
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			assert.ok(!testObject.enabled);
-
-			done();
-		});
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test EnableAction when extension is uninstalling', (done) => {
+	test('Test EnableAction when extension is uninstalling', () => {
 		const testObject: ExtensionsActions.EnableAction = instantiationService.createInstance(ExtensionsActions.EnableAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				assert.ok(!testObject.enabled);
+			});
 	});
 
 	test('Test DisableForWorkspaceAction when there is no extension', () => {
@@ -701,42 +709,46 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test DisableForWorkspaceAction when the extension is disabled globally', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.DisableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.DisableForWorkspaceAction, 'id');
+	test('Test DisableForWorkspaceAction when the extension is disabled globally', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.DisableForWorkspaceAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableForWorkspaceAction when the extension is disabled workspace', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.DisableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.DisableForWorkspaceAction, 'id');
+	test('Test DisableForWorkspaceAction when the extension is disabled workspace', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.DisableForWorkspaceAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableForWorkspaceAction when extension is enabled', (done) => {
+	test('Test DisableForWorkspaceAction when extension is enabled', () => {
 		const testObject: ExtensionsActions.DisableForWorkspaceAction = instantiationService.createInstance(ExtensionsActions.DisableForWorkspaceAction, 'id');
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+			});
 	});
 
 	test('Test DisableGloballyAction when there is no extension', () => {
@@ -745,42 +757,46 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test DisableGloballyAction when the extension is disabled globally', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.DisableGloballyAction = instantiationService.createInstance(ExtensionsActions.DisableGloballyAction, 'id');
+	test('Test DisableGloballyAction when the extension is disabled globally', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableGloballyAction = instantiationService.createInstance(ExtensionsActions.DisableGloballyAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableGloballyAction when the extension is disabled for workspace', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.DisableGloballyAction = instantiationService.createInstance(ExtensionsActions.DisableGloballyAction, 'id');
+	test('Test DisableGloballyAction when the extension is disabled for workspace', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableGloballyAction = instantiationService.createInstance(ExtensionsActions.DisableGloballyAction, 'id');
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableGloballyAction when the extension is enabled', (done) => {
+	test('Test DisableGloballyAction when the extension is enabled', () => {
 		const testObject: ExtensionsActions.DisableGloballyAction = instantiationService.createInstance(ExtensionsActions.DisableGloballyAction, 'id');
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+			});
 	});
 
 	test('Test DisableAction when there is no extension', () => {
@@ -789,82 +805,85 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test DisableAction when extension is installed and enabled', (done) => {
+	test('Test DisableAction when extension is installed and enabled', () => {
 		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				assert.ok(testObject.enabled);
+			});
 	});
 
-	test('Test DisableAction when extension is installed and disabled globally', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
+	test('Test DisableAction when extension is installed and disabled globally', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableAction when extension is installed and disabled for workspace', (done) => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
+	test('Test DisableAction when extension is installed and disabled for workspace', () => {
 		const local = aLocalExtension('a');
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test DisableAction when extension is uninstalled', (done) => {
+	test('Test DisableAction when extension is uninstalled', () => {
 		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test DisableAction when extension is installing', (done) => {
+	test('Test DisableAction when extension is installing', () => {
 		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
 
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done(page => {
-			testObject.extension = page.firstPage[0];
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then(page => {
+				testObject.extension = page.firstPage[0];
 
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			assert.ok(!testObject.enabled);
-
-			done();
-		});
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test DisableAction when extension is uninstalling', (done) => {
+	test('Test DisableAction when extension is uninstalling', () => {
 		const testObject: ExtensionsActions.DisableAction = instantiationService.createInstance(ExtensionsActions.DisableAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				assert.ok(!testObject.enabled);
+			});
 	});
 
 	test('Test UpdateAllAction when no installed extensions', () => {
@@ -873,60 +892,59 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test UpdateAllAction when installed extensions are not outdated', (done) => {
+	test('Test UpdateAllAction when installed extensions are not outdated', () => {
 		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a'), aLocalExtension('b')]);
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => assert.ok(!testObject.enabled));
 	});
 
-	test('Test UpdateAllAction when some installed extensions are outdated', (done) => {
+	test('Test UpdateAllAction when some installed extensions are outdated', () => {
 		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label');
 		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		workbenchService.queryLocal().done(() => {
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)));
-			workbenchService.queryGallery().done(() => {
-				assert.ok(testObject.enabled);
-				done();
+		return workbenchService.queryLocal()
+			.then(() => {
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)));
+				return workbenchService.queryGallery()
+					.then(() => assert.ok(testObject.enabled));
 			});
-		});
 	});
 
-	test('Test UpdateAllAction when some installed extensions are outdated and some outdated are being installed', (done) => {
+	test('Test UpdateAllAction when some installed extensions are outdated and some outdated are being installed', () => {
 		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label');
 		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
 		const gallery = [aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)];
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		workbenchService.queryLocal().done(() => {
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
-			workbenchService.queryGallery().done(() => {
-				installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
-				assert.ok(testObject.enabled);
-				done();
+		return workbenchService.queryLocal()
+			.then(() => {
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
+				return workbenchService.queryGallery()
+					.then(() => {
+						installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
+						assert.ok(testObject.enabled);
+					});
 			});
-		});
 	});
 
-	test('Test UpdateAllAction when some installed extensions are outdated and all outdated are being installed', (done) => {
+	test('Test UpdateAllAction when some installed extensions are outdated and all outdated are being installed', () => {
 		const testObject: ExtensionsActions.UpdateAllAction = instantiationService.createInstance(ExtensionsActions.UpdateAllAction, 'id', 'label');
 		const local = [aLocalExtension('a', { version: '1.0.1' }), aLocalExtension('b', { version: '1.0.1' }), aLocalExtension('c', { version: '1.0.1' })];
 		const gallery = [aGalleryExtension('a', { identifier: local[0].identifier, version: '1.0.2' }), aGalleryExtension('b', { identifier: local[1].identifier, version: '1.0.2' }), aGalleryExtension('c', local[2].manifest)];
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', local);
-		workbenchService.queryLocal().done(() => {
-			instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
-			workbenchService.queryGallery().done(() => {
-				installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
-				installEvent.fire({ identifier: local[1].identifier, gallery: gallery[1] });
-				assert.ok(!testObject.enabled);
-				done();
+		return workbenchService.queryLocal()
+			.then(() => {
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(...gallery));
+				return workbenchService.queryGallery()
+					.then(() => {
+						installEvent.fire({ identifier: local[0].identifier, gallery: gallery[0] });
+						installEvent.fire({ identifier: local[1].identifier, gallery: gallery[1] });
+						assert.ok(!testObject.enabled);
+					});
 			});
-		});
 	});
 
 	test('Test ReloadAction when there is no extension', () => {
@@ -935,233 +953,241 @@ suite('ExtensionsActions Test', () => {
 		assert.ok(!testObject.enabled);
 	});
 
-	test('Test ReloadAction when extension state is installing', (done) => {
+	test('Test ReloadAction when extension state is installing', () => {
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		workbenchService.queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			installEvent.fire({ identifier: gallery.identifier, gallery });
+		return workbenchService.queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				installEvent.fire({ identifier: gallery.identifier, gallery });
 
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test ReloadAction when extension state is uninstalling', (done) => {
+	test('Test ReloadAction when extension state is uninstalling', () => {
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
 
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test ReloadAction when extension is newly installed', (done) => {
+	test('Test ReloadAction when extension is newly installed', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
 
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to activate', testObject.tooltip);
-			assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
-			done();
-		});
+				assert.ok(testObject.enabled);
+				assert.equal('Reload to activate', testObject.tooltip);
+				assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
+			});
 	});
 
-	test('Test ReloadAction when extension is installed and uninstalled', (done) => {
+	test('Test ReloadAction when extension is installed and uninstalled', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const gallery = aGalleryExtension('a');
 		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(gallery));
-		instantiationService.get(IExtensionsWorkbenchService).queryGallery().done((paged) => {
-			testObject.extension = paged.firstPage[0];
-			const identifier = { id: getLocalExtensionIdFromGallery(gallery, gallery.version) };
-			installEvent.fire({ identifier: identifier, gallery });
-			didInstallEvent.fire({ identifier: identifier, gallery, local: aLocalExtension('a', gallery, { identifier }) });
-			uninstallEvent.fire(identifier);
-			didUninstallEvent.fire({ identifier: identifier });
+		return instantiationService.get(IExtensionsWorkbenchService).queryGallery()
+			.then((paged) => {
+				testObject.extension = paged.firstPage[0];
+				const identifier = { id: getLocalExtensionIdFromGallery(gallery, gallery.version) };
+				installEvent.fire({ identifier: identifier, gallery });
+				didInstallEvent.fire({ identifier: identifier, gallery, local: aLocalExtension('a', gallery, { identifier }) });
+				uninstallEvent.fire(identifier);
+				didUninstallEvent.fire({ identifier: identifier });
 
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test ReloadAction when extension is uninstalled', (done) => {
+	test('Test ReloadAction when extension is uninstalled', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			didUninstallEvent.fire({ identifier: local.identifier });
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				didUninstallEvent.fire({ identifier: local.identifier });
 
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to deactivate', testObject.tooltip);
-			assert.equal(`Reload this window to deactivate the uninstalled extension 'a'?`, testObject.reloadMessage);
-			done();
-		});
+				assert.ok(testObject.enabled);
+				assert.equal('Reload to deactivate', testObject.tooltip);
+				assert.equal(`Reload this window to deactivate the uninstalled extension 'a'?`, testObject.reloadMessage);
+			});
 	});
 
-	test('Test ReloadAction when extension is uninstalled and installed', (done) => {
+	test('Test ReloadAction when extension is uninstalled and installed', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		instantiationService.get(IExtensionsWorkbenchService).queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			uninstallEvent.fire(local.identifier);
-			didUninstallEvent.fire({ identifier: local.identifier });
+		return instantiationService.get(IExtensionsWorkbenchService).queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
+				uninstallEvent.fire(local.identifier);
+				didUninstallEvent.fire({ identifier: local.identifier });
 
-			const gallery = aGalleryExtension('a');
-			const id = getLocalExtensionIdFromGallery(gallery, gallery.version);
-			installEvent.fire({ identifier: { id }, gallery });
-			didInstallEvent.fire({ identifier: { id }, gallery, local });
+				const gallery = aGalleryExtension('a');
+				const id = getLocalExtensionIdFromGallery(gallery, gallery.version);
+				installEvent.fire({ identifier: { id }, gallery });
+				didInstallEvent.fire({ identifier: { id }, gallery, local });
 
-			assert.ok(!testObject.enabled);
-			done();
-		});
+				assert.ok(!testObject.enabled);
+			});
 	});
 
-	test('Test ReloadAction when extension is updated while running', (done) => {
+	test('Test ReloadAction when extension is updated while running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.1' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a', { version: '1.0.1' });
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
+		return workbenchService.queryLocal()
+			.then(extensions => {
+				testObject.extension = extensions[0];
 
-			const gallery = aGalleryExtension('a', { uuid: local.identifier.id, version: '1.0.2' });
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+				const gallery = aGalleryExtension('a', { uuid: local.identifier.id, version: '1.0.2' });
+				installEvent.fire({ identifier: gallery.identifier, gallery });
+				didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
 
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to update', testObject.tooltip);
-			assert.equal(`Reload this window to activate the updated extension 'a'?`, testObject.reloadMessage);
-			done();
-
-		});
+				assert.ok(testObject.enabled);
+				assert.equal('Reload to update', testObject.tooltip);
+				assert.equal(`Reload this window to activate the updated extension 'a'?`, testObject.reloadMessage);
+			});
 	});
 
-	test('Test ReloadAction when extension is updated when not running', (done) => {
+	test('Test ReloadAction when extension is updated when not running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a', { version: '1.0.1' });
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+				return workbenchService.queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
 
-			const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+						const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
+						installEvent.fire({ identifier: gallery.identifier, gallery });
+						didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
 
-			assert.ok(!testObject.enabled);
-			done();
-		});
+						assert.ok(!testObject.enabled);
+					});
+			});
 	});
 
-	test('Test ReloadAction when extension is disabled when running', (done) => {
+	test('Test ReloadAction when extension is disabled when running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
+		return workbenchService.queryLocal().then(extensions => {
 			testObject.extension = extensions[0];
-			workbenchService.setEnablement(extensions[0], EnablementState.Disabled);
-
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to deactivate', testObject.tooltip);
-			assert.equal(`Reload this window to deactivate the extension 'a'?`, testObject.reloadMessage);
-			done();
+			return workbenchService.setEnablement(extensions[0], EnablementState.Disabled)
+				.then(() => {
+					assert.ok(testObject.enabled);
+					assert.equal('Reload to deactivate', testObject.tooltip);
+					assert.equal(`Reload this window to deactivate the extension 'a'?`, testObject.reloadMessage);
+				});
 		});
 	});
 
-	test('Test ReloadAction when extension enablement is toggled when running', (done) => {
+	test('Test ReloadAction when extension enablement is toggled when running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.a', version: '1.0.0' }]);
 		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
 		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			workbenchService.setEnablement(extensions[0], EnablementState.Disabled);
-			workbenchService.setEnablement(extensions[0], EnablementState.Enabled);
-
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return workbenchService.queryLocal().
+			then(extensions => {
+				testObject.extension = extensions[0];
+				return workbenchService.setEnablement(extensions[0], EnablementState.Disabled)
+					.then(() => workbenchService.setEnablement(extensions[0], EnablementState.Enabled))
+					.then(() => assert.ok(!testObject.enabled));
+			});
 	});
 
-	test('Test ReloadAction when extension is enabled when not running', (done) => {
+	test('Test ReloadAction when extension is enabled when not running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			workbenchService.setEnablement(extensions[0], EnablementState.Enabled);
-
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to activate', testObject.tooltip);
-			assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
-			done();
-		});
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+				return workbenchService.queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						return workbenchService.setEnablement(extensions[0], EnablementState.Enabled)
+							.then(() => {
+								assert.ok(testObject.enabled);
+								assert.equal('Reload to activate', testObject.tooltip);
+								assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
+							});
+					});
+			});
 	});
 
-	test('Test ReloadAction when extension enablement is toggled when not running', (done) => {
+	test('Test ReloadAction when extension enablement is toggled when not running', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a');
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
-			workbenchService.setEnablement(extensions[0], EnablementState.Enabled);
-			workbenchService.setEnablement(extensions[0], EnablementState.Disabled);
-
-			assert.ok(!testObject.enabled);
-			done();
-		});
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+				return workbenchService.queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
+						return workbenchService.setEnablement(extensions[0], EnablementState.Enabled)
+							.then(() => workbenchService.setEnablement(extensions[0], EnablementState.Disabled))
+							.then(() => assert.ok(!testObject.enabled));
+					});
+			});
 	});
 
-	test('Test ReloadAction when extension is updated when not running and enabled', (done) => {
+	test('Test ReloadAction when extension is updated when not running and enabled', () => {
 		instantiationService.stubPromise(IExtensionService, 'getExtensions', [{ id: 'pub.b' }]);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
 		const local = aLocalExtension('a', { version: '1.0.1' });
-		const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
-		workbenchService.queryLocal().done(extensions => {
-			testObject.extension = extensions[0];
+		return instantiationService.get(IExtensionEnablementService).setEnablement(local, EnablementState.Disabled)
+			.then(() => {
+				const testObject: ExtensionsActions.ReloadAction = instantiationService.createInstance(ExtensionsActions.ReloadAction);
+				const workbenchService = instantiationService.get(IExtensionsWorkbenchService);
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [local]);
+				return workbenchService.queryLocal()
+					.then(extensions => {
+						testObject.extension = extensions[0];
 
-			const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
-			installEvent.fire({ identifier: gallery.identifier, gallery });
-			didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
-			workbenchService.setEnablement(extensions[0], EnablementState.Enabled);
+						const gallery = aGalleryExtension('a', { identifier: local.identifier, version: '1.0.2' });
+						installEvent.fire({ identifier: gallery.identifier, gallery });
+						didInstallEvent.fire({ identifier: gallery.identifier, gallery, local: aLocalExtension('a', gallery, gallery) });
+						return workbenchService.setEnablement(extensions[0], EnablementState.Enabled)
+							.then(() => {
+								assert.ok(testObject.enabled);
+								assert.equal('Reload to activate', testObject.tooltip);
+								assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
+							});
 
-			assert.ok(testObject.enabled);
-			assert.equal('Reload to activate', testObject.tooltip);
-			assert.equal(`Reload this window to activate the extension 'a'?`, testObject.reloadMessage);
-			done();
-		});
+					});
+			});
 	});
 
 	function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension {
diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index 0e32124f83d..d93520cfab0 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -698,283 +698,374 @@ suite('ExtensionsWorkbenchService Test', () => {
 	});
 
 	test('test uninstalled extensions are always enabled', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.WorkspaceDisabled);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-		instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a')));
-		return testObject.queryGallery().then(pagedResponse => {
-			const actual = pagedResponse.firstPage[0];
-			assert.equal(actual.enablementState, EnablementState.Enabled);
-		});
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage(aGalleryExtension('a')));
+				return testObject.queryGallery().then(pagedResponse => {
+					const actual = pagedResponse.firstPage[0];
+					assert.equal(actual.enablementState, EnablementState.Enabled);
+				});
+			});
 	});
 
 	test('test enablement state installed enabled extension', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		const actual = testObject.local[0];
+				const actual = testObject.local[0];
 
-		assert.equal(actual.enablementState, EnablementState.Enabled);
+				assert.equal(actual.enablementState, EnablementState.Enabled);
+			});
 	});
 
 	test('test workspace disabled extension', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.d' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.e' }, EnablementState.WorkspaceDisabled);
+		const extensionA = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('d'), EnablementState.Disabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.WorkspaceDisabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('e'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				const actual = testObject.local[0];
 
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.WorkspaceDisabled);
+				assert.equal(actual.enablementState, EnablementState.WorkspaceDisabled);
+			});
 	});
 
 	test('test globally disabled extension', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.d' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.WorkspaceDisabled);
+		const localExtension = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(localExtension, EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('d'), EnablementState.Disabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [localExtension]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				const actual = testObject.local[0];
 
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.Disabled);
+				assert.equal(actual.enablementState, EnablementState.Disabled);
+			});
 	});
 
 	test('test enablement state is updated for user extensions', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-
-		testObject.setEnablement(testObject.local[0], EnablementState.WorkspaceDisabled);
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.WorkspaceDisabled);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				return testObject.setEnablement(testObject.local[0], EnablementState.WorkspaceDisabled)
+					.then(() => {
+						const actual = testObject.local[0];
+						assert.equal(actual.enablementState, EnablementState.WorkspaceDisabled);
+					});
+			});
 	});
 
 	test('test enable extension globally when extension is disabled for workspace', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-
-		testObject.setEnablement(testObject.local[0], EnablementState.Enabled);
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.Enabled);
+		const localExtension = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(localExtension, EnablementState.WorkspaceDisabled)
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [localExtension]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
+					.then(() => {
+						const actual = testObject.local[0];
+						assert.equal(actual.enablementState, EnablementState.Enabled);
+					});
+			});
 	});
 
 	test('test disable extension globally', () => {
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
 		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.Disabled);
+		return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+			.then(() => {
+				const actual = testObject.local[0];
+				assert.equal(actual.enablementState, EnablementState.Disabled);
+			});
 	});
 
 	test('test system extensions are always enabled', () => {
 		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', {}, { type: LocalExtensionType.System })]);
 		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.Enabled);
+		return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+			.then(() => {
+				const actual = testObject.local[0];
+				assert.equal(actual.enablementState, EnablementState.Enabled);
+			});
 	});
 
 	test('test enablement state is updated on change from outside', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		const localExtension = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [localExtension]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		const actual = testObject.local[0];
-
-		assert.equal(actual.enablementState, EnablementState.Disabled);
+				return instantiationService.get(IExtensionEnablementService).setEnablement(localExtension, EnablementState.Disabled)
+					.then(() => {
+						const actual = testObject.local[0];
+						assert.equal(actual.enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test disable extension with dependencies disable only itself', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
+					});
+			});
 	});
 
 	test('test disable extension with dependencies disable all', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c')]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test disable extension fails if extension is a dependent of other', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
 
-		return testObject.setEnablement(testObject.local[1], EnablementState.Disabled).then(() => assert.fail('Should fail'), error => assert.ok(true));
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				return testObject.setEnablement(testObject.local[1], EnablementState.Disabled).then(() => assert.fail('Should fail'), error => assert.ok(true));
+			});
 	});
 
 	test('test disable extension does not fail if its dependency is a dependent of other but chosen to disable only itself', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c', { extensionDependencies: ['pub.b'] })]);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.b'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
-
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test disable extension fails if its dependency is a dependent of other', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c', { extensionDependencies: ['pub.b'] })]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.b'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-
-		return testObject.setEnablement(testObject.local[0], EnablementState.Disabled).then(() => assert.fail('Should fail'), error => assert.ok(true));
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled).then(() => assert.fail('Should fail'), error => assert.ok(true));
+			});
 	});
 
 	test('test disable extension if its dependency is a dependent of other disabled extension', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c', { extensionDependencies: ['pub.b'] })]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.b'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test disable extension if its dependencys dependency is itself', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b', { extensionDependencies: ['pub.a'] }), aLocalExtension('c')]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b', { extensionDependencies: ['pub.a'] });
+		const extensionC = aLocalExtension('c');
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test disable extension if its dependency is dependent and is disabled', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c', { extensionDependencies: ['pub.b'] })]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.b'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Disabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => assert.equal(testObject.local[0].enablementState, EnablementState.Disabled));
+			});
 	});
 
 	test('test disable extension with cyclic dependencies', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Enabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Enabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b', { extensionDependencies: ['pub.c'] }), aLocalExtension('c', { extensionDependencies: ['pub.a'] })]);
-		instantiationService.stubPromise(IChoiceService, 'choose', 1);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b', { extensionDependencies: ['pub.c'] });
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.a'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Enabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Enabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Enabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				instantiationService.stubPromise(IChoiceService, 'choose', 1);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Disabled);
+					});
+			});
 	});
 
 	test('test enable extension with dependencies enable all', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b'), aLocalExtension('c')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b');
+		const extensionC = aLocalExtension('c');
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Enabled);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Disabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Enabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Enabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
+					});
+			});
 	});
 
 	test('test enable extension with cyclic dependencies', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a', { extensionDependencies: ['pub.b'] }), aLocalExtension('b', { extensionDependencies: ['pub.c'] }), aLocalExtension('c', { extensionDependencies: ['pub.a'] })]);
+		const extensionA = aLocalExtension('a', { extensionDependencies: ['pub.b'] });
+		const extensionB = aLocalExtension('b', { extensionDependencies: ['pub.c'] });
+		const extensionC = aLocalExtension('c', { extensionDependencies: ['pub.a'] });
 
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(extensionA, EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionB, EnablementState.Disabled))
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(extensionC, EnablementState.Disabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [extensionA, extensionB, extensionC]);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Enabled);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
 
-		assert.equal(testObject.local[0].enablementState, EnablementState.Enabled);
-		assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
-		assert.equal(testObject.local[2].enablementState, EnablementState.Enabled);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Enabled)
+					.then(() => {
+						assert.equal(testObject.local[0].enablementState, EnablementState.Enabled);
+						assert.equal(testObject.local[1].enablementState, EnablementState.Enabled);
+						assert.equal(testObject.local[2].enablementState, EnablementState.Enabled);
+					});
+			});
 	});
 
 	test('test change event is fired when disablement flags are changed', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-		const target = sinon.spy();
-		testObject.onChange(target);
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				const target = sinon.spy();
+				testObject.onChange(target);
 
-		testObject.setEnablement(testObject.local[0], EnablementState.Disabled);
-
-		assert.ok(target.calledOnce);
+				return testObject.setEnablement(testObject.local[0], EnablementState.Disabled)
+					.then(() => assert.ok(target.calledOnce));
+			});
 	});
 
 	test('test change event is fired when disablement flags are changed from outside', () => {
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.c' }, EnablementState.Disabled);
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.b' }, EnablementState.WorkspaceDisabled);
-		instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [aLocalExtension('a')]);
-		testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
-		const target = sinon.spy();
-		testObject.onChange(target);
+		const localExtension = aLocalExtension('a');
+		return instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('c'), EnablementState.Disabled)
+			.then(() => instantiationService.get(IExtensionEnablementService).setEnablement(aLocalExtension('b'), EnablementState.WorkspaceDisabled))
+			.then(() => {
+				instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', [localExtension]);
+				testObject = instantiationService.createInstance(ExtensionsWorkbenchService);
+				const target = sinon.spy();
+				testObject.onChange(target);
 
-		instantiationService.get(IExtensionEnablementService).setEnablement({ id: 'pub.a' }, EnablementState.Disabled);
-
-		assert.ok(target.calledOnce);
+				return instantiationService.get(IExtensionEnablementService).setEnablement(localExtension, EnablementState.Disabled)
+					.then(() => assert.ok(target.calledOnce));
+			});
 	});
 
 	function aLocalExtension(name: string = 'someext', manifest: any = {}, properties: any = {}): ILocalExtension {

From 54a7be43f1180ab24460a4b810e143812dfc5357 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 17:00:22 +0100
Subject: [PATCH 385/710] #41755 Add canChangeEnablement check to disable
 actions

---
 .../parts/extensions/browser/extensionsActions.ts      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index 159b42c26c9..905b22e3f88 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -560,7 +560,8 @@ export class DisableForWorkspaceAction extends Action implements IExtensionActio
 
 	constructor(label: string,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
 	) {
 		super(DisableForWorkspaceAction.ID, label);
 
@@ -572,7 +573,7 @@ export class DisableForWorkspaceAction extends Action implements IExtensionActio
 	private update(): void {
 		this.enabled = false;
 		if (this.extension && this.workspaceContextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
-			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled);
+			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 
@@ -598,7 +599,8 @@ export class DisableGloballyAction extends Action implements IExtensionAction {
 	set extension(extension: IExtension) { this._extension = extension; this.update(); }
 
 	constructor(label: string,
-		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService
+		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
+		@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService
 	) {
 		super(DisableGloballyAction.ID, label);
 
@@ -609,7 +611,7 @@ export class DisableGloballyAction extends Action implements IExtensionAction {
 	private update(): void {
 		this.enabled = false;
 		if (this.extension) {
-			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled);
+			this.enabled = this.extension.type !== LocalExtensionType.System && (this.extension.enablementState === EnablementState.Enabled || this.extension.enablementState === EnablementState.WorkspaceEnabled) && this.extension.local && this.extensionEnablementService.canChangeEnablement(this.extension.local);
 		}
 	}
 

From 773aa87efb6ec05a3c8cf85a358051134d051342 Mon Sep 17 00:00:00 2001
From: Christof Marti 
Date: Thu, 18 Jan 2018 17:23:52 +0100
Subject: [PATCH 386/710] Disable insiders label

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

diff --git a/.github/insiders.yml b/.github/insiders.yml
index 28192b556e5..5ad2cb40a96 100644
--- a/.github/insiders.yml
+++ b/.github/insiders.yml
@@ -1,4 +1,4 @@
 {
     insidersLabel: 'insiders',
-    perform: true
+    perform: false
 }
\ No newline at end of file

From fe3199f4a2314a99a598a74e69343de992b081b7 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Thu, 18 Jan 2018 17:25:23 +0100
Subject: [PATCH 387/710] #41759 Show the status in the viewlet

---
 src/vs/platform/progress/common/progress.ts     |  3 ++-
 .../node/extensionsWorkbenchService.ts          | 17 ++++++++++++-----
 .../progress/browser/progressService2.ts        |  2 ++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 75addbff74d..71a17a51176 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -58,7 +58,8 @@ export class Progress implements IProgress {
 
 export enum ProgressLocation {
 	Scm = 1,
-	Window = 10,
+	Extensions = 2,
+	Window = 10
 }
 
 export interface IProgressOptions {
diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
index 6769d246ae5..566a87e56c3 100644
--- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
+++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts
@@ -539,8 +539,8 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 	install(extension: string | IExtension): TPromise {
 		if (typeof extension === 'string') {
 			return this.progressService.withProgress({
-				location: ProgressLocation.Window,
-				title: nls.localize('installingExtension', 'Installing extension from VSIX...'),
+				location: ProgressLocation.Extensions,
+				title: nls.localize('installingVSIXExtension', 'Installing extension from VSIX...'),
 				tooltip: `${extension}`
 			}, () => this.extensionService.install(extension));
 		}
@@ -556,7 +556,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 			return TPromise.wrapError(new Error('Missing gallery'));
 		}
 
-		return this.extensionService.installFromGallery(gallery);
+		return this.progressService.withProgress({
+			location: ProgressLocation.Extensions,
+			title: nls.localize('installingMarketPlaceExtension', 'Installing extension from Market place....'),
+			tooltip: `${extension.id}`
+		}, () => this.extensionService.installFromGallery(gallery));
 	}
 
 	setEnablement(extension: IExtension, enablementState: EnablementState): TPromise {
@@ -597,8 +601,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 		}
 
 		this.logService.info(`Requested uninstalling the extension ${extension.id} from window ${this.windowService.getCurrentWindowId()}`);
-		return this.extensionService.uninstall(local);
-
+		return this.progressService.withProgress({
+			location: ProgressLocation.Extensions,
+			title: nls.localize('uninstallingExtension', 'Uninstalling extension....'),
+			tooltip: `${local.identifier.id}`
+		}, () => this.extensionService.uninstall(local));
 	}
 
 	private promptAndSetEnablement(extension: IExtension, enablementState: EnablementState, enable: boolean): TPromise {
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
index 8c87a033e1c..ad8d9889ea9 100644
--- a/src/vs/workbench/services/progress/browser/progressService2.ts
+++ b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -75,6 +75,8 @@ export class ProgressService2 implements IProgressService2 {
 				return this._withWindowProgress(options, task);
 			case ProgressLocation.Scm:
 				return this._withViewletProgress('workbench.view.scm', task);
+			case ProgressLocation.Extensions:
+				return this._withViewletProgress('workbench.view.extensions', task);
 			default:
 				console.warn(`Bad progress location: ${location}`);
 				return undefined;

From 2ffaacf56bedd72b6a4d7626a58586a48e8771c1 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Thu, 18 Jan 2018 17:55:18 +0100
Subject: [PATCH 388/710] Implement snapshots; prepare for merging to master

---
 .../chunksTextBuffer/chunksTextBuffer.ts      | 40 +++++++++++++++++++
 src/vs/editor/common/model/textModel.ts       |  2 +-
 .../test/common/model/textModel.test.ts       | 12 +++---
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
index b4c26664a75..d089cd00af0 100644
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
+++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
@@ -10,6 +10,7 @@ import { BufferPiece, LeafOffsetLenEdit } from 'vs/editor/common/model/chunksTex
 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;
@@ -92,6 +93,10 @@ export class ChunksTextBuffer implements ITextBuffer {
 		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;
@@ -566,6 +571,37 @@ const BufferCursorPool = new class {
 	}
 };
 
+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;
@@ -1205,6 +1241,10 @@ class Buffer {
 		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);
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 88777784b31..6506c95e3b0 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -37,7 +37,7 @@ import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/l
 import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 // Here is the master switch for the text buffer implementation:
-const USE_CHUNKS_TEXT_BUFFER = true;
+const USE_CHUNKS_TEXT_BUFFER = false;
 function createTextBufferBuilder() {
 	if (USE_CHUNKS_TEXT_BUFFER) {
 		return new ChunksTextBufferBuilder();
diff --git a/src/vs/editor/test/common/model/textModel.test.ts b/src/vs/editor/test/common/model/textModel.test.ts
index be2fd30bd13..a99bde0f438 100644
--- a/src/vs/editor/test/common/model/textModel.test.ts
+++ b/src/vs/editor/test/common/model/textModel.test.ts
@@ -891,16 +891,18 @@ suite('TextModel.createSnapshot', () => {
 		let snapshot = model.createSnapshot();
 		let actual = '';
 
-		// 70999 length => 2 read calls are necessary
+		// 70999 length => at most 2 read calls are necessary
 		let tmp1 = snapshot.read();
 		assert.ok(tmp1);
 		actual += tmp1;
 
 		let tmp2 = snapshot.read();
-		assert.ok(tmp2);
-		actual += tmp2;
-
-		assert.equal(snapshot.read(), null);
+		if (tmp2 === null) {
+			// all good
+		} else {
+			actual += tmp2;
+			assert.equal(snapshot.read(), null);
+		}
 
 		assert.equal(actual, text);
 

From e9a2ebe248690f2b1aec8fca25d85bbc5d27e7b1 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Thu, 18 Jan 2018 10:01:15 -0800
Subject: [PATCH 389/710] Defer terminal init to LifecyclePhase.Running

Fixes #41823
---
 .../electron-browser/terminalPanel.ts         | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
index d12de43f06d..797ae1d1a3a 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalPanel.ts
@@ -27,6 +27,7 @@ import URI from 'vs/base/common/uri';
 import { PANEL_BACKGROUND } from 'vs/workbench/common/theme';
 import { TERMINAL_BACKGROUND_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';
 
 export class TerminalPanel extends Panel {
 
@@ -45,6 +46,7 @@ export class TerminalPanel extends Panel {
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@IInstantiationService private _instantiationService: IInstantiationService,
 		@ITerminalService private _terminalService: ITerminalService,
+		@ILifecycleService private _lifecycleService: ILifecycleService,
 		@IThemeService protected themeService: IThemeService,
 		@ITelemetryService telemetryService: ITelemetryService
 	) {
@@ -102,16 +104,20 @@ export class TerminalPanel extends Panel {
 				this._updateTheme();
 			} else {
 				return super.setVisible(visible).then(() => {
-					// Allow time for the panel to display if it is being shown
-					// for the first time. If there is not wait here the initial
-					// dimensions of the pty could be wrong.
-					setTimeout(() => {
-						const instance = this._terminalService.createInstance();
-						if (instance) {
-							this._updateFont();
-							this._updateTheme();
-						}
-					}, 0);
+					// Ensure the "Running" lifecycle face has been reached before creating the
+					// first terminal.
+					this._lifecycleService.when(LifecyclePhase.Running).then(() => {
+						// Allow time for the panel to display if it is being shown
+						// for the first time. If there is not wait here the initial
+						// dimensions of the pty could be wrong.
+						setTimeout(() => {
+							const instance = this._terminalService.createInstance();
+							if (instance) {
+								this._updateFont();
+								this._updateTheme();
+							}
+						}, 0);
+					});
 					return TPromise.as(void 0);
 				});
 			}

From 771da41ddb0e5db1c71540e3c75913f2ac570b56 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 11:06:14 -0800
Subject: [PATCH 390/710] Use uint16array to store numbers smaller than 65536

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 47222990f21..787fe2208e4 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -57,15 +57,20 @@ function resetSentinel(): void {
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
 
-export function createUint32Array(arr: number[]): Uint32Array {
-	let r = new Uint32Array(arr.length);
+export function createUintArray(arr: number[]): Uint32Array | Uint16Array {
+	let r;
+	if (arr[arr.length - 1] < 65536) {
+		r = new Uint16Array(arr.length);
+	} else {
+		r = new Uint32Array(arr.length);
+	}
 	r.set(arr, 0);
 	return r;
 }
 
 export class LineStarts {
 	constructor(
-		public readonly lineStarts: Uint32Array | number[],
+		public readonly lineStarts: Uint32Array | Uint16Array | number[],
 		public readonly cr: number,
 		public readonly lf: number,
 		public readonly crlf: number,
@@ -93,7 +98,7 @@ export function createLineStartsFast(str: string, readonly: boolean = true): Uin
 		}
 	}
 	if (readonly) {
-		return createUint32Array(r);
+		return createUintArray(r);
 	} else {
 		return r;
 	}
@@ -130,8 +135,7 @@ export function createLineStarts(r: number[], str: string): LineStarts {
 			}
 		}
 	}
-
-	const result = new LineStarts(createUint32Array(r), cr, lf, crlf, isBasicASCII);
+	const result = new LineStarts(createUintArray(r), cr, lf, crlf, isBasicASCII);
 	r.length = 0;
 
 	return result;
@@ -259,9 +263,9 @@ export class Piece {
 
 export class StringBuffer {
 	buffer: string;
-	lineStarts: number[] | Uint32Array;
+	lineStarts: Uint32Array | Uint16Array | number[];
 
-	constructor(buffer: string, lineStarts: number[] | Uint32Array) {
+	constructor(buffer: string, lineStarts: Uint32Array | Uint16Array | number[]) {
 		this.buffer = buffer;
 		this.lineStarts = lineStarts;
 	}

From 03277ab6464b5014a70007660813cad7d6237484 Mon Sep 17 00:00:00 2001
From: Shobhit Chittora 
Date: Thu, 18 Jan 2018 15:11:35 +0530
Subject: [PATCH 391/710] [fix-panel-auto-maximize] removes condition which
 contraints panelHeight

---
 src/vs/workbench/browser/layout.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 81b49fbed8d..2fb52f64487 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -468,9 +468,7 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 			panelHeight = 0;
 			panelWidth = 0;
 		} else if (panelPosition === Position.BOTTOM) {
-			if (this.panelHeight === previousMaxPanelHeight) {
-				panelHeight = maxPanelHeight;
-			} else if (this.panelHeight > 0) {
+			if (this.panelHeight > 0) {
 				panelHeight = Math.min(maxPanelHeight, Math.max(this.partLayoutInfo.panel.minHeight, this.panelHeight));
 			} else {
 				panelHeight = sidebarSize.height * DEFAULT_PANEL_SIZE_COEFFICIENT;

From 10f84165fad35a64fdb370767c855e913f6f2dd8 Mon Sep 17 00:00:00 2001
From: Shobhit Chittora 
Date: Fri, 19 Jan 2018 05:00:54 +0530
Subject: [PATCH 392/710] [fix-panel-auto-maximize] removes unused var

---
 src/vs/workbench/browser/layout.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts
index 2fb52f64487..371db68f7da 100644
--- a/src/vs/workbench/browser/layout.ts
+++ b/src/vs/workbench/browser/layout.ts
@@ -451,7 +451,6 @@ export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontal
 		this.statusbarHeight = isStatusbarHidden ? 0 : this.partLayoutInfo.statusbar.height;
 		this.titlebarHeight = isTitlebarHidden ? 0 : this.partLayoutInfo.titlebar.height / getZoomFactor(); // adjust for zoom prevention
 
-		const previousMaxPanelHeight = this.sidebarHeight - this.partLayoutInfo.editor.minHeight;
 		this.sidebarHeight = this.workbenchSize.height - this.statusbarHeight - this.titlebarHeight;
 		let sidebarSize = new Dimension(this.sidebarWidth, this.sidebarHeight);
 

From 8c47809732068d803ca4436f3ad24a8f59ea9f2c Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 16:47:22 -0800
Subject: [PATCH 393/710] CreateSnapshot for piece tree.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 44 ++++++++++++++++---
 .../pieceTreeTextBuffer.ts                    |  5 +++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 787fe2208e4..3e83f1f7afb 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -7,6 +7,7 @@
 import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
 import { Range } from 'vs/editor/common/core/range';
+import { ITextSnapshot } from 'vs/platform/files/common/files';
 
 export const enum NodeColor {
 	Black = 0,
@@ -271,6 +272,28 @@ export class StringBuffer {
 	}
 }
 
+class PieceTreeSnapshot implements ITextSnapshot {
+	// pieces/tree nodes in order
+	private _nodes: TreeNode[];
+	private _index: number;
+	constructor(private tree: PieceTreeBase, BOM: string) {
+		this._nodes = [];
+		tree.iterate(tree.root, node => {
+			this._nodes.push(node);
+			return true;
+		});
+		this._index = 0;
+	}
+
+	read(): string {
+		if (this._index > this._nodes.length - 1) {
+			return null;
+		}
+
+		return this.tree.getNodeContent(this._nodes[this._index++]);
+	}
+}
+
 export class PieceTreeBase {
 	root: TreeNode;
 	protected _buffers: StringBuffer[]; // 0 is change buffer, others are readonly original buffer.
@@ -323,7 +346,8 @@ export class PieceTreeBase {
 		let tempChunkLen = 0;
 		let chunks: StringBuffer[] = [];
 
-		this.iterate(this.root, (str) => {
+		this.iterate(this.root, node => {
+			let str = this.getNodeContent(node);
 			let len = str.length;
 			if (tempChunkLen <= min || tempChunkLen + len < max) {
 				tempChunk += str;
@@ -347,7 +371,12 @@ export class PieceTreeBase {
 		this.create(chunks);
 	}
 
+
 	// #region Buffer API
+	public createSnapshot(BOM: string): ITextSnapshot {
+		return new PieceTreeSnapshot(this, BOM);
+	}
+
 	public equal(other: PieceTreeBase): boolean {
 		if (this.getLength() !== other.getLength()) {
 			return false;
@@ -357,7 +386,8 @@ export class PieceTreeBase {
 		}
 
 		let offset = 0;
-		let ret = this.iterate(this.root, str => {
+		let ret = this.iterate(this.root, node => {
+			let str = this.getNodeContent(node);
 			let len = str.length;
 			let startPosition = other.nodeAt(offset);
 			let endPosition = other.nodeAt(offset + len);
@@ -1249,9 +1279,9 @@ export class PieceTreeBase {
 	// #endregion
 
 	// #region Red Black Tree
-	iterate(node: TreeNode, callback: (str: string) => boolean): boolean {
+	iterate(node: TreeNode, callback: (node: TreeNode) => boolean): boolean {
 		if (node === SENTINEL) {
-			return callback('');
+			return callback(SENTINEL);
 		}
 
 		let leftRet = this.iterate(node.left, callback);
@@ -1259,13 +1289,17 @@ export class PieceTreeBase {
 			return leftRet;
 		}
 
+		return callback(node) && this.iterate(node.right, callback);
+	}
+
+	getNodeContent(node: TreeNode) {
 		let buffer = this._buffers[node.piece.bufferIndex];
 		let currentContent;
 		let piece = node.piece;
 		let startOffset = this.offsetInBuffer(piece.bufferIndex, piece.start);
 		let endOffset = this.offsetInBuffer(piece.bufferIndex, piece.end);
 		currentContent = buffer.buffer.substring(startOffset, endOffset);
-		return callback(currentContent) && this.iterate(node.right, callback);
+		return currentContent;
 	}
 
 	leftRotate(x: TreeNode) {
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index c5dcfc58f7c..baaf505f6d0 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -10,6 +10,7 @@ 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 } from 'vs/editor/common/model';
+import { ITextSnapshot } from 'vs/platform/files/common/files';
 
 export class PieceTreeTextBuffer implements ITextBuffer {
 	private _pieceTree: PieceTreeBase;
@@ -54,6 +55,10 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 		return this._EOL;
 	}
 
+	public createSnapshot(preserveBOM: boolean): ITextSnapshot {
+		return this._pieceTree.createSnapshot(preserveBOM ? this._BOM : '');
+	}
+
 	public getOffsetAt(lineNumber: number, column: number): number {
 		return this._pieceTree.getOffsetAt(lineNumber, column);
 	}

From f31ea9bba3a4adb85ac495909839aa345d4578f0 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Thu, 18 Jan 2018 17:11:52 -0800
Subject: [PATCH 394/710] Move files under vs/code/electron-browser/issue

---
 build/gulpfile.vscode.js                                       | 1 +
 src/vs/code/buildfile.js                                       | 3 ++-
 .../electron-browser/issue}/bootstrap.css                      | 0
 .../electron-browser/issue}/issueReporter.css                  | 0
 .../electron-browser/issue/issueReporter.html}                 | 2 +-
 .../index.js => code/electron-browser/issue/issueReporter.js}  | 2 +-
 .../electron-browser/issue/issueReporterMain.ts}               | 2 +-
 .../electron-browser/issue}/issueReporterModel.ts              | 0
 .../electron-browser}/issue/test/testReporterModel.test.ts     | 2 +-
 src/vs/platform/issue/electron-main/issueService.ts            | 2 +-
 10 files changed, 8 insertions(+), 6 deletions(-)
 rename src/vs/{issue/electron-browser => code/electron-browser/issue}/bootstrap.css (100%)
 rename src/vs/{issue/electron-browser => code/electron-browser/issue}/issueReporter.css (100%)
 rename src/vs/{issue/electron-browser/index.html => code/electron-browser/issue/issueReporter.html} (98%)
 rename src/vs/{issue/electron-browser/index.js => code/electron-browser/issue/issueReporter.js} (96%)
 rename src/vs/{issue/electron-browser/issueReporter.ts => code/electron-browser/issue/issueReporterMain.ts} (99%)
 rename src/vs/{issue/electron-browser => code/electron-browser/issue}/issueReporterModel.ts (100%)
 rename src/vs/{ => code/electron-browser}/issue/test/testReporterModel.test.ts (89%)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 78a09a2db01..81868d9a90c 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -83,6 +83,7 @@ const vscodeResources = [
 	'out-build/vs/workbench/services/files/**/*.exe',
 	'out-build/vs/workbench/services/files/**/*.md',
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
+	'out-build/vs/code/electron-browser/issue/issueReporter.js',
 	'!**/test/**'
 ];
 
diff --git a/src/vs/code/buildfile.js b/src/vs/code/buildfile.js
index f94e19b95b8..0293acbb5be 100644
--- a/src/vs/code/buildfile.js
+++ b/src/vs/code/buildfile.js
@@ -21,6 +21,7 @@ exports.collectModules= function() {
 		createModuleDescription('vs/code/electron-main/main', []),
 		createModuleDescription('vs/code/node/cli', []),
 		createModuleDescription('vs/code/node/cliProcessMain', ['vs/code/node/cli']),
-		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', [])
+		createModuleDescription('vs/code/electron-browser/sharedProcess/sharedProcessMain', []),
+		createModuleDescription('vs/code/electron-browser/issue/issueReporterMain', [])
 	];
 };
\ No newline at end of file
diff --git a/src/vs/issue/electron-browser/bootstrap.css b/src/vs/code/electron-browser/issue/bootstrap.css
similarity index 100%
rename from src/vs/issue/electron-browser/bootstrap.css
rename to src/vs/code/electron-browser/issue/bootstrap.css
diff --git a/src/vs/issue/electron-browser/issueReporter.css b/src/vs/code/electron-browser/issue/issueReporter.css
similarity index 100%
rename from src/vs/issue/electron-browser/issueReporter.css
rename to src/vs/code/electron-browser/issue/issueReporter.css
diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/code/electron-browser/issue/issueReporter.html
similarity index 98%
rename from src/vs/issue/electron-browser/index.html
rename to src/vs/code/electron-browser/issue/issueReporter.html
index 986c49abcf7..c5ef557615c 100644
--- a/src/vs/issue/electron-browser/index.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -99,5 +99,5 @@
 		
    
 	
 
-	
+	
 
\ No newline at end of file
diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/code/electron-browser/issue/issueReporter.js
similarity index 96%
rename from src/vs/issue/electron-browser/index.js
rename to src/vs/code/electron-browser/issue/issueReporter.js
index 86898c8dc84..f54c82c250f 100644
--- a/src/vs/issue/electron-browser/index.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -53,7 +53,7 @@ function main() {
 			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
 		});
 
-		require(['vs/issue/electron-browser/issueReporter'], (issueReporter) => {
+		require(['vs/code/electron-browser/issue/issueReporterMain'], (issueReporter) => {
 			issueReporter.startup(configuration);
 		});
 	});
diff --git a/src/vs/issue/electron-browser/issueReporter.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
similarity index 99%
rename from src/vs/issue/electron-browser/issueReporter.ts
rename to src/vs/code/electron-browser/issue/issueReporterMain.ts
index 0fad9b980e1..ace7e535d87 100644
--- a/src/vs/issue/electron-browser/issueReporter.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -23,7 +23,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia
 import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
 import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { IssueReporterModel, IssueReporterData } from 'vs/issue/electron-browser/issueReporterModel';
+import { IssueReporterModel, IssueReporterData } from 'vs/code/electron-browser/issue/issueReporterModel';
 import { IssueReporterStyles } from 'vs/platform/issue/common/issue';
 
 export function startup(configuration: IWindowConfiguration) {
diff --git a/src/vs/issue/electron-browser/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
similarity index 100%
rename from src/vs/issue/electron-browser/issueReporterModel.ts
rename to src/vs/code/electron-browser/issue/issueReporterModel.ts
diff --git a/src/vs/issue/test/testReporterModel.test.ts b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
similarity index 89%
rename from src/vs/issue/test/testReporterModel.test.ts
rename to src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
index f159fa48466..657dc3d2649 100644
--- a/src/vs/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
-import { IssueReporterModel } from 'vs/issue/electron-browser/issueReporterModel';
+import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
 
 suite('IssueReporter', () => {
 
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 26f91282f77..40402597a34 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -69,6 +69,6 @@ export class IssueService implements IIssueService {
 			windowId: this._issueWindow.id,
 			machineId: this.machineId
 		};
-		return `${require.toUrl('vs/issue/electron-browser/index.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
+		return `${require.toUrl('vs/code/electron-browser/issue/issueReporter.html')}?config=${encodeURIComponent(JSON.stringify(config))}`;
 	}
 }

From 23b732a35959f26c8c955678bf16b30711f11c69 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 17:20:35 -0800
Subject: [PATCH 395/710] Fix cases for iterator.

---
 .../model/pieceTreeTextBuffer/pieceTreeBase.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 3e83f1f7afb..ca6f940fcc2 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -276,8 +276,12 @@ class PieceTreeSnapshot implements ITextSnapshot {
 	// pieces/tree nodes in order
 	private _nodes: TreeNode[];
 	private _index: number;
-	constructor(private tree: PieceTreeBase, BOM: string) {
+	private _tree: PieceTreeBase;
+	private _BOM: string;
+	constructor(tree: PieceTreeBase, BOM: string) {
 		this._nodes = [];
+		this._tree = tree;
+		this._BOM = BOM;
 		tree.iterate(tree.root, node => {
 			this._nodes.push(node);
 			return true;
@@ -290,7 +294,10 @@ class PieceTreeSnapshot implements ITextSnapshot {
 			return null;
 		}
 
-		return this.tree.getNodeContent(this._nodes[this._index++]);
+		if (this._index === 0) {
+			return this._BOM + this._tree.getNodeContent(this._nodes[this._index++]);
+		}
+		return this._tree.getNodeContent(this._nodes[this._index++]);
 	}
 }
 
@@ -1293,6 +1300,9 @@ export class PieceTreeBase {
 	}
 
 	getNodeContent(node: TreeNode) {
+		if (node === SENTINEL) {
+			return '';
+		}
 		let buffer = this._buffers[node.piece.bufferIndex];
 		let currentContent;
 		let piece = node.piece;
@@ -1673,8 +1683,8 @@ export class PieceTreeBase {
 	getContentOfSubTree(node: TreeNode): string {
 		let str = '';
 
-		this.iterate(node, (newStr) => {
-			str += newStr;
+		this.iterate(node, node => {
+			str += this.getNodeContent(node);
 			return true;
 		});
 

From 253434c87c55d62a109887aeccc0d0f201739e88 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Thu, 18 Jan 2018 17:20:46 -0800
Subject: [PATCH 396/710] Fix webview protocol logic for windows

Fixes #41795

Make sure we use the correct path seps and normalization on windows for the new webview protocol
---
 .../workbench/parts/extensions/browser/extensionEditor.ts  | 3 ++-
 src/vs/workbench/parts/html/browser/webview.ts             | 7 ++++---
 .../parts/update/electron-browser/releaseNotesEditor.ts    | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index 43a5d963e96..fd380543ec4 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -53,6 +53,7 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe
 import { Color } from 'vs/base/common/color';
 import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import URI from 'vs/base/common/uri';
 
 /**  A context key that is set when an extension editor webview has focus. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey('extensionEditorWebviewFocus', undefined);
@@ -67,7 +68,7 @@ function renderBody(
 	body: string,
 	environmentService: IEnvironmentService
 ): string {
-	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://' + environmentService.appRoot, 'vscode-core-resource://');
+	const styleSheetPath = require.toUrl('./media/markdown.css').replace(URI.file(environmentService.appRoot).toString(true), 'vscode-core-resource://');
 	return `
 		
 			
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index b46ee754598..3de46823520 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -15,7 +15,7 @@ import { WebviewFindWidget } from './webviewFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { normalize, join } from 'vs/base/common/paths';
+import { normalize, join, nativeSep } from 'vs/base/common/paths';
 import { startsWith } from 'vs/base/common/strings';
 
 export interface WebviewElementFindInPageOptions {
@@ -102,7 +102,7 @@ export default class Webview {
 
 				const contents = this._webview.getWebContents();
 				if (contents && !contents.isDestroyed()) {
-					registerFileProtocol(contents, 'vscode-core-resource', this._environmentService.appRoot);
+					registerFileProtocol(contents, 'vscode-core-resource', this._environmentService.appRoot + nativeSep);
 				}
 			}));
 		}
@@ -421,7 +421,8 @@ function registerFileProtocol(
 ) {
 	contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => {
 		const requestPath = URI.parse(request.url).path;
-		const normalizedPath = normalize(join(root, requestPath));
+		const normalizedPath = normalize(join(root, requestPath), true);
+		console.log(root, requestPath, normalizedPath);
 		if (startsWith(normalizedPath, root)) {
 			callback({ path: normalizedPath });
 		} else {
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index 53e1440adbd..444c67aa91f 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -28,13 +28,14 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
+import URI from 'vs/base/common/uri';
 
 function renderBody(
 	body: string,
 	css: string,
 	environmentService: IEnvironmentService
 ): string {
-	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://' + environmentService.appRoot, 'vscode-core-resource://');
+	const styleSheetPath = require.toUrl('./media/markdown.css').replace(URI.file(environmentService.appRoot).toString(true), 'vscode-core-resource://');
 	return `
 		
 			

From b0a26a94c6c1ae43acd2b19c820e4b27d270a797 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Wed, 17 Jan 2018 15:21:40 -0800
Subject: [PATCH 397/710] Add quick fix all for JS/TS

Fixes #40170
---
 .../src/features/quickFixProvider.ts          | 94 ++++++++++++++++---
 .../typescript/src/typescriptService.ts       |  1 +
 extensions/typescript/src/utils/api.ts        |  5 +
 extensions/typescript/src/utils/codeAction.ts | 18 +---
 .../typescript/src/utils/workspaceEdit.ts     | 24 +++++
 5 files changed, 117 insertions(+), 25 deletions(-)
 create mode 100644 extensions/typescript/src/utils/workspaceEdit.ts

diff --git a/extensions/typescript/src/features/quickFixProvider.ts b/extensions/typescript/src/features/quickFixProvider.ts
index a91b0eb40a6..4c4a86d1d97 100644
--- a/extensions/typescript/src/features/quickFixProvider.ts
+++ b/extensions/typescript/src/features/quickFixProvider.ts
@@ -11,6 +11,10 @@ import { vsRangeToTsFileRange } from '../utils/convert';
 import FormattingConfigurationManager from './formattingConfigurationManager';
 import { getEditForCodeAction, applyCodeActionCommands } from '../utils/codeAction';
 import { Command, CommandManager } from '../utils/commandManager';
+import { createWorkspaceEditFromFileCodeEdits } from '../utils/workspaceEdit';
+
+import * as nls from 'vscode-nls';
+const localize = nls.loadMessageBundle();
 
 class ApplyCodeActionCommand implements Command {
 	public static readonly ID = '_typescript.applyCodeActionCommand';
@@ -87,23 +91,50 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 
 		const results: vscode.CodeAction[] = [];
 		for (const diagnostic of fixableDiagnostics) {
-			const args: Proto.CodeFixRequestArgs = {
-				...vsRangeToTsFileRange(file, diagnostic.range),
-				errorCodes: [+diagnostic.code]
-			};
-			const response = await this.client.execute('getCodeFixes', args, token);
-			if (response.body) {
-				results.push(...response.body.map(action => this.getCommandForAction(diagnostic, action)));
-			}
+			results.push(...await this.getFixesForDiagnostic(file, diagnostic, token));
 		}
 		return results;
 	}
 
-	private getCommandForAction(
+	private async getFixesForDiagnostic(
+		file: string,
 		diagnostic: vscode.Diagnostic,
-		tsAction: Proto.CodeAction
+		token: vscode.CancellationToken
+	): Promise> {
+		const args: Proto.CodeFixRequestArgs = {
+			...vsRangeToTsFileRange(file, diagnostic.range),
+			errorCodes: [+diagnostic.code]
+		};
+		const codeFixesResponse = await this.client.execute('getCodeFixes', args, token);
+		if (codeFixesResponse.body) {
+			const results: vscode.CodeAction[] = [];
+			for (const tsCodeFix of codeFixesResponse.body) {
+				results.push(...await this.getAllFixesForTsCodeAction(file, diagnostic, tsCodeFix, token));
+			}
+			return results;
+		}
+		return [];
+	}
+
+	private async getAllFixesForTsCodeAction(
+		file: string,
+		diagnostic: vscode.Diagnostic,
+		tsAction: Proto.CodeFixAction,
+		token: vscode.CancellationToken
+	): Promise> {
+		const singleFix = this.getSingleFixForTsCodeAction(diagnostic, tsAction);
+		const fixAll = await this.getFixAllForTsCodeAction(file, diagnostic, tsAction, token);
+		return fixAll ? [singleFix, fixAll] : [singleFix];
+	}
+
+	private getSingleFixForTsCodeAction(
+		diagnostic: vscode.Diagnostic,
+		tsAction: Proto.CodeFixAction
 	): vscode.CodeAction {
-		const codeAction = new vscode.CodeAction(tsAction.description, getEditForCodeAction(this.client, tsAction));
+		const codeAction = new vscode.CodeAction(
+			tsAction.description,
+			getEditForCodeAction(this.client, tsAction));
+
 		codeAction.diagnostics = [diagnostic];
 		if (tsAction.commands) {
 			codeAction.command = {
@@ -114,4 +145,45 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 		}
 		return codeAction;
 	}
+
+	private async getFixAllForTsCodeAction(
+		file: string,
+		diagnostic: vscode.Diagnostic,
+		tsAction: Proto.CodeFixAction,
+		token: vscode.CancellationToken
+	): Promise {
+		if (!tsAction.fixId || !this.client.apiVersion.has270Features()) {
+			return undefined;
+		}
+
+		const args: Proto.GetCombinedCodeFixRequestArgs = {
+			scope: {
+				type: 'file',
+				args: { file }
+			},
+			fixId: tsAction.fixId
+		};
+
+		try {
+			const combinedCodeFixesResponse = await this.client.execute('getCombinedCodeFix', args, token);
+			if (!combinedCodeFixesResponse.body) {
+				return undefined;
+			}
+
+			const codeAction = new vscode.CodeAction(
+				localize('fixAllInFileLabel', '{0} (Fix all in file)', tsAction.description),
+				createWorkspaceEditFromFileCodeEdits(this.client, combinedCodeFixesResponse.body.changes));
+			codeAction.diagnostics = [diagnostic];
+			if (tsAction.commands) {
+				codeAction.command = {
+					command: ApplyCodeActionCommand.ID,
+					arguments: [tsAction],
+					title: tsAction.description
+				};
+			}
+			return codeAction;
+		} catch {
+			return undefined;
+		}
+	}
 }
diff --git a/extensions/typescript/src/typescriptService.ts b/extensions/typescript/src/typescriptService.ts
index fbcda9c7938..db51d60464c 100644
--- a/extensions/typescript/src/typescriptService.ts
+++ b/extensions/typescript/src/typescriptService.ts
@@ -61,6 +61,7 @@ export interface ITypeScriptServiceClient {
 	execute(command: 'navtree', args: Proto.FileRequestArgs, token?: CancellationToken): Promise;
 	execute(command: 'getCodeFixes', args: Proto.CodeFixRequestArgs, token?: CancellationToken): Promise;
 	execute(command: 'getSupportedCodeFixes', args: null, token?: CancellationToken): Promise;
+	execute(command: 'getCombinedCodeFix', args: Proto.GetCombinedCodeFixRequestArgs, token?: CancellationToken): Promise;
 	execute(command: 'docCommentTemplate', args: Proto.FileLocationRequestArgs, token?: CancellationToken): Promise;
 	execute(command: 'getApplicableRefactors', args: Proto.GetApplicableRefactorsRequestArgs, token?: CancellationToken): Promise;
 	execute(command: 'getEditsForRefactor', args: Proto.GetEditsForRefactorRequestArgs, token?: CancellationToken): Promise;
diff --git a/extensions/typescript/src/utils/api.ts b/extensions/typescript/src/utils/api.ts
index 5b2e98f7372..e4103a29231 100644
--- a/extensions/typescript/src/utils/api.ts
+++ b/extensions/typescript/src/utils/api.ts
@@ -91,4 +91,9 @@ export default class API {
 	public has262Features(): boolean {
 		return semver.gte(this.version, '2.6.2');
 	}
+
+	@memoize
+	public has270Features(): boolean {
+		return semver.gte(this.version, '2.7.0');
+	}
 }
\ No newline at end of file
diff --git a/extensions/typescript/src/utils/codeAction.ts b/extensions/typescript/src/utils/codeAction.ts
index e3fc0178af1..4c05629c78c 100644
--- a/extensions/typescript/src/utils/codeAction.ts
+++ b/extensions/typescript/src/utils/codeAction.ts
@@ -5,26 +5,16 @@
 
 import { WorkspaceEdit, workspace } from 'vscode';
 import * as Proto from '../protocol';
-import { tsTextSpanToVsRange } from './convert';
 import { ITypeScriptServiceClient } from '../typescriptService';
+import { createWorkspaceEditFromFileCodeEdits } from './workspaceEdit';
 
 export function getEditForCodeAction(
 	client: ITypeScriptServiceClient,
 	action: Proto.CodeAction
 ): WorkspaceEdit | undefined {
-	if (action.changes && action.changes.length) {
-		const workspaceEdit = new WorkspaceEdit();
-		for (const change of action.changes) {
-			for (const textChange of change.textChanges) {
-				workspaceEdit.replace(client.asUrl(change.fileName),
-					tsTextSpanToVsRange(textChange),
-					textChange.newText);
-			}
-		}
-
-		return workspaceEdit;
-	}
-	return undefined;
+	return action.changes && action.changes.length
+		? createWorkspaceEditFromFileCodeEdits(client, action.changes)
+		: undefined;
 }
 
 export async function applyCodeAction(
diff --git a/extensions/typescript/src/utils/workspaceEdit.ts b/extensions/typescript/src/utils/workspaceEdit.ts
new file mode 100644
index 00000000000..4cb29eb8467
--- /dev/null
+++ b/extensions/typescript/src/utils/workspaceEdit.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import * as vscode from 'vscode';
+import { ITypeScriptServiceClient } from '../typescriptService';
+import * as Proto from '../protocol';
+import { tsTextSpanToVsRange } from './convert';
+
+export function createWorkspaceEditFromFileCodeEdits(
+	client: ITypeScriptServiceClient,
+	edits: Iterable
+): vscode.WorkspaceEdit {
+	const workspaceEdit = new vscode.WorkspaceEdit();
+	for (const edit of edits) {
+		for (const textChange of edit.textChanges) {
+			workspaceEdit.replace(client.asUrl(edit.fileName),
+				tsTextSpanToVsRange(textChange),
+				textChange.newText);
+		}
+	}
+
+	return workspaceEdit;
+}
\ No newline at end of file

From 47832c90391103f27df84ded193decb72bb327b5 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Thu, 18 Jan 2018 17:23:08 -0800
Subject: [PATCH 398/710] Remove extra logging statement

---
 src/vs/workbench/parts/html/browser/webview.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index 3de46823520..814050eaa77 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -422,7 +422,6 @@ function registerFileProtocol(
 	contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => {
 		const requestPath = URI.parse(request.url).path;
 		const normalizedPath = normalize(join(root, requestPath), true);
-		console.log(root, requestPath, normalizedPath);
 		if (startsWith(normalizedPath, root)) {
 			callback({ path: normalizedPath });
 		} else {

From 97eb9459b1f933f8cad77f56ea3e602cc15f15b3 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 17:35:56 -0800
Subject: [PATCH 399/710] disable piece tree.

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

diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index a8257f00275..fc3139a558d 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -38,7 +38,7 @@ import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeText
 import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 // Here is the master switch for the text buffer implementation:
-const USE_PIECE_TREE_IMPLEMENTATION = true;
+const USE_PIECE_TREE_IMPLEMENTATION = false;
 const USE_CHUNKS_TEXT_BUFFER = false;
 
 function createTextBufferBuilder() {

From 12ffe4382e9dff8b3be3655f232d767aae2e7c47 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Thu, 18 Jan 2018 21:04:45 -0800
Subject: [PATCH 400/710] Add winjs skipFiles pattern to launch config

---
 .vscode/launch.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 37898b81577..930f764b9b1 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -129,6 +129,9 @@
 			"runtimeArgs": [
 				"--inspect=5875"
 			],
+			"skipFiles": [
+				"**/winjs*.js"
+			],
 			"webRoot": "${workspaceFolder}"
 		},
 		{

From b91616bd649a5fba78963a0ec0857dfb27b59f72 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 21:08:01 -0800
Subject: [PATCH 401/710] avoid unnecessary code change.

---
 src/vs/editor/common/model/linesTextBuffer/textSource.ts | 2 +-
 src/vs/editor/common/viewModel/prefixSumComputer.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/model/linesTextBuffer/textSource.ts b/src/vs/editor/common/model/linesTextBuffer/textSource.ts
index d2ea4389338..79c06f1c9f1 100644
--- a/src/vs/editor/common/model/linesTextBuffer/textSource.ts
+++ b/src/vs/editor/common/model/linesTextBuffer/textSource.ts
@@ -35,7 +35,7 @@ export interface IRawTextSource {
 
 export class TextSource {
 
-	/**f
+	/**
 	 * 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'.
diff --git a/src/vs/editor/common/viewModel/prefixSumComputer.ts b/src/vs/editor/common/viewModel/prefixSumComputer.ts
index 291ec21fa35..8730795093f 100644
--- a/src/vs/editor/common/viewModel/prefixSumComputer.ts
+++ b/src/vs/editor/common/viewModel/prefixSumComputer.ts
@@ -23,7 +23,7 @@ export class PrefixSumComputer {
 	/**
 	 * values[i] is the value at index i
 	 */
-	values: Uint32Array;
+	private values: Uint32Array;
 
 	/**
 	 * prefixSum[i] = SUM(heights[j]), 0 <= j <= i

From de36a96db176ff796cb6d365f124311b8dbd68ce Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 21:25:20 -0800
Subject: [PATCH 402/710] add detailed comments for piece tree snapshot.

---
 .../common/model/pieceTreeTextBuffer/pieceTreeBase.ts  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index ca6f940fcc2..2dbb4357a1d 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -272,12 +272,18 @@ export class StringBuffer {
 	}
 }
 
+/**
+ * Readonly snapshot for piece tree.
+ * In a real multiple thread environment, to make snapshot reading always work correctly, we need to
+ * 1. Make TreeNode.piece immutable, then reading and writing can run in parallel.
+ * 2. TreeNode/Buffers normalization should not happen during snapshot reading.
+ */
 class PieceTreeSnapshot implements ITextSnapshot {
-	// pieces/tree nodes in order
-	private _nodes: TreeNode[];
+	private _nodes: TreeNode[]; // pieces/tree nodes in order
 	private _index: number;
 	private _tree: PieceTreeBase;
 	private _BOM: string;
+
 	constructor(tree: PieceTreeBase, BOM: string) {
 		this._nodes = [];
 		this._tree = tree;

From 16a0a75f7b68efd175f945123e8d05fda48cf678 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Thu, 18 Jan 2018 21:35:40 -0800
Subject: [PATCH 403/710] Support searching preferences with installed
 extension filters

---
 .../parts/preferences/common/preferences.ts   |   2 -
 .../electron-browser/preferencesSearch.ts     | 116 ++++++++++--------
 2 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index 63a3adeabfd..9330e27ba91 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -176,8 +176,6 @@ export const IPreferencesSearchService = createDecorator;
+
 	constructor(
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IInstantiationService private instantiationService: IInstantiationService
+		@IInstantiationService private instantiationService: IInstantiationService,
+		@IExtensionManagementService private extensionManagementService: IExtensionManagementService
 	) {
 		super();
+		this._installedExtensions = this.extensionManagementService.getInstalled(LocalExtensionType.User);
 	}
 
 	private get remoteSearchAllowed(): boolean {
@@ -45,10 +50,10 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 			return false;
 		}
 
-		return !!this.endpoint.urlBase;
+		return !!this._endpoint.urlBase;
 	}
 
-	get endpoint(): IEndpointDetails {
+	private get _endpoint(): IEndpointDetails {
 		const workbenchSettings = this.configurationService.getValue().workbench.settings;
 		if (workbenchSettings.naturalLanguageSearchEndpoint) {
 			return {
@@ -63,7 +68,7 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 	}
 
 	getRemoteSearchProvider(filter: string): RemoteSearchProvider {
-		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this.endpoint);
+		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this._endpoint, this._installedExtensions);
 	}
 
 	getLocalSearchProvider(filter: string): LocalSearchProvider {
@@ -119,9 +124,9 @@ export class RemoteSearchProvider implements ISearchProvider {
 	private _filter: string;
 	private _remoteSearchP: TPromise;
 
-	constructor(filter: string, endpoint: IEndpointDetails,
+	constructor(filter: string, endpoint: IEndpointDetails, private installedExtensions: TPromise,
 		@IEnvironmentService private environmentService: IEnvironmentService,
-		@IRequestService private requestService: IRequestService
+		@IRequestService private requestService: IRequestService,
 	) {
 		this._filter = filter;
 
@@ -151,25 +156,23 @@ export class RemoteSearchProvider implements ISearchProvider {
 	}
 
 	private getSettingsFromBing(filter: string, endpoint: IEndpointDetails): TPromise {
-		const url = prepareUrl(filter, endpoint, this.environmentService.settingsSearchBuildId);
 		const start = Date.now();
-		const p = this.requestService.request({
-			url,
-			headers: {
-				'User-Agent': 'request',
-				'Content-Type': 'application/json; charset=utf-8',
-				'api-key': endpoint.key
-			},
-			timeout: 5000
-		})
-			.then(context => {
+		return this.prepareUrl(filter, endpoint, this.environmentService.settingsSearchBuildId).then(url => {
+			return this.requestService.request({
+				url,
+				headers: {
+					'User-Agent': 'request',
+					'Content-Type': 'application/json; charset=utf-8',
+					'api-key': endpoint.key
+				},
+				timeout: 5000
+			}).then(context => {
 				if (context.res.statusCode >= 300) {
 					throw new Error(`${url} returned status code: ${context.res.statusCode}`);
 				}
 
 				return asJson(context);
-			})
-			.then((result: any) => {
+			}).then((result: any) => {
 				const timestamp = Date.now();
 				const duration = timestamp - start;
 				const suggestions = (result.value || [])
@@ -194,8 +197,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 					context: result['@odata.context']
 				};
 			});
-
-		return TPromise.as(p as any);
+		});
 	}
 
 	private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher {
@@ -209,11 +211,51 @@ export class RemoteSearchProvider implements ISearchProvider {
 			return null;
 		};
 	}
+
+	private prepareUrl(query: string, endpoint: IEndpointDetails, buildNumber: number): TPromise {
+		query = escapeSpecialChars(query);
+		const boost = 10;
+		const userQuery = `(${query})^${boost}`;
+
+		// Appending Fuzzy after each word.
+		query = query.replace(/\ +/g, '~ ') + '~';
+
+		const encodedQuery = encodeURIComponent(userQuery + ' || ' + query);
+		let url = `${endpoint.urlBase}?`;
+
+		return this.installedExtensions.then(exts => {
+			if (endpoint.key) {
+				url += `${API_VERSION}`;
+				url += `&search=${encodedQuery}`;
+
+				const filters = exts.map(ext => {
+					const uuid = ext.identifier.uuid;
+					const versionString = ext.manifest.version
+						.split('.')
+						.map(versionPart => strings.pad(versionPart, 10))
+						.join('');
+
+					return `(packageid eq '${uuid}' and startbuildno le '${versionString}' and endbuildno ge '${versionString}')`;
+				});
+
+				if (buildNumber) {
+					filters.push(`(packageid eq 'core' and startbuildno le '${buildNumber}' and endbuildno ge '${buildNumber}')`);
+					url += `&$filter=${filters.join(' or ')}`;
+				}
+			} else {
+				url += `query=${encodedQuery}`;
+
+				if (buildNumber) {
+					url += `&build=${buildNumber}`;
+				}
+			}
+
+			return url;
+		});
+	}
 }
 
 const API_VERSION = 'api-version=2016-09-01-Preview';
-const QUERY_TYPE = 'querytype=full';
-const SCORING_PROFILE = 'scoringProfile=ranking';
 
 function escapeSpecialChars(query: string): string {
 	return query.replace(/\./g, ' ')
@@ -222,34 +264,6 @@ function escapeSpecialChars(query: string): string {
 		.trim();
 }
 
-function prepareUrl(query: string, endpoint: IEndpointDetails, buildNumber: number): string {
-	query = escapeSpecialChars(query);
-	const boost = 10;
-	const userQuery = `(${query})^${boost}`;
-
-	// Appending Fuzzy after each word.
-	query = query.replace(/\ +/g, '~ ') + '~';
-
-	const encodedQuery = encodeURIComponent(userQuery + ' || ' + query);
-	let url = `${endpoint.urlBase}?`;
-	if (endpoint.key) {
-		url += `search=${encodedQuery}`;
-		url += `&${API_VERSION}&${QUERY_TYPE}&${SCORING_PROFILE}`;
-
-		if (buildNumber) {
-			url += `&$filter startbuildno le ${buildNumber} and endbuildno ge ${buildNumber}`;
-		}
-	} else {
-		url += `query=${encodedQuery}`;
-
-		if (buildNumber) {
-			url += `&build=${buildNumber}`;
-		}
-	}
-
-	return url;
-}
-
 class SettingMatches {
 
 	private readonly descriptionMatchingWords: Map = new Map();

From 8e9a69c8566ccc6f989fa44afbc994e355ce3175 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 21:39:40 -0800
Subject: [PATCH 404/710] inline rbTree get/set NodeColor.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 93 +++++++++----------
 .../pieceTreeTextBuffer.test.ts               | 14 +--
 2 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 2dbb4357a1d..2d35c561c07 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -18,10 +18,6 @@ export function getNodeColor(node: TreeNode) {
 	return node.color;
 }
 
-function setNodeColor(node: TreeNode, color: NodeColor) {
-	node.color = color;
-}
-
 function leftest(node: TreeNode): TreeNode {
 	while (node.left !== SENTINEL) {
 		node = node.left;
@@ -218,7 +214,7 @@ export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
 SENTINEL.parent = SENTINEL;
 SENTINEL.left = SENTINEL;
 SENTINEL.right = SENTINEL;
-setNodeColor(SENTINEL, NodeColor.Black);
+SENTINEL.color = NodeColor.Black;
 
 export interface NodePosition {
 	/**
@@ -1383,7 +1379,7 @@ export class PieceTreeBase {
 		let x = this.root;
 		if (x === SENTINEL) {
 			this.root = z;
-			setNodeColor(z, NodeColor.Black);
+			z.color = NodeColor.Black;
 		} else if (node.right === SENTINEL) {
 			node.right = z;
 			z.parent = node;
@@ -1415,7 +1411,7 @@ export class PieceTreeBase {
 		let x = this.root;
 		if (x === SENTINEL) {
 			this.root = z;
-			setNodeColor(z, NodeColor.Black);
+			z.color = NodeColor.Black;
 		} else if (node.left === SENTINEL) {
 			node.left = z;
 			z.parent = node;
@@ -1448,8 +1444,7 @@ export class PieceTreeBase {
 			this.root = x;
 
 			// if x is null, we are removing the only node
-			setNodeColor(x, NodeColor.Black);
-
+			x.color = NodeColor.Black;
 			z.detach();
 			resetSentinel();
 			this.root.parent = SENTINEL;
@@ -1457,7 +1452,7 @@ export class PieceTreeBase {
 			return;
 		}
 
-		let yWasRed = (getNodeColor(y) === NodeColor.Red);
+		let yWasRed = (y.color === NodeColor.Red);
 
 		if (y === y.parent.left) {
 			y.parent.left = x;
@@ -1481,7 +1476,7 @@ export class PieceTreeBase {
 			y.left = z.left;
 			y.right = z.right;
 			y.parent = z.parent;
-			setNodeColor(y, getNodeColor(z));
+			y.color = z.color;
 
 			if (z === this.root) {
 				this.root = y;
@@ -1529,79 +1524,79 @@ export class PieceTreeBase {
 
 		// RB-DELETE-FIXUP
 		let w: TreeNode;
-		while (x !== this.root && getNodeColor(x) === NodeColor.Black) {
+		while (x !== this.root && x.color === NodeColor.Black) {
 			if (x === x.parent.left) {
 				w = x.parent.right;
 
-				if (getNodeColor(w) === NodeColor.Red) {
-					setNodeColor(w, NodeColor.Black);
-					setNodeColor(x.parent, NodeColor.Red);
+				if (w.color === NodeColor.Red) {
+					w.color = NodeColor.Black;
+					x.parent.color = NodeColor.Red;
 					this.leftRotate(x.parent);
 					w = x.parent.right;
 				}
 
-				if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) {
-					setNodeColor(w, NodeColor.Red);
+				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+					w.color = NodeColor.Red;
 					x = x.parent;
 				} else {
-					if (getNodeColor(w.right) === NodeColor.Black) {
-						setNodeColor(w.left, NodeColor.Black);
-						setNodeColor(w, NodeColor.Red);
+					if (w.right.color === NodeColor.Black) {
+						w.left.color = NodeColor.Black;
+						w.color = NodeColor.Red;
 						this.rightRotate(w);
 						w = x.parent.right;
 					}
 
-					setNodeColor(w, getNodeColor(x.parent));
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(w.right, NodeColor.Black);
+					w.color = x.parent.color;
+					x.parent.color = NodeColor.Black;
+					w.right.color = NodeColor.Black;
 					this.leftRotate(x.parent);
 					x = this.root;
 				}
 			} else {
 				w = x.parent.left;
 
-				if (getNodeColor(w) === NodeColor.Red) {
-					setNodeColor(w, NodeColor.Black);
-					setNodeColor(x.parent, NodeColor.Red);
+				if (w.color === NodeColor.Red) {
+					w.color = NodeColor.Black;
+					x.parent.color = NodeColor.Red;
 					this.rightRotate(x.parent);
 					w = x.parent.left;
 				}
 
-				if (getNodeColor(w.left) === NodeColor.Black && getNodeColor(w.right) === NodeColor.Black) {
-					setNodeColor(w, NodeColor.Red);
+				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+					w.color = NodeColor.Red;
 					x = x.parent;
 
 				} else {
-					if (getNodeColor(w.left) === NodeColor.Black) {
-						setNodeColor(w.right, NodeColor.Black);
-						setNodeColor(w, NodeColor.Red);
+					if (w.left.color === NodeColor.Black) {
+						w.right.color = NodeColor.Black;
+						w.color = NodeColor.Red;
 						this.leftRotate(w);
 						w = x.parent.left;
 					}
 
-					setNodeColor(w, getNodeColor(x.parent));
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(w.left, NodeColor.Black);
+					w.color = x.parent.color;
+					x.parent.color = NodeColor.Black;
+					w.left.color = NodeColor.Black;
 					this.rightRotate(x.parent);
 					x = this.root;
 				}
 			}
 		}
-		setNodeColor(x, NodeColor.Black);
+		x.color = NodeColor.Black;
 		resetSentinel();
 	}
 
 	fixInsert(x: TreeNode) {
 		this.recomputeTreeMetadata(x);
 
-		while (x !== this.root && getNodeColor(x.parent) === NodeColor.Red) {
+		while (x !== this.root && x.parent.color === NodeColor.Red) {
 			if (x.parent === x.parent.parent.left) {
 				const y = x.parent.parent.right;
 
-				if (getNodeColor(y) === NodeColor.Red) {
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(y, NodeColor.Black);
-					setNodeColor(x.parent.parent, NodeColor.Red);
+				if (y.color === NodeColor.Red) {
+					x.parent.color = NodeColor.Black;
+					y.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
 					x = x.parent.parent;
 				} else {
 					if (x === x.parent.right) {
@@ -1609,31 +1604,31 @@ export class PieceTreeBase {
 						this.leftRotate(x);
 					}
 
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(x.parent.parent, NodeColor.Red);
+					x.parent.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
 					this.rightRotate(x.parent.parent);
 				}
 			} else {
 				const y = x.parent.parent.left;
 
-				if (getNodeColor(y) === NodeColor.Red) {
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(y, NodeColor.Black);
-					setNodeColor(x.parent.parent, NodeColor.Red);
+				if (y.color === NodeColor.Red) {
+					x.parent.color = NodeColor.Black;
+					y.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
 					x = x.parent.parent;
 				} else {
 					if (x === x.parent.left) {
 						x = x.parent;
 						this.rightRotate(x);
 					}
-					setNodeColor(x.parent, NodeColor.Black);
-					setNodeColor(x.parent.parent, NodeColor.Red);
+					x.parent.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
 					this.leftRotate(x.parent.parent);
 				}
 			}
 		}
 
-		setNodeColor(this.root, NodeColor.Black);
+		this.root.color = NodeColor.Black;
 	}
 
 	updateTreeMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void {
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 a58c8aa8c2b..edf6c9af1f9 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -9,7 +9,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { PieceTreeBase, getNodeColor, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { PieceTreeBase, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
 import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n';
@@ -158,7 +158,7 @@ function createTextBuffer(val: string[], normalizeEOL: boolean = true): PieceTre
 }
 
 function assertTreeInvariants(T: PieceTreeBase): void {
-	assert(getNodeColor(SENTINEL) === NodeColor.Black);
+	assert(SENTINEL.color === NodeColor.Black);
 	assert(SENTINEL.parent === SENTINEL);
 	assert(SENTINEL.left === SENTINEL);
 	assert(SENTINEL.right === SENTINEL);
@@ -173,7 +173,7 @@ function depth(n: TreeNode): number {
 		return 1;
 	}
 	assert(depth(n.left) === depth(n.right));
-	return (getNodeColor(n) === NodeColor.Black ? 1 : 0) + depth(n.left);
+	return (n.color === NodeColor.Black ? 1 : 0) + depth(n.left);
 }
 
 function assertValidNode(n: TreeNode): { size: number, lf_cnt: number } {
@@ -184,9 +184,9 @@ function assertValidNode(n: TreeNode): { size: number, lf_cnt: number } {
 	let l = n.left;
 	let r = n.right;
 
-	if (getNodeColor(n) === NodeColor.Red) {
-		assert(getNodeColor(l) === NodeColor.Black);
-		assert(getNodeColor(r) === NodeColor.Black);
+	if (n.color === NodeColor.Red) {
+		assert(l.color === NodeColor.Black);
+		assert(r.color === NodeColor.Black);
 	}
 
 	let actualLeft = assertValidNode(l);
@@ -201,7 +201,7 @@ function assertValidTree(T: PieceTreeBase): void {
 	if (T.root === SENTINEL) {
 		return;
 	}
-	assert(getNodeColor(T.root) === NodeColor.Black);
+	assert(T.root.color === NodeColor.Black);
 	assert(depth(T.root.left) === depth(T.root.right));
 	assertValidNode(T.root);
 }

From 8888586ff77d976175d6a18c754b151ef063bb0b Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Thu, 18 Jan 2018 21:59:14 -0800
Subject: [PATCH 405/710] Add edcore to benchmark; Support iterations in
 benchmark.

---
 .../common/model/benchmark/benchmarkUtils.ts  | 29 ++++++++++++-------
 .../model/benchmark/operations.benchmark.ts   |  1 +
 .../benchmark/searchNReplace.benchmark.ts     |  1 +
 .../textBufferAutoTestUtils.ts                |  2 +-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
index 50c0516109b..f466e4d21c8 100644
--- a/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
+++ b/src/vs/editor/test/common/model/benchmark/benchmarkUtils.ts
@@ -6,6 +6,7 @@
 import { ITextBufferBuilder, ITextBufferFactory, ITextBuffer, DefaultEndOfLine } from 'vs/editor/common/model';
 import { LinesTextBufferBuilder } from 'vs/editor/common/model/linesTextBuffer/linesTextBufferBuilder';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
+import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 export function doBenchmark(id: string, ts: T[], fn: (t: T) => void) {
 	let columns: string[] = [id];
@@ -37,10 +38,12 @@ export interface IBenchmark {
 
 export class BenchmarkSuite {
 	name: string;
+	iterations: number;
 	benchmarks: IBenchmark[];
 
-	constructor(suiteOptions: { name: string }) {
+	constructor(suiteOptions: { name: string, iterations: number }) {
 		this.name = suiteOptions.name;
+		this.iterations = suiteOptions.iterations;
 		this.benchmarks = [];
 	}
 
@@ -49,19 +52,23 @@ export class BenchmarkSuite {
 	}
 
 	run() {
-		console.log(`|${this.name}\t|line buffer\t|piece table\t|`);
-		console.log('|---|---|---|');
+		console.log(`|${this.name}\t|line buffer\t|piece table\t|edcore\t`);
+		console.log('|---|---|---|---|');
 		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) => {
-				let factory = benchmark.buildBuffer(builder);
-				let buffer = factory.create(DefaultEndOfLine.LF);
-				benchmark.preCycle(buffer);
-				var start = process.hrtime();
-				benchmark.fn(buffer);
-				var diff = process.hrtime(start);
-				columns.push(`${(diff[0] * 1000 + diff[1] / 1000000).toFixed(3)} ms`);
+			[new LinesTextBufferBuilder(), new PieceTreeTextBufferBuilder(), new ChunksTextBufferBuilder()].forEach((builder: ITextBufferBuilder) => {
+				let timeDiffTotal = 0.0;
+				for (let j = 0; j < this.iterations; j++) {
+					let factory = benchmark.buildBuffer(builder);
+					let buffer = factory.create(DefaultEndOfLine.LF);
+					benchmark.preCycle(buffer);
+					var start = process.hrtime();
+					benchmark.fn(buffer);
+					var diff = process.hrtime(start);
+					timeDiffTotal += (diff[0] * 1000 * 1000 + diff[1] / 1000);
+				}
+				columns.push(`${(timeDiffTotal / 1000 / this.iterations).toFixed(3)} ms`);
 			});
 			console.log('|' + columns.join('\t|') + '|');
 		}
diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
index 02c7e90958e..5a83e5f29e9 100644
--- a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
@@ -39,6 +39,7 @@ for (let fileSize of fileSizes) {
 
 		let editsSuite = new BenchmarkSuite({
 			name: `File Size: ${fileSize}Byte, ${editType.id}`,
+			iterations: 10
 		});
 
 		for (let i of [10, 100, 1000]) {
diff --git a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
index b805c477637..6c4667ca0fa 100644
--- a/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/searchNReplace.benchmark.ts
@@ -26,6 +26,7 @@ for (let fileSize of fileSizes) {
 
 	let replaceSuite = new BenchmarkSuite({
 		name: `File Size: ${fileSize}Byte`,
+		iterations: 10
 	});
 
 	let edits = generateRandomReplaces(chunks, 500, 5, 10);
diff --git a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
index b8ea951b318..b43de70c81b 100644
--- a/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
+++ b/src/vs/editor/test/common/model/linesTextBuffer/textBufferAutoTestUtils.ts
@@ -160,7 +160,7 @@ export function generateRandomChunkWithLF(minLength: number, maxLength: number):
 	let r = '';
 	for (let i = 0; i < length; i++) {
 		let randomI = getRandomInt(0, CharCode.z - CharCode.a + 1);
-		if (randomI === 0) {
+		if (randomI === 0 && Math.random() < 0.3) {
 			r += '\n';
 		} else {
 			r += String.fromCharCode(randomI + CharCode.a - 1);

From d21e6a3e388897a2250cb10ae897b6481e0bd61d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 07:14:31 +0100
Subject: [PATCH 406/710] fix tests

---
 .../test/electron-browser/extensionsWorkbenchService.test.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
index d93520cfab0..0390501aceb 100644
--- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
+++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts
@@ -34,6 +34,8 @@ import { IChoiceService } from 'vs/platform/message/common/message';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 import { IWindowService } from 'vs/platform/windows/common/windows';
+import { IProgressService2 } from 'vs/platform/progress/common/progress';
+import { ProgressService2 } from 'vs/workbench/services/progress/browser/progressService2';
 
 suite('ExtensionsWorkbenchService Test', () => {
 
@@ -56,6 +58,7 @@ suite('ExtensionsWorkbenchService Test', () => {
 		instantiationService.stub(ITelemetryService, NullTelemetryService);
 		instantiationService.stub(ILogService, NullLogService);
 		instantiationService.stub(IWindowService, TestWindowService);
+		instantiationService.stub(IProgressService2, ProgressService2);
 
 		instantiationService.stub(IExtensionGalleryService, ExtensionGalleryService);
 

From 60b1e7ed841764e3f28801b094fb27bcdd78e896 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 09:38:33 +0100
Subject: [PATCH 407/710] Provide a setting to configure the multi selection
 modifier key (fixes #41799)

---
 src/vs/base/browser/ui/list/listPaging.ts     |  8 ++-
 src/vs/base/browser/ui/list/listWidget.ts     | 71 ++++++++++++-------
 .../common/config/commonEditorConfig.ts       |  6 +-
 src/vs/platform/list/browser/listService.ts   | 40 ++++++++---
 .../parts/quickopen/quickOpenController.ts    |  7 +-
 .../workbench/browser/parts/views/treeView.ts | 13 ++--
 .../electron-browser/main.contribution.ts     | 16 +++++
 .../debug/electron-browser/breakpointsView.ts | 11 ++-
 .../debug/electron-browser/callStackView.ts   | 11 +--
 .../debugConfigurationManager.ts              |  4 +-
 .../debugEditorContribution.ts                |  4 +-
 .../debug/electron-browser/debugHover.ts      | 11 ++-
 .../parts/debug/electron-browser/repl.ts      |  9 ++-
 .../debug/electron-browser/variablesView.ts   | 12 ++--
 .../electron-browser/watchExpressionsView.ts  | 12 ++--
 .../extensions/browser/extensionEditor.ts     |  7 +-
 .../electron-browser/extensionsViews.ts       | 11 ++-
 .../runtimeExtensionsEditor.ts                |  9 +--
 .../electron-browser/views/explorerView.ts    | 11 ++-
 .../electron-browser/views/explorerViewer.ts  | 30 ++++++--
 .../electron-browser/views/openEditorsView.ts | 11 ++-
 .../parts/markers/browser/markersPanel.ts     |  9 +--
 .../preferences/browser/keybindingsEditor.ts  |  7 +-
 .../parts/scm/electron-browser/scmViewlet.ts  | 14 ++--
 .../parts/search/browser/searchViewlet.ts     |  7 +-
 25 files changed, 193 insertions(+), 158 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts
index c6ed333a2e4..0c72f6ff5e3 100644
--- a/src/vs/base/browser/ui/list/listPaging.ts
+++ b/src/vs/base/browser/ui/list/listPaging.ts
@@ -7,7 +7,7 @@ import 'vs/css!./list';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { range } from 'vs/base/common/arrays';
 import { IDelegate, IRenderer, IListEvent } from './list';
-import { List, IListOptions, IListStyles } from './listWidget';
+import { List, IListCreationOptions, IListStyles, IListOptions } from './listWidget';
 import { IPagedModel } from 'vs/base/common/paging';
 import Event, { mapEvent } from 'vs/base/common/event';
 
@@ -67,7 +67,7 @@ export class PagedList {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IPagedRenderer[],
-		options: IListOptions = {} // TODO@Joao: should be IListOptions
+		options: IListCreationOptions = {} // TODO@Joao: should be IListOptions
 	) {
 		const pagedRenderers = renderers.map(r => new PagedRenderer>(r, () => this.model));
 		this.list = new List(container, delegate, pagedRenderers, options);
@@ -181,4 +181,8 @@ export class PagedList {
 	style(styles: IListStyles): void {
 		this.list.style(styles);
 	}
+
+	updateOptions(options: IListOptions): void {
+		this.list.updateOptions(options);
+	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index afa154bc231..1ee43f1916c 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -265,7 +265,7 @@ class KeyboardController implements IDisposable {
 	constructor(
 		private list: List,
 		private view: ListView,
-		options: IListOptions
+		options: IListCreationOptions
 	) {
 		const multipleSelectionSupport = !(options.multipleSelectionSupport === false);
 		this.disposables = [];
@@ -344,18 +344,6 @@ class KeyboardController implements IDisposable {
 	}
 }
 
-function isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
-	return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
-}
-
-function isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
-	return event.browserEvent.shiftKey;
-}
-
-function isSelectionChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
-	return isSelectionSingleChangeEvent(event) || isSelectionRangeChangeEvent(event);
-}
-
 class MouseController implements IDisposable {
 
 	private multipleSelectionSupport: boolean;
@@ -396,7 +384,7 @@ class MouseController implements IDisposable {
 	constructor(
 		private list: List,
 		private view: ListView,
-		private options: IListOptions = {}
+		private options: IListCreationOptions = {}
 	) {
 		this.multipleSelectionSupport = options.multipleSelectionSupport !== false;
 
@@ -408,6 +396,26 @@ class MouseController implements IDisposable {
 		Gesture.addTarget(view.domNode);
 	}
 
+	updateOptions(options: IListOptions): void {
+		this.options.useAltAsMultiSelectModifier = options.useAltAsMultiSelectModifier;
+	}
+
+	private isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		if (this.options.useAltAsMultiSelectModifier) {
+			return event.browserEvent.altKey;
+		}
+
+		return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
+	}
+
+	private isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		return event.browserEvent.shiftKey;
+	}
+
+	private isSelectionChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		return this.isSelectionSingleChangeEvent(event) || this.isSelectionRangeChangeEvent(event);
+	}
+
 	private onMouseDown(e: IListMouseEvent | IListTouchEvent): void {
 		if (this.options.focusOnMouseDown === false) {
 			e.browserEvent.preventDefault();
@@ -419,14 +427,14 @@ class MouseController implements IDisposable {
 		let reference = this.list.getFocus()[0];
 		reference = reference === undefined ? this.list.getSelection()[0] : reference;
 
-		if (this.multipleSelectionSupport && isSelectionRangeChangeEvent(e)) {
+		if (this.multipleSelectionSupport && this.isSelectionRangeChangeEvent(e)) {
 			return this.changeSelection(e, reference);
 		}
 
 		const focus = e.index;
 		this.list.setFocus([focus]);
 
-		if (this.multipleSelectionSupport && isSelectionChangeEvent(e)) {
+		if (this.multipleSelectionSupport && this.isSelectionChangeEvent(e)) {
 			return this.changeSelection(e, reference);
 		}
 
@@ -437,7 +445,7 @@ class MouseController implements IDisposable {
 	}
 
 	private onPointer(e: IListMouseEvent): void {
-		if (this.multipleSelectionSupport && isSelectionChangeEvent(e)) {
+		if (this.multipleSelectionSupport && this.isSelectionChangeEvent(e)) {
 			return;
 		}
 
@@ -449,7 +457,7 @@ class MouseController implements IDisposable {
 	}
 
 	private onDoubleClick(e: IListMouseEvent): void {
-		if (this.multipleSelectionSupport && isSelectionChangeEvent(e)) {
+		if (this.multipleSelectionSupport && this.isSelectionChangeEvent(e)) {
 			return;
 		}
 
@@ -461,7 +469,7 @@ class MouseController implements IDisposable {
 	private changeSelection(e: IListMouseEvent | IListTouchEvent, reference: number | undefined): void {
 		const focus = e.index;
 
-		if (isSelectionRangeChangeEvent(e) && reference !== undefined) {
+		if (this.isSelectionRangeChangeEvent(e) && reference !== undefined) {
 			const min = Math.min(reference, focus);
 			const max = Math.max(reference, focus);
 			const rangeSelection = range(min, max + 1);
@@ -475,7 +483,7 @@ class MouseController implements IDisposable {
 			const newSelection = disjunction(rangeSelection, relativeComplement(selection, contiguousRange));
 			this.list.setSelection(newSelection);
 
-		} else if (isSelectionSingleChangeEvent(e)) {
+		} else if (this.isSelectionSingleChangeEvent(e)) {
 			const selection = this.list.getSelection();
 			const newSelection = selection.filter(i => i !== focus);
 
@@ -492,7 +500,11 @@ class MouseController implements IDisposable {
 	}
 }
 
-export interface IListOptions extends IListViewOptions, IListStyles {
+export interface IListOptions {
+	useAltAsMultiSelectModifier?: boolean;
+}
+
+export interface IListCreationOptions extends IListViewOptions, IListStyles, IListOptions {
 	identityProvider?: IIdentityProvider;
 	ariaLabel?: string;
 	mouseSupport?: boolean;
@@ -533,7 +545,7 @@ const defaultStyles: IListStyles = {
 	listDropBackground: Color.fromHex('#383B3D')
 };
 
-const DefaultOptions: IListOptions = {
+const DefaultOptions: IListCreationOptions = {
 	keyboardSupport: true,
 	mouseSupport: true,
 	multipleSelectionSupport: true
@@ -664,6 +676,7 @@ export class List implements ISpliceable, IDisposable {
 	private spliceable: ISpliceable;
 	protected disposables: IDisposable[];
 	private styleElement: HTMLStyleElement;
+	private mouseController: MouseController;
 
 	@memoize get onFocusChange(): Event> {
 		return mapEvent(this.eventBufferer.wrapEvent(this.focus.onChange), e => this.toListEvent(e));
@@ -709,7 +722,7 @@ export class List implements ISpliceable, IDisposable {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IRenderer[],
-		options: IListOptions = DefaultOptions
+		options: IListCreationOptions = DefaultOptions
 	) {
 		const aria = new Aria();
 		this.focus = new FocusTrait(i => this.getElementDomId(i));
@@ -744,9 +757,9 @@ export class List implements ISpliceable, IDisposable {
 		}
 
 		if (typeof options.mouseSupport !== 'boolean' || options.mouseSupport) {
-			const controller = new MouseController(this, this.view, options);
-			this.disposables.push(controller);
-			this.onContextMenu = controller.onContextMenu;
+			this.mouseController = new MouseController(this, this.view, options);
+			this.disposables.push(this.mouseController);
+			this.onContextMenu = this.mouseController.onContextMenu;
 		}
 
 		this.onFocusChange(this._onFocusChange, this, this.disposables);
@@ -759,6 +772,12 @@ export class List implements ISpliceable, IDisposable {
 		this.style(options);
 	}
 
+	updateOptions(options: IListOptions): void {
+		if (this.mouseController) {
+			this.mouseController.updateOptions(options);
+		}
+	}
+
 	splice(start: number, deleteCount: number, elements: T[] = []): void {
 		if (deleteCount === 0 && elements.length === 0) {
 			return;
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
index da33dd2058d..a51f6df0ba1 100644
--- a/src/vs/editor/common/config/commonEditorConfig.ts
+++ b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -352,8 +352,8 @@ const editorConfiguration: IConfigurationNode = {
 			'type': 'string',
 			'enum': ['ctrlCmd', 'alt'],
 			'enumDescriptions': [
-				nls.localize('multiCursorModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on OSX."),
-				nls.localize('multiCursorModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on OSX.")
+				nls.localize('multiCursorModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
+				nls.localize('multiCursorModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
 			],
 			'default': 'alt',
 			'description': nls.localize({
@@ -362,7 +362,7 @@ const editorConfiguration: IConfigurationNode = {
 					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
 					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
 				]
-			}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on OSX. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
+			}, "The modifier to be used to add multiple cursors with the mouse. `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The Go To Definition and Open Link mouse gestures will adapt such that they do not conflict with the multicursor modifier.")
 		},
 		'editor.quickSuggestions': {
 			'anyOf': [
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index a8c4ebfeeea..f0105abc6ec 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
-import { List, IListOptions } from 'vs/base/browser/ui/list/listWidget';
+import { List, IListCreationOptions } from 'vs/base/browser/ui/list/listWidget';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, toDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
@@ -15,6 +15,8 @@ import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { mixin } from 'vs/base/common/objects';
 
 export type ListWidget = List | PagedList | ITree;
 
@@ -89,6 +91,12 @@ function createScopedContextKeyService(contextKeyService: IContextKeyService, wi
 	return result;
 }
 
+export const multiSelectModifierSettingKey = 'workbench.multiSelectModifier';
+
+function useAltAsMultiSelectModifier(configurationService: IConfigurationService): { useAltAsMultiSelectModifier: boolean } {
+	return { useAltAsMultiSelectModifier: configurationService.getValue(multiSelectModifierSettingKey) === 'alt' };
+}
+
 export class WorkbenchList extends List {
 
 	readonly contextKeyService: IContextKeyService;
@@ -98,12 +106,13 @@ export class WorkbenchList extends List {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IRenderer[],
-		options: IListOptions,
+		private options: IListCreationOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, options);
+		super(container, delegate, renderers, mixin(options, useAltAsMultiSelectModifier(configurationService)));
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
 
@@ -116,6 +125,15 @@ export class WorkbenchList extends List {
 			const selection = this.getSelection();
 			this.listDoubleSelection.set(selection && selection.length === 2);
 		}));
+		this.disposables.push(configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
+				this.updateOptions(useAltAsMultiSelectModifier(configurationService));
+			}
+		}));
+	}
+
+	public get useAltAsMultiSelectModifier(): boolean {
+		return this.options.useAltAsMultiSelectModifier;
 	}
 }
 
@@ -128,18 +146,24 @@ export class WorkbenchPagedList extends PagedList {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IPagedRenderer[],
-		options: IListOptions,
+		options: IListCreationOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
-		@IThemeService themeService: IThemeService
+		@IThemeService themeService: IThemeService,
+		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, options);
+		super(container, delegate, renderers, mixin(options, useAltAsMultiSelectModifier(configurationService)));
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 
 		this.disposable = combinedDisposable([
 			this.contextKeyService,
 			(listService as ListService).register(this),
-			attachListStyler(this, themeService)
+			attachListStyler(this, themeService),
+			configurationService.onDidChangeConfiguration(e => {
+				if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
+					this.updateOptions(useAltAsMultiSelectModifier(configurationService));
+				}
+			})
 		]);
 	}
 
diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index a3720fad8db..935b7d8bed5 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -54,7 +54,7 @@ import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { FileKind, IFileService } from 'vs/platform/files/common/files';
 import { scoreItem, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 import { getBaseLabel } from 'vs/base/common/labels';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 const HELP_PREFIX = '?';
 
@@ -107,7 +107,6 @@ export class QuickOpenController extends Component implements IQuickOpenService
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@IPartService private partService: IPartService,
-		@IListService private listService: IListService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IThemeService themeService: IThemeService
 	) {
@@ -311,7 +310,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 				}, {
 					inputPlaceHolder: options.placeHolder || '',
 					keyboardSupport: false,
-					treeCreator: (container, config, opts) => new WorkbenchTree(container, config, opts, this.contextKeyService, this.listService, this.themeService)
+					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
 				}
 			);
 			this.toUnbind.push(attachQuickOpenStyler(this.pickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
@@ -569,7 +568,7 @@ export class QuickOpenController extends Component implements IQuickOpenService
 				}, {
 					inputPlaceHolder: this.hasHandler(HELP_PREFIX) ? nls.localize('quickOpenInput', "Type '?' to get help on the actions you can take from here") : '',
 					keyboardSupport: false,
-					treeCreator: (container, config, opts) => new WorkbenchTree(container, config, opts, this.contextKeyService, this.listService, this.themeService)
+					treeCreator: (container, config, opts) => this.instantiationService.createInstance(WorkbenchTree, container, config, opts)
 				}
 			);
 			this.toUnbind.push(attachQuickOpenStyler(this.quickOpenWidget, this.themeService, { background: SIDE_BAR_BACKGROUND, foreground: SIDE_BAR_FOREGROUND }));
diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts
index a1cb7fc9468..a72b589137a 100644
--- a/src/vs/workbench/browser/parts/views/treeView.ts
+++ b/src/vs/workbench/browser/parts/views/treeView.ts
@@ -26,7 +26,7 @@ import { ViewsRegistry, TreeItemCollapsibleState, ITreeItem, ITreeViewDataProvid
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { ResourceLabel } from 'vs/workbench/browser/labels';
 import URI from 'vs/base/common/uri';
 import { basename } from 'vs/base/common/paths';
@@ -48,9 +48,7 @@ export class TreeView extends TreeViewsViewletPanel {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IListService private listService: IListService,
-		@IThemeService private themeService: IWorkbenchThemeService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IThemeService themeService: IWorkbenchThemeService,
 		@IExtensionService private extensionService: IExtensionService,
 		@ICommandService private commandService: ICommandService
 	) {
@@ -91,13 +89,10 @@ export class TreeView extends TreeViewsViewletPanel {
 		const dataSource = this.instantiationService.createInstance(TreeDataSource, this.id);
 		const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, this.menus);
 		const controller = this.instantiationService.createInstance(TreeController, this.id, this.menus);
-		const tree = new FileIconThemableWorkbenchTree(
+		const tree = this.instantiationService.createInstance(FileIconThemableWorkbenchTree,
 			container.getHTMLElement(),
 			{ dataSource, renderer, controller },
-			{ keyboardSupport: false },
-			this.contextKeyService,
-			this.listService,
-			this.themeService
+			{ keyboardSupport: false }
 		);
 
 		tree.contextKeyService.createKey(this.id, true);
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index c4c44281642..4714ac3c1c8 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -266,6 +266,22 @@ configurationRegistry.registerConfiguration({
 			],
 			'included': isMacintosh
 		},
+		'workbench.multiSelectModifier': {
+			'type': 'string',
+			'enum': ['ctrlCmd', 'alt'],
+			'enumDescriptions': [
+				nls.localize('multiSelectModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
+				nls.localize('multiSelectModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
+			],
+			'default': 'ctrlCmd',
+			'description': nls.localize({
+				key: 'multiSelectModifier',
+				comment: [
+					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
+					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
+				]
+			}, "The modifier to be used to add an item to a multi-selection with the mouse (for example in trees and lists, if supported). `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
+		},
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings."),
diff --git a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts
index 3807f7aa779..6e4c6862c91 100644
--- a/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/breakpointsView.ts
@@ -28,9 +28,8 @@ import { IEditorService, IEditor } from 'vs/platform/editor/common/editor';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { KeyCode } from 'vs/base/common/keyCodes';
-import { WorkbenchList, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { ViewsViewletPanel, IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewlet';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { attachInputBoxStyler } from 'vs/platform/theme/common/styler';
 import { isCodeEditor } from 'vs/editor/browser/editorBrowser';
 
@@ -50,11 +49,9 @@ export class BreakpointsView extends ViewsViewletPanel {
 		@IDebugService private debugService: IDebugService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IListService private listService: IListService,
 		@IThemeService private themeService: IThemeService,
 		@IEditorService private editorService: IEditorService,
-		@IContextViewService private contextViewService: IContextViewService,
-		@IContextKeyService private contextKeyService: IContextKeyService
+		@IContextViewService private contextViewService: IContextViewService
 	) {
 		super(options, keybindingService, contextMenuService);
 
@@ -67,7 +64,7 @@ export class BreakpointsView extends ViewsViewletPanel {
 		dom.addClass(container, 'debug-breakpoints');
 		const delegate = new BreakpointsDelegate(this.debugService);
 
-		this.list = new WorkbenchList(container, delegate, [
+		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [
 			this.instantiationService.createInstance(BreakpointsRenderer),
 			new ExceptionBreakpointsRenderer(this.debugService),
 			new FunctionBreakpointsRenderer(this.debugService),
@@ -75,7 +72,7 @@ export class BreakpointsView extends ViewsViewletPanel {
 		], {
 				identityProvider: element => element.getId(),
 				multipleSelectionSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		CONTEXT_BREAKPOINTS_FOCUSED.bindTo(this.list.contextKeyService);
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
index 5948091a39d..fd458ff3c8b 100644
--- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts
@@ -15,7 +15,6 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
 import { ITree, IActionProvider, IDataSource, IRenderer, IAccessibilityProvider } from 'vs/base/parts/tree/browser/tree';
 import { IAction, IActionItem } from 'vs/base/common/actions';
@@ -25,8 +24,7 @@ import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { basenameOrAuthority } from 'vs/base/common/resources';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import FileResultsNavigation from 'vs/workbench/parts/files/browser/fileResultsNavigation';
 
@@ -44,12 +42,9 @@ export class CallStackView extends TreeViewsViewletPanel {
 	constructor(
 		private options: IViewletViewOptions,
 		@IContextMenuService contextMenuService: IContextMenuService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IDebugService private debugService: IDebugService,
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IThemeService private themeService: IThemeService,
-		@IListService private listService: IListService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: nls.localize('callstackSection', "Call Stack Section") }, keybindingService, contextMenuService);
@@ -99,7 +94,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 		const actionProvider = new CallStackActionProvider(this.debugService, this.keybindingService);
 		const controller = this.instantiationService.createInstance(CallStackController, actionProvider, MenuId.DebugCallStackContext);
 
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new CallStackDataSource(),
 			renderer: this.instantiationService.createInstance(CallStackRenderer),
 			accessibilityProvider: this.instantiationService.createInstance(CallstackAccessibilityProvider),
@@ -108,7 +103,7 @@ export class CallStackView extends TreeViewsViewletPanel {
 				ariaLabel: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'callStackAriaLabel' }, "Debug Call Stack"),
 				twistiePixels,
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		const fileResultsNavigation = new FileResultsNavigation(this.tree);
 		this.disposables.push(fileResultsNavigation);
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 3a779ea68b0..744037e75fb 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -102,11 +102,11 @@ export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerE
 				}
 			},
 			osx: {
-				description: nls.localize('vscode.extension.contributes.debuggers.osx', "OS X specific settings."),
+				description: nls.localize('vscode.extension.contributes.debuggers.osx', "macOS specific settings."),
 				type: 'object',
 				properties: {
 					runtime: {
-						description: nls.localize('vscode.extension.contributes.debuggers.osx.runtime', "Runtime used for OSX."),
+						description: nls.localize('vscode.extension.contributes.debuggers.osx.runtime', "Runtime used for macOS."),
 						type: 'string'
 					}
 				}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
index 9205cb17df3..5db4e4a3828 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
@@ -41,7 +41,6 @@ import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 import { first } from 'vs/base/common/arrays';
 import { IMarginData } from 'vs/editor/browser/controller/mouseTarget';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IListService } from 'vs/platform/list/browser/listService';
 
 const HOVER_DELAY = 300;
 const LAUNCH_JSON_REGEX = /launch\.json$/;
@@ -78,13 +77,12 @@ export class DebugEditorContribution implements IDebugEditorContribution {
 		@ICommandService private commandService: ICommandService,
 		@ICodeEditorService private codeEditorService: ICodeEditorService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IListService listService: IListService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IThemeService themeService: IThemeService,
 		@IKeybindingService private keybindingService: IKeybindingService
 	) {
 		this.breakpointHintDecoration = [];
-		this.hoverWidget = new DebugHoverWidget(this.editor, this.debugService, this.instantiationService, themeService, contextKeyService, listService);
+		this.hoverWidget = new DebugHoverWidget(this.editor, this.debugService, this.instantiationService, themeService);
 		this.toDispose = [];
 		this.showHoverScheduler = new RunOnceScheduler(() => this.showHover(this.hoverRange, false), HOVER_DELAY);
 		this.hideHoverScheduler = new RunOnceScheduler(() => this.hoverWidget.hide(), HOVER_DELAY);
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
index 072347dc3b7..30c4fca4496 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts
@@ -25,8 +25,7 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { editorHoverBackground, editorHoverBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 const $ = dom.$;
 const MAX_ELEMENTS_SHOWN = 18;
@@ -54,9 +53,7 @@ export class DebugHoverWidget implements IContentWidget {
 		private editor: ICodeEditor,
 		private debugService: IDebugService,
 		private instantiationService: IInstantiationService,
-		private themeService: IThemeService,
-		private contextKeyService: IContextKeyService,
-		private listService: IListService
+		private themeService: IThemeService
 	) {
 		this.toDispose = [];
 
@@ -71,7 +68,7 @@ export class DebugHoverWidget implements IContentWidget {
 		this.complexValueTitle = dom.append(this.complexValueContainer, $('.title'));
 		this.treeContainer = dom.append(this.complexValueContainer, $('.debug-hover-tree'));
 		this.treeContainer.setAttribute('role', 'tree');
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new VariablesDataSource(),
 			renderer: this.instantiationService.createInstance(VariablesHoverRenderer),
 			controller: new DebugHoverController(this.editor)
@@ -80,7 +77,7 @@ export class DebugHoverWidget implements IContentWidget {
 				twistiePixels: 15,
 				ariaLabel: nls.localize('treeAriaLabel', "Debug Hover"),
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		this.valueContainer = $('.value');
 		this.valueContainer.tabIndex = 0;
diff --git a/src/vs/workbench/parts/debug/electron-browser/repl.ts b/src/vs/workbench/parts/debug/electron-browser/repl.ts
index db4c7dd26a1..6ea2b74afef 100644
--- a/src/vs/workbench/parts/debug/electron-browser/repl.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/repl.ts
@@ -41,7 +41,7 @@ import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { clipboard } from 'electron';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { memoize } from 'vs/base/common/decorators';
 import { dispose } from 'vs/base/common/lifecycle';
 
@@ -93,8 +93,7 @@ export class Repl extends Panel implements IPrivateReplService {
 		@IPanelService private panelService: IPanelService,
 		@IThemeService protected themeService: IThemeService,
 		@IModelService private modelService: IModelService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IListService private listService: IListService
+		@IContextKeyService private contextKeyService: IContextKeyService
 	) {
 		super(debug.REPL_ID, telemetryService, themeService);
 
@@ -139,12 +138,12 @@ export class Repl extends Panel implements IPrivateReplService {
 		const controller = this.instantiationService.createInstance(ReplExpressionsController, new ReplExpressionsActionProvider(this.instantiationService), MenuId.DebugConsoleContext);
 		controller.toFocusOnClick = this.replInput;
 
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new ReplExpressionsDataSource(),
 			renderer: this.renderer,
 			accessibilityProvider: new ReplExpressionsAccessibilityProvider(),
 			controller
-		}, replTreeOptions, this.contextKeyService, this.listService, this.themeService);
+		}, replTreeOptions);
 
 		if (!Repl.HISTORY) {
 			Repl.HISTORY = new ReplHistory(JSON.parse(this.storageService.get(HISTORY_STORAGE_KEY, StorageScope.WORKSPACE, '[]')));
diff --git a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
index 36384afa9f8..e157a61a862 100644
--- a/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/variablesView.ts
@@ -16,7 +16,6 @@ import { IContextMenuService, IContextViewService } from 'vs/platform/contextvie
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { once } from 'vs/base/common/event';
 import { twistiePixels, renderViewTree, IVariableTemplateData, BaseDebugController, renderRenameBox, renderVariable } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
@@ -28,7 +27,7 @@ import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { IMouseEvent } from 'vs/base/browser/mouseEvent';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 const $ = dom.$;
 
@@ -45,10 +44,7 @@ export class VariablesView extends TreeViewsViewletPanel {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IDebugService private debugService: IDebugService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IListService private listService: IListService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IThemeService private themeService: IThemeService
+		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: nls.localize('variablesSection', "Variables Section") }, keybindingService, contextMenuService);
 
@@ -87,7 +83,7 @@ export class VariablesView extends TreeViewsViewletPanel {
 		dom.addClass(container, 'debug-variables');
 		this.treeContainer = renderViewTree(container);
 
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new VariablesDataSource(),
 			renderer: this.instantiationService.createInstance(VariablesRenderer),
 			accessibilityProvider: new VariablesAccessibilityProvider(),
@@ -96,7 +92,7 @@ export class VariablesView extends TreeViewsViewletPanel {
 				ariaLabel: nls.localize('variablesAriaTreeLabel', "Debug Variables"),
 				twistiePixels,
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		CONTEXT_VARIABLES_FOCUSED.bindTo(this.tree.contextKeyService);
 
diff --git a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
index 23ddbee6eff..dbbd7bfeb29 100644
--- a/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/watchExpressionsView.ts
@@ -19,7 +19,6 @@ import { IContextMenuService, IContextViewService } from 'vs/platform/contextvie
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { MenuId } from 'vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { once } from 'vs/base/common/event';
 import { IAction, IActionItem } from 'vs/base/common/actions';
@@ -29,7 +28,7 @@ import { equalsIgnoreCase } from 'vs/base/common/strings';
 import { IMouseEvent, DragMouseEvent } from 'vs/base/browser/mouseEvent';
 import { DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults';
 import { IVariableTemplateData, renderVariable, renderRenameBox, renderExpressionValue, BaseDebugController, twistiePixels, renderViewTree } from 'vs/workbench/parts/debug/electron-browser/baseDebugView';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 const $ = dom.$;
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
@@ -46,10 +45,7 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IDebugService private debugService: IDebugService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IListService private listService: IListService,
-		@IInstantiationService private instantiationService: IInstantiationService,
-		@IThemeService private themeService: IThemeService
+		@IInstantiationService private instantiationService: IInstantiationService
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: nls.localize('expressionsSection', "Expressions Section") }, keybindingService, contextMenuService);
 		this.settings = options.viewletSettings;
@@ -65,7 +61,7 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 		this.treeContainer = renderViewTree(container);
 
 		const actionProvider = new WatchExpressionsActionProvider(this.debugService, this.keybindingService);
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new WatchExpressionsDataSource(this.debugService),
 			renderer: this.instantiationService.createInstance(WatchExpressionsRenderer),
 			accessibilityProvider: new WatchExpressionsAccessibilityProvider(),
@@ -75,7 +71,7 @@ export class WatchExpressionsView extends TreeViewsViewletPanel {
 				ariaLabel: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'watchAriaTreeLabel' }, "Debug Watch Expressions"),
 				twistiePixels,
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		CONTEXT_WATCH_EXPRESSIONS_FOCUSED.bindTo(this.tree.contextKeyService);
 
diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index fd380543ec4..53b8c33bf14 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -51,7 +51,7 @@ import { Command, ICommandOptions } from 'vs/editor/browser/editorExtensions';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { Color } from 'vs/base/common/color';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import URI from 'vs/base/common/uri';
 
@@ -196,7 +196,6 @@ export class ExtensionEditor extends BaseEditor {
 		@IKeybindingService private keybindingService: IKeybindingService,
 		@IMessageService private messageService: IMessageService,
 		@IOpenerService private openerService: IOpenerService,
-		@IListService private listService: IListService,
 		@IPartService private partService: IPartService,
 		@IContextViewService private contextViewService: IContextViewService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
@@ -522,7 +521,7 @@ export class ExtensionEditor extends BaseEditor {
 	private renderDependencies(container: HTMLElement, extensionDependencies: IExtensionDependencies): Tree {
 		const renderer = this.instantiationService.createInstance(Renderer);
 		const controller = this.instantiationService.createInstance(Controller);
-		const tree = new WorkbenchTree(container, {
+		const tree = this.instantiationService.createInstance(WorkbenchTree, container, {
 			dataSource: new DataSource(),
 			renderer,
 			controller
@@ -530,7 +529,7 @@ export class ExtensionEditor extends BaseEditor {
 				indentPixels: 40,
 				twistiePixels: 20,
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		tree.setInput(extensionDependencies);
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 9fa2d2ff226..3c7d35378b0 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -35,8 +35,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { CountBadge } from 'vs/base/browser/ui/countBadge/countBadge';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { InstallWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceFolderRecommendedExtensionsAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
-import { WorkbenchPagedList, IListService } from 'vs/platform/list/browser/listService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { WorkbenchPagedList } from 'vs/platform/list/browser/listService';
 
 export class ExtensionsListView extends ViewsViewletPanel {
 
@@ -52,7 +51,6 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		@IKeybindingService keybindingService: IKeybindingService,
 		@IContextMenuService contextMenuService: IContextMenuService,
 		@IInstantiationService protected instantiationService: IInstantiationService,
-		@IListService private listService: IListService,
 		@IThemeService private themeService: IThemeService,
 		@IExtensionService private extensionService: IExtensionService,
 		@IExtensionsWorkbenchService private extensionsWorkbenchService: IExtensionsWorkbenchService,
@@ -60,8 +58,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		@IEditorGroupService private editorInputService: IEditorGroupService,
 		@IExtensionTipsService private tipsService: IExtensionTipsService,
 		@IModeService private modeService: IModeService,
-		@ITelemetryService private telemetryService: ITelemetryService,
-		@IContextKeyService private contextKeyService: IContextKeyService
+		@ITelemetryService private telemetryService: ITelemetryService
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: options.name }, keybindingService, contextMenuService);
 	}
@@ -80,10 +77,10 @@ export class ExtensionsListView extends ViewsViewletPanel {
 		this.messageBox = append(container, $('.message'));
 		const delegate = new Delegate();
 		const renderer = this.instantiationService.createInstance(Renderer);
-		this.list = new WorkbenchPagedList(this.extensionsList, delegate, [renderer], {
+		this.list = this.instantiationService.createInstance(WorkbenchPagedList, this.extensionsList, delegate, [renderer], {
 			ariaLabel: localize('extensions', "Extensions"),
 			keyboardSupport: false
-		}, this.contextKeyService, this.listService, this.themeService);
+		});
 
 		chain(this.list.onSelectionChange)
 			.map(e => e.elements[0])
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 19134fb1b09..23c2fa6549b 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -20,11 +20,10 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IExtensionsWorkbenchService, IExtension } from 'vs/workbench/parts/extensions/common/extensions';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IExtensionService, IExtensionDescription, IExtensionsStatus, IExtensionHostProfile } from 'vs/platform/extensions/common/extensions';
 import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
-import { WorkbenchList, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { append, $, addClass, toggleClass } from 'vs/base/browser/dom';
 import { ActionBar, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IMessageService, Severity } from 'vs/platform/message/common/message';
@@ -103,8 +102,6 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 		@IThemeService themeService: IThemeService,
 		@IExtensionsWorkbenchService private readonly _extensionsWorkbenchService: IExtensionsWorkbenchService,
 		@IExtensionService private readonly _extensionService: IExtensionService,
-		@IListService private readonly _listService: IListService,
-		@IContextKeyService private readonly _contextKeyService: IContextKeyService,
 		@IMessageService private readonly _messageService: IMessageService,
 		@IContextMenuService private readonly _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
@@ -363,9 +360,9 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 			}
 		};
 
-		this._list = new WorkbenchList(container, delegate, [renderer], {
+		this._list = this._instantiationService.createInstance(WorkbenchList, container, delegate, [renderer], {
 			multipleSelectionSupport: false
-		}, this._contextKeyService, this._listService, this.themeService);
+		});
 
 		this._list.splice(0, this._list.length, this._elements);
 
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 f2cb5c1ca89..ad23c7e52e9 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
@@ -39,10 +39,9 @@ import { IMessageService, Severity } from 'vs/platform/message/common/message';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources';
-import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { isLinux } from 'vs/base/common/platform';
 import { IDecorationsService } from 'vs/workbench/services/decorations/browser/decorations';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 export interface IExplorerViewOptions extends IViewletViewOptions {
 	viewletState: FileViewletState;
@@ -84,14 +83,12 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IWorkspaceContextService private contextService: IWorkspaceContextService,
 		@IProgressService private progressService: IProgressService,
-		@IListService private listService: IListService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IFileService private fileService: IFileService,
 		@IPartService private partService: IPartService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
+		@IContextKeyService contextKeyService: IContextKeyService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
 		@IDecorationsService decorationService: IDecorationsService
 	) {
 		super({ ...(options as IViewOptions), ariaHeaderLabel: nls.localize('explorerSection', "Files Explorer Section") }, keybindingService, contextMenuService);
@@ -396,7 +393,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 		const dnd = this.instantiationService.createInstance(FileDragAndDrop);
 		const accessibilityProvider = this.instantiationService.createInstance(FileAccessibilityProvider);
 
-		this.explorerViewer = new FileIconThemableWorkbenchTree(container.getHTMLElement(), {
+		this.explorerViewer = this.instantiationService.createInstance(FileIconThemableWorkbenchTree, container.getHTMLElement(), {
 			dataSource,
 			renderer,
 			controller,
@@ -408,7 +405,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
 				autoExpandSingleChildren: true,
 				ariaLabel: nls.localize('treeAriaLabel', "Files Explorer"),
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		// Bind context keys
 		FilesExplorerFocusedContext.bindTo(this.explorerViewer.contextKeyService);
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 83037b46262..2fea10cc6ed 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -56,7 +56,7 @@ import { extractResources } from 'vs/workbench/browser/editor';
 import { relative } from 'path';
 import { DataTransfers } from 'vs/base/browser/dnd';
 import { distinctParents } from 'vs/base/common/resources';
-import { WorkbenchTree } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree, multiSelectModifierSettingKey } from 'vs/platform/list/browser/listService';
 
 export class FileDataSource implements IDataSource {
 	constructor(
@@ -330,16 +330,30 @@ export class FileController extends DefaultController implements IDisposable {
 	private contributedContextMenu: IMenu;
 	private toDispose: IDisposable[];
 	private previousSelectionRangeStop: FileStat;
+	private useAltAsMultiSelectModifier: boolean;
 
-	constructor( @IWorkbenchEditorService private editorService: IWorkbenchEditorService,
+	constructor(
+		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@ITelemetryService private telemetryService: ITelemetryService,
 		@IMenuService private menuService: IMenuService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IConfigurationService private configurationService: IConfigurationService
 	) {
 		super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */, keyboardSupport: false /* handled via IListService */ });
 
+		this.useAltAsMultiSelectModifier = configurationService.getValue(multiSelectModifierSettingKey);
 		this.toDispose = [];
+
+		this.registerListeners();
+	}
+
+	private registerListeners(): void {
+		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
+			if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
+				this.useAltAsMultiSelectModifier = this.configurationService.getValue(multiSelectModifierSettingKey);
+			}
+		}));
 	}
 
 	public onLeftClick(tree: ITree, stat: FileStat | Model, event: IMouseEvent, origin: string = 'mouse'): boolean {
@@ -379,7 +393,8 @@ export class FileController extends DefaultController implements IDisposable {
 			return true;
 		}
 
-		if (event.ctrlKey || event.metaKey) {
+		// Allow to multiselect
+		if ((this.useAltAsMultiSelectModifier && event.altKey) || !this.useAltAsMultiSelectModifier && (event.ctrlKey || event.metaKey)) {
 			const selection = tree.getSelection();
 			this.previousSelectionRangeStop = undefined;
 			if (selection.indexOf(stat) >= 0) {
@@ -418,7 +433,12 @@ export class FileController extends DefaultController implements IDisposable {
 			tree.setSelection([stat], payload);
 
 			if (!stat.isDirectory) {
-				this.openEditor(stat, { preserveFocus, sideBySide: event && event.altKey, pinned: isDoubleClick });
+				let sideBySide = false;
+				if (event) {
+					sideBySide = this.useAltAsMultiSelectModifier ? (event.ctrlKey || event.metaKey) : event.altKey;
+				}
+
+				this.openEditor(stat, { preserveFocus, sideBySide, pinned: isDoubleClick });
 			}
 		}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index fa163df1bb8..2c882a9221b 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -28,7 +28,7 @@ import { EditorGroup } from 'vs/workbench/common/editor/editorStacksModel';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { IListService, WorkbenchList } from 'vs/platform/list/browser/listService';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListMouseEvent } from 'vs/base/browser/ui/list/list';
 import { EditorLabel } from 'vs/workbench/browser/labels';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -74,7 +74,6 @@ export class OpenEditorsView extends ViewsViewletPanel {
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IConfigurationService private configurationService: IConfigurationService,
 		@IKeybindingService keybindingService: IKeybindingService,
-		@IListService private listService: IListService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IThemeService private themeService: IThemeService,
@@ -150,13 +149,13 @@ export class OpenEditorsView extends ViewsViewletPanel {
 
 			return focused;
 		};
-		this.list = new WorkbenchList(container, delegate, [
+		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [
 			new EditorGroupRenderer(this.keybindingService, this.instantiationService, this.editorGroupService),
 			new OpenEditorRenderer(getSelectedElements, this.instantiationService, this.keybindingService, this.configurationService, this.editorGroupService)
 		], {
 				keyboardSupport: false,
 				identityProvider: element => element instanceof OpenEditor ? element.getId() : element.id.toString()
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		this.contributedContextMenu = this.menuService.createMenu(MenuId.OpenEditorsContext, this.list.contextKeyService);
 		this.disposables.push(this.contributedContextMenu);
@@ -194,7 +193,7 @@ export class OpenEditorsView extends ViewsViewletPanel {
 				const focused = this.list.getFocusedElements();
 				const element = focused.length ? focused[0] : undefined;
 				if (element instanceof OpenEditor) {
-					this.openEditor(element, { pinned: false, sideBySide: !!event.altKey, preserveFocus: false });
+					this.openEditor(element, { pinned: false, sideBySide: !!(event.altKey || event.ctrlKey || event.metaKey), preserveFocus: false });
 				}
 			}
 		}));
@@ -279,7 +278,7 @@ export class OpenEditorsView extends ViewsViewletPanel {
 			const position = this.model.positionOfGroup(element.group);
 			this.editorService.closeEditor(position, element.editor).done(null, errors.onUnexpectedError);
 		} else {
-			this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: event.browserEvent.altKey });
+			this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: this.list.useAltAsMultiSelectModifier ? (event.browserEvent.ctrlKey || event.browserEvent.metaKey) : event.browserEvent.altKey });
 		}
 	}
 
diff --git a/src/vs/workbench/parts/markers/browser/markersPanel.ts b/src/vs/workbench/parts/markers/browser/markersPanel.ts
index 99ef58222f1..6767bce8c4f 100644
--- a/src/vs/workbench/parts/markers/browser/markersPanel.ts
+++ b/src/vs/workbench/parts/markers/browser/markersPanel.ts
@@ -27,13 +27,12 @@ import { CollapseAllAction, FilterAction, FilterInputBoxActionItem } from 'vs/wo
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import Messages from 'vs/workbench/parts/markers/common/messages';
 import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import FileResultsNavigation from 'vs/workbench/parts/files/browser/fileResultsNavigation';
 import { debounceEvent } from 'vs/base/common/event';
 import { SimpleFileResourceDragAndDrop } from 'vs/base/parts/tree/browser/treeDnd';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
 import { localize } from 'vs/nls';
 
@@ -66,9 +65,7 @@ export class MarkersPanel extends Panel {
 		@IEditorGroupService private editorGroupService: IEditorGroupService,
 		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IContextKeyService private contextKeyService: IContextKeyService,
 		@ITelemetryService telemetryService: ITelemetryService,
-		@IListService private listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IActivityService private activityService: IActivityService
 	) {
@@ -215,7 +212,7 @@ export class MarkersPanel extends Panel {
 		const renderer = this.instantiationService.createInstance(Viewer.Renderer);
 		const dnd = new SimpleFileResourceDragAndDrop(obj => obj instanceof Resource ? obj.uri : void 0);
 		let controller = this.instantiationService.createInstance(Controller);
-		this.tree = new WorkbenchTree(this.treeContainer, {
+		this.tree = this.instantiationService.createInstance(WorkbenchTree, this.treeContainer, {
 			dataSource: new Viewer.DataSource(),
 			renderer,
 			controller,
@@ -227,7 +224,7 @@ export class MarkersPanel extends Panel {
 				twistiePixels: 20,
 				ariaLabel: Messages.MARKERS_PANEL_ARIA_LABEL_PROBLEMS_TREE,
 				keyboardSupport: false
-			}, this.contextKeyService, this.listService, this.themeService);
+			});
 
 		Constants.MarkerFocusContextKey.bindTo(this.tree.contextKeyService);
 
diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index fe748a73678..0b9c84a41c5 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -40,7 +40,7 @@ import { KeyCode, ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { listHighlightForeground } from 'vs/platform/theme/common/colorRegistry';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
-import { WorkbenchList, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
 
 let $ = DOM.$;
 
@@ -104,7 +104,6 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 		@IContextMenuService private contextMenuService: IContextMenuService,
 		@IPreferencesService private preferencesService: IPreferencesService,
 		@IKeybindingEditingService private keybindingEditingService: IKeybindingEditingService,
-		@IListService private listService: IListService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
 		@IMessageService private messageService: IMessageService,
 		@IClipboardService private clipboardService: IClipboardService,
@@ -333,8 +332,8 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
 	private createList(parent: HTMLElement): void {
 		this.keybindingsListContainer = DOM.append(parent, $('.keybindings-list-container'));
 
-		this.keybindingsList = this._register(new WorkbenchList(this.keybindingsListContainer, new Delegate(), [new KeybindingHeaderRenderer(), new KeybindingItemRenderer(this, this.keybindingsService)],
-			{ identityProvider: e => e.id, keyboardSupport: false, mouseSupport: true, ariaLabel: localize('keybindingsLabel', "Keybindings") }, this.contextKeyService, this.listService, this.themeService));
+		this.keybindingsList = this._register(this.instantiationService.createInstance(WorkbenchList, this.keybindingsListContainer, new Delegate(), [new KeybindingHeaderRenderer(), new KeybindingItemRenderer(this, this.keybindingsService)],
+			{ identityProvider: e => e.id, keyboardSupport: false, mouseSupport: true, ariaLabel: localize('keybindingsLabel', "Keybindings") }));
 		this._register(this.keybindingsList.onContextMenu(e => this.onContextMenu(e)));
 		this._register(this.keybindingsList.onFocusChange(e => this.onFocusChange(e)));
 		this._register(this.keybindingsList.onDidFocus(() => {
diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
index 156a7bb20a6..6a467b92bea 100644
--- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
+++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts
@@ -55,7 +55,7 @@ import * as platform from 'vs/base/common/platform';
 import { format } from 'vs/base/common/strings';
 import { ISpliceable, ISequence, ISplice } from 'vs/base/common/sequence';
 import { firstIndex } from 'vs/base/common/arrays';
-import { WorkbenchList, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchList } from 'vs/platform/list/browser/listService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 
 // TODO@Joao
@@ -226,9 +226,7 @@ class MainPanel extends ViewletPanel {
 		@IContextMenuService protected contextMenuService: IContextMenuService,
 		@ISCMService protected scmService: ISCMService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IThemeService private themeService: IThemeService,
 		@IContextKeyService private contextKeyService: IContextKeyService,
-		@IListService private listService: IListService,
 		@IMenuService private menuService: IMenuService
 	) {
 		super(localize('scm providers', "Source Control Providers"), {}, keybindingService, contextMenuService);
@@ -260,9 +258,9 @@ class MainPanel extends ViewletPanel {
 		const delegate = new ProvidersListDelegate();
 		const renderer = this.instantiationService.createInstance(ProviderRenderer);
 
-		this.list = new WorkbenchList(container, delegate, [renderer], {
+		this.list = this.instantiationService.createInstance(WorkbenchList, container, delegate, [renderer], {
 			identityProvider: repository => repository.provider.id
-		}, this.contextKeyService, this.listService, this.themeService);
+		});
 
 		this.disposables.push(this.list);
 		this.list.onSelectionChange(this.onListSelectionChange, this, this.disposables);
@@ -690,12 +688,10 @@ export class RepositoryPanel extends ViewletPanel {
 		@IThemeService protected themeService: IThemeService,
 		@IContextMenuService protected contextMenuService: IContextMenuService,
 		@IContextViewService protected contextViewService: IContextViewService,
-		@IListService protected listService: IListService,
 		@ICommandService protected commandService: ICommandService,
 		@IMessageService protected messageService: IMessageService,
 		@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
 		@IEditorGroupService protected editorGroupService: IEditorGroupService,
-		@IContextKeyService protected contextKeyService: IContextKeyService,
 		@IInstantiationService protected instantiationService: IInstantiationService,
 		@IConfigurationService protected configurationService: IConfigurationService
 	) {
@@ -844,10 +840,10 @@ export class RepositoryPanel extends ViewletPanel {
 			this.instantiationService.createInstance(ResourceRenderer, this.menus, actionItemProvider, () => this.getSelectedResources()),
 		];
 
-		this.list = new WorkbenchList(this.listContainer, delegate, renderers, {
+		this.list = this.instantiationService.createInstance(WorkbenchList, this.listContainer, delegate, renderers, {
 			identityProvider: scmResourceIdentityProvider,
 			keyboardSupport: false
-		}, this.contextKeyService, this.listService, this.themeService);
+		});
 
 		chain(this.list.onOpen)
 			.map(e => e.elements[0])
diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index b47db749deb..5eb985b8db2 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -59,7 +59,7 @@ import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/comm
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { SimpleFileResourceDragAndDrop } from 'vs/base/parts/tree/browser/treeDnd';
 import { isDiffEditor, isCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { WorkbenchTree, IListService } from 'vs/platform/list/browser/listService';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
 
 export class SearchViewlet extends Viewlet {
@@ -120,7 +120,6 @@ export class SearchViewlet extends Viewlet {
 		@IReplaceService private replaceService: IReplaceService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IPreferencesService private preferencesService: IPreferencesService,
-		@IListService private listService: IListService,
 		@IThemeService protected themeService: IThemeService,
 		@IOutputService private outputService: IOutputService
 	) {
@@ -499,7 +498,7 @@ export class SearchViewlet extends Viewlet {
 
 			let dnd = new SimpleFileResourceDragAndDrop(obj => obj instanceof FileMatch ? obj.resource() : void 0);
 
-			this.tree = new WorkbenchTree(div.getHTMLElement(), {
+			this.tree = this.instantiationService.createInstance(WorkbenchTree, div.getHTMLElement(), {
 				dataSource: dataSource,
 				renderer: renderer,
 				sorter: new SearchSorter(),
@@ -509,7 +508,7 @@ export class SearchViewlet extends Viewlet {
 			}, {
 					ariaLabel: nls.localize('treeAriaLabel', "Search Results"),
 					keyboardSupport: false
-				}, this.contextKeyService, this.listService, this.themeService);
+				});
 
 			this.tree.setInput(this.viewModel.searchResult);
 			this.toUnbind.push(renderer);

From 09e25dfad8fae41d38a1e3aeade3c26e1b7bff9a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 09:46:33 +0100
Subject: [PATCH 408/710] avoid layer breaker with settings

---
 src/vs/platform/list/browser/listService.ts   | 30 +++++++++++++++++++
 .../electron-browser/main.contribution.ts     | 16 ----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index f0105abc6ec..1bba7f047a6 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -17,6 +17,9 @@ import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { InputFocusedContextKey } from 'vs/platform/workbench/common/contextkeys';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { mixin } from 'vs/base/common/objects';
+import { localize } from 'vs/nls';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { Extensions as ConfigurationExtensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 
 export type ListWidget = List | PagedList | ITree;
 
@@ -206,3 +209,30 @@ export class WorkbenchTree extends Tree {
 		this.disposables = dispose(this.disposables);
 	}
 }
+
+const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration);
+
+configurationRegistry.registerConfiguration({
+	'id': 'workbench',
+	'order': 7,
+	'title': localize('workbenchConfigurationTitle', "Workbench"),
+	'type': 'object',
+	'properties': {
+		'workbench.multiSelectModifier': {
+			'type': 'string',
+			'enum': ['ctrlCmd', 'alt'],
+			'enumDescriptions': [
+				localize('multiSelectModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
+				localize('multiSelectModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
+			],
+			'default': 'ctrlCmd',
+			'description': localize({
+				key: 'multiSelectModifier',
+				comment: [
+					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
+					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
+				]
+			}, "The modifier to be used to add an item to a multi-selection with the mouse (for example in trees and lists, if supported). `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
+		}
+	}
+});
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 4714ac3c1c8..c4c44281642 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -266,22 +266,6 @@ configurationRegistry.registerConfiguration({
 			],
 			'included': isMacintosh
 		},
-		'workbench.multiSelectModifier': {
-			'type': 'string',
-			'enum': ['ctrlCmd', 'alt'],
-			'enumDescriptions': [
-				nls.localize('multiSelectModifier.ctrlCmd', "Maps to `Control` on Windows and Linux and to `Command` on macOS."),
-				nls.localize('multiSelectModifier.alt', "Maps to `Alt` on Windows and Linux and to `Option` on macOS.")
-			],
-			'default': 'ctrlCmd',
-			'description': nls.localize({
-				key: 'multiSelectModifier',
-				comment: [
-					'- `ctrlCmd` refers to a value the setting can take and should not be localized.',
-					'- `Control` and `Command` refer to the modifier keys Ctrl or Cmd on the keyboard and can be localized.'
-				]
-			}, "The modifier to be used to add an item to a multi-selection with the mouse (for example in trees and lists, if supported). `ctrlCmd` maps to `Control` on Windows and Linux and to `Command` on macOS. The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier.")
-		},
 		'workbench.settings.enableNaturalLanguageSearch': {
 			'type': 'boolean',
 			'description': nls.localize('enableNaturalLanguageSettingsSearch', "Controls whether to enable the natural language search mode for settings."),

From fa4509a5a2025df5dc09182ca5b0ad1f349e622d Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Fri, 19 Jan 2018 10:15:06 +0100
Subject: [PATCH 409/710] Add extension version to language packs extension
 cache

---
 .../sharedProcess/contrib/languagePackExtensions.ts            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
index 98f80d2e7a8..1add53f4777 100644
--- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
@@ -15,6 +15,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 
 interface ILanguageSource {
 	extensionIdentifier: IExtensionIdentifier;
+	version: string;
 	path: string;
 }
 
@@ -71,7 +72,7 @@ export class LanguagePackExtensions extends Disposable {
 				const extensionIdentifier = { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid };
 				for (const localeContribution of extension.manifest.contributes.locales) {
 					const languageSources = languagePacks[localeContribution.locale] || [];
-					languageSources.splice(0, 0, { extensionIdentifier, path: join(extension.path, localeContribution.path) });
+					languageSources.splice(0, 0, { extensionIdentifier, path: join(extension.path, localeContribution.path), version: extension.manifest.version });
 					languagePacks[localeContribution.locale] = languageSources;
 				}
 			}

From a59e2c3c4296767b6703947716e799271d0248c0 Mon Sep 17 00:00:00 2001
From: Dirk Baeumer 
Date: Fri, 19 Jan 2018 10:22:26 +0100
Subject: [PATCH 410/710] Protect against malformed problem data.

---
 .../platform/markers/common/problemMatcher.ts | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/vs/platform/markers/common/problemMatcher.ts b/src/vs/platform/markers/common/problemMatcher.ts
index 7268756d769..e6dd0d5bdbe 100644
--- a/src/vs/platform/markers/common/problemMatcher.ts
+++ b/src/vs/platform/markers/common/problemMatcher.ts
@@ -245,24 +245,28 @@ abstract class AbstractLineMatcher implements ILineMatcher {
 	}
 
 	protected getMarkerMatch(data: ProblemData): ProblemMatch {
-		let location = this.getLocation(data);
-		if (data.file && location && data.message) {
-			let marker: IMarkerData = {
-				severity: this.getSeverity(data),
-				startLineNumber: location.startLineNumber,
-				startColumn: location.startCharacter,
-				endLineNumber: location.startLineNumber,
-				endColumn: location.endCharacter,
-				message: data.message
-			};
-			if (!Types.isUndefined(data.code)) {
-				marker.code = data.code;
+		try {
+			let location = this.getLocation(data);
+			if (data.file && location && data.message) {
+				let marker: IMarkerData = {
+					severity: this.getSeverity(data),
+					startLineNumber: location.startLineNumber,
+					startColumn: location.startCharacter,
+					endLineNumber: location.startLineNumber,
+					endColumn: location.endCharacter,
+					message: data.message
+				};
+				if (!Types.isUndefined(data.code)) {
+					marker.code = data.code;
+				}
+				return {
+					description: this.matcher,
+					resource: this.getResource(data.file),
+					marker: marker
+				};
 			}
-			return {
-				description: this.matcher,
-				resource: this.getResource(data.file),
-				marker: marker
-			};
+		} catch (err) {
+			console.error(`Failed to convert problem data into match: ${JSON.stringify(data)}`);
 		}
 		return undefined;
 	}

From c63c92b84ec96fefb56fb38cc6db42fecb6bf6fd Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Fri, 19 Jan 2018 10:46:44 +0100
Subject: [PATCH 411/710] remove table from print action, only have new
 command, #41712

---
 src/vs/workbench/electron-browser/actions.ts  | 116 ------------------
 .../performance/electron-browser/stats.ts     |   7 ++
 2 files changed, 7 insertions(+), 116 deletions(-)

diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts
index f0a5ba05fad..c35e4ffc6c2 100644
--- a/src/vs/workbench/electron-browser/actions.ts
+++ b/src/vs/workbench/electron-browser/actions.ts
@@ -324,14 +324,6 @@ export class ShowStartupPerformance extends Action {
 
 			(console).table(this.getStartupMetricsTable(nodeModuleLoadTime));
 
-			if (this.environmentService.performance) {
-				const data = this.analyzeLoaderStats();
-				for (let type in data) {
-					(console).groupCollapsed(`Loader: ${type}`);
-					(console).table(data[type]);
-					(console).groupEnd();
-				}
-			}
 
 			(console).groupEnd();
 
@@ -422,114 +414,6 @@ export class ShowStartupPerformance extends Action {
 
 		return { table: result, duration: Math.round(total) };
 	}
-
-	private analyzeLoaderStats(): { [type: string]: any[] } {
-		const stats = (require).getStats().slice(0).sort((a: ILoaderEvent, b: ILoaderEvent) => {
-			if (a.detail < b.detail) {
-				return -1;
-			} else if (a.detail > b.detail) {
-				return 1;
-			} else if (a.type < b.type) {
-				return -1;
-			} else if (a.type > b.type) {
-				return 1;
-			} else {
-				return 0;
-			}
-		});
-
-		class Tick {
-
-			public readonly duration: number;
-			public readonly detail: string;
-
-			constructor(public readonly start: ILoaderEvent, public readonly end: ILoaderEvent) {
-				console.assert(start.detail === end.detail);
-
-				this.duration = this.end.timestamp - this.start.timestamp;
-				this.detail = start.detail;
-			}
-
-			toTableObject() {
-				return {
-					['Path']: this.start.detail,
-					['Took (ms)']: this.duration.toFixed(2),
-					// ['Start (ms)']: this.start.timestamp,
-					// ['End (ms)']: this.end.timestamp
-				};
-			}
-
-			static compareUsingStartTimestamp(a: Tick, b: Tick): number {
-				if (a.start.timestamp < b.start.timestamp) {
-					return -1;
-				} else if (a.start.timestamp > b.start.timestamp) {
-					return 1;
-				} else {
-					return 0;
-				}
-			}
-		}
-
-		const ticks: { [type: number]: Tick[] } = {
-			[LoaderEventType.BeginLoadingScript]: [],
-			[LoaderEventType.BeginInvokeFactory]: [],
-			[LoaderEventType.NodeBeginEvaluatingScript]: [],
-			[LoaderEventType.NodeBeginNativeRequire]: [],
-		};
-
-		for (let i = 1; i < stats.length - 1; i++) {
-			const stat = stats[i];
-			const nextStat = stats[i + 1];
-
-			if (nextStat.type - stat.type > 2) {
-				//bad?!
-				break;
-			}
-
-			i += 1;
-			ticks[stat.type].push(new Tick(stat, nextStat));
-		}
-
-		ticks[LoaderEventType.BeginInvokeFactory].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.BeginInvokeFactory].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.NodeBeginEvaluatingScript].sort(Tick.compareUsingStartTimestamp);
-		ticks[LoaderEventType.NodeBeginNativeRequire].sort(Tick.compareUsingStartTimestamp);
-
-		const ret = {
-			'Load Script': ticks[LoaderEventType.BeginLoadingScript].map(t => t.toTableObject()),
-			'(Node) Load Script': ticks[LoaderEventType.NodeBeginNativeRequire].map(t => t.toTableObject()),
-			'Eval Script': ticks[LoaderEventType.BeginInvokeFactory].map(t => t.toTableObject()),
-			'(Node) Eval Script': ticks[LoaderEventType.NodeBeginEvaluatingScript].map(t => t.toTableObject()),
-		};
-
-		function total(ticks: Tick[]): number {
-			let sum = 0;
-			for (const tick of ticks) {
-				sum += tick.duration;
-			}
-			return sum;
-		}
-
-		// totals
-		ret['Load Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.BeginLoadingScript]).toFixed(2)
-		});
-		ret['Eval Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.BeginInvokeFactory]).toFixed(2)
-		});
-		ret['(Node) Load Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.NodeBeginNativeRequire]).toFixed(2)
-		});
-		ret['(Node) Eval Script'].push({
-			['Path']: 'TOTAL TIME',
-			['Took (ms)']: total(ticks[LoaderEventType.NodeBeginEvaluatingScript]).toFixed(2)
-		});
-
-		return ret;
-	}
 }
 
 export class ReloadWindowAction extends Action {
diff --git a/src/vs/workbench/parts/performance/electron-browser/stats.ts b/src/vs/workbench/parts/performance/electron-browser/stats.ts
index 252eab924dc..397935d4179 100644
--- a/src/vs/workbench/parts/performance/electron-browser/stats.ts
+++ b/src/vs/workbench/parts/performance/electron-browser/stats.ts
@@ -7,6 +7,7 @@
 
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 
 interface IRequire {
@@ -109,6 +110,12 @@ function getStats(): Map {
 CommandsRegistry.registerCommand('dev.stats.loader', accessor => {
 
 	const clipboard = accessor.get(IClipboardService);
+	const env = accessor.get(IEnvironmentService);
+
+	if (!env.performance) {
+		console.warn('no loader stats, start with `--performance`');
+		return;
+	}
 
 	let value = `Name\tDuration\n`;
 	for (let tick of getStats().get(LoaderEventType.BeginInvokeFactory)) {

From 9fc9a728162a7245687fe35e774f352691db3574 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Fri, 19 Jan 2018 11:22:10 +0100
Subject: [PATCH 412/710] better adapter picking when multiple adapters
 registered for same language

fixes #41835
---
 .../debug/electron-browser/debugConfigurationManager.ts  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 744037e75fb..f31e9cb9b68 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -403,6 +403,7 @@ export class ConfigurationManager implements IConfigurationManager {
 			}
 
 			const editor = this.editorService.getActiveEditor();
+			let candidates: Adapter[];
 			if (editor) {
 				const codeEditor = editor.getControl();
 				if (isCodeEditor(codeEditor)) {
@@ -412,10 +413,16 @@ export class ConfigurationManager implements IConfigurationManager {
 					if (adapters.length === 1) {
 						return TPromise.as(adapters[0]);
 					}
+					if (adapters.length > 1) {
+						candidates = adapters;
+					}
 				}
 			}
 
-			return this.quickOpenService.pick([...this.adapters.filter(a => a.hasInitialConfiguration() || a.hasConfigurationProvider), { label: 'More...', separator: { border: true } }], { placeHolder: nls.localize('selectDebug', "Select Environment") })
+			if (!candidates) {
+				candidates = this.adapters.filter(a => a.hasInitialConfiguration() || a.hasConfigurationProvider);
+			}
+			return this.quickOpenService.pick([...candidates, { label: 'More...', separator: { border: true } }], { placeHolder: nls.localize('selectDebug', "Select Environment") })
 				.then(picked => {
 					if (picked instanceof Adapter) {
 						return picked;

From bdb5d24a0136f55d32468890f61e69027506ff9b Mon Sep 17 00:00:00 2001
From: Adrian Lehmann 
Date: Fri, 19 Jan 2018 11:29:36 +0100
Subject: [PATCH 413/710] Suport Polish in terminal

---
 .../parts/terminal/electron-browser/terminalInstance.ts          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 1bae637dc81..33b84aae5e5 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -955,6 +955,7 @@ export class TerminalInstance implements ITerminalInstance {
 				it: 'IT',
 				ja: 'JP',
 				ko: 'KR',
+				pl: 'PL',
 				ru: 'RU',
 				zh: 'CN'
 			};

From 178f9a95b61ade9dbc40e42cf7077fea7514e397 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 11:31:36 +0100
Subject: [PATCH 414/710] wip: windows fast updates

---
 src/typings/windows-mutex.ts                  |   2 +
 src/vs/code/electron-main/menus.ts            |  11 ++
 src/vs/platform/update/common/update.ts       |  10 +-
 src/vs/platform/update/common/updateIpc.ts    |  16 +++
 .../electron-main/auto-updater.win32.ts       |  74 ++++++++++-
 .../update/electron-main/updateService.ts     |  62 ++++++++--
 .../parts/update/electron-browser/update.ts   | 116 ++++++++++++------
 7 files changed, 239 insertions(+), 52 deletions(-)

diff --git a/src/typings/windows-mutex.ts b/src/typings/windows-mutex.ts
index 039dffcc2ad..a3acc8f4430 100644
--- a/src/typings/windows-mutex.ts
+++ b/src/typings/windows-mutex.ts
@@ -9,4 +9,6 @@ declare module 'windows-mutex' {
 		isActive(): boolean;
 		release(): void;
 	}
+
+	export function isActive(name: string): boolean;
 }
\ No newline at end of file
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 59229fbc739..ced1253651e 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -1045,6 +1045,17 @@ export class CodeMenu {
 				return [];
 
 			case UpdateState.UpdateDownloaded:
+				return [new MenuItem({
+					label: nls.localize('miInstallUpdate', "Install Update..."), click: () => {
+						this.reportMenuActionTelemetry('InstallUpdate');
+						this.updateService.applyUpdate();
+					}
+				})];
+
+			case UpdateState.UpdateInstalling:
+				return [new MenuItem({ label: nls.localize('miInstallingUpdate', "Installing Update..."), enabled: false })];
+
+			case UpdateState.UpdateReady:
 				return [new MenuItem({
 					label: nls.localize('miRestartToUpdate', "Restart to Update..."), click: () => {
 						this.reportMenuActionTelemetry('RestartToUpdate');
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 13928e33f17..eecba458299 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -14,7 +14,9 @@ export enum State {
 	Idle,
 	CheckingForUpdate,
 	UpdateAvailable,
-	UpdateDownloaded
+	UpdateDownloaded,
+	UpdateInstalling,
+	UpdateReady
 }
 
 export enum ExplicitState {
@@ -26,6 +28,7 @@ export interface IRawUpdate {
 	releaseNotes: string;
 	version: string;
 	date: Date;
+	supportsFastUpdate?: boolean;
 }
 
 export interface IUpdate {
@@ -33,11 +36,13 @@ export interface IUpdate {
 	date?: Date;
 	releaseNotes?: string;
 	url?: string;
+	supportsFastUpdate?: boolean;
 }
 
 export interface IAutoUpdater extends NodeEventEmitter {
 	setFeedURL(url: string): void;
 	checkForUpdates(): void;
+	applyUpdate?(): TPromise;
 	quitAndInstall(): void;
 }
 
@@ -49,10 +54,13 @@ export interface IUpdateService {
 	readonly onError: Event;
 	readonly onUpdateAvailable: Event<{ url: string; version: string; }>;
 	readonly onUpdateNotAvailable: Event;
+	readonly onUpdateDownloaded: Event;
+	readonly onUpdateInstalling: Event;
 	readonly onUpdateReady: Event;
 	readonly onStateChange: Event;
 	readonly state: State;
 
 	checkForUpdates(explicit: boolean): TPromise;
+	applyUpdate(): TPromise;
 	quitAndInstall(): TPromise;
 }
\ No newline at end of file
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index bd42c38e018..9b8b30041a3 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -15,9 +15,12 @@ export interface IUpdateChannel extends IChannel {
 	call(command: 'event:onError'): TPromise;
 	call(command: 'event:onUpdateAvailable'): TPromise;
 	call(command: 'event:onUpdateNotAvailable'): TPromise;
+	call(command: 'event:onUpdateDownloaded'): TPromise;
+	call(command: 'event:onUpdateInstalling'): TPromise;
 	call(command: 'event:onUpdateReady'): TPromise;
 	call(command: 'event:onStateChange'): TPromise;
 	call(command: 'checkForUpdates', arg: boolean): TPromise;
+	call(command: 'applyUpdate'): TPromise;
 	call(command: 'quitAndInstall'): TPromise;
 	call(command: '_getInitialState'): TPromise;
 	call(command: string, arg?: any): TPromise;
@@ -32,9 +35,12 @@ export class UpdateChannel implements IUpdateChannel {
 			case 'event:onError': return eventToCall(this.service.onError);
 			case 'event:onUpdateAvailable': return eventToCall(this.service.onUpdateAvailable);
 			case 'event:onUpdateNotAvailable': return eventToCall(this.service.onUpdateNotAvailable);
+			case 'event:onUpdateDownloaded': return eventToCall(this.service.onUpdateDownloaded);
+			case 'event:onUpdateInstalling': return eventToCall(this.service.onUpdateInstalling);
 			case 'event:onUpdateReady': return eventToCall(this.service.onUpdateReady);
 			case 'event:onStateChange': return eventToCall(this.service.onStateChange);
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
+			case 'applyUpdate': return this.service.applyUpdate();
 			case 'quitAndInstall': return this.service.quitAndInstall();
 			case '_getInitialState': return TPromise.as(this.service.state);
 		}
@@ -55,6 +61,12 @@ export class UpdateChannelClient implements IUpdateService {
 	private _onUpdateNotAvailable = eventFromCall(this.channel, 'event:onUpdateNotAvailable');
 	get onUpdateNotAvailable(): Event { return this._onUpdateNotAvailable; }
 
+	private _onUpdateDownloaded = eventFromCall(this.channel, 'event:onUpdateDownloaded');
+	get onUpdateDownloaded(): Event { return this._onUpdateDownloaded; }
+
+	private _onUpdateInstalling = eventFromCall(this.channel, 'event:onUpdateInstalling');
+	get onUpdateInstalling(): Event { return this._onUpdateInstalling; }
+
 	private _onUpdateReady = eventFromCall(this.channel, 'event:onUpdateReady');
 	get onUpdateReady(): Event { return this._onUpdateReady; }
 
@@ -82,6 +94,10 @@ export class UpdateChannelClient implements IUpdateService {
 		return this.channel.call('checkForUpdates', explicit);
 	}
 
+	applyUpdate(): TPromise {
+		return this.channel.call('applyUpdate');
+	}
+
 	quitAndInstall(): TPromise {
 		return this.channel.call('quitAndInstall');
 	}
diff --git a/src/vs/platform/update/electron-main/auto-updater.win32.ts b/src/vs/platform/update/electron-main/auto-updater.win32.ts
index c88880617f3..401dc510256 100644
--- a/src/vs/platform/update/electron-main/auto-updater.win32.ts
+++ b/src/vs/platform/update/electron-main/auto-updater.win32.ts
@@ -6,6 +6,7 @@
 'use strict';
 
 import * as path from 'path';
+import * as fs from 'fs';
 import * as pfs from 'vs/base/node/pfs';
 import { checksum } from 'vs/base/node/crypto';
 import { EventEmitter } from 'events';
@@ -17,6 +18,7 @@ import { download, asJson } from 'vs/base/node/request';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { IAutoUpdater } from 'vs/platform/update/common/update';
 import product from 'vs/platform/node/product';
+import { isActive } from 'windows-mutex';
 
 interface IUpdate {
 	url: string;
@@ -25,13 +27,35 @@ interface IUpdate {
 	version: string;
 	productVersion: string;
 	hash: string;
+	supportsFastUpdate?: boolean;
+}
+
+function pollUntil(fn: () => boolean, timeout = 1000): TPromise {
+	return new TPromise(c => {
+		const poll = () => {
+			if (fn()) {
+				c(null);
+			} else {
+				setTimeout(poll, timeout);
+			}
+		};
+
+		poll();
+	});
+}
+
+interface IAvailableUpdate {
+	packagePath: string;
+	version: string;
+	supportsFastUpdate: boolean;
+	updateFilePath?: string;
 }
 
 export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
 
 	private url: string = null;
 	private currentRequest: Promise = null;
-	private updatePackagePath: string = null;
+	private currentUpdate: IAvailableUpdate = null;
 
 	constructor(
 		@IRequestService private requestService: IRequestService
@@ -87,14 +111,21 @@ export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
 								.then(() => updatePackagePath);
 						});
 					}).then(updatePackagePath => {
-						this.updatePackagePath = updatePackagePath;
+						const supportsFastUpdate = !!update.supportsFastUpdate;
+
+						this.currentUpdate = {
+							packagePath: updatePackagePath,
+							version: update.version,
+							supportsFastUpdate
+						};
 
 						this.emit('update-downloaded',
 							{},
 							update.releaseNotes,
 							update.productVersion,
 							new Date(),
-							this.url
+							this.url,
+							supportsFastUpdate
 						);
 					});
 				});
@@ -126,12 +157,45 @@ export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
 			);
 	}
 
+	applyUpdate(): TPromise {
+		if (!this.currentUpdate) {
+			return TPromise.as(null);
+		}
+
+		return this.cachePath.then(cachePath => {
+			this.currentUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${product.quality}-${this.currentUpdate.version}.flag`);
+
+			return pfs.touch(this.currentUpdate.updateFilePath).then(() => {
+				spawn(this.currentUpdate.packagePath, ['/verysilent', '/update=FILENAME', '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+					detached: true,
+					stdio: ['ignore', 'ignore', 'ignore']
+				});
+
+				const readyMutexName = `${product.win32MutexName}-ready`;
+
+				// poll for mutex-ready
+				pollUntil(() => isActive(readyMutexName)).then(() => {
+
+					// now we're ready for `quitAndInstall`
+					this.emit('update-ready');
+				});
+			});
+		});
+	}
+
 	quitAndInstall(): void {
-		if (!this.updatePackagePath) {
+		if (!this.currentUpdate) {
 			return;
 		}
 
-		spawn(this.updatePackagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+		if (this.currentUpdate.supportsFastUpdate && this.currentUpdate.updateFilePath) {
+			// let's delete the file, to signal inno setup that we want Code to start
+			// after the update is applied. after that, just die
+			fs.unlinkSync(this.currentUpdate.updateFilePath);
+			return;
+		}
+
+		spawn(this.currentUpdate.packagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 			detached: true,
 			stdio: ['ignore', 'ignore', 'ignore']
 		});
diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts
index b7f8f5edf69..849f57f279d 100644
--- a/src/vs/platform/update/electron-main/updateService.ts
+++ b/src/vs/platform/update/electron-main/updateService.ts
@@ -45,6 +45,12 @@ export class UpdateService implements IUpdateService {
 	private _onUpdateNotAvailable = new Emitter();
 	get onUpdateNotAvailable(): Event { return this._onUpdateNotAvailable.event; }
 
+	private _onUpdateDownloaded = new Emitter();
+	get onUpdateDownloaded(): Event { return this._onUpdateDownloaded.event; }
+
+	private _onUpdateInstalling = new Emitter();
+	get onUpdateInstalling(): Event { return this._onUpdateInstalling.event; }
+
 	private _onUpdateReady = new Emitter();
 	get onUpdateReady(): Event { return this._onUpdateReady.event; }
 
@@ -68,14 +74,19 @@ export class UpdateService implements IUpdateService {
 
 	@memoize
 	private get onRawUpdateDownloaded(): Event {
-		return fromNodeEventEmitter(this.raw, 'update-downloaded', (_, releaseNotes, version, date, url) => ({ releaseNotes, version, date }));
+		return fromNodeEventEmitter(this.raw, 'update-downloaded', (_, releaseNotes, version, date, url, supportsFastUpdate) => ({ releaseNotes, version, date, supportsFastUpdate }));
+	}
+
+	@memoize
+	private get onRawUpdateReady(): Event {
+		return fromNodeEventEmitter(this.raw, 'update-ready');
 	}
 
 	get state(): State {
 		return this._state;
 	}
 
-	set state(state: State) {
+	private updateState(state: State): void {
 		this._state = state;
 		this._onStateChange.fire(state);
 	}
@@ -119,7 +130,7 @@ export class UpdateService implements IUpdateService {
 			return; // application not signed
 		}
 
-		this.state = State.Idle;
+		this.updateState(State.Idle);
 
 		// Start checking for updates after 30 seconds
 		this.scheduleCheckForUpdates(30 * 1000)
@@ -157,20 +168,20 @@ export class UpdateService implements IUpdateService {
 		}
 
 		this._onCheckForUpdate.fire();
-		this.state = State.CheckingForUpdate;
+		this.updateState(State.CheckingForUpdate);
 
 		const listeners: IDisposable[] = [];
 		const result = new TPromise((c, e) => {
 			once(this.onRawError)(e, null, listeners);
 			once(this.onRawUpdateNotAvailable)(() => c(null), null, listeners);
 			once(this.onRawUpdateAvailable)(({ url, version }) => url && c({ url, version }), null, listeners);
-			once(this.onRawUpdateDownloaded)(({ version, date, releaseNotes }) => c({ version, date, releaseNotes }), null, listeners);
+			once(this.onRawUpdateDownloaded)(({ version, date, releaseNotes, supportsFastUpdate }) => c({ version, date, releaseNotes, supportsFastUpdate }), null, listeners);
 
 			this.raw.checkForUpdates();
 		}).then(update => {
 			if (!update) {
 				this._onUpdateNotAvailable.fire(explicit);
-				this.state = State.Idle;
+				this.updateState(State.Idle);
 				/* __GDPR__
 					"update:notAvailable" : {
 						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -178,6 +189,7 @@ export class UpdateService implements IUpdateService {
 				*/
 				this.telemetryService.publicLog('update:notAvailable', { explicit });
 
+				// LINUX
 			} else if (update.url) {
 				const data: IUpdate = {
 					url: update.url,
@@ -188,7 +200,7 @@ export class UpdateService implements IUpdateService {
 
 				this._availableUpdate = data;
 				this._onUpdateAvailable.fire({ url: update.url, version: update.version });
-				this.state = State.UpdateAvailable;
+				this.updateState(State.UpdateAvailable);
 				/* __GDPR__
 					"update:available" : {
 						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
@@ -202,12 +214,20 @@ export class UpdateService implements IUpdateService {
 				const data: IRawUpdate = {
 					releaseNotes: update.releaseNotes,
 					version: update.version,
-					date: update.date
+					date: update.date,
+					supportsFastUpdate: update.supportsFastUpdate
 				};
 
 				this._availableUpdate = data;
-				this._onUpdateReady.fire(data);
-				this.state = State.UpdateDownloaded;
+
+				if (update.supportsFastUpdate) {
+					this._onUpdateDownloaded.fire(data);
+					this.updateState(State.UpdateDownloaded);
+				} else {
+					this._onUpdateReady.fire(data);
+					this.updateState(State.UpdateReady);
+				}
+
 				/* __GDPR__
 					"update:downloaded" : {
 						"version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
@@ -218,7 +238,7 @@ export class UpdateService implements IUpdateService {
 
 			return update;
 		}, err => {
-			this.state = State.Idle;
+			this.updateState(State.Idle);
 			return TPromise.wrapError(err);
 		});
 
@@ -260,6 +280,26 @@ export class UpdateService implements IUpdateService {
 		return process.platform;
 	}
 
+	// for windows fast updates
+	applyUpdate(): TPromise {
+		if (this.state !== State.UpdateDownloaded) {
+			return TPromise.as(null);
+		}
+
+		if (!this.raw.applyUpdate) {
+			return TPromise.as(null);
+		}
+
+		once(this.onRawUpdateReady)(() => {
+			this._onUpdateReady.fire(this._availableUpdate as IRawUpdate);
+			this.updateState(State.UpdateReady);
+		});
+
+		this._onUpdateInstalling.fire(this._availableUpdate as IRawUpdate);
+		this.updateState(State.UpdateInstalling);
+		return this.raw.applyUpdate();
+	}
+
 	quitAndInstall(): TPromise {
 		if (!this._availableUpdate) {
 			return TPromise.as(null);
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index fca8ccd73a6..08349ed005d 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -9,7 +9,7 @@ import nls = require('vs/nls');
 import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
-import { mapEvent } from 'vs/base/common/event';
+import { mapEvent, filterEvent, once } from 'vs/base/common/event';
 import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IMessageService, CloseAction, Severity } from 'vs/platform/message/common/message';
@@ -34,16 +34,6 @@ import * as semver from 'semver';
 import { OS, isLinux, isWindows } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
-class ApplyUpdateAction extends Action {
-	constructor( @IUpdateService private updateService: IUpdateService) {
-		super('update.applyUpdate', nls.localize('updateNow', "Update Now"), null, true);
-	}
-
-	run(): TPromise {
-		return this.updateService.quitAndInstall();
-	}
-}
-
 const NotNowAction = new Action(
 	'update.later',
 	nls.localize('later', "Later"),
@@ -178,17 +168,6 @@ export class ShowCurrentReleaseNotesAction extends AbstractShowReleaseNotesActio
 	}
 }
 
-export class DownloadAction extends Action {
-
-	constructor( @IUpdateService private updateService: IUpdateService) {
-		super('update.download', nls.localize('downloadNow', "Download Now"), null, true);
-	}
-
-	run(): TPromise {
-		return this.updateService.quitAndInstall();
-	}
-}
-
 const LinkAction = (id: string, message: string, licenseUrl: string) => new Action(
 	id, message, null, true,
 	() => { window.open(licenseUrl); return TPromise.as(null); }
@@ -328,11 +307,25 @@ export class UpdateContribution implements IGlobalActivity {
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IActivityService private activityService: IActivityService
 	) {
-		const onUpdateAvailable = isLinux
-			? mapEvent(updateService.onUpdateAvailable, e => e.version)
-			: mapEvent(updateService.onUpdateReady, e => e.version);
+		if (isLinux) {
+			mapEvent(updateService.onUpdateAvailable, e => e.version)
+				(this.onUpdateAvailable, this, this.disposables);
+		} else if (isWindows) {
+			// fast updates
+			mapEvent(updateService.onUpdateDownloaded, e => e.version)
+				(this.onUpdateDownloaded, this, this.disposables);
+			mapEvent(updateService.onUpdateInstalling, e => e.version)
+				(this.onUpdateInstalling, this, this.disposables);
+
+			// regular old updates
+			mapEvent(filterEvent(updateService.onUpdateReady, e => !e.supportsFastUpdate), e => e.version)
+				(this.onUpdateAvailable, this, this.disposables);
+
+		} else {
+			mapEvent(updateService.onUpdateReady, e => e.version)
+				(this.onUpdateAvailable, this, this.disposables);
+		}
 
-		onUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
 		updateService.onError(this.onError, this, this.disposables);
 		updateService.onUpdateNotAvailable(this.onUpdateNotAvailable, this, this.disposables);
 
@@ -370,7 +363,7 @@ export class UpdateContribution implements IGlobalActivity {
 		}
 	}
 
-	private onUpdateAvailable(version: string): void {
+	private shouldShowNotification(): boolean {
 		const currentVersion = product.commit;
 		const currentMillis = new Date().getTime();
 		const lastKnownVersion = this.storageService.get('update/lastKnownVersion', StorageScope.GLOBAL);
@@ -384,27 +377,73 @@ export class UpdateContribution implements IGlobalActivity {
 		const updateNotificationMillis = this.storageService.getInteger('update/updateNotificationTime', StorageScope.GLOBAL, currentMillis);
 		const diffDays = (currentMillis - updateNotificationMillis) / (1000 * 60 * 60 * 24);
 
-		// if 5 days have passed from stored date, show message service
-		if (diffDays > 5) {
-			this.showUpdateNotification(version);
-		}
+		return diffDays > 5;
 	}
 
-	private showUpdateNotification(version: string): void {
+	// windows fast updates
+	private onUpdateDownloaded(version: string): void {
+		if (!this.shouldShowNotification()) {
+			return;
+		}
+
+		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
+		const installUpdateAction = new Action('update.applyUpdate', nls.localize('installUpdate', "Install Update"), undefined, true, () => {
+			once(mapEvent(filterEvent(this.updateService.onUpdateReady, e => e.supportsFastUpdate), e => e.version))
+				(this.onWindowsFastUpdateReady, this);
+
+			return this.updateService.applyUpdate();
+		});
+
+		this.messageService.show(severity.Info, {
+			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, version),
+			actions: [installUpdateAction, NotNowAction, releaseNotesAction]
+		});
+	}
+
+	// windows fast updates
+	private onWindowsFastUpdateReady(version: string): void {
+		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
+		const restartAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () => this.updateService.quitAndInstall());
+
+		this.messageService.show(severity.Info, {
+			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
+			actions: [restartAction, NotNowAction, releaseNotesAction]
+		});
+	}
+
+	// windows fast updates
+	private onUpdateInstalling(version: string): void {
+		const neverShowAgain = new NeverShowAgain('update/win32-fast-updates', this.storageService);
+
+		if (!neverShowAgain.shouldShow()) {
+			return;
+		}
+
+		this.messageService.show(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, version),
+			actions: [CloseAction, neverShowAgain.action]
+		});
+	}
+
+	private onUpdateAvailable(version: string): void {
+		if (!this.shouldShowNotification()) {
+			return;
+		}
+
 		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
 
 		if (isLinux) {
-			const downloadAction = this.instantiationService.createInstance(DownloadAction);
+			const downloadAction = new Action('update.download', nls.localize('downloadNow', "Download Now"), undefined, true, () => this.updateService.quitAndInstall());
 
 			this.messageService.show(severity.Info, {
 				message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
 				actions: [downloadAction, NotNowAction, releaseNotesAction]
 			});
 		} else {
-			const applyUpdateAction = this.instantiationService.createInstance(ApplyUpdateAction);
+			const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () => this.updateService.quitAndInstall());
 
 			this.messageService.show(severity.Info, {
-				message: nls.localize('updateAvailable', "{0} will be updated after it restarts.", product.nameLong),
+				message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
 				actions: [applyUpdateAction, NotNowAction, releaseNotesAction]
 			});
 		}
@@ -461,6 +500,13 @@ export class UpdateContribution implements IGlobalActivity {
 				return new Action('update.available', updateAvailableLabel, undefined, false);
 
 			case UpdateState.UpdateDownloaded:
+				return new Action('update.apply', nls.localize('installUpdate...', "Install Update..."), undefined, true, () =>
+					this.updateService.applyUpdate());
+
+			case UpdateState.UpdateInstalling:
+				return new Action('update.applying', nls.localize('installingUpdate', "Installing Update..."), undefined, false);
+
+			case UpdateState.UpdateReady:
 				return new Action('update.restart', nls.localize('restartToUpdate', "Restart to Update..."), undefined, true, () =>
 					this.updateService.quitAndInstall());
 

From 079899193e25b7e45f73f6727189f236680a1823 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 11:48:08 +0100
Subject: [PATCH 415/710] load mutex later

---
 src/vs/platform/update/electron-main/auto-updater.win32.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/update/electron-main/auto-updater.win32.ts b/src/vs/platform/update/electron-main/auto-updater.win32.ts
index 401dc510256..55da62dda4e 100644
--- a/src/vs/platform/update/electron-main/auto-updater.win32.ts
+++ b/src/vs/platform/update/electron-main/auto-updater.win32.ts
@@ -18,7 +18,6 @@ import { download, asJson } from 'vs/base/node/request';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { IAutoUpdater } from 'vs/platform/update/common/update';
 import product from 'vs/platform/node/product';
-import { isActive } from 'windows-mutex';
 
 interface IUpdate {
 	url: string;
@@ -172,6 +171,7 @@ export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
 				});
 
 				const readyMutexName = `${product.win32MutexName}-ready`;
+				const isActive = (require.__$__nodeRequire('windows-mutex') as any).isActive;
 
 				// poll for mutex-ready
 				pollUntil(() => isActive(readyMutexName)).then(() => {

From 7ed151b2b6e18161ec9b810f436c00aa51cb5b8e Mon Sep 17 00:00:00 2001
From: isidor 
Date: Fri, 19 Jan 2018 11:59:06 +0100
Subject: [PATCH 416/710] commands: if only one resource is selected explictly
 call save since the behavior is a bit different than save all

fixes #41841
---
 .../workbench/parts/files/electron-browser/fileCommands.ts   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
index 23990abc9fe..b562912f181 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts
@@ -474,6 +474,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	handler: (accessor, resource: URI) => {
 		const editorService = accessor.get(IWorkbenchEditorService);
 		const resources = getMultiSelectedResources(resource, accessor.get(IListService), editorService);
+
+		if (resources.length === 1) {
+			// If only one resource is selected explictly call save since the behavior is a bit different than save all #41841
+			return save(resources[0], false, editorService, accessor.get(IFileService), accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService));
+		}
 		return saveAll(resources, editorService, accessor.get(IUntitledEditorService), accessor.get(ITextFileService), accessor.get(IEditorGroupService));
 	}
 });

From 76cbab0a2f780bccbc676f59739fdfe5555e10a7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 12:02:44 +0100
Subject: [PATCH 417/710] some polish and fixes

---
 .../code/electron-browser/issue/bootstrap.css | 88 -------------------
 .../electron-browser/issue/issueReporter.html |  3 +-
 .../electron-browser/issue/issueReporter.js   | 27 ++++++
 .../issue/issueReporterMain.ts                |  3 +
 .../issue/issueReporterModel.ts               |  2 +
 .../issue/{ => media}/issueReporter.css       | 84 ++++++++++++++++++
 .../issue/test/testReporterModel.test.ts      |  2 +
 src/vs/code/electron-main/main.ts             |  1 +
 tslint.json                                   | 12 +++
 9 files changed, 132 insertions(+), 90 deletions(-)
 delete mode 100644 src/vs/code/electron-browser/issue/bootstrap.css
 rename src/vs/code/electron-browser/issue/{ => media}/issueReporter.css (61%)

diff --git a/src/vs/code/electron-browser/issue/bootstrap.css b/src/vs/code/electron-browser/issue/bootstrap.css
deleted file mode 100644
index 07e8df4786f..00000000000
--- a/src/vs/code/electron-browser/issue/bootstrap.css
+++ /dev/null
@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-/**
- * Table
- */
-
-table {
-	width: 100%;
-	max-width: 100%;
-	margin-bottom: 1rem;
-	background-color: transparent;
-	border-collapse: collapse;
-}
-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;
-}
-
-/**
- * Forms
- */
-input, textarea {
-	display: block;
-	width: 100%;
-	padding: .375rem .75rem;
-	margin: 0;
-	font-size: 1rem;
-	line-height: 1.5;
-	color: #495057;
-	background-color: #fff;
-	border-radius: .25rem;
-	border: 1px solid #ced4da;
-}
-textarea {
-	overflow: auto;
-	resize: vertical;
-}
-small {
-	color: #868e96;
-	display: block;
-	margin-top: .25rem;
-	font-size: 80%;
-	font-weight: 400;
-}
-
-/**
- * Button
- */
-button {
-	display: inline-block;
-	font-weight: 400;
-	line-height: 1.25;
-	text-align: center;
-	white-space: nowrap;
-	vertical-align: middle;
-	user-select: none;
-	padding: .5rem 1rem;
-	font-size: 1rem;
-	border-radius: .25rem;
-	background: none;
-}
-
-select {
-	height: calc(2.25rem + 2px);
-	display: block;
-	width: 100%;
-	padding: 0.375rem 0.75rem;
-	font-size: 1rem;
-	line-height: 1.5;
-	color: #495057;
-	background-color: #fff;
-	border-radius: 0.25rem;
-	border: none;
-}
diff --git a/src/vs/code/electron-browser/issue/issueReporter.html b/src/vs/code/electron-browser/issue/issueReporter.html
index c5ef557615c..553c3d51de5 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -3,8 +3,7 @@
 
 	
 		
-		
-		
+		
 	
 	
 		
    
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index f54c82c250f..31dc101872f 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -3,7 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 const path = require('path');
+const remote = require('electron').remote;
 
 function parseURLQueryArgs() {
 	const search = window.location.search || '';
@@ -36,6 +39,30 @@ function uriFromPath(_path) {
 function main() {
 	const args = parseURLQueryArgs();
 	const configuration = JSON.parse(args['config'] || '{}') || {};
+
+	const extractKey = function (e) {
+		return [
+			e.ctrlKey ? 'ctrl-' : '',
+			e.metaKey ? 'meta-' : '',
+			e.altKey ? 'alt-' : '',
+			e.shiftKey ? 'shift-' : '',
+			e.keyCode
+		].join('');
+	};
+
+	const TOGGLE_DEV_TOOLS_KB = (process.platform === 'darwin' ? 'meta-alt-73' : 'ctrl-shift-73'); // mac: Cmd-Alt-I, rest: Ctrl-Shift-I
+	const RELOAD_KB = (process.platform === 'darwin' ? 'meta-82' : 'ctrl-82'); // mac: Cmd-R, rest: Ctrl-R
+
+	window.addEventListener('keydown', function (e) {
+		const key = extractKey(e);
+		if (key === TOGGLE_DEV_TOOLS_KB) {
+			remote.getCurrentWebContents().toggleDevTools();
+		} else if (key === RELOAD_KB) {
+			remote.getCurrentWindow().reload();
+		}
+	});
+
+	// Load the loader and start loading the workbench
 	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
 
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index ace7e535d87..f37957e1518 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -3,6 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
+import 'vs/css!./media/issueReporter';
 import { shell, ipcRenderer, webFrame } from 'electron';
 import { $ } from 'vs/base/browser/dom';
 import * as browser from 'vs/base/browser/browser';
diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts
index 2389cbea151..ab6facf3a25 100644
--- a/src/vs/code/electron-browser/issue/issueReporterModel.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import { assign } from 'vs/base/common/objects';
 
 export interface IssueReporterData {
diff --git a/src/vs/code/electron-browser/issue/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
similarity index 61%
rename from src/vs/code/electron-browser/issue/issueReporter.css
rename to src/vs/code/electron-browser/issue/media/issueReporter.css
index 2d9c3f5274d..cb43afc9bc1 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -3,6 +3,90 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+/**
+ * Table
+ */
+
+table {
+	width: 100%;
+	max-width: 100%;
+	margin-bottom: 1rem;
+	background-color: transparent;
+	border-collapse: collapse;
+}
+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;
+}
+
+/**
+ * Forms
+ */
+input, textarea {
+	display: block;
+	width: 100%;
+	padding: .375rem .75rem;
+	margin: 0;
+	font-size: 1rem;
+	line-height: 1.5;
+	color: #495057;
+	background-color: #fff;
+	border-radius: .25rem;
+	border: 1px solid #ced4da;
+}
+textarea {
+	overflow: auto;
+	resize: vertical;
+}
+small {
+	color: #868e96;
+	display: block;
+	margin-top: .25rem;
+	font-size: 80%;
+	font-weight: 400;
+}
+
+/**
+ * Button
+ */
+button {
+	display: inline-block;
+	font-weight: 400;
+	line-height: 1.25;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	user-select: none;
+	padding: .5rem 1rem;
+	font-size: 1rem;
+	border-radius: .25rem;
+	background: none;
+}
+
+select {
+	height: calc(2.25rem + 2px);
+	display: block;
+	width: 100%;
+	padding: 0.375rem 0.75rem;
+	font-size: 1rem;
+	line-height: 1.5;
+	color: #495057;
+	background-color: #fff;
+	border-radius: 0.25rem;
+	border: none;
+}
+
 * {
 	box-sizing: border-box;
 }
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 657dc3d2649..16c41488e74 100644
--- a/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
+++ b/src/vs/code/electron-browser/issue/test/testReporterModel.test.ts
@@ -3,6 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+'use strict';
+
 import * as assert from 'assert';
 import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
 
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 6ab6a690829..ea7bf733406 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -127,6 +127,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise {
 
 	function setup(retry: boolean): TPromise {
 		return serve(environmentService.mainIPCHandle).then(server => {
+
 			// Print --status usage info
 			if (environmentService.args.status) {
 				logService.warn('Warning: The --status argument can only be used if Code is already running. Please run it again after Code has started.');
diff --git a/tslint.json b/tslint.json
index 23e3b8f5899..24a7ac86d1b 100644
--- a/tslint.json
+++ b/tslint.json
@@ -398,6 +398,18 @@
 					"*" // node modules
 				]
 			},
+			{
+				"target": "**/vs/code/electron-browser/**",
+				"restrictions": [
+					"vs/nls",
+					"vs/css!./**/*",
+					"vs/nls",
+					"**/vs/base/**",
+					"**/vs/platform/**",
+					"**/vs/code/**",
+					"*" // node modules
+				]
+			},
 			{
 				"target": "**/vs/code/**",
 				"restrictions": [

From 7bf655d11a81864ddbdb790ddbd4ecf92cd0cf70 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 12:32:24 +0100
Subject: [PATCH 418/710] fix badge, win32 flag file

---
 .../update/electron-main/auto-updater.win32.ts         | 10 ++++++++--
 .../workbench/parts/update/electron-browser/update.ts  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/update/electron-main/auto-updater.win32.ts b/src/vs/platform/update/electron-main/auto-updater.win32.ts
index 55da62dda4e..3100d0941d2 100644
--- a/src/vs/platform/update/electron-main/auto-updater.win32.ts
+++ b/src/vs/platform/update/electron-main/auto-updater.win32.ts
@@ -164,12 +164,18 @@ export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
 		return this.cachePath.then(cachePath => {
 			this.currentUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${product.quality}-${this.currentUpdate.version}.flag`);
 
-			return pfs.touch(this.currentUpdate.updateFilePath).then(() => {
-				spawn(this.currentUpdate.packagePath, ['/verysilent', '/update=FILENAME', '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+			return pfs.writeFile(this.currentUpdate.updateFilePath, 'flag').then(() => {
+				const child = spawn(this.currentUpdate.packagePath, ['/verysilent', `/update="${this.currentUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 					detached: true,
 					stdio: ['ignore', 'ignore', 'ignore']
 				});
 
+				child.once('exit', () => {
+					this.emit('update-not-available');
+					this.currentRequest = null;
+					this.currentUpdate = null;
+				});
+
 				const readyMutexName = `${product.win32MutexName}-ready`;
 				const isActive = (require.__$__nodeRequire('windows-mutex') as any).isActive;
 
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 08349ed005d..34e36f495bb 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 isUpdateAvailable = isLinux
 			? state === UpdateState.UpdateAvailable
-			: state === UpdateState.UpdateDownloaded;
+			: state === UpdateState.UpdateDownloaded || state === UpdateState.UpdateReady;
 
 		if (isUpdateAvailable) {
 			const badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));

From 7eff5d6d85f7352ffd7e2ea79f10aceca41aa1ef Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Fri, 19 Jan 2018 12:32:20 +0100
Subject: [PATCH 419/710] Simplify edits handling in TextModelTokens

---
 src/vs/editor/common/model.ts                 |  1 -
 .../chunksTextBuffer/chunksTextBuffer.ts      |  1 -
 .../model/linesTextBuffer/linesTextBuffer.ts  |  1 -
 .../pieceTreeTextBuffer.ts                    |  1 -
 src/vs/editor/common/model/textModel.ts       | 19 ++++++++--
 src/vs/editor/common/model/textModelTokens.ts | 38 ++++++-------------
 6 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/src/vs/editor/common/model.ts b/src/vs/editor/common/model.ts
index a84ce2a5bca..31f7b8be668 100644
--- a/src/vs/editor/common/model.ts
+++ b/src/vs/editor/common/model.ts
@@ -1120,7 +1120,6 @@ export class ApplyEditsResult {
  */
 export interface IInternalModelContentChange extends IModelContentChange {
 	range: Range;
-	lines: string[];
 	rangeOffset: number;
 	forceMoveMarkers: boolean;
 }
diff --git a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
index d089cd00af0..046f3387ea5 100644
--- a/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
+++ b/src/vs/editor/common/model/chunksTextBuffer/chunksTextBuffer.ts
@@ -412,7 +412,6 @@ export class ChunksTextBuffer implements ITextBuffer {
 				range: op.range,
 				rangeLength: op.rangeLength,
 				text: text,
-				lines: op.lines,
 				rangeOffset: op.rangeOffset,
 				forceMoveMarkers: op.forceMoveMarkers
 			});
diff --git a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
index 3121969026a..0d03ecd90a0 100644
--- a/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
+++ b/src/vs/editor/common/model/linesTextBuffer/linesTextBuffer.ts
@@ -590,7 +590,6 @@ export class LinesTextBuffer implements ITextBuffer {
 				range: contentChangeRange,
 				rangeLength: op.rangeLength,
 				text: text,
-				lines: op.lines,
 				rangeOffset: op.rangeOffset,
 				forceMoveMarkers: op.forceMoveMarkers
 			});
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
index baaf505f6d0..f8505567923 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.ts
@@ -413,7 +413,6 @@ export class PieceTreeTextBuffer implements ITextBuffer {
 				range: contentChangeRange,
 				rangeLength: op.rangeLength,
 				text: text,
-				lines: op.lines,
 				rangeOffset: op.rangeOffset,
 				forceMoveMarkers: op.forceMoveMarkers
 			});
diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index fc3139a558d..90e95ac7bb7 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -1096,12 +1096,16 @@ export class TextModel extends Disposable implements model.ITextModel {
 		}
 	}
 
-	private static _eolCount(text: string): number {
+	private static _eolCount(text: string): [number, number] {
 		let eolCount = 0;
+		let firstLineLength = 0;
 		for (let i = 0, len = text.length; i < len; i++) {
 			const chr = text.charCodeAt(i);
 
 			if (chr === CharCode.CarriageReturn) {
+				if (eolCount === 0) {
+					firstLineLength = i;
+				}
 				eolCount++;
 				if (i + 1 < len && text.charCodeAt(i + 1) === CharCode.LineFeed) {
 					// \r\n... case
@@ -1110,10 +1114,16 @@ export class TextModel extends Disposable implements model.ITextModel {
 					// \r... case
 				}
 			} else if (chr === CharCode.LineFeed) {
+				if (eolCount === 0) {
+					firstLineLength = i;
+				}
 				eolCount++;
 			}
 		}
-		return eolCount;
+		if (eolCount === 0) {
+			firstLineLength = text.length;
+		}
+		return [eolCount, firstLineLength];
 	}
 
 	private _applyEdits(rawOperations: model.IIdentifiedSingleEditOperation[]): model.IIdentifiedSingleEditOperation[] {
@@ -1134,7 +1144,8 @@ export class TextModel extends Disposable implements model.ITextModel {
 			let lineCount = oldLineCount;
 			for (let i = 0, len = contentChanges.length; i < len; i++) {
 				const change = contentChanges[i];
-				this._tokens.applyEdits(change.range, change.lines);
+				const [eolCount, firstLineLength] = TextModel._eolCount(change.text);
+				this._tokens.applyEdits(change.range, eolCount, firstLineLength);
 				this._onDidChangeDecorations.fire();
 				this._decorationsTree.acceptReplace(change.rangeOffset, change.rangeLength, change.text.length, change.forceMoveMarkers);
 
@@ -1142,7 +1153,7 @@ export class TextModel extends Disposable implements model.ITextModel {
 				const endLineNumber = change.range.endLineNumber;
 
 				const deletingLinesCnt = endLineNumber - startLineNumber;
-				const insertingLinesCnt = TextModel._eolCount(change.text);
+				const insertingLinesCnt = eolCount;
 				const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt);
 
 				const changeLineCountDelta = (insertingLinesCnt - deletingLinesCnt);
diff --git a/src/vs/editor/common/model/textModelTokens.ts b/src/vs/editor/common/model/textModelTokens.ts
index e190d4337bb..bc0a715dda9 100644
--- a/src/vs/editor/common/model/textModelTokens.ts
+++ b/src/vs/editor/common/model/textModelTokens.ts
@@ -285,34 +285,18 @@ export class ModelLinesTokens {
 
 	//#region Editing
 
-	// TODO: simplify
-	public applyEdits(range: Range, lines: string[]): void {
+	public applyEdits(range: Range, eolCount: number, firstLineLength: number): void {
 
 		const deletingLinesCnt = range.endLineNumber - range.startLineNumber;
-		const insertingLinesCnt = (lines ? lines.length - 1 : 0);
+		const insertingLinesCnt = eolCount;
 		const editingLinesCnt = Math.min(deletingLinesCnt, insertingLinesCnt);
 
-		// Iterating descending to overlap with previous op
-		// in case there are common lines being edited in both
 		for (let j = editingLinesCnt; j >= 0; j--) {
-			const editLineNumber = range.startLineNumber + j;
-			this.invalidateLine(editLineNumber - 1);
-		}
-
-		if (editingLinesCnt < deletingLinesCnt) {
-			// Must delete some lines
-			const spliceStartLineNumber = range.startLineNumber + editingLinesCnt;
-			this.invalidateLine(spliceStartLineNumber - 1);
-		}
-
-		if (editingLinesCnt < insertingLinesCnt) {
-			// Must insert some lines
-			const spliceLineNumber = range.startLineNumber + editingLinesCnt;
-			this.invalidateLine(spliceLineNumber - 1);
+			this.invalidateLine(range.startLineNumber + j - 1);
 		}
 
 		this._acceptDeleteRange(range);
-		this._acceptInsertText(new Position(range.startLineNumber, range.startColumn), lines);
+		this._acceptInsertText(new Position(range.startLineNumber, range.startColumn), eolCount, firstLineLength);
 	}
 
 	private _acceptDeleteRange(range: Range): void {
@@ -350,9 +334,9 @@ export class ModelLinesTokens {
 		this._tokens.splice(range.startLineNumber, range.endLineNumber - range.startLineNumber);
 	}
 
-	private _acceptInsertText(position: Position, insertLines: string[]): void {
+	private _acceptInsertText(position: Position, eolCount: number, firstLineLength: number): void {
 
-		if (!insertLines || insertLines.length === 0) {
+		if (eolCount === 0 && firstLineLength === 0) {
 			// Nothing to insert
 			return;
 		}
@@ -362,18 +346,18 @@ export class ModelLinesTokens {
 			return;
 		}
 
-		if (insertLines.length === 1) {
+		if (eolCount === 0) {
 			// Inserting text on one line
-			this._tokens[lineIndex].insert(position.column - 1, insertLines[0].length);
+			this._tokens[lineIndex].insert(position.column - 1, firstLineLength);
 			return;
 		}
 
 		const line = this._tokens[lineIndex];
 		line.deleteEnding(position.column - 1);
-		line.insert(position.column - 1, insertLines[0].length);
+		line.insert(position.column - 1, firstLineLength);
 
-		let insert: ModelLineTokens[] = new Array(insertLines.length - 1);
-		for (let i = insertLines.length - 2; i >= 0; i--) {
+		let insert: ModelLineTokens[] = new Array(eolCount);
+		for (let i = eolCount - 1; i >= 0; i--) {
 			insert[i] = new ModelLineTokens(null);
 		}
 		this._tokens = arrays.arrayInsert(this._tokens, position.lineNumber, insert);

From 7032bc2888aac947205e0ad60ecb20d4b9347117 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 12:33:09 +0100
Subject: [PATCH 420/710] rollback update mechanism if user cancels

---
 src/vs/platform/update/electron-main/updateService.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts
index 849f57f279d..fde9b01d33f 100644
--- a/src/vs/platform/update/electron-main/updateService.ts
+++ b/src/vs/platform/update/electron-main/updateService.ts
@@ -295,6 +295,11 @@ export class UpdateService implements IUpdateService {
 			this.updateState(State.UpdateReady);
 		});
 
+		once(this.onRawUpdateNotAvailable)(() => {
+			this._onUpdateNotAvailable.fire(false);
+			this.updateState(State.Idle);
+		});
+
 		this._onUpdateInstalling.fire(this._availableUpdate as IRawUpdate);
 		this.updateState(State.UpdateInstalling);
 		return this.raw.applyUpdate();

From f01d2d2d7d912ea42476e0b4da934ed2e819e1df Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 14:24:56 +0100
Subject: [PATCH 421/710] log asset

---
 build/tfs/common/publish.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/tfs/common/publish.ts b/build/tfs/common/publish.ts
index 8e25b630c3e..ca580ce1b4d 100644
--- a/build/tfs/common/publish.ts
+++ b/build/tfs/common/publish.ts
@@ -240,6 +240,8 @@ async function publish(commit: string, quality: string, platform: string, type:
 		asset.supportsFastUpdate = true;
 	}
 
+	console.log('Asset:', JSON.stringify(asset, null, '  '));
+
 	const release = {
 		id: commit,
 		timestamp: (new Date()).getTime(),

From a721dbb9b967ddf9c0ca536feaea437e037cf809 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Fri, 19 Jan 2018 15:23:22 +0100
Subject: [PATCH 422/710] Fix #40260

---
 .../node/extensionManagementService.ts        | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
index 8307eb715fb..84ab67e438e 100644
--- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -10,7 +10,7 @@ import * as path from 'path';
 import * as pfs from 'vs/base/node/pfs';
 import * as errors from 'vs/base/common/errors';
 import { assign } from 'vs/base/common/objects';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle';
 import { flatten, distinct } from 'vs/base/common/arrays';
 import { extract, buffer } from 'vs/base/node/zip';
 import { TPromise } from 'vs/base/common/winjs.base';
@@ -107,14 +107,16 @@ export class ExtensionManagementService implements IExtensionManagementService {
 	private uninstalledFileLimiter: Limiter;
 	private disposables: IDisposable[] = [];
 
-	private _onInstallExtension = new Emitter();
-	onInstallExtension: Event = this._onInstallExtension.event;
+	private readonly _onInstallExtension = new Emitter();
+	readonly onInstallExtension: Event = this._onInstallExtension.event;
 
-	private _onDidInstallExtension = new Emitter();
-	onDidInstallExtension: Event = this._onDidInstallExtension.event;
+	private readonly _onDidInstallExtension = new Emitter();
+	readonly onDidInstallExtension: Event = this._onDidInstallExtension.event;
 
-	private _onUninstallExtension = new Emitter();
-	onUninstallExtension: Event = this._onUninstallExtension.event;
+	private readonly _onUninstallExtension = new Emitter();
+	readonly onUninstallExtension: Event = this._onUninstallExtension.event;
+
+	private readonly installingExtensions: Map> = new Map>();
 
 	private _onDidUninstallExtension = new Emitter();
 	onDidUninstallExtension: Event = this._onDidUninstallExtension.event;
@@ -129,6 +131,7 @@ export class ExtensionManagementService implements IExtensionManagementService {
 		this.uninstalledPath = path.join(this.extensionsPath, '.obsolete');
 		this.userDataPath = environmentService.userDataPath;
 		this.uninstalledFileLimiter = new Limiter(1);
+		this.disposables.push(toDisposable(() => this.installingExtensions.clear()));
 	}
 
 	private deleteExtensionsManifestCache(): void {
@@ -259,9 +262,18 @@ export class ExtensionManagementService implements IExtensionManagementService {
 	}
 
 	private downloadAndInstallExtensions(extensions: IGalleryExtension[]): TPromise {
-		return TPromise.join(extensions.map(extensionToInstall => this.downloadInstallableExtension(extensionToInstall)
-			.then(installableExtension => this.installExtension(installableExtension))
-		)).then(null, errors => this.rollback(extensions).then(() => TPromise.wrapError(errors), () => TPromise.wrapError(errors)));
+		return TPromise.join(extensions.map(extensionToInstall => this.downloadAndInstallExtension(extensionToInstall)))
+			.then(null, errors => this.rollback(extensions).then(() => TPromise.wrapError(errors), () => TPromise.wrapError(errors)));
+	}
+
+	private downloadAndInstallExtension(extension: IGalleryExtension): TPromise {
+		let installingExtension = this.installingExtensions.get(extension.identifier.id);
+		if (!installingExtension) {
+			installingExtension = this.downloadInstallableExtension(extension).then(installableExtension => this.installExtension(installableExtension));
+			this.installingExtensions.set(extension.identifier.id, installingExtension);
+			installingExtension.then(local => { this.installingExtensions.delete(extension.identifier.id); return local; }, e => { this.installingExtensions.delete(extension.identifier.id); return TPromise.wrapError(e); });
+		}
+		return installingExtension;
 	}
 
 	private downloadInstallableExtension(extension: IGalleryExtension): TPromise {

From f796928a8ec2802b0de879f77d398d0ffd08f92d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 15:37:21 +0100
Subject: [PATCH 423/710] some menu polish for issue reporter

---
 src/vs/code/electron-main/menus.ts                  | 2 +-
 src/vs/platform/issue/electron-main/issueService.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 59229fbc739..aafae0c8ed9 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -327,7 +327,7 @@ export class CodeMenu {
 		const showAll = new MenuItem({ label: nls.localize('mShowAll', "Show All"), role: 'unhide' });
 		const quit = new MenuItem(this.likeAction('workbench.action.quit', {
 			label: nls.localize('miQuit', "Quit {0}", product.nameLong), click: () => {
-				if (this.windowsMainService.getWindowCount() === 0 || !!this.windowsMainService.getFocusedWindow()) {
+				if (this.windowsMainService.getWindowCount() === 0 || !!BrowserWindow.getFocusedWindow()) {
 					this.windowsMainService.quit(); // fix for https://github.com/Microsoft/vscode/issues/39191
 				}
 			}
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 40402597a34..26ba9c5f6bd 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -43,6 +43,8 @@ export class IssueService implements IIssueService {
 			alwaysOnTop: true
 		});
 
+		this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented
+
 		this._issueWindow.loadURL(this.getIssueReporterPath());
 
 		return TPromise.as(null);

From 3afc26eed3b934943969438181262a4a28973599 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Fri, 19 Jan 2018 16:25:42 +0100
Subject: [PATCH 424/710] Fix #41868

---
 .../preferences/browser/preferencesEditor.ts  | 15 ++++----
 .../browser/preferencesRenderers.ts           | 36 ++++++++++++-------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index b6bc981673c..e913c38ddf2 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -911,7 +911,8 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 
 	private _hasAssociatedPreferencesModelChanged(associatedPreferencesModelUri: URI): TPromise {
 		return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
-			return !(preferencesRenderer && preferencesRenderer.associatedPreferencesModel && preferencesRenderer.associatedPreferencesModel.uri.toString() === associatedPreferencesModelUri.toString());
+			const associatedPreferencesModel = preferencesRenderer.getAssociatedPreferencesModel();
+			return !(preferencesRenderer && associatedPreferencesModel && associatedPreferencesModel.uri.toString() === associatedPreferencesModelUri.toString());
 		});
 	}
 
@@ -920,10 +921,11 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 			.then(associatedPreferencesEditorModel => {
 				return this.preferencesRendererCreationPromise.then(preferencesRenderer => {
 					if (preferencesRenderer) {
-						if (preferencesRenderer.associatedPreferencesModel) {
-							preferencesRenderer.associatedPreferencesModel.dispose();
+						const associatedPreferencesModel = preferencesRenderer.getAssociatedPreferencesModel();
+						if (associatedPreferencesModel) {
+							associatedPreferencesModel.dispose();
 						}
-						preferencesRenderer.associatedPreferencesModel = associatedPreferencesEditorModel;
+						preferencesRenderer.setAssociatedPreferencesModel(associatedPreferencesEditorModel);
 					}
 					return preferencesRenderer;
 				});
@@ -934,8 +936,9 @@ abstract class AbstractSettingsEditorContribution extends Disposable implements
 		if (this.preferencesRendererCreationPromise) {
 			this.preferencesRendererCreationPromise.then(preferencesRenderer => {
 				if (preferencesRenderer) {
-					if (preferencesRenderer.associatedPreferencesModel) {
-						preferencesRenderer.associatedPreferencesModel.dispose();
+					const associatedPreferencesModel = preferencesRenderer.getAssociatedPreferencesModel();
+					if (associatedPreferencesModel) {
+						associatedPreferencesModel.dispose();
 					}
 					preferencesRenderer.preferencesModel.dispose();
 					preferencesRenderer.dispose();
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 659b652788a..49d6784e666 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -35,8 +35,10 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { ITextModel, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model';
 
 export interface IPreferencesRenderer extends IDisposable {
-	preferencesModel: IPreferencesEditorModel;
-	associatedPreferencesModel: IPreferencesEditorModel;
+	readonly preferencesModel: IPreferencesEditorModel;
+
+	getAssociatedPreferencesModel(): IPreferencesEditorModel;
+	setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel): void;
 
 	onFocusPreference: Event;
 	onClearFocusPreference: Event;
@@ -55,7 +57,7 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 	private editSettingActionRenderer: EditSettingRenderer;
 	private highlightMatchesRenderer: HighlightMatchesRenderer;
 	private modelChangeDelayer: Delayer = new Delayer(200);
-	private _associatedPreferencesModel: IPreferencesEditorModel;
+	private associatedPreferencesModel: IPreferencesEditorModel;
 
 	private _onFocusPreference: Emitter = new Emitter();
 	public readonly onFocusPreference: Event = this._onFocusPreference.event;
@@ -81,12 +83,12 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 		this.createHeader();
 	}
 
-	public get associatedPreferencesModel(): IPreferencesEditorModel {
-		return this._associatedPreferencesModel;
+	public getAssociatedPreferencesModel(): IPreferencesEditorModel {
+		return this.associatedPreferencesModel;
 	}
 
-	public set associatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel) {
-		this._associatedPreferencesModel = associatedPreferencesModel;
+	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel): void {
+		this.associatedPreferencesModel = associatedPreferencesModel;
 		this.editSettingActionRenderer.associatedPreferencesModel = associatedPreferencesModel;
 	}
 
@@ -206,10 +208,15 @@ export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements I
 		this._register(new SettingsHeaderWidget(this.editor, '')).setMessage(nls.localize('emptyWorkspaceSettingsHeader', "Place your settings here to overwrite the User Settings."));
 	}
 
+	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel): void {
+		super.setAssociatedPreferencesModel(associatedPreferencesModel);
+		this.workspaceConfigurationRenderer.render(this.getAssociatedPreferencesModel());
+	}
+
 	public render(): void {
 		super.render();
 		this.unsupportedSettingsRenderer.render();
-		this.workspaceConfigurationRenderer.render();
+		this.workspaceConfigurationRenderer.render(this.getAssociatedPreferencesModel());
 	}
 }
 
@@ -278,11 +285,11 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this._register(preferencesModel.onDidChangeGroups(() => this.render()));
 	}
 
-	public get associatedPreferencesModel(): IPreferencesEditorModel {
+	public getAssociatedPreferencesModel(): IPreferencesEditorModel {
 		return this._associatedPreferencesModel;
 	}
 
-	public set associatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel) {
+	public setAssociatedPreferencesModel(associatedPreferencesModel: IPreferencesEditorModel): void {
 		this._associatedPreferencesModel = associatedPreferencesModel;
 		this.editSettingActionRenderer.associatedPreferencesModel = associatedPreferencesModel;
 	}
@@ -1216,17 +1223,20 @@ class UnsupportedSettingsRenderer extends Disposable {
 class WorkspaceConfigurationRenderer extends Disposable {
 
 	private decorationIds: string[] = [];
+	private associatedSettingsEditorModel: IPreferencesEditorModel;
 	private renderingDelayer: Delayer = new Delayer(200);
 
 	constructor(private editor: ICodeEditor, private workspaceSettingsEditorModel: SettingsEditorModel,
 		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
 	) {
 		super();
-		this._register(this.editor.getModel().onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render())));
+		this._register(this.editor.getModel().onDidChangeContent(() => this.renderingDelayer.trigger(() => this.render(this.associatedSettingsEditorModel))));
 	}
 
-	public render(): void {
-		if (this.workspaceContextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.workspaceSettingsEditorModel instanceof WorkspaceConfigurationEditorModel) {
+	public render(associatedSettingsEditorModel: IPreferencesEditorModel): void {
+		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[] = [];

From a3bede4943fd550e2df13628d10c8c6141ff5b3a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 16:30:49 +0100
Subject: [PATCH 425/710] fix #41724

---
 src/vs/base/common/glob.ts         |  8 ++++++--
 src/vs/base/test/node/glob.test.ts | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts
index 7314589644a..451a01bb666 100644
--- a/src/vs/base/common/glob.ts
+++ b/src/vs/base/common/glob.ts
@@ -220,8 +220,12 @@ function parseRegExp(pattern: string): string {
 				}
 			}
 
-			// Tail: Add the slash we had split on if there is more to come and the next one is not a globstar
-			if (index < segments.length - 1 && segments[index + 1] !== GLOBSTAR) {
+			// Tail: Add the slash we had split on if there is more to come and the remaining pattern is not a globstar
+			// For example if pattern: some/**/*.js we want the "/" after some to be included in the RegEx to prevent
+			// a folder called "something" to match as well.
+			// However, if pattern: some/**, we tolerate that we also match on "something" because our globstar behaviour
+			// is to match 0-N segments.
+			if (index < segments.length - 1 && (segments[index + 1] !== GLOBSTAR || index + 2 < segments.length)) {
 				regEx += PATH_REGEX;
 			}
 
diff --git a/src/vs/base/test/node/glob.test.ts b/src/vs/base/test/node/glob.test.ts
index 25dc9c517a6..df770c9c862 100644
--- a/src/vs/base/test/node/glob.test.ts
+++ b/src/vs/base/test/node/glob.test.ts
@@ -301,6 +301,22 @@ suite('Glob', () => {
 		assert(!glob.match(p, '/xpackage.json'));
 	});
 
+	test('issue 41724', function () {
+		let p = 'some/**/*.js';
+
+		assert(glob.match(p, 'some/foo.js'));
+		assert(glob.match(p, 'some/folder/foo.js'));
+		assert(!glob.match(p, 'something/foo.js'));
+		assert(!glob.match(p, 'something/folder/foo.js'));
+
+		p = 'some/**/*';
+
+		assert(glob.match(p, 'some/foo.js'));
+		assert(glob.match(p, 'some/folder/foo.js'));
+		assert(!glob.match(p, 'something/foo.js'));
+		assert(!glob.match(p, 'something/folder/foo.js'));
+	});
+
 	test('brace expansion', function () {
 		let p = '*.{html,js}';
 

From dc31fa213be87c0c937324ec608e42157dbb4418 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Fri, 19 Jan 2018 17:54:54 +0100
Subject: [PATCH 426/710] support interleaving file and text changes, basically
 rewrite bulk edit...

---
 src/vs/editor/browser/services/bulkEdit.ts    | 423 ++++++++----------
 src/vs/editor/common/modes.ts                 |  44 +-
 .../contrib/quickFix/quickFixCommands.ts      |   9 +-
 .../contrib/quickFix/test/quickFix.test.ts    |   4 +-
 src/vs/editor/contrib/rename/rename.ts        |   8 +-
 src/vs/monaco.d.ts                            |  26 +-
 src/vs/platform/progress/common/progress.ts   |   6 +
 src/vs/vscode.d.ts                            |  56 ++-
 .../api/electron-browser/mainThreadEditors.ts |  53 +--
 .../mainThreadLanguageFeatures.ts             |  18 +-
 src/vs/workbench/api/node/extHost.protocol.ts |  53 +--
 .../workbench/api/node/extHostApiCommands.ts  |   6 +-
 .../node/extHostDocumentSaveParticipant.ts    |  14 +-
 .../api/node/extHostLanguageFeatures.ts       |   8 +-
 .../workbench/api/node/extHostTextEditors.ts  |  43 +-
 .../api/node/extHostTypeConverters.ts         |  36 +-
 src/vs/workbench/api/node/extHostTypes.ts     | 100 ++---
 .../parts/search/browser/replaceService.ts    |  18 +-
 .../extHostDocumentSaveParticipant.test.ts    |  30 +-
 .../api/extHostLanguageFeatures.test.ts       |   5 +-
 .../api/extHostTextEditors.test.ts            |  15 +-
 .../electron-browser/api/extHostTypes.test.ts |  50 ++-
 .../api/mainThreadEditors.test.ts             |  58 ++-
 23 files changed, 499 insertions(+), 584 deletions(-)

diff --git a/src/vs/editor/browser/services/bulkEdit.ts b/src/vs/editor/browser/services/bulkEdit.ts
index d5052d8c706..2be87d824bf 100644
--- a/src/vs/editor/browser/services/bulkEdit.ts
+++ b/src/vs/editor/browser/services/bulkEdit.ts
@@ -5,75 +5,46 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { flatten } from 'vs/base/common/arrays';
-import { IStringDictionary, forEach, values, groupBy, size } from 'vs/base/common/collections';
 import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IFileService, IFileChange } from 'vs/platform/files/common/files';
+import { IFileService } from 'vs/platform/files/common/files';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { Selection, ISelection } from 'vs/editor/common/core/selection';
+import { Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { IIdentifiedSingleEditOperation, ITextModel, EndOfLineSequence } from 'vs/editor/common/model';
-import { IProgressRunner } from 'vs/platform/progress/common/progress';
+import { IProgressRunner, emptyProgressRunner, IProgress } from 'vs/platform/progress/common/progress';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { IResourceRename, IResourceCreate } from 'vs/editor/common/modes';
+import { optional } from 'vs/platform/instantiation/common/instantiation';
+import { ResourceTextEdit, ResourceFileEdit, isResourceFileEdit } from 'vs/editor/common/modes';
+import { getPathLabel } from 'vs/base/common/labels';
 
-export interface IResourceFileEdit {
-	readonly renamedResources: { from: URI, to }[];
-	readonly createdResources: { uri: URI, contents: string }[];
-	readonly deletedResources: URI[];
-}
 
-export interface IResourceEdit {
-	resource: URI;
-	range?: IRange;
-	newText: string;
-	newEol?: EndOfLineSequence;
-}
+abstract class IRecording {
 
-interface IRecording {
-	stop(): void;
-	hasChanged(resource: URI): boolean;
-	allChanges(): IFileChange[];
-}
-
-class ChangeRecorder {
-
-	private _fileService: IFileService;
-
-	constructor(fileService?: IFileService) {
-		this._fileService = fileService;
-	}
-
-	public start(): IRecording {
-
-		const changes: IStringDictionary = Object.create(null);
+	static start(fileService: IFileService): IRecording {
 
+		const _changes = new Set();
 		let stop: IDisposable;
-		if (this._fileService) {
-			stop = this._fileService.onFileChanges((event) => {
-				event.changes.forEach(change => {
 
-					const key = String(change.resource);
-					let array = changes[key];
-
-					if (!array) {
-						changes[key] = array = [];
-					}
-
-					array.push(change);
-				});
+		if (fileService) {
+			// watch only when there is a fileservice available
+			stop = fileService.onFileChanges(event => {
+				for (const change of event.changes) {
+					_changes.add(change.resource.toString());
+				}
 			});
 		}
 
 		return {
-			stop: () => { return stop && stop.dispose(); },
-			hasChanged: (resource: URI) => !!changes[resource.toString()],
-			allChanges: () => flatten(values(changes))
+			stop() { return dispose(stop); },
+			hasChanged(resource) { return _changes.has(resource.toString()); }
 		};
 	}
+
+	abstract stop(): void;
+	abstract hasChanged(resource: URI): boolean;
 }
 
 class EditTask implements IDisposable {
@@ -91,26 +62,34 @@ class EditTask implements IDisposable {
 		this._edits = [];
 	}
 
-	public addEdit(edit: IResourceEdit): void {
-
-		if (typeof edit.newEol === 'number') {
-			// honor eol-change
-			this._newEol = edit.newEol;
-		}
-
-		if (edit.range || edit.newText) {
-			// create edit operation
-			let range: Range;
-			if (!edit.range) {
-				range = this._model.getFullModelRange();
-			} else {
-				range = Range.lift(edit.range);
-			}
-			this._edits.push(EditOperation.replaceMove(range, edit.newText));
+	dispose() {
+		if (this._model) {
+			this._modelReference.dispose();
+			this._modelReference = null;
 		}
 	}
 
-	public apply(): void {
+	addEdit(resourceEdit: ResourceTextEdit): void {
+
+		for (const edit of resourceEdit.edits) {
+			if (typeof edit.eol === 'number') {
+				// honor eol-change
+				this._newEol = edit.eol;
+			}
+			if (edit.range || edit.text) {
+				// create edit operation
+				let range: Range;
+				if (!edit.range) {
+					range = this._model.getFullModelRange();
+				} else {
+					range = Range.lift(edit.range);
+				}
+				this._edits.push(EditOperation.replaceMove(range, edit.text));
+			}
+		}
+	}
+
+	apply(): void {
 		if (this._edits.length > 0) {
 
 			this._edits = this._edits.map((value, index) => ({ value, index })).sort((a, b) => {
@@ -167,16 +146,10 @@ class EditTask implements IDisposable {
 		return [this._endCursorSelection];
 	}
 
-	public getEndCursorSelection(): Selection {
+	getEndCursorSelection(): Selection {
 		return this._endCursorSelection;
 	}
 
-	dispose() {
-		if (this._model) {
-			this._modelReference.dispose();
-			this._modelReference = null;
-		}
-	}
 }
 
 class SourceModelEditTask extends EditTask {
@@ -196,46 +169,42 @@ class SourceModelEditTask extends EditTask {
 class BulkEditModel implements IDisposable {
 
 	private _textModelResolverService: ITextModelService;
-	private _numberOfResourcesToModify: number = 0;
-	private _edits: IStringDictionary = Object.create(null);
+	private _edits = new Map();
 	private _tasks: EditTask[];
 	private _sourceModel: URI;
 	private _sourceSelections: Selection[];
 	private _sourceModelTask: SourceModelEditTask;
+	private _progress: IProgress;
 
 	constructor(
 		textModelResolverService: ITextModelService,
-		sourceModel: URI,
-		sourceSelections: Selection[],
-		edits: IResourceEdit[],
-		private progress: IProgressRunner,
-		private renames: IResourceRename[],
-		private creates: IResourceCreate[],
-		private deletes: URI[],
-		private fileService: IFileService
+		editor: ICodeEditor,
+		edits: ResourceTextEdit[],
+		progress: IProgress
 	) {
 		this._textModelResolverService = textModelResolverService;
-		this._sourceModel = sourceModel;
-		this._sourceSelections = sourceSelections;
-		this._sourceModelTask = null;
+		this._sourceModel = editor ? editor.getModel().uri : undefined;
+		this._sourceSelections = editor ? editor.getSelections() : undefined;
+		this._sourceModelTask = undefined;
+		this._progress = progress;
 
-		this._numberOfResourcesToModify += this.renames.length + this.deletes.length + this.creates.length;
-
-		for (let edit of edits) {
-			this._addEdit(edit);
-		}
+		edits.forEach(this.addEdit, this);
 	}
 
-	private _addEdit(edit: IResourceEdit): void {
-		let array = this._edits[edit.resource.toString()];
+	dispose(): void {
+		this._tasks = dispose(this._tasks);
+	}
+
+	addEdit(edit: ResourceTextEdit): void {
+		let array = this._edits.get(edit.resource.toString());
 		if (!array) {
-			this._edits[edit.resource.toString()] = array = [];
-			this._numberOfResourcesToModify += 1;
+			array = [];
+			this._edits.set(edit.resource.toString(), array);
 		}
 		array.push(edit);
 	}
 
-	public async prepare(): TPromise {
+	async prepare(): TPromise {
 
 		if (this._tasks) {
 			throw new Error('illegal state - already prepared');
@@ -244,42 +213,25 @@ class BulkEditModel implements IDisposable {
 		this._tasks = [];
 		const promises: TPromise[] = [];
 
-		if (this.progress) {
-			this.progress.total(this._numberOfResourcesToModify * 2);
-		}
-
-		await TPromise.join(this.renames.map(rename =>
-			this.fileService.moveFile(rename.from, rename.to)));
-
-		await TPromise.join(this.creates.map(create =>
-			this.fileService.createFile(create.uri, create.contents)));
-
-		await TPromise.join(this.deletes.map(uri =>
-			this.fileService.del(uri)));
-
-		forEach(this._edits, entry => {
-			const promise = this._textModelResolverService.createModelReference(URI.parse(entry.key)).then(ref => {
+		this._edits.forEach((value, key) => {
+			const promise = this._textModelResolverService.createModelReference(URI.parse(key)).then(ref => {
 				const model = ref.object;
 
 				if (!model || !model.textEditorModel) {
-					throw new Error(`Cannot load file ${entry.key}`);
+					throw new Error(`Cannot load file ${key}`);
 				}
 
-				const textEditorModel = model.textEditorModel;
 				let task: EditTask;
-
-				if (this._sourceModel && textEditorModel.uri.toString() === this._sourceModel.toString()) {
+				if (this._sourceModel && model.textEditorModel.uri.toString() === this._sourceModel.toString()) {
 					this._sourceModelTask = new SourceModelEditTask(ref, this._sourceSelections);
 					task = this._sourceModelTask;
 				} else {
 					task = new EditTask(ref);
 				}
 
-				entry.value.forEach(edit => task.addEdit(edit));
+				value.forEach(edit => task.addEdit(edit));
 				this._tasks.push(task);
-				if (this.progress) {
-					this.progress.worked(1);
-				}
+				this._progress.report(undefined);
 			});
 			promises.push(promise);
 		});
@@ -289,131 +241,52 @@ class BulkEditModel implements IDisposable {
 		return this;
 	}
 
-	public apply(): Selection {
-		this._tasks.forEach(task => this.applyTask(task));
-		let r: Selection = null;
-		if (this._sourceModelTask) {
-			r = this._sourceModelTask.getEndCursorSelection();
+	apply(): Selection {
+		for (const task of this._tasks) {
+			task.apply();
+			this._progress.report(undefined);
 		}
-		return r;
-	}
-
-	private applyTask(task: EditTask): void {
-		task.apply();
-		if (this.progress) {
-			this.progress.worked(1);
-		}
-	}
-
-	dispose(): void {
-		this._tasks = dispose(this._tasks);
+		return this._sourceModelTask
+			? this._sourceModelTask.getEndCursorSelection()
+			: undefined;
 	}
 }
 
-export interface BulkEdit {
-	progress(progress: IProgressRunner): void;
-	add(edit: IResourceEdit[]): void;
-	addRename(edit: IResourceRename[]): void;
-	addCreate(edit: IResourceCreate[]): void;
-	addDelete(edit: URI[]): void;
-	finish(): TPromise;
-	ariaMessage(): string;
-}
+export type Edit = ResourceFileEdit | ResourceTextEdit;
 
-export function bulkEdit(textModelResolverService: ITextModelService, editor: ICodeEditor, edits: IResourceEdit[], fileService: IFileService, resourceFileEdits?: IResourceFileEdit): TPromise {
-	let bulk = createBulkEdit(textModelResolverService, editor, fileService);
-	bulk.add(edits);
-	bulk.addRename(resourceFileEdits.renamedResources);
-	bulk.addCreate(resourceFileEdits.createdResources);
-	bulk.addDelete(resourceFileEdits.deletedResources);
-	bulk.progress(null);
-	return bulk.finish();
-}
+export class BulkEdit {
 
-export function createBulkEdit(textModelResolverService: ITextModelService, editor?: ICodeEditor, fileService?: IFileService): BulkEdit {
-
-	let all: IResourceEdit[] = [];
-	const renames: IResourceRename[] = [];
-	const creates: IResourceCreate[] = [];
-	const deletes: URI[] = [];
-	let recording = new ChangeRecorder(fileService).start();
-	let progressRunner: IProgressRunner;
-
-	function progress(progress: IProgressRunner) {
-		progressRunner = progress;
+	static perform(edits: Edit[], textModelService: ITextModelService, fileService: IFileService, editor: ICodeEditor): TPromise {
+		const edit = new BulkEdit(editor, null, textModelService, fileService);
+		edit.add(edits);
+		return edit.perform();
 	}
 
-	function add(edits: IResourceEdit[]): void {
-		all.push(...edits);
+	private _edits: Edit[] = [];
+	private _editor: ICodeEditor;
+	private _progress: IProgressRunner;
+
+	constructor(
+		editor: ICodeEditor,
+		progress: IProgressRunner,
+		@ITextModelService private _textModelService: ITextModelService,
+		@optional(IFileService) private _fileService: IFileService
+	) {
+		this._editor = editor;
+		this._progress = progress || emptyProgressRunner;
 	}
 
-	function addRename(edits: IResourceRename[]): void {
-		renames.push(...edits);
-	}
-
-	function addCreate(edits: IResourceCreate[]): void {
-		creates.push(...edits);
-	}
-
-	function addDelete(edits: URI[]): void {
-		deletes.push(...edits);
-	}
-
-	function getConcurrentEdits() {
-		let names: string[];
-		for (let edit of all) {
-			if (recording.hasChanged(edit.resource)) {
-				if (!names) {
-					names = [];
-				}
-				names.push(edit.resource.fsPath);
-			}
+	add(edits: Edit[] | Edit): void {
+		if (Array.isArray(edits)) {
+			this._edits.push(...edits);
+		} else {
+			this._edits.push(edits);
 		}
-		if (names) {
-			return nls.localize('conflict', "These files have changed in the meantime: {0}", names.join(', '));
-		}
-		return undefined;
 	}
 
-	function finish(): TPromise {
-
-		if (all.length === 0 && renames.length === 0 && creates.length === 0 && deletes.length === 0) {
-			return TPromise.as(undefined);
-		}
-
-		let concurrentEdits = getConcurrentEdits();
-		if (concurrentEdits) {
-			return TPromise.wrapError(new Error(concurrentEdits));
-		}
-
-		let uri: URI;
-		let selections: Selection[];
-
-		if (editor && editor.getModel()) {
-			uri = editor.getModel().uri;
-			selections = editor.getSelections();
-		}
-
-		const model = new BulkEditModel(textModelResolverService, uri, selections, all, progressRunner, renames, creates, deletes, fileService);
-
-		return model.prepare().then(async _ => {
-
-			let concurrentEdits = getConcurrentEdits();
-			if (concurrentEdits) {
-				throw new Error(concurrentEdits);
-			}
-
-			recording.stop();
-
-			const result = await model.apply();
-			model.dispose();
-			return result;
-		});
-	}
-
-	function ariaMessage(): string {
-		let editCount = all.length;
-		let resourceCount = size(groupBy(all, edit => edit.resource.toString()));
+	ariaMessage(): string {
+		const editCount = this._edits.reduce((prev, cur) => isResourceFileEdit(cur) ? prev : prev + cur.edits.length, 0);
+		const resourceCount = this._edits.length;
 		if (editCount === 0) {
 			return nls.localize('summary.0', "Made no edits");
 		} else if (editCount > 1 && resourceCount > 1) {
@@ -423,13 +296,81 @@ export function createBulkEdit(textModelResolverService: ITextModelService, edit
 		}
 	}
 
-	return {
-		progress,
-		add,
-		addRename,
-		addCreate,
-		addDelete,
-		finish,
-		ariaMessage
-	};
+	async perform(): TPromise {
+
+		let seen = new Set();
+		let total = 0;
+
+		const groups: Edit[][] = [];
+		let group: Edit[];
+		for (const edit of this._edits) {
+			if (!group || isResourceFileEdit(group[0]) === isResourceFileEdit(edit)) {
+				group = [];
+				groups.push(group);
+			}
+			group.push(edit);
+
+			if (isResourceFileEdit(edit)) {
+				total += 1;
+			} else if (!seen.has(edit.resource.toString())) {
+				seen.add(edit.resource.toString());
+				total += 2;
+			}
+		}
+
+		// define total work and progress callback
+		// for child operations
+		this._progress.total(total);
+		let progress: IProgress = { report: _ => this._progress.worked(1) };
+
+		// do it. return the last selection computed
+		// by a text change (can be undefined then)
+		let res: Selection = undefined;
+		for (const group of groups) {
+			if (isResourceFileEdit(group[0])) {
+				await this._performFileEdits(group, progress);
+			} else {
+				res = await this._performTextEdits(group, progress) || res;
+			}
+		}
+		return res;
+	}
+
+	private async _performFileEdits(edits: ResourceFileEdit[], progress: IProgress) {
+		for (const edit of edits) {
+
+			progress.report(undefined);
+
+			if (edit.newUri && edit.oldUri) {
+				await this._fileService.moveFile(edit.oldUri, edit.newUri, false);
+			} else if (!edit.newUri && edit.oldUri) {
+				await this._fileService.del(edit.oldUri, true);
+			} else if (edit.newUri && !edit.oldUri) {
+				await this._fileService.createFile(edit.newUri, undefined, { overwrite: false });
+			}
+		}
+	}
+
+	private async _performTextEdits(edits: ResourceTextEdit[], progress: IProgress): TPromise {
+
+		const recording = IRecording.start(this._fileService);
+		const model = new BulkEditModel(this._textModelService, this._editor, edits, progress);
+
+		await model.prepare();
+
+		const conflicts = edits
+			.filter(edit => recording.hasChanged(edit.resource))
+			.map(edit => getPathLabel(edit.resource));
+
+		recording.stop();
+
+		if (conflicts.length > 0) {
+			model.dispose();
+			throw new Error(nls.localize('conflict', "These files have changed in the meantime: {0}", conflicts.join(', ')));
+		}
+
+		const selection = await model.apply();
+		model.dispose();
+		return selection;
+	}
 }
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index 9aa2e6ae1ba..e822789ab01 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -17,6 +17,7 @@ import { TokenizationRegistryImpl } from 'vs/editor/common/modes/tokenizationReg
 import { Color } from 'vs/base/common/color';
 import { IMarkerData } from 'vs/platform/markers/common/markers';
 import * as model from 'vs/editor/common/model';
+import { isObject } from 'vs/base/common/types';
 
 /**
  * Open ended enum at runtime
@@ -816,29 +817,36 @@ export interface DocumentColorProvider {
 	provideColorPresentations(model: model.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable;
 }
 
-export interface IResourceEdit {
+/**
+ * @internal
+ */
+export function isResourceFileEdit(thing: any): thing is ResourceFileEdit {
+	return isObject(thing) && (Boolean((thing).newUri) || Boolean((thing).oldUri));
+}
+
+/**
+ * @internal
+ */
+export function isResourceTextEdit(thing: any): thing is ResourceTextEdit {
+	return isObject(thing) && (thing).resource && Array.isArray((thing).edits);
+}
+
+export interface ResourceFileEdit {
+	oldUri: URI;
+	newUri: URI;
+}
+
+export interface ResourceTextEdit {
 	resource: URI;
-	range: IRange;
-	newText: string;
-}
-
-export interface IResourceRename {
-	readonly from: URI;
-	readonly to: URI;
-}
-
-export interface IResourceCreate {
-	readonly uri: URI;
-	readonly contents: string;
+	modelVersionId?: number;
+	edits: TextEdit[];
 }
 
 export interface WorkspaceEdit {
-	edits: IResourceEdit[];
-	renamedResources?: IResourceRename[];
-	createdResources?: IResourceCreate[];
-	deletedResources?: URI[];
-	rejectReason?: string;
+	edits: Array;
+	rejectReason?: string; // TODO@joh, move to rename
 }
+
 export interface RenameProvider {
 	provideRenameEdits(model: model.ITextModel, position: Position, newName: string, token: CancellationToken): WorkspaceEdit | Thenable;
 }
diff --git a/src/vs/editor/contrib/quickFix/quickFixCommands.ts b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
index f012b11a4ca..1345f72935b 100644
--- a/src/vs/editor/contrib/quickFix/quickFixCommands.ts
+++ b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
@@ -22,10 +22,9 @@ import { LightBulbWidget } from './lightBulbWidget';
 import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CodeAction } from 'vs/editor/common/modes';
-import { bulkEdit } from 'vs/editor/browser/services/bulkEdit';
+import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
 import { IFileService } from 'vs/platform/files/common/files';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
-import URI from 'vs/base/common/uri';
 
 export class QuickFixController implements IEditorContribution {
 
@@ -113,11 +112,7 @@ export class QuickFixController implements IEditorContribution {
 
 	private async _onApplyCodeAction(action: CodeAction): TPromise {
 		if (action.edit) {
-			await bulkEdit(this._textModelService, this._editor, action.edit.edits, this._fileService, {
-				createdResources: action.edit.createdResources.map(create => ({ uri: URI.revive(create.uri), contents: create.contents })),
-				renamedResources: action.edit.renamedResources.map(rename => ({ from: URI.revive(rename.from), to: URI.revive(rename.to) })),
-				deletedResources: action.edit.deletedResources.map(URI.revive)
-			});
+			await BulkEdit.perform(action.edit.edits, this._textModelService, this._fileService, this._editor);
 		}
 
 		if (action.command) {
diff --git a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts b/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
index 8e1fdc79473..0a598114488 100644
--- a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
+++ b/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, IResourceEdit } from 'vs/editor/common/modes';
+import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, ResourceTextEdit } from 'vs/editor/common/modes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Range } from 'vs/editor/common/core/range';
 import { getCodeActions } from 'vs/editor/contrib/quickFix/quickFix';
@@ -57,7 +57,7 @@ suite('QuickFix', () => {
 			bcd: {
 				diagnostics: [],
 				edit: new class implements WorkspaceEdit {
-					edits: IResourceEdit[];
+					edits: ResourceTextEdit[];
 				},
 				title: 'abc'
 			}
diff --git a/src/vs/editor/contrib/rename/rename.ts b/src/vs/editor/contrib/rename/rename.ts
index 0fbe5db81f9..b25b9b3f74b 100644
--- a/src/vs/editor/contrib/rename/rename.ts
+++ b/src/vs/editor/contrib/rename/rename.ts
@@ -18,7 +18,7 @@ import { registerEditorAction, registerEditorContribution, ServicesAccessor, Edi
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { createBulkEdit } from 'vs/editor/browser/services/bulkEdit';
+import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import RenameInputField from './renameInputField';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
@@ -147,9 +147,7 @@ class RenameController implements IEditorContribution {
 			this._renameInputVisible.reset();
 			this.editor.focus();
 
-			// start recording of file changes so that we can figure out if a file that
-			// is to be renamed conflicts with another (concurrent) modification
-			const edit = createBulkEdit(this._textModelResolverService, this.editor, this._fileService);
+			const edit = new BulkEdit(this.editor, null, this._textModelResolverService, this._fileService);
 			const state = new EditorState(this.editor, CodeEditorStateFlag.Position | CodeEditorStateFlag.Value | CodeEditorStateFlag.Selection | CodeEditorStateFlag.Scroll);
 
 			const renameOperation = rename(this.editor.getModel(), this.editor.getPosition(), newName).then(result => {
@@ -163,7 +161,7 @@ class RenameController implements IEditorContribution {
 				}
 				edit.add(result.edits);
 
-				return edit.finish().then(selection => {
+				return edit.perform().then(selection => {
 					if (selection) {
 						this.editor.setSelection(selection);
 					}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index 58eb60dd225..ea436add39c 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4907,27 +4907,19 @@ declare module monaco.languages {
 		provideColorPresentations(model: editor.ITextModel, colorInfo: IColorInformation, token: CancellationToken): IColorPresentation[] | Thenable;
 	}
 
-	export interface IResourceEdit {
+	export interface ResourceFileEdit {
+		oldUri: Uri;
+		newUri: Uri;
+	}
+
+	export interface ResourceTextEdit {
 		resource: Uri;
-		range: IRange;
-		newText: string;
-	}
-
-	export interface IResourceRename {
-		readonly from: Uri;
-		readonly to: Uri;
-	}
-
-	export interface IResourceCreate {
-		readonly uri: Uri;
-		readonly contents: string;
+		modelVersionId?: number;
+		edits: TextEdit[];
 	}
 
 	export interface WorkspaceEdit {
-		edits: IResourceEdit[];
-		renamedResources?: IResourceRename[];
-		createdResources?: IResourceCreate[];
-		deletedResources?: Uri[];
+		edits: Array;
 		rejectReason?: string;
 	}
 
diff --git a/src/vs/platform/progress/common/progress.ts b/src/vs/platform/progress/common/progress.ts
index 75addbff74d..97fc957c02b 100644
--- a/src/vs/platform/progress/common/progress.ts
+++ b/src/vs/platform/progress/common/progress.ts
@@ -31,6 +31,12 @@ export interface IProgressRunner {
 	done(): void;
 }
 
+export const emptyProgressRunner: IProgressRunner = Object.freeze({
+	total() { },
+	worked() { },
+	done() { }
+});
+
 export interface IProgress {
 	report(item: T): void;
 }
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index ad5cb36dc8c..1529b850f59 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -2430,29 +2430,6 @@ declare module 'vscode' {
 		 */
 		readonly size: number;
 
-		/**
-		 * Renames a given resource in the workspace.
-		 *
-		 * @param from Uri of current resource.
-		 * @param to Uri of renamed resource.
-		 */
-		renameResource(from: Uri, to: Uri): void;
-
-		/**
-		 * Create a new resource in the workspace.
-		 *
-		 * @param uri Uri of resource to create.
-		 * @param contents New file contents.
-		 */
-		createResource(uri: Uri, contents: String): void;
-
-		/**
-		 * Delete a given resource in the workspace.
-		 *
-		 * @param uri Uri of resource to delete.
-		 */
-		deleteResource(uri: Uri): void;
-
 		/**
 		 * Replace the given range with given text for the given resource.
 		 *
@@ -2510,19 +2487,40 @@ declare module 'vscode' {
 		entries(): [Uri, TextEdit[]][];
 
 		/**
-		 * Get all resource rename edits.
+		 * Renames a given resource in the workspace.
+		 *
+		 * @param from Uri of current resource.
+		 * @param to Uri of renamed resource.
 		 */
-		readonly renamedResources: { from: Uri, to: Uri }[];
+		renameResource(from: Uri, to: Uri): void;
 
 		/**
-		 * Get all resource create edits.
+		 * Create a new resource in the workspace.
+		 *
+		 * @param uri Uri of resource to create.
 		 */
-		readonly createdResources: { uri: Uri, contents: string }[];
+		createResource(uri: Uri): void;
 
 		/**
-		 * Get all resource delete edits.
+		 * Delete a given resource in the workspace.
+		 *
+		 * @param uri Uri of resource to delete.
 		 */
-		readonly deletedResources: Uri[];
+		deleteResource(uri: Uri): void;
+
+		/**
+		 * Get the resource edits for this workspace edit.
+		 *
+		 * @returns A array of uri-tuples in which a rename-edit
+		 * is represented as `[from, to]`, a delete-operation as `[from, null]`,
+		 * and a create-operation as `[null, to]`;
+		 */
+		resourceEdits(): [Uri, Uri][];
+
+		/**
+		 *
+		 */
+		allEntries(): ([Uri, TextEdit[]] | [Uri, Uri])[];
 	}
 
 	/**
diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
index 1af196d2491..409e9df963d 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts
@@ -15,17 +15,18 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { Position as EditorPosition, ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { MainThreadTextEditor } from './mainThreadEditor';
-import { ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions, IResourceFileEdit } from 'vs/workbench/api/node/extHost.protocol';
+import { ITextEditorConfigurationUpdate, TextEditorRevealType, IApplyEditsOptions, IUndoStopOptions, WorkspaceEditDto, reviveWorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors';
 import { equals as objectEquals } from 'vs/base/common/objects';
-import { ExtHostContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IExtHostContext, IWorkspaceResourceEdit } from '../node/extHost.protocol';
+import { ExtHostContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IExtHostContext } from '../node/extHost.protocol';
 import { IRange } from 'vs/editor/common/core/range';
 import { ISelection } from 'vs/editor/common/core/selection';
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { IFileService } from 'vs/platform/files/common/files';
-import { bulkEdit, IResourceEdit } from 'vs/editor/browser/services/bulkEdit';
+import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { isCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { isResourceFileEdit } from 'vs/editor/common/modes';
 
 export class MainThreadEditors implements MainThreadEditorsShape {
 
@@ -210,40 +211,22 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 		return TPromise.as(this._documentsAndEditors.getEditor(id).applyEdits(modelVersionId, edits, opts));
 	}
 
-	$tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[], resourceFileEdits?: IResourceFileEdit): TPromise {
+	$tryApplyWorkspaceEdit(dto: WorkspaceEditDto): TPromise {
+
+		const { edits } = reviveWorkspaceEditDto(dto);
 
 		// First check if loaded models were not changed in the meantime
-		for (let i = 0, len = workspaceResourceEdits.length; i < len; i++) {
-			const workspaceResourceEdit = workspaceResourceEdits[i];
-			if (workspaceResourceEdit.modelVersionId) {
-				const uri = URI.revive(workspaceResourceEdit.resource);
-				let model = this._modelService.getModel(uri);
-				if (model && model.getVersionId() !== workspaceResourceEdit.modelVersionId) {
+		for (let i = 0, len = edits.length; i < len; i++) {
+			const edit = edits[i];
+			if (!isResourceFileEdit(edit) && edit.modelVersionId) {
+				let model = this._modelService.getModel(edit.resource);
+				if (model && model.getVersionId() !== edit.modelVersionId) {
 					// model changed in the meantime
 					return TPromise.as(false);
 				}
 			}
 		}
 
-		// Convert to shape expected by bulkEdit below
-		let resourceEdits: IResourceEdit[] = [];
-		for (let i = 0, len = workspaceResourceEdits.length; i < len; i++) {
-			const workspaceResourceEdit = workspaceResourceEdits[i];
-			const uri = URI.revive(workspaceResourceEdit.resource);
-			const edits = workspaceResourceEdit.edits;
-
-			for (let j = 0, lenJ = edits.length; j < lenJ; j++) {
-				const edit = edits[j];
-
-				resourceEdits.push({
-					resource: uri,
-					newText: edit.newText,
-					newEol: edit.newEol,
-					range: edit.range
-				});
-			}
-		}
-
 		let codeEditor: ICodeEditor;
 		let editor = this._workbenchEditorService.getActiveEditor();
 		if (editor) {
@@ -253,17 +236,7 @@ export class MainThreadEditors implements MainThreadEditorsShape {
 			}
 		}
 
-		return bulkEdit(
-			this._textModelResolverService,
-			codeEditor,
-			resourceEdits,
-			this._fileService,
-			resourceFileEdits ? {
-				renamedResources: resourceFileEdits.renamedResources.map(entry => ({ from: URI.revive(entry.from), to: URI.revive(entry.to) })),
-				createdResources: resourceFileEdits.createdResources.map(entry => ({ uri: URI.revive(entry.uri), contents: entry.contents })),
-				deletedResources: resourceFileEdits.deletedResources.map(URI.revive)
-			} : undefined
-		).then(() => true);
+		return BulkEdit.perform(edits, this._textModelResolverService, this._fileService, codeEditor).then(() => true);
 	}
 
 	$tryInsertSnippet(id: string, template: string, ranges: IRange[], opts: IUndoStopOptions): TPromise {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index d60034d69a2..77ff222bd12 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -15,7 +15,7 @@ import { wireCancellationToken } from 'vs/base/common/async';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { Position as EditorPosition } from 'vs/editor/common/core/position';
 import { Range as EditorRange } from 'vs/editor/common/core/range';
-import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, SymbolInformationDto, WorkspaceEditDto, ResourceEditDto, CodeActionDto } from '../node/extHost.protocol';
+import { ExtHostContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, MainContext, IExtHostContext, ISerializedLanguageConfiguration, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, LocationDto, SymbolInformationDto, CodeActionDto, reviveWorkspaceEditDto } from '../node/extHost.protocol';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { LanguageConfiguration, IndentationRule, OnEnterRule } from 'vs/editor/common/modes/languageConfiguration';
 import { IHeapService } from './mainThreadHeapService';
@@ -86,21 +86,9 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 		}
 	}
 
-	private static _reviveResourceEditDto(data: ResourceEditDto): modes.IResourceEdit {
-		data.resource = URI.revive(data.resource);
-		return data;
-	}
-
-	private static _reviveWorkspaceEditDto(data: WorkspaceEditDto): modes.WorkspaceEdit {
-		if (data && data.edits) {
-			data.edits.forEach(MainThreadLanguageFeatures._reviveResourceEditDto);
-		}
-		return data;
-	}
-
 	private static _reviveCodeActionDto(data: CodeActionDto[]): modes.CodeAction[] {
 		if (data) {
-			data.forEach(code => MainThreadLanguageFeatures._reviveWorkspaceEditDto(code.edit));
+			data.forEach(code => reviveWorkspaceEditDto(code.edit));
 		}
 		return data;
 	}
@@ -266,7 +254,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 	$registerRenameSupport(handle: number, selector: vscode.DocumentSelector): void {
 		this._registrations[handle] = modes.RenameProviderRegistry.register(toLanguageSelector(selector), {
 			provideRenameEdits: (model: ITextModel, position: EditorPosition, newName: string, token: CancellationToken): Thenable => {
-				return wireCancellationToken(token, this._proxy.$provideRenameEdits(handle, model.uri, position, newName)).then(MainThreadLanguageFeatures._reviveWorkspaceEditDto);
+				return wireCancellationToken(token, this._proxy.$provideRenameEdits(handle, model.uri, position, newName)).then(reviveWorkspaceEditDto);
 			}
 		});
 	}
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 0d3ad1d8df1..dad2c493041 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -14,7 +14,7 @@ import {
 
 import * as vscode from 'vscode';
 
-import { UriComponents } from 'vs/base/common/uri';
+import URI, { UriComponents } from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 
@@ -52,7 +52,7 @@ import { IStat, IFileChange } from 'vs/platform/files/common/files';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
-import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model';
+import { ISingleEditOperation } from 'vs/editor/common/model';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
@@ -191,8 +191,6 @@ export interface IApplyEditsOptions extends IUndoStopOptions {
 	setEndOfLine: EndOfLine;
 }
 
-
-
 export interface ITextDocumentShowOptions {
 	position?: EditorPosition;
 	preserveFocus?: boolean;
@@ -200,22 +198,6 @@ export interface ITextDocumentShowOptions {
 	selection?: IRange;
 }
 
-export interface IWorkspaceResourceEdit {
-	resource: UriComponents;
-	modelVersionId?: number;
-	edits: {
-		range?: IRange;
-		newText: string;
-		newEol?: EndOfLineSequence;
-	}[];
-}
-
-export interface IResourceFileEdit {
-	renamedResources: { from: UriComponents, to: UriComponents }[];
-	createdResources: { uri: UriComponents, contents: string }[];
-	deletedResources: UriComponents[];
-}
-
 export interface MainThreadEditorsShape extends IDisposable {
 	$tryShowTextDocument(resource: UriComponents, options: ITextDocumentShowOptions): TPromise;
 	$registerTextEditorDecorationType(key: string, options: editorCommon.IDecorationRenderOptions): void;
@@ -228,7 +210,7 @@ export interface MainThreadEditorsShape extends IDisposable {
 	$tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise;
 	$trySetSelections(id: string, selections: ISelection[]): TPromise;
 	$tryApplyEdits(id: string, modelVersionId: number, edits: ISingleEditOperation[], opts: IApplyEditsOptions): TPromise;
-	$tryApplyWorkspaceEdit(workspaceResourceEdits: IWorkspaceResourceEdit[], resourceFileEdits?: IResourceFileEdit): TPromise;
+	$tryApplyWorkspaceEdit(workspaceEditDto: WorkspaceEditDto): TPromise;
 	$tryInsertSnippet(id: string, template: string, selections: IRange[], opts: IUndoStopOptions): TPromise;
 	$getDiffInformation(id: string): TPromise;
 }
@@ -622,17 +604,38 @@ export interface WorkspaceSymbolsDto extends IdObject {
 	symbols: SymbolInformationDto[];
 }
 
-export interface ResourceEditDto {
+export interface ResourceFileEditDto {
+	oldUri: UriComponents;
+	newUri: UriComponents;
+}
+
+export interface ResourceTextEditDto {
 	resource: UriComponents;
-	range: IRange;
-	newText: string;
+	modelVersionId?: number;
+	edits: modes.TextEdit[];
 }
 
 export interface WorkspaceEditDto {
-	edits: ResourceEditDto[];
+	edits: (ResourceFileEditDto | ResourceTextEditDto)[];
+
+	// todo@joh reject should go into rename
 	rejectReason?: string;
 }
 
+export function reviveWorkspaceEditDto(data: WorkspaceEditDto): modes.WorkspaceEdit {
+	if (data && data.edits) {
+		for (const edit of data.edits) {
+			if (typeof (edit).resource === 'object') {
+				(edit).resource = URI.revive((edit).resource);
+			} else {
+				(edit).newUri = URI.revive((edit).newUri);
+				(edit).oldUri = URI.revive((edit).oldUri);
+			}
+		}
+	}
+	return data;
+}
+
 export interface CodeActionDto {
 	title: string;
 	edit?: WorkspaceEditDto;
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index 62652183f85..d29bab7425a 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -344,11 +344,7 @@ export class ExtHostApiCommands {
 			if (value.rejectReason) {
 				return TPromise.wrapError(new Error(value.rejectReason));
 			}
-			let workspaceEdit = new types.WorkspaceEdit();
-			for (let edit of value.edits) {
-				workspaceEdit.replace(edit.resource, typeConverters.toRange(edit.range), edit.newText);
-			}
-			return workspaceEdit;
+			return typeConverters.WorkspaceEdit.to(value);
 		});
 	}
 
diff --git a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
index 3733a20adbc..d6edc95eb20 100644
--- a/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
+++ b/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
@@ -8,7 +8,7 @@ import Event from 'vs/base/common/event';
 import URI, { UriComponents } from 'vs/base/common/uri';
 import { sequence, always } from 'vs/base/common/async';
 import { illegalState } from 'vs/base/common/errors';
-import { ExtHostDocumentSaveParticipantShape, MainThreadEditorsShape, IWorkspaceResourceEdit } from 'vs/workbench/api/node/extHost.protocol';
+import { ExtHostDocumentSaveParticipantShape, MainThreadEditorsShape, ResourceTextEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { TextEdit } from 'vs/workbench/api/node/extHostTypes';
 import { fromRange, TextDocumentSaveReason, EndOfLine } from 'vs/workbench/api/node/extHostTypeConverters';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
@@ -142,7 +142,7 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 
 		}).then(values => {
 
-			let workspaceResourceEdit: IWorkspaceResourceEdit = {
+			const resourceEdit: ResourceTextEditDto = {
 				resource: document.uri,
 				edits: []
 			};
@@ -150,10 +150,10 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 			for (const value of values) {
 				if (Array.isArray(value) && (value).every(e => e instanceof TextEdit)) {
 					for (const { newText, newEol, range } of value) {
-						workspaceResourceEdit.edits.push({
+						resourceEdit.edits.push({
 							range: range && fromRange(range),
-							newText,
-							newEol: EndOfLine.from(newEol)
+							text: newText,
+							eol: EndOfLine.from(newEol)
 						});
 					}
 				}
@@ -161,12 +161,12 @@ export class ExtHostDocumentSaveParticipant implements ExtHostDocumentSavePartic
 
 			// apply edits if any and if document
 			// didn't change somehow in the meantime
-			if (workspaceResourceEdit.edits.length === 0) {
+			if (resourceEdit.edits.length === 0) {
 				return undefined;
 			}
 
 			if (version === document.version) {
-				return this._mainThreadEditors.$tryApplyWorkspaceEdit([workspaceResourceEdit]);
+				return this._mainThreadEditors.$tryApplyWorkspaceEdit({ edits: [resourceEdit] });
 			}
 
 			// TODO@joh bubble this to listener?
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 37ac8015683..731fccd8492 100644
--- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts
+++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -17,7 +17,7 @@ import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/node/extHostCommands';
 import { ExtHostDiagnostics, DiagnosticCollection } from 'vs/workbench/api/node/extHostDiagnostics';
 import { asWinJsPromise } from 'vs/base/common/async';
-import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, SymbolInformationDto, SuggestResultDto, WorkspaceSymbolsDto, SuggestionDto } from './extHost.protocol';
+import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier, IRawColorInfo, IMainContext, IdObject, ISerializedRegExp, ISerializedIndentationRule, ISerializedOnEnterRule, ISerializedLanguageConfiguration, SymbolInformationDto, SuggestResultDto, WorkspaceSymbolsDto, SuggestionDto, CodeActionDto } from './extHost.protocol';
 import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange } from 'vs/editor/common/core/range';
@@ -255,7 +255,7 @@ class ReferenceAdapter {
 	}
 }
 
-export interface CustomCodeAction extends modes.CodeAction {
+export interface CustomCodeAction extends CodeActionDto {
 	_isSynthetic?: boolean;
 }
 
@@ -273,7 +273,7 @@ class CodeActionAdapter {
 		this._provider = provider;
 	}
 
-	provideCodeActions(resource: URI, range: IRange): TPromise {
+	provideCodeActions(resource: URI, range: IRange): TPromise {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const ran = TypeConverters.toRange(range);
@@ -943,7 +943,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideCodeActions(handle: number, resource: UriComponents, range: IRange): TPromise {
+	$provideCodeActions(handle: number, resource: UriComponents, range: IRange): TPromise {
 		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range));
 	}
 
diff --git a/src/vs/workbench/api/node/extHostTextEditors.ts b/src/vs/workbench/api/node/extHostTextEditors.ts
index 2b3738a27f3..ea973d68b22 100644
--- a/src/vs/workbench/api/node/extHostTextEditors.ts
+++ b/src/vs/workbench/api/node/extHostTextEditors.ts
@@ -12,7 +12,7 @@ import * as TypeConverters from './extHostTypeConverters';
 import { TextEditorDecorationType, ExtHostTextEditor } from './extHostTextEditor';
 import { ExtHostDocumentsAndEditors } from './extHostDocumentsAndEditors';
 import { Position as EditorPosition } from 'vs/platform/editor/common/editor';
-import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IResolvedTextEditorConfiguration, ISelectionChangeEvent, IMainContext, IWorkspaceResourceEdit } from './extHost.protocol';
+import { MainContext, MainThreadEditorsShape, ExtHostEditorsShape, ITextDocumentShowOptions, ITextEditorPositionData, IResolvedTextEditorConfiguration, ISelectionChangeEvent, IMainContext, WorkspaceEditDto } from './extHost.protocol';
 import * as vscode from 'vscode';
 
 export class ExtHostEditors implements ExtHostEditorsShape {
@@ -92,40 +92,23 @@ export class ExtHostEditors implements ExtHostEditorsShape {
 
 	applyWorkspaceEdit(edit: vscode.WorkspaceEdit): TPromise {
 
-		let workspaceResourceEdits: IWorkspaceResourceEdit[] = [];
+		const dto: WorkspaceEditDto = { edits: [] };
 
-		let entries = edit.entries();
-		for (let entry of entries) {
-			let [uri, edits] = entry;
-
-			let doc = this._extHostDocumentsAndEditors.getDocument(uri.toString());
-			let docVersion: number = undefined;
-			if (doc) {
-				docVersion = doc.version;
-			}
-
-			let workspaceResourceEdit: IWorkspaceResourceEdit = {
-				resource: uri,
-				modelVersionId: docVersion,
-				edits: []
-			};
-
-			for (let edit of edits) {
-				workspaceResourceEdit.edits.push({
-					newText: edit.newText,
-					newEol: TypeConverters.EndOfLine.from(edit.newEol),
-					range: edit.range && TypeConverters.fromRange(edit.range)
+		for (let entry of edit.allEntries()) {
+			let [uri, uriOrEdits] = entry;
+			if (Array.isArray(uriOrEdits)) {
+				let doc = this._extHostDocumentsAndEditors.getDocument(uri.toString());
+				dto.edits.push({
+					resource: uri,
+					modelVersionId: doc && doc.version,
+					edits: uriOrEdits.map(TypeConverters.TextEdit.from)
 				});
+			} else {
+				dto.edits.push({ oldUri: uri, newUri: uriOrEdits });
 			}
-
-			workspaceResourceEdits.push(workspaceResourceEdit);
 		}
 
-		return this._proxy.$tryApplyWorkspaceEdit(workspaceResourceEdits, {
-			createdResources: edit.createdResources,
-			renamedResources: edit.renamedResources,
-			deletedResources: edit.deletedResources
-		});
+		return this._proxy.$tryApplyWorkspaceEdit(dto);
 	}
 
 	// --- called from main thread
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
index f1379708459..af3ba6607cd 100644
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
@@ -20,6 +20,7 @@ import { ISelection } from 'vs/editor/common/core/selection';
 import * as htmlContent from 'vs/base/common/htmlContent';
 import { IRelativePattern } from 'vs/base/common/glob';
 import { LanguageSelector, LanguageFilter } from 'vs/editor/common/modes/languageSelector';
+import { WorkspaceEditDto, ResourceTextEditDto, ResourceFileEditDto } from 'vs/workbench/api/node/extHost.protocol';
 
 export interface PositionLike {
 	line: number;
@@ -229,28 +230,35 @@ export const TextEdit = {
 export namespace WorkspaceEdit {
 	export function from(value: vscode.WorkspaceEdit): modes.WorkspaceEdit {
 		const result: modes.WorkspaceEdit = {
-			edits: [],
-			renamedResources: value.renamedResources,
-			createdResources: value.createdResources,
-			deletedResources: value.deletedResources
+			edits: []
 		};
-		for (let entry of value.entries()) {
-			let [uri, textEdits] = entry;
-			for (let textEdit of textEdits) {
-				result.edits.push({
-					resource: uri,
-					newText: textEdit.newText,
-					range: fromRange(textEdit.range)
-				});
+		for (const entry of value.allEntries()) {
+			const [uri, uriOrEdits] = entry;
+			if (Array.isArray(uriOrEdits)) {
+				// text edits
+				result.edits.push({ resource: uri, edits: uriOrEdits.map(TextEdit.from) });
+			} else {
+				// resource edits
+				result.edits.push({ oldUri: uri, newUri: uriOrEdits });
 			}
 		}
 		return result;
 	}
 
-	export function to(value: modes.WorkspaceEdit) {
+	export function to(value: WorkspaceEditDto) {
 		const result = new types.WorkspaceEdit();
 		for (const edit of value.edits) {
-			result.replace(edit.resource, toRange(edit.range), edit.newText);
+			if (Array.isArray((edit).edits)) {
+				result.set(
+					URI.revive((edit).resource),
+					(edit).edits.map(TextEdit.to)
+				);
+			} else {
+				result.renameResource(
+					URI.revive((edit).oldUri),
+					URI.revive((edit).newUri)
+				);
+			}
 		}
 		return result;
 	}
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index a7b250b6d69..b7351530c0c 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -491,44 +491,28 @@ export class TextEdit {
 	}
 }
 
-export class WorkspaceEdit {
+export class WorkspaceEdit implements vscode.WorkspaceEdit {
 
-	private _values: [URI, TextEdit[]][] = [];
-	private readonly _resourcesCreated: { uri: URI, contents: string }[] = [];
-	private readonly _resourcesDeleted: URI[] = [];
-	private readonly _resourcesRenamed: { from: URI, to: URI }[] = [];
-	private _index = new Map();
+	private _clock: number = 0;
 
-	private _validResources = new Set();
-	private _invalidResources = new Set();
+	private _resourceEdits: [number/*time*/, URI, URI][] = [];
+	private _textEdits: [URI, TextEdit[]][] = [];
+	private _textEditsIndex = new Map();
 
-
-	createResource(uri: URI, contents: string): void {
-		if (this._invalidResources.has(uri)) {
-			throw illegalArgument('Cannot create already deleted resource');
-		}
-		this._resourcesCreated.push({ uri: uri, contents: contents });
-		this._validResources.add(uri);
+	createResource(uri: vscode.Uri): void {
+		this.renameResource(undefined, uri);
 	}
 
-	deleteResource(uri: URI): void {
-		if (this._validResources.has(uri)) {
-			throw illegalArgument('Cannot delete newly created resource');
-		}
-		this._resourcesDeleted.push(uri);
-		this._invalidResources.add(uri);
+	deleteResource(uri: vscode.Uri): void {
+		this.renameResource(uri, undefined);
 	}
 
-	renameResource(uri: URI, newUri: URI): void {
-		if (this._validResources.has(uri)) {
-			throw illegalArgument('Cannot delete newly created resource');
-		}
-		if (this._invalidResources.has(newUri)) {
-			throw illegalArgument('Cannot create already deleted resource');
-		}
-		this._resourcesRenamed.push({ from: uri, to: newUri });
-		this._invalidResources.add(uri);
-		this._validResources.add(newUri);
+	renameResource(from: vscode.Uri, to: vscode.Uri): void {
+		this._resourceEdits.push([this._clock++, from, to]);
+	}
+
+	resourceEdits(): [vscode.Uri, vscode.Uri][] {
+		return this._resourceEdits.map(([, oldUri, newUri]) => (<[vscode.Uri, vscode.Uri]>[oldUri, newUri]));
 	}
 
 	replace(uri: URI, range: Range, newText: string): void {
@@ -550,50 +534,54 @@ export class WorkspaceEdit {
 	}
 
 	has(uri: URI): boolean {
-		return this._index.has(uri.toString());
+		return this._textEditsIndex.has(uri.toString());
 	}
 
 	set(uri: URI, edits: TextEdit[]): void {
-		if (this._invalidResources.has(uri)) {
-			throw illegalArgument('Cannot modify already deleted resource');
-		}
-		this._validResources.add(uri);
-		const idx = this._index.get(uri.toString());
-		if (typeof idx === 'undefined') {
-			let newLen = this._values.push([uri, edits]);
-			this._index.set(uri.toString(), newLen - 1);
+		if (!this._textEditsIndex.has(uri.toString())) {
+			let newLen = this._textEdits.push([uri, edits]);
+			this._textEditsIndex.set(uri.toString(), [newLen - 1, this._clock++]);
 		} else {
-			this._values[idx][1] = edits;
+			const [idx] = this._textEditsIndex.get(uri.toString());
+			this._textEdits[idx][1] = edits;
 		}
 	}
 
 	get(uri: URI): TextEdit[] {
-		let idx = this._index.get(uri.toString());
-		return typeof idx !== 'undefined' && this._values[idx][1];
+		if (!this._textEditsIndex.has(uri.toString())) {
+			return undefined;
+		}
+		const [idx] = this._textEditsIndex.get(uri.toString());
+		return this._textEdits[idx][1];
 	}
 
 	entries(): [URI, TextEdit[]][] {
-		return this._values;
+		// todo@joh - make this immutable
+		return this._textEdits;
 	}
 
-	get createdResources(): { uri: URI, contents: string }[] {
-		return this._resourcesCreated;
-	}
-
-	get deletedResources(): URI[] {
-		return this._resourcesDeleted;
-	}
-
-	get renamedResources(): { from: URI, to: URI }[] {
-		return this._resourcesRenamed;
+	allEntries(): ([URI, TextEdit[]] | [URI, URI])[] {
+		// use the 'time' the we have assigned when inserting
+		// the operation and use that order in the resulting
+		// array
+		const res: ([URI, TextEdit[]] | [URI, URI])[] = [];
+		this._textEditsIndex.forEach(value => {
+			const [index, time] = value;
+			res[time] = this._textEdits[index];
+		});
+		this._resourceEdits.forEach(value => {
+			const [time, oldUri, newUri] = value;
+			res[time] = [oldUri, newUri];
+		});
+		return res;
 	}
 
 	get size(): number {
-		return this._values.length + this._resourcesCreated.length + this._resourcesRenamed.length + this._resourcesDeleted.length;
+		return this._textEdits.length + this._resourceEdits.length;
 	}
 
 	toJSON(): any {
-		return this._values;
+		return this._textEdits;
 	}
 }
 
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index c93549e85dd..82bbc09d363 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -15,7 +15,7 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Match, FileMatch, FileMatchOrMatch, ISearchWorkbenchService } from 'vs/workbench/parts/search/common/searchModel';
-import { BulkEdit, IResourceEdit, createBulkEdit } from 'vs/editor/browser/services/bulkEdit';
+import { BulkEdit } from 'vs/editor/browser/services/bulkEdit';
 import { IProgressRunner } from 'vs/platform/progress/common/progress';
 import { IDiffEditor } from 'vs/editor/browser/editorBrowser';
 import { ITextModelService, ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
@@ -24,6 +24,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IFileService } from 'vs/platform/files/common/files';
+import { ResourceTextEdit } from 'vs/editor/common/modes';
 
 const REPLACE_PREVIEW = 'replacePreview';
 
@@ -103,8 +104,7 @@ export class ReplaceService implements IReplaceService {
 	public replace(match: FileMatchOrMatch, progress?: IProgressRunner, resource?: URI): TPromise;
 	public replace(arg: any, progress: IProgressRunner = null, resource: URI = null): TPromise {
 
-		let bulkEdit: BulkEdit = createBulkEdit(this.textModelResolverService, null, this.fileService);
-		bulkEdit.progress(progress);
+		let bulkEdit = new BulkEdit(null, progress, this.textModelResolverService, this.fileService);
 
 		if (arg instanceof Match) {
 			let match = arg;
@@ -126,7 +126,7 @@ export class ReplaceService implements IReplaceService {
 			});
 		}
 
-		return bulkEdit.finish();
+		return bulkEdit.perform();
 	}
 
 	public openReplacePreview(element: FileMatchOrMatch, preserveFocus?: boolean, sideBySide?: boolean, pinned?: boolean): TPromise {
@@ -174,12 +174,14 @@ export class ReplaceService implements IReplaceService {
 			});
 	}
 
-	private createEdit(match: Match, text: string, resource: URI = null): IResourceEdit {
+	private createEdit(match: Match, text: string, resource: URI = null): ResourceTextEdit {
 		let fileMatch: FileMatch = match.parent();
-		let resourceEdit: IResourceEdit = {
+		let resourceEdit: ResourceTextEdit = {
 			resource: resource !== null ? resource : fileMatch.resource(),
-			range: match.range(),
-			newText: text
+			edits: [{
+				range: match.range(),
+				text: text
+			}]
 		};
 		return resourceEdit;
 	}
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 a4c0366b6e4..8ec74bfb073 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts
@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { TextDocumentSaveReason, TextEdit, Position, EndOfLine } from 'vs/workbench/api/node/extHostTypes';
-import { MainThreadEditorsShape, IWorkspaceResourceEdit } from 'vs/workbench/api/node/extHost.protocol';
+import { MainThreadEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import { ExtHostDocumentSaveParticipant } from 'vs/workbench/api/node/extHostDocumentSaveParticipant';
 import { SingleProxyRPCProtocol } from './testRPCProtocol';
 import { SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
@@ -18,6 +18,7 @@ import * as vscode from 'vscode';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
 import { NullLogService } from 'vs/platform/log/common/log';
+import { isResourceTextEdit, ResourceTextEdit } from 'vs/editor/common/modes';
 
 suite('ExtHostDocumentSaveParticipant', () => {
 
@@ -262,10 +263,10 @@ suite('ExtHostDocumentSaveParticipant', () => {
 
 	test('event delivery, pushEdits sync', () => {
 
-		let edits: IWorkspaceResourceEdit[];
+		let dto: WorkspaceEditDto;
 		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock() {
-			$tryApplyWorkspaceEdit(_edits: IWorkspaceResourceEdit[]) {
-				edits = _edits;
+			$tryApplyWorkspaceEdit(_edits: WorkspaceEditDto) {
+				dto = _edits;
 				return TPromise.as(true);
 			}
 		});
@@ -278,16 +279,17 @@ suite('ExtHostDocumentSaveParticipant', () => {
 		return participant.$participateInSave(resource, SaveReason.EXPLICIT).then(() => {
 			sub.dispose();
 
-			assert.equal(edits.length, 1);
-			assert.equal(edits[0].edits.length, 2);
+			assert.equal(dto.edits.length, 1);
+			assert.ok(isResourceTextEdit(dto.edits[0]));
+			assert.equal((dto.edits[0]).edits.length, 2);
 		});
 	});
 
 	test('event delivery, concurrent change', () => {
 
-		let edits: IWorkspaceResourceEdit[];
+		let edits: WorkspaceEditDto;
 		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock() {
-			$tryApplyWorkspaceEdit(_edits: IWorkspaceResourceEdit[]) {
+			$tryApplyWorkspaceEdit(_edits: WorkspaceEditDto) {
 				edits = _edits;
 				return TPromise.as(true);
 			}
@@ -321,16 +323,20 @@ suite('ExtHostDocumentSaveParticipant', () => {
 	test('event delivery, two listeners -> two document states', () => {
 
 		const participant = new ExtHostDocumentSaveParticipant(nullLogService, documents, new class extends mock() {
-			$tryApplyWorkspaceEdit(_edits: IWorkspaceResourceEdit[]) {
+			$tryApplyWorkspaceEdit(dto: WorkspaceEditDto) {
 
-				for (const { resource, edits } of _edits) {
+				for (const edit of dto.edits) {
+					if (!isResourceTextEdit(edit)) {
+						continue;
+					}
+					const { resource, edits } = edit;
 					const uri = URI.revive(resource);
-					for (const { newText, range } of edits) {
+					for (const { text, range } of edits) {
 						documents.$acceptModelChanged(uri.toString(), {
 							changes: [{
 								range,
+								text,
 								rangeLength: undefined,
-								text: newText
 							}],
 							eol: undefined,
 							versionId: documents.getDocumentData(uri).version + 1
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 256ebb6879f..f85ee97b9cb 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -24,7 +24,7 @@ import { IHeapService } from 'vs/workbench/api/electron-browser/mainThreadHeapSe
 import { ExtHostDocuments } from 'vs/workbench/api/node/extHostDocuments';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { getDocumentSymbols } from 'vs/editor/contrib/quickOpen/quickOpen';
-import { DocumentSymbolProviderRegistry, DocumentHighlightKind, Hover } from 'vs/editor/common/modes';
+import { DocumentSymbolProviderRegistry, DocumentHighlightKind, Hover, ResourceTextEdit } from 'vs/editor/common/modes';
 import { getCodeLensData } from 'vs/editor/contrib/codelens/codelens';
 import { getDefinitionsAtPosition, getImplementationsAtPosition, getTypeDefinitionsAtPosition } from 'vs/editor/contrib/goToDeclaration/goToDeclaration';
 import { getHover } from 'vs/editor/contrib/hover/getHover';
@@ -812,7 +812,8 @@ suite('ExtHostLanguageFeatures', function () {
 		return rpcProtocol.sync().then(() => {
 
 			return rename(model, new EditorPosition(1, 1), 'newName').then(value => {
-				assert.equal(value.edits.length, 2); // least relevant renamer
+				assert.equal(value.edits.length, 1); // least relevant renamer
+				assert.equal((value.edits)[0].edits.length, 2); // least relevant renamer
 			});
 		});
 	});
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
index b5ec3f55274..41663d277ef 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts
@@ -7,25 +7,26 @@
 import * as assert from 'assert';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
-import { MainContext, MainThreadEditorsShape, IWorkspaceResourceEdit } from 'vs/workbench/api/node/extHost.protocol';
+import { MainContext, MainThreadEditorsShape, WorkspaceEditDto } from 'vs/workbench/api/node/extHost.protocol';
 import URI from 'vs/base/common/uri';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumentsAndEditors';
 import { SingleProxyRPCProtocol, TestRPCProtocol } from 'vs/workbench/test/electron-browser/api/testRPCProtocol';
 import { ExtHostEditors } from 'vs/workbench/api/node/extHostTextEditors';
+import { ResourceTextEdit } from 'vs/editor/common/modes';
 
 suite('ExtHostTextEditors.applyWorkspaceEdit', () => {
 
 	const resource = URI.parse('foo:bar');
 	let editors: ExtHostEditors;
-	let workspaceResourceEdits: IWorkspaceResourceEdit[];
+	let workspaceResourceEdits: WorkspaceEditDto;
 
 	setup(() => {
 		workspaceResourceEdits = null;
 
 		let rpcProtocol = new TestRPCProtocol();
 		rpcProtocol.set(MainContext.MainThreadEditors, new class extends mock() {
-			$tryApplyWorkspaceEdit(_workspaceResourceEdits: IWorkspaceResourceEdit[]): TPromise {
+			$tryApplyWorkspaceEdit(_workspaceResourceEdits: WorkspaceEditDto): TPromise {
 				workspaceResourceEdits = _workspaceResourceEdits;
 				return TPromise.as(true);
 			}
@@ -48,8 +49,8 @@ suite('ExtHostTextEditors.applyWorkspaceEdit', () => {
 		let edit = new extHostTypes.WorkspaceEdit();
 		edit.replace(resource, new extHostTypes.Range(0, 0, 0, 0), 'hello');
 		return editors.applyWorkspaceEdit(edit).then((result) => {
-			assert.equal(workspaceResourceEdits.length, 1);
-			assert.equal(workspaceResourceEdits[0].modelVersionId, 1337);
+			assert.equal(workspaceResourceEdits.edits.length, 1);
+			assert.equal((workspaceResourceEdits.edits[0]).modelVersionId, 1337);
 		});
 	});
 
@@ -57,8 +58,8 @@ suite('ExtHostTextEditors.applyWorkspaceEdit', () => {
 		let edit = new extHostTypes.WorkspaceEdit();
 		edit.replace(URI.parse('foo:bar2'), new extHostTypes.Range(0, 0, 0, 0), 'hello');
 		return editors.applyWorkspaceEdit(edit).then((result) => {
-			assert.equal(workspaceResourceEdits.length, 1);
-			assert.ok(typeof workspaceResourceEdits[0].modelVersionId === 'undefined');
+			assert.equal(workspaceResourceEdits.edits.length, 1);
+			assert.ok(typeof (workspaceResourceEdits.edits[0]).modelVersionId === 'undefined');
 		});
 	});
 
diff --git a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
index 3e99b175fc7..478b506e60f 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostTypes.test.ts
@@ -362,17 +362,51 @@ suite('ExtHostTypes', function () {
 
 	});
 
-	test('WorkspaceEdit should fail when editing deleted resource', () => {
-		const resource = URI.parse('file:///a.ts');
+	// test('WorkspaceEdit should fail when editing deleted resource', () => {
+	// 	const resource = URI.parse('file:///a.ts');
+
+	// 	const edit = new types.WorkspaceEdit();
+	// 	edit.deleteResource(resource);
+	// 	try {
+	// 		edit.insert(resource, new types.Position(0, 0), '');
+	// 		assert.fail(false, 'Should disallow edit of deleted resource');
+	// 	} catch {
+	// 		// expected
+	// 	}
+	// });
+
+	test('WorkspaceEdit - keep order of text and file changes', function () {
 
 		const edit = new types.WorkspaceEdit();
-		edit.deleteResource(resource);
-		try {
-			edit.insert(resource, new types.Position(0, 0), '');
-			assert.fail(false, 'Should disallow edit of deleted resource');
-		} catch {
-			// expected
+		edit.replace(URI.parse('foo:a'), new types.Range(1, 1, 1, 1), 'foo');
+		edit.renameResource(URI.parse('foo:a'), URI.parse('foo:b'));
+		edit.replace(URI.parse('foo:a'), new types.Range(2, 1, 2, 1), 'bar');
+		edit.replace(URI.parse('foo:b'), new types.Range(3, 1, 3, 1), 'bazz');
+
+		const all = edit.allEntries();
+		assert.equal(all.length, 3);
+
+		function isFileChange(thing: [URI, types.TextEdit[]] | [URI, URI]): thing is [URI, URI] {
+			const [f, s] = thing;
+			return URI.isUri(f) && URI.isUri(s);
 		}
+
+		function isTextChange(thing: [URI, types.TextEdit[]] | [URI, URI]): thing is [URI, types.TextEdit[]] {
+			const [f, s] = thing;
+			return URI.isUri(f) && Array.isArray(s);
+		}
+
+		const [first, second, third] = all;
+		assert.equal(first[0].toString(), 'foo:a');
+		assert.ok(!isFileChange(first));
+		assert.ok(isTextChange(first) && first[1].length === 2);
+
+		assert.equal(second[0].toString(), 'foo:a');
+		assert.ok(isFileChange(second));
+
+		assert.equal(third[0].toString(), 'foo:b');
+		assert.ok(!isFileChange(third));
+		assert.ok(isTextChange(third) && third[1].length === 1);
 	});
 
 	test('DocumentLink', function () {
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
index b725c6163bd..da8f3fb2498 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
@@ -13,7 +13,7 @@ import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
 import { TestCodeEditorService } from 'vs/editor/test/browser/testCodeEditorService';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { ExtHostDocumentsAndEditorsShape, IWorkspaceResourceEdit, ExtHostContext, ExtHostDocumentsShape } from 'vs/workbench/api/node/extHost.protocol';
+import { ExtHostDocumentsAndEditorsShape, ExtHostContext, ExtHostDocumentsShape } from 'vs/workbench/api/node/extHost.protocol';
 import { mock } from 'vs/workbench/test/electron-browser/api/mock';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import Event from 'vs/base/common/event';
@@ -26,6 +26,7 @@ import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { TestFileService } from 'vs/workbench/test/workbenchTestServices';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IFileStat } from 'vs/platform/files/common/files';
+import { ResourceTextEdit } from 'vs/editor/common/modes';
 
 suite('MainThreadEditors', () => {
 
@@ -35,7 +36,7 @@ suite('MainThreadEditors', () => {
 	let editors: MainThreadEditors;
 
 	const movedResources = new Map();
-	const createdResources = new Map();
+	const createdResources = new Set();
 	const deletedResources = new Set();
 
 	setup(() => {
@@ -46,23 +47,22 @@ suite('MainThreadEditors', () => {
 		movedResources.clear();
 		createdResources.clear();
 		deletedResources.clear();
-		const fileService = new TestFileService();
 
-		fileService.moveFile = async (from, target): TPromise => {
-			assert(!movedResources.has(from));
-			movedResources.set(from, target);
-			return createMockFileStat(target);
-		};
-		fileService.createFile = async (uri, contents): TPromise => {
-			assert(!createdResources.has(uri));
-			createdResources.set(uri, contents);
-			return createMockFileStat(uri);
-		};
-		fileService.del = async (uri): TPromise => {
-			assert(!deletedResources.has(uri));
-			deletedResources.add(uri);
+		const fileService = new class extends TestFileService {
+			async moveFile(from, target): TPromise {
+				movedResources.set(from, target);
+				return createMockFileStat(target);
+			}
+			async createFile(uri): TPromise {
+				createdResources.add(uri);
+				return createMockFileStat(uri);
+			}
+			async del(uri): TPromise {
+				deletedResources.add(uri);
+			}
 		};
 
+
 		const textFileService = new class extends mock() {
 			isDirty() { return false; }
 			models = {
@@ -119,11 +119,11 @@ suite('MainThreadEditors', () => {
 
 		let model = modelService.createModel('something', null, resource);
 
-		let workspaceResourceEdit: IWorkspaceResourceEdit = {
+		let workspaceResourceEdit: ResourceTextEdit = {
 			resource: resource,
 			modelVersionId: model.getVersionId(),
 			edits: [{
-				newText: 'asdfg',
+				text: 'asdfg',
 				range: new Range(1, 1, 1, 1)
 			}]
 		};
@@ -131,28 +131,22 @@ suite('MainThreadEditors', () => {
 		// Act as if the user edited the model
 		model.applyEdits([EditOperation.insert(new Position(0, 0), 'something')]);
 
-		return editors.$tryApplyWorkspaceEdit([workspaceResourceEdit]).then((result) => {
+		return editors.$tryApplyWorkspaceEdit({ edits: [workspaceResourceEdit] }).then((result) => {
 			assert.equal(result, false);
 		});
 	});
 
 	test(`applyWorkspaceEdit with only resource edit`, () => {
-		let model = modelService.createModel('something', null, resource);
-
-		let workspaceResourceEdit: IWorkspaceResourceEdit = {
-			resource: resource,
-			modelVersionId: model.getVersionId(),
-			edits: []
-		};
-
-		return editors.$tryApplyWorkspaceEdit([workspaceResourceEdit], {
-			renamedResources: [{ from: resource, to: resource }],
-			createdResources: [{ uri: resource, contents: 'foo' }],
-			deletedResources: [resource]
+		return editors.$tryApplyWorkspaceEdit({
+			edits: [
+				{ oldUri: resource, newUri: resource },
+				{ oldUri: undefined, newUri: resource },
+				{ oldUri: resource, newUri: undefined }
+			]
 		}).then((result) => {
 			assert.equal(result, true);
 			assert.equal(movedResources.get(resource), resource);
-			assert.equal(createdResources.get(resource), 'foo');
+			assert.equal(createdResources.has(resource), true);
 			assert.equal(deletedResources.has(resource), true);
 		});
 	});

From cb3c8e7e50ed530f272973b5ddf67a95873ba901 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Fri, 19 Jan 2018 17:56:23 +0100
Subject: [PATCH 427/710] fix format on save problem that occurs when a
 provider returns no edits

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

diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
index 5d0a02c34e3..07a61e0f3b8 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -26,6 +26,7 @@ import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerServ
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { localize } from 'vs/nls';
+import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 
 export interface ISaveParticipantParticipant extends ISaveParticipant {
 	// progressMessage: string;
@@ -208,7 +209,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 				});
 
 		}).then(edits => {
-			if (edits && versionNow === model.getVersionId()) {
+			if (!isFalsyOrEmpty(edits) && versionNow === model.getVersionId()) {
 				const editor = findEditor(model, this._editorService);
 				if (editor) {
 					this._editsWithEditor(editor, edits);

From b39e1227f1c6e0c6875e74ca596ea6a528cc7299 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Fri, 19 Jan 2018 18:28:33 +0100
Subject: [PATCH 428/710] use uuid as extensions configuration id

---
 .../common/configurationExtensionPoint.ts              | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
index bdd9c346c22..2be9fac95bd 100644
--- a/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
+++ b/src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
@@ -94,7 +94,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint {
 	const configurations: IConfigurationNode[] = [];
 
-	function handleConfiguration(node: IConfigurationNode, id: string, extension: IExtensionPointUser) {
+	function handleConfiguration(node: IConfigurationNode, extension: IExtensionPointUser) {
 		let configuration = objects.deepClone(node);
 
 		if (configuration.title && (typeof configuration.title !== 'string')) {
@@ -103,17 +103,17 @@ configurationExtPoint.setHandler(extensions => {
 
 		validateProperties(configuration, extension);
 
-		configuration.id = id;
+		configuration.id = extension.description.uuid || extension.description.id;
+		configuration.title = configuration.title || extension.description.displayName || extension.description.id;
 		configurations.push(configuration);
 	}
 
 	for (let extension of extensions) {
 		const value = extension.value;
-		const id = extension.description.id;
 		if (!Array.isArray(value)) {
-			handleConfiguration(value, id, extension);
+			handleConfiguration(value, extension);
 		} else {
-			value.forEach(v => handleConfiguration(v, id, extension));
+			value.forEach(v => handleConfiguration(v, extension));
 		}
 	}
 	configurationRegistry.registerConfigurations(configurations, registeredDefaultConfigurations, false);

From 98be848bf4c05c44ffdbaa0eae3a7ed1198d310e Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Fri, 19 Jan 2018 10:04:47 -0800
Subject: [PATCH 429/710] Catch any errors that onLineData users throw

Fixes #41165
---
 .../parts/terminal/electron-browser/terminalInstance.ts   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 33b84aae5e5..7b25da78866 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -912,7 +912,13 @@ export class TerminalInstance implements ITerminalInstance {
 		while (lineIndex >= 0 && buffer.lines.get(lineIndex--).isWrapped) {
 			lineData = buffer.translateBufferLineToString(lineIndex, true) + lineData;
 		}
-		this._onLineDataListeners.forEach(listener => listener(lineData));
+		this._onLineDataListeners.forEach(listener => {
+			try {
+				listener(lineData);
+			} catch (err) {
+				console.error(`onLineData listener threw`, err);
+			}
+		});
 	}
 
 	public onExit(listener: (exitCode: number) => void): lifecycle.IDisposable {

From 9e34212e269bf885cd9c243a9bc0828412602e4a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Fri, 19 Jan 2018 19:05:51 +0100
Subject: [PATCH 430/710] backups - make sure to use "utf8" as encoding and not
 "utf-8"

---
 src/vs/workbench/services/backup/common/backup.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts
index 7228988ab14..7a46ffa491e 100644
--- a/src/vs/workbench/services/backup/common/backup.ts
+++ b/src/vs/workbench/services/backup/common/backup.ts
@@ -13,8 +13,8 @@ import { ITextBufferFactory } from 'vs/editor/common/model';
 
 export const IBackupFileService = createDecorator('backupFileService');
 
-export const BACKUP_FILE_RESOLVE_OPTIONS: IResolveContentOptions = { acceptTextOnly: true, encoding: 'utf-8' };
-export const BACKUP_FILE_UPDATE_OPTIONS: IUpdateContentOptions = { encoding: 'utf-8' };
+export const BACKUP_FILE_RESOLVE_OPTIONS: IResolveContentOptions = { acceptTextOnly: true, encoding: 'utf8' };
+export const BACKUP_FILE_UPDATE_OPTIONS: IUpdateContentOptions = { encoding: 'utf8' };
 
 /**
  * A service that handles any I/O and state associated with the backup system.

From 16306c893a08469857a0156d43688dca4d3190bc Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 19:25:43 +0100
Subject: [PATCH 431/710] unify update services across platforms

---
 src/vs/code/electron-main/app.ts              |  13 +-
 src/vs/code/electron-main/menus.ts            |  63 ++--
 src/vs/platform/update/common/update.ts       |  67 ++--
 src/vs/platform/update/common/updateIpc.ts    |  38 +-
 .../electron-main/abstractUpdateService.ts    | 137 +++++++
 .../electron-main/auto-updater.linux.ts       |  77 ----
 .../electron-main/auto-updater.win32.ts       | 209 -----------
 .../electron-main/updateService.darwin.ts     | 114 ++++++
 .../electron-main/updateService.linux.ts      |  77 ++++
 .../update/electron-main/updateService.ts     | 340 ------------------
 .../electron-main/updateService.win32.ts      | 207 +++++++++++
 .../parts/update/electron-browser/update.ts   | 293 +++++++--------
 12 files changed, 767 insertions(+), 868 deletions(-)
 create mode 100644 src/vs/platform/update/electron-main/abstractUpdateService.ts
 delete mode 100644 src/vs/platform/update/electron-main/auto-updater.linux.ts
 delete mode 100644 src/vs/platform/update/electron-main/auto-updater.win32.ts
 create mode 100644 src/vs/platform/update/electron-main/updateService.darwin.ts
 create mode 100644 src/vs/platform/update/electron-main/updateService.linux.ts
 delete mode 100644 src/vs/platform/update/electron-main/updateService.ts
 create mode 100644 src/vs/platform/update/electron-main/updateService.win32.ts

diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index ca4a569c0f6..d5a8604b0bb 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -16,7 +16,6 @@ import { CodeMenu } from 'vs/code/electron-main/menus';
 import { getShellEnvironment } from 'vs/code/node/shellEnv';
 import { IUpdateService } from 'vs/platform/update/common/update';
 import { UpdateChannel } from 'vs/platform/update/common/updateIpc';
-import { UpdateService } from 'vs/platform/update/electron-main/updateService';
 import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron-main';
 import { Server, connect, Client } from 'vs/base/parts/ipc/node/ipc.net';
 import { SharedProcess } from 'vs/code/electron-main/sharedProcess';
@@ -52,6 +51,9 @@ import URI from 'vs/base/common/uri';
 import { WorkspacesChannel } from 'vs/platform/workspaces/common/workspacesIpc';
 import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
 import { getMachineId } from 'vs/base/node/id';
+import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
+import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
+import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin';
 
 export class CodeApplication {
 
@@ -296,7 +298,14 @@ export class CodeApplication {
 	private initServices(machineId: string): IInstantiationService {
 		const services = new ServiceCollection();
 
-		services.set(IUpdateService, new SyncDescriptor(UpdateService));
+		if (process.platform === 'win32') {
+			services.set(IUpdateService, new SyncDescriptor(Win32UpdateService));
+		} else if (process.platform === 'linux') {
+			services.set(IUpdateService, new SyncDescriptor(LinuxUpdateService));
+		} else if (process.platform === 'darwin') {
+			services.set(IUpdateService, new SyncDescriptor(DarwinUpdateService));
+		}
+
 		services.set(IWindowsMainService, new SyncDescriptor(WindowsManager, machineId));
 		services.set(IWindowsService, new SyncDescriptor(WindowsService, this.sharedProcess));
 		services.set(ILaunchService, new SyncDescriptor(LaunchService));
diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index ced1253651e..6a3d1c1da5f 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -14,7 +14,7 @@ import { OpenContext, IRunActionInWindowRequest } from 'vs/platform/windows/comm
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { AutoSaveConfiguration } from 'vs/platform/files/common/files';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IUpdateService, State as UpdateState } from 'vs/platform/update/common/update';
+import { IUpdateService, StateType } from 'vs/platform/update/common/update';
 import product from 'vs/platform/node/product';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -1040,11 +1040,34 @@ export class CodeMenu {
 	}
 
 	private getUpdateMenuItems(): Electron.MenuItem[] {
-		switch (this.updateService.state) {
-			case UpdateState.Uninitialized:
+		const state = this.updateService.state;
+
+		switch (state.type) {
+			case StateType.Uninitialized:
 				return [];
 
-			case UpdateState.UpdateDownloaded:
+			case StateType.Idle:
+				return [new MenuItem({
+					label: nls.localize('miCheckForUpdates', "Check for Updates..."), click: () => setTimeout(() => {
+						this.reportMenuActionTelemetry('CheckForUpdate');
+						this.updateService.checkForUpdates(true);
+					}, 0)
+				})];
+
+			case StateType.CheckingForUpdates:
+				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking For Updates..."), enabled: false })];
+
+			case StateType.Available:
+				return [new MenuItem({
+					label: nls.localize('miDownloadUpdate', "Download Available Update"), click: () => {
+						shell.openExternal(state.update.url);
+					}
+				})];
+
+			case StateType.Downloading:
+				return [new MenuItem({ label: nls.localize('miDownloadingUpdate', "Downloading Update..."), enabled: false })];
+
+			case StateType.Downloaded:
 				return [new MenuItem({
 					label: nls.localize('miInstallUpdate', "Install Update..."), click: () => {
 						this.reportMenuActionTelemetry('InstallUpdate');
@@ -1052,44 +1075,16 @@ export class CodeMenu {
 					}
 				})];
 
-			case UpdateState.UpdateInstalling:
+			case StateType.Updating:
 				return [new MenuItem({ label: nls.localize('miInstallingUpdate', "Installing Update..."), enabled: false })];
 
-			case UpdateState.UpdateReady:
+			case StateType.Ready:
 				return [new MenuItem({
 					label: nls.localize('miRestartToUpdate', "Restart to Update..."), click: () => {
 						this.reportMenuActionTelemetry('RestartToUpdate');
 						this.updateService.quitAndInstall();
 					}
 				})];
-
-			case UpdateState.CheckingForUpdate:
-				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking For Updates..."), enabled: false })];
-
-			case UpdateState.UpdateAvailable:
-				if (isLinux) {
-					return [new MenuItem({
-						label: nls.localize('miDownloadUpdate', "Download Available Update"), click: () => {
-							this.updateService.quitAndInstall();
-						}
-					})];
-				}
-
-				const updateAvailableLabel = isWindows
-					? nls.localize('miDownloadingUpdate', "Downloading Update...")
-					: nls.localize('miInstallingUpdate', "Installing Update...");
-
-				return [new MenuItem({ label: updateAvailableLabel, enabled: false })];
-
-			default:
-				const result = [new MenuItem({
-					label: nls.localize('miCheckForUpdates', "Check for Updates..."), click: () => setTimeout(() => {
-						this.reportMenuActionTelemetry('CheckForUpdate');
-						this.updateService.checkForUpdates(true);
-					}, 0)
-				})];
-
-				return result;
 		}
 	}
 
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index eecba458299..5a397113d90 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -9,36 +9,49 @@ import Event, { NodeEventEmitter } from 'vs/base/common/event';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
 
-export enum State {
-	Uninitialized,
-	Idle,
-	CheckingForUpdate,
-	UpdateAvailable,
-	UpdateDownloaded,
-	UpdateInstalling,
-	UpdateReady
-}
-
-export enum ExplicitState {
-	Implicit,
-	Explicit
-}
-
-export interface IRawUpdate {
-	releaseNotes: string;
-	version: string;
-	date: Date;
-	supportsFastUpdate?: boolean;
-}
-
 export interface IUpdate {
 	version: string;
+	productVersion: string;
 	date?: Date;
 	releaseNotes?: string;
-	url?: string;
 	supportsFastUpdate?: boolean;
+	url?: string;
+	hash?: string;
 }
 
+export enum StateType {
+	Uninitialized = 'uninitialized',
+	Idle = 'idle',
+	Available = 'available',
+	CheckingForUpdates = 'checking for updates',
+	Downloading = 'downloading',
+	Downloaded = 'downloaded',
+	Updating = 'updating',
+	Ready = 'ready',
+}
+
+export type Uninitialized = { type: StateType.Uninitialized };
+export type Idle = { type: StateType.Idle };
+export type CheckingForUpdates = { type: StateType.CheckingForUpdates, explicit: boolean };
+export type Available = { type: StateType.Available, update: IUpdate };
+export type Downloading = { type: StateType.Downloading, update: IUpdate };
+export type Downloaded = { type: StateType.Downloaded, update: IUpdate };
+export type Updating = { type: StateType.Updating, update: IUpdate };
+export type Ready = { type: StateType.Ready, update: IUpdate };
+
+export type State = Uninitialized | Idle | CheckingForUpdates | Available | Downloading | Downloaded | Updating | Ready;
+
+export const State = {
+	Uninitialized: { type: StateType.Uninitialized } as Uninitialized,
+	Idle: { type: StateType.Idle } as Idle,
+	CheckingForUpdates: (explicit: boolean) => ({ type: StateType.CheckingForUpdates, explicit } as CheckingForUpdates),
+	Available: (update: IUpdate) => ({ type: StateType.Available, update } as Available),
+	Downloading: (update: IUpdate) => ({ type: StateType.Downloading, update } as Downloading),
+	Downloaded: (update: IUpdate) => ({ type: StateType.Downloaded, update } as Downloaded),
+	Updating: (update: IUpdate) => ({ type: StateType.Updating, update } as Updating),
+	Ready: (update: IUpdate) => ({ type: StateType.Ready, update } as Ready),
+};
+
 export interface IAutoUpdater extends NodeEventEmitter {
 	setFeedURL(url: string): void;
 	checkForUpdates(): void;
@@ -51,16 +64,10 @@ export const IUpdateService = createDecorator('updateService');
 export interface IUpdateService {
 	_serviceBrand: any;
 
-	readonly onError: Event;
-	readonly onUpdateAvailable: Event<{ url: string; version: string; }>;
-	readonly onUpdateNotAvailable: Event;
-	readonly onUpdateDownloaded: Event;
-	readonly onUpdateInstalling: Event;
-	readonly onUpdateReady: Event;
 	readonly onStateChange: Event;
 	readonly state: State;
 
-	checkForUpdates(explicit: boolean): TPromise;
+	checkForUpdates(explicit: boolean): TPromise;
 	applyUpdate(): TPromise;
 	quitAndInstall(): TPromise;
 }
\ No newline at end of file
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index 9b8b30041a3..9aef4457e9b 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -9,17 +9,10 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
 import Event, { Emitter } from 'vs/base/common/event';
 import { onUnexpectedError } from 'vs/base/common/errors';
-import { IUpdateService, IRawUpdate, State, IUpdate } from './update';
+import { IUpdateService, State } from './update';
 
 export interface IUpdateChannel extends IChannel {
-	call(command: 'event:onError'): TPromise;
-	call(command: 'event:onUpdateAvailable'): TPromise;
-	call(command: 'event:onUpdateNotAvailable'): TPromise;
-	call(command: 'event:onUpdateDownloaded'): TPromise;
-	call(command: 'event:onUpdateInstalling'): TPromise;
-	call(command: 'event:onUpdateReady'): TPromise;
-	call(command: 'event:onStateChange'): TPromise;
-	call(command: 'checkForUpdates', arg: boolean): TPromise;
+	call(command: 'checkForUpdates', arg: boolean): TPromise;
 	call(command: 'applyUpdate'): TPromise;
 	call(command: 'quitAndInstall'): TPromise;
 	call(command: '_getInitialState'): TPromise;
@@ -32,12 +25,6 @@ export class UpdateChannel implements IUpdateChannel {
 
 	call(command: string, arg?: any): TPromise {
 		switch (command) {
-			case 'event:onError': return eventToCall(this.service.onError);
-			case 'event:onUpdateAvailable': return eventToCall(this.service.onUpdateAvailable);
-			case 'event:onUpdateNotAvailable': return eventToCall(this.service.onUpdateNotAvailable);
-			case 'event:onUpdateDownloaded': return eventToCall(this.service.onUpdateDownloaded);
-			case 'event:onUpdateInstalling': return eventToCall(this.service.onUpdateInstalling);
-			case 'event:onUpdateReady': return eventToCall(this.service.onUpdateReady);
 			case 'event:onStateChange': return eventToCall(this.service.onStateChange);
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
 			case 'applyUpdate': return this.service.applyUpdate();
@@ -52,25 +39,8 @@ export class UpdateChannelClient implements IUpdateService {
 
 	_serviceBrand: any;
 
-	private _onError = eventFromCall(this.channel, 'event:onError');
-	get onError(): Event { return this._onError; }
-
-	private _onUpdateAvailable = eventFromCall<{ url: string; version: string; }>(this.channel, 'event:onUpdateAvailable');
-	get onUpdateAvailable(): Event<{ url: string; version: string; }> { return this._onUpdateAvailable; }
-
-	private _onUpdateNotAvailable = eventFromCall(this.channel, 'event:onUpdateNotAvailable');
-	get onUpdateNotAvailable(): Event { return this._onUpdateNotAvailable; }
-
-	private _onUpdateDownloaded = eventFromCall(this.channel, 'event:onUpdateDownloaded');
-	get onUpdateDownloaded(): Event { return this._onUpdateDownloaded; }
-
-	private _onUpdateInstalling = eventFromCall(this.channel, 'event:onUpdateInstalling');
-	get onUpdateInstalling(): Event { return this._onUpdateInstalling; }
-
-	private _onUpdateReady = eventFromCall(this.channel, 'event:onUpdateReady');
-	get onUpdateReady(): Event { return this._onUpdateReady; }
-
 	private _onRemoteStateChange = eventFromCall(this.channel, 'event:onStateChange');
+
 	private _onStateChange = new Emitter();
 	get onStateChange(): Event { return this._onStateChange.event; }
 
@@ -90,7 +60,7 @@ export class UpdateChannelClient implements IUpdateService {
 		}, onUnexpectedError);
 	}
 
-	checkForUpdates(explicit: boolean): TPromise {
+	checkForUpdates(explicit: boolean): TPromise {
 		return this.channel.call('checkForUpdates', explicit);
 	}
 
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
new file mode 100644
index 00000000000..f7fa618119c
--- /dev/null
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import Event, { Emitter } from 'vs/base/common/event';
+import { Throttler } from 'vs/base/common/async';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
+import product from 'vs/platform/node/product';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { IUpdateService, State, StateType } from 'vs/platform/update/common/update';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ILogService } from 'vs/platform/log/common/log';
+
+export function createUpdateURL(platform: string, quality: string): string {
+	return `${product.updateUrl}/api/update/${platform}/${quality}/${product.commit}`;
+}
+
+export abstract class AbstractUpdateService implements IUpdateService {
+
+	_serviceBrand: any;
+
+	private _state: State = State.Uninitialized;
+	private throttler: Throttler = new Throttler();
+
+	private _onStateChange = new Emitter();
+	get onStateChange(): Event { return this._onStateChange.event; }
+
+	get state(): State {
+		return this._state;
+	}
+
+	protected setState(state: State): void {
+		this._state = state;
+		this._onStateChange.fire(state);
+	}
+
+	constructor(
+		@ILifecycleService private lifecycleService: ILifecycleService,
+		@IConfigurationService private configurationService: IConfigurationService,
+		@IEnvironmentService private environmentService: IEnvironmentService,
+		@ILogService protected logService: ILogService
+	) {
+		if (this.environmentService.disableUpdates) {
+			return;
+		}
+
+		if (!product.updateUrl || !product.commit) {
+			return;
+		}
+
+		const quality = this.getProductQuality();
+
+		if (!quality) {
+			return;
+		}
+
+		if (!this.setUpdateFeedUrl(quality)) {
+			return;
+		}
+
+		this.setState({ type: StateType.Idle });
+
+		// Start checking for updates after 30 seconds
+		this.scheduleCheckForUpdates(30 * 1000)
+			.done(null, err => this.logService.error(err));
+	}
+
+	private getProductQuality(): string {
+		const quality = this.configurationService.getValue('update.channel');
+		return quality === 'none' ? null : product.quality;
+	}
+
+	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): TPromise {
+		return TPromise.timeout(delay)
+			.then(() => this.checkForUpdates())
+			.then(update => {
+				if (update) {
+					// Update found, no need to check more
+					return TPromise.as(null);
+				}
+
+				// Check again after 1 hour
+				return this.scheduleCheckForUpdates(60 * 60 * 1000);
+			});
+	}
+
+	checkForUpdates(explicit = false): TPromise {
+		if (this.state !== State.Idle) {
+			return TPromise.as(null);
+		}
+
+		return this.throttler.queue(() => TPromise.as(this.doCheckForUpdates(explicit)));
+	}
+
+	applyUpdate(): TPromise {
+		if (this.state.type !== StateType.Ready) {
+			return TPromise.as(null);
+		}
+
+		return this.doApplyUpdate();
+	}
+
+	protected doApplyUpdate(): TPromise {
+		return TPromise.as(null);
+	}
+
+	quitAndInstall(): TPromise {
+		if (this.state.type !== StateType.Ready) {
+			return TPromise.as(null);
+		}
+
+		this.logService.trace('update#quitAndInstall(): before lifecycle quit()');
+
+		this.lifecycleService.quit(true /* from update */).done(vetod => {
+			this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
+			if (vetod) {
+				return;
+			}
+
+			this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
+			this.doQuitAndInstall();
+		});
+
+		return TPromise.as(null);
+	}
+
+	protected doQuitAndInstall(): void {
+		// noop
+	}
+
+	protected abstract setUpdateFeedUrl(quality: string): boolean;
+	protected abstract doCheckForUpdates(explicit: boolean): void;
+}
diff --git a/src/vs/platform/update/electron-main/auto-updater.linux.ts b/src/vs/platform/update/electron-main/auto-updater.linux.ts
deleted file mode 100644
index bdc9c183329..00000000000
--- a/src/vs/platform/update/electron-main/auto-updater.linux.ts
+++ /dev/null
@@ -1,77 +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 { EventEmitter } from 'events';
-import { isString } from 'vs/base/common/types';
-import { Promise } from 'vs/base/common/winjs.base';
-import { asJson } from 'vs/base/node/request';
-import { IRequestService } from 'vs/platform/request/node/request';
-import { IAutoUpdater } from 'vs/platform/update/common/update';
-import product from 'vs/platform/node/product';
-
-interface IUpdate {
-	url: string;
-	name: string;
-	releaseNotes?: string;
-	version: string;
-	productVersion: string;
-	hash: string;
-}
-
-export class LinuxAutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
-
-	private url: string;
-	private currentRequest: Promise;
-
-	constructor(
-		@IRequestService private requestService: IRequestService
-	) {
-		super();
-
-		this.url = null;
-		this.currentRequest = null;
-	}
-
-	setFeedURL(url: string): void {
-		this.url = url;
-	}
-
-	checkForUpdates(): void {
-		if (!this.url) {
-			throw new Error('No feed url set.');
-		}
-
-		if (this.currentRequest) {
-			return;
-		}
-
-		this.emit('checking-for-update');
-
-		this.currentRequest = this.requestService.request({ url: this.url })
-			.then(asJson)
-			.then(update => {
-				if (!update || !update.url || !update.version || !update.productVersion) {
-					this.emit('update-not-available');
-				} else {
-					this.emit('update-available', null, product.downloadUrl, update.productVersion);
-				}
-			})
-			.then(null, e => {
-				if (isString(e) && /^Server returned/.test(e)) {
-					return;
-				}
-
-				this.emit('update-not-available');
-				this.emit('error', e);
-			})
-			.then(() => this.currentRequest = null);
-	}
-
-	quitAndInstall(): void {
-		// noop
-	}
-}
diff --git a/src/vs/platform/update/electron-main/auto-updater.win32.ts b/src/vs/platform/update/electron-main/auto-updater.win32.ts
deleted file mode 100644
index 3100d0941d2..00000000000
--- a/src/vs/platform/update/electron-main/auto-updater.win32.ts
+++ /dev/null
@@ -1,209 +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 path from 'path';
-import * as fs from 'fs';
-import * as pfs from 'vs/base/node/pfs';
-import { checksum } from 'vs/base/node/crypto';
-import { EventEmitter } from 'events';
-import { tmpdir } from 'os';
-import { spawn } from 'child_process';
-import { isString } from 'vs/base/common/types';
-import { Promise, TPromise } from 'vs/base/common/winjs.base';
-import { download, asJson } from 'vs/base/node/request';
-import { IRequestService } from 'vs/platform/request/node/request';
-import { IAutoUpdater } from 'vs/platform/update/common/update';
-import product from 'vs/platform/node/product';
-
-interface IUpdate {
-	url: string;
-	name: string;
-	releaseNotes?: string;
-	version: string;
-	productVersion: string;
-	hash: string;
-	supportsFastUpdate?: boolean;
-}
-
-function pollUntil(fn: () => boolean, timeout = 1000): TPromise {
-	return new TPromise(c => {
-		const poll = () => {
-			if (fn()) {
-				c(null);
-			} else {
-				setTimeout(poll, timeout);
-			}
-		};
-
-		poll();
-	});
-}
-
-interface IAvailableUpdate {
-	packagePath: string;
-	version: string;
-	supportsFastUpdate: boolean;
-	updateFilePath?: string;
-}
-
-export class Win32AutoUpdaterImpl extends EventEmitter implements IAutoUpdater {
-
-	private url: string = null;
-	private currentRequest: Promise = null;
-	private currentUpdate: IAvailableUpdate = null;
-
-	constructor(
-		@IRequestService private requestService: IRequestService
-	) {
-		super();
-	}
-
-	get cachePath(): TPromise {
-		const result = path.join(tmpdir(), `vscode-update-${process.arch}`);
-		return pfs.mkdirp(result, null).then(() => result);
-	}
-
-	setFeedURL(url: string): void {
-		this.url = url;
-	}
-
-	checkForUpdates(): void {
-		if (!this.url) {
-			throw new Error('No feed url set.');
-		}
-
-		if (this.currentRequest) {
-			return;
-		}
-
-		this.emit('checking-for-update');
-
-		this.currentRequest = this.requestService.request({ url: this.url })
-			.then(asJson)
-			.then(update => {
-				if (!update || !update.url || !update.version) {
-					this.emit('update-not-available');
-					return this.cleanup();
-				}
-
-				this.emit('update-available');
-
-				return this.cleanup(update.version).then(() => {
-					return this.getUpdatePackagePath(update.version).then(updatePackagePath => {
-						return pfs.exists(updatePackagePath).then(exists => {
-							if (exists) {
-								return TPromise.as(updatePackagePath);
-							}
-
-							const url = update.url;
-							const hash = update.hash;
-							const downloadPath = `${updatePackagePath}.tmp`;
-
-							return this.requestService.request({ url })
-								.then(context => download(downloadPath, context))
-								.then(hash ? () => checksum(downloadPath, update.hash) : () => null)
-								.then(() => pfs.rename(downloadPath, updatePackagePath))
-								.then(() => updatePackagePath);
-						});
-					}).then(updatePackagePath => {
-						const supportsFastUpdate = !!update.supportsFastUpdate;
-
-						this.currentUpdate = {
-							packagePath: updatePackagePath,
-							version: update.version,
-							supportsFastUpdate
-						};
-
-						this.emit('update-downloaded',
-							{},
-							update.releaseNotes,
-							update.productVersion,
-							new Date(),
-							this.url,
-							supportsFastUpdate
-						);
-					});
-				});
-			})
-			.then(null, e => {
-				if (isString(e) && /^Server returned/.test(e)) {
-					return;
-				}
-
-				this.emit('update-not-available');
-				this.emit('error', e);
-			})
-			.then(() => this.currentRequest = null);
-	}
-
-	private getUpdatePackagePath(version: string): TPromise {
-		return this.cachePath.then(cachePath => path.join(cachePath, `CodeSetup-${product.quality}-${version}.exe`));
-	}
-
-	private cleanup(exceptVersion: string = null): Promise {
-		const filter = exceptVersion ? one => !(new RegExp(`${product.quality}-${exceptVersion}\\.exe$`).test(one)) : () => true;
-
-		return this.cachePath
-			.then(cachePath => pfs.readdir(cachePath)
-				.then(all => Promise.join(all
-					.filter(filter)
-					.map(one => pfs.unlink(path.join(cachePath, one)).then(null, () => null))
-				))
-			);
-	}
-
-	applyUpdate(): TPromise {
-		if (!this.currentUpdate) {
-			return TPromise.as(null);
-		}
-
-		return this.cachePath.then(cachePath => {
-			this.currentUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${product.quality}-${this.currentUpdate.version}.flag`);
-
-			return pfs.writeFile(this.currentUpdate.updateFilePath, 'flag').then(() => {
-				const child = spawn(this.currentUpdate.packagePath, ['/verysilent', `/update="${this.currentUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
-					detached: true,
-					stdio: ['ignore', 'ignore', 'ignore']
-				});
-
-				child.once('exit', () => {
-					this.emit('update-not-available');
-					this.currentRequest = null;
-					this.currentUpdate = null;
-				});
-
-				const readyMutexName = `${product.win32MutexName}-ready`;
-				const isActive = (require.__$__nodeRequire('windows-mutex') as any).isActive;
-
-				// poll for mutex-ready
-				pollUntil(() => isActive(readyMutexName)).then(() => {
-
-					// now we're ready for `quitAndInstall`
-					this.emit('update-ready');
-				});
-			});
-		});
-	}
-
-	quitAndInstall(): void {
-		if (!this.currentUpdate) {
-			return;
-		}
-
-		if (this.currentUpdate.supportsFastUpdate && this.currentUpdate.updateFilePath) {
-			// let's delete the file, to signal inno setup that we want Code to start
-			// after the update is applied. after that, just die
-			fs.unlinkSync(this.currentUpdate.updateFilePath);
-			return;
-		}
-
-		spawn(this.currentUpdate.packagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
-			detached: true,
-			stdio: ['ignore', 'ignore', 'ignore']
-		});
-	}
-}
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
new file mode 100644
index 00000000000..88b0f193102
--- /dev/null
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as electron from 'electron';
+import { IDisposable, dispose } from 'vs/base/common/lifecycle';
+import Event, { fromNodeEventEmitter } from 'vs/base/common/event';
+import { memoize } from 'vs/base/common/decorators';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
+import { State, IUpdate, StateType } from 'vs/platform/update/common/update';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ILogService } from 'vs/platform/log/common/log';
+import { AbstractUpdateService, createUpdateURL } from 'vs/platform/update/electron-main/abstractUpdateService';
+
+export class DarwinUpdateService extends AbstractUpdateService {
+
+	_serviceBrand: any;
+
+	private disposables: IDisposable[] = [];
+
+	@memoize private get onRawError(): Event { return fromNodeEventEmitter(electron.autoUpdater, 'error', (_, message) => message); }
+	@memoize private get onRawUpdateNotAvailable(): Event { return fromNodeEventEmitter(electron.autoUpdater, 'update-not-available'); }
+	@memoize private get onRawUpdateAvailable(): Event { return fromNodeEventEmitter(electron.autoUpdater, 'update-available', (_, url, version) => ({ url, version, productVersion: version })); }
+	@memoize private get onRawUpdateDownloaded(): Event { return fromNodeEventEmitter(electron.autoUpdater, 'update-downloaded', (_, releaseNotes, version, date) => ({ releaseNotes, version, productVersion: version, date })); }
+
+	constructor(
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@ILogService logService: ILogService
+	) {
+		super(lifecycleService, configurationService, environmentService, logService);
+		this.onRawError(this.logService.error, this.logService, this.disposables);
+		this.onRawUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
+		this.onRawUpdateDownloaded(this.onUpdateDownloaded, this, this.disposables);
+		this.onRawUpdateNotAvailable(this.onUpdateNotAvailable, this, this.disposables);
+	}
+
+	protected setUpdateFeedUrl(quality: string): boolean {
+		try {
+			electron.autoUpdater.setFeedURL(createUpdateURL('darwin', quality));
+		} catch (e) {
+			// application is very likely not signed
+			this.logService.error('Failed to set update feed URL');
+			return false;
+		}
+
+		return true;
+	}
+
+	protected doCheckForUpdates(explicit: boolean): void {
+		this.setState(State.CheckingForUpdates(explicit));
+		electron.autoUpdater.checkForUpdates();
+	}
+
+	private onUpdateAvailable(update: IUpdate): void {
+		if (this.state.type !== StateType.CheckingForUpdates) {
+			return;
+		}
+
+		this.setState(State.Downloading(update));
+	}
+
+	private onUpdateDownloaded(update: IUpdate): void {
+		if (this.state.type !== StateType.Downloading) {
+			return;
+		}
+
+		/* __GDPR__
+			"update:downloaded" : {
+				"version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+			}
+		*/
+		this.telemetryService.publicLog('update:downloaded', { version: update.version });
+
+		this.setState(State.Ready(update));
+	}
+
+	private onUpdateNotAvailable(): void {
+		if (this.state.type !== StateType.CheckingForUpdates) {
+			return;
+		}
+
+		/* __GDPR__
+				"update:notAvailable" : {
+					"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+				}
+			*/
+		this.telemetryService.publicLog('update:notAvailable', { explicit: this.state.explicit });
+
+		this.setState(State.Idle);
+	}
+
+	protected doQuitAndInstall(): void {
+		// for some reason updating on Mac causes the local storage not to be flushed.
+		// we workaround this issue by forcing an explicit flush of the storage data.
+		// see also https://github.com/Microsoft/vscode/issues/172
+		this.logService.trace('update#quitAndInstall(): calling flushStorageData()');
+		electron.session.defaultSession.flushStorageData();
+
+		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
+		electron.autoUpdater.quitAndInstall();
+	}
+
+	dispose(): void {
+		this.disposables = dispose(this.disposables);
+	}
+}
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
new file mode 100644
index 00000000000..a8c1ea132b2
--- /dev/null
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
+import { IRequestService } from 'vs/platform/request/node/request';
+import { State, IUpdate } from 'vs/platform/update/common/update';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ILogService } from 'vs/platform/log/common/log';
+import { createUpdateURL, AbstractUpdateService } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { asJson } from 'vs/base/node/request';
+
+export class LinuxUpdateService extends AbstractUpdateService {
+
+	_serviceBrand: any;
+
+	private url: string | undefined;
+
+	constructor(
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IRequestService private requestService: IRequestService,
+		@ILogService logService: ILogService
+	) {
+		super(lifecycleService, configurationService, environmentService, logService);
+	}
+
+	protected setUpdateFeedUrl(quality: string): boolean {
+		this.url = createUpdateURL(`linux-${process.arch}`, quality);
+		return true;
+	}
+
+	protected doCheckForUpdates(explicit: boolean): void {
+		if (!this.url) {
+			return;
+		}
+
+		this.requestService.request({ url: this.url })
+			.then(asJson)
+			.then(update => {
+				if (!update || !update.url || !update.version || !update.productVersion) {
+					/* __GDPR__
+							"update:notAvailable" : {
+								"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
+					this.telemetryService.publicLog('update:notAvailable', { explicit });
+
+					this.setState(State.Idle);
+				} else {
+					this.setState(State.Available(update));
+				}
+			})
+			.then(null, err => {
+				this.logService.error(err);
+
+				/* __GDPR__
+					"update:notAvailable" : {
+					"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+					*/
+				this.telemetryService.publicLog('update:notAvailable', { explicit });
+				this.setState(State.Idle);
+			});
+	}
+
+	protected doQuitAndInstall(): void {
+		// not available
+	}
+}
diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts
deleted file mode 100644
index fde9b01d33f..00000000000
--- a/src/vs/platform/update/electron-main/updateService.ts
+++ /dev/null
@@ -1,340 +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 fs from 'original-fs';
-import * as path from 'path';
-import * as electron from 'electron';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import Event, { Emitter, once, filterEvent, fromNodeEventEmitter } from 'vs/base/common/event';
-import { always, Throttler } from 'vs/base/common/async';
-import { memoize } from 'vs/base/common/decorators';
-import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { Win32AutoUpdaterImpl } from './auto-updater.win32';
-import { LinuxAutoUpdaterImpl } from './auto-updater.linux';
-import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
-import { IRequestService } from 'vs/platform/request/node/request';
-import product from 'vs/platform/node/product';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { IUpdateService, State, IAutoUpdater, IUpdate, IRawUpdate } from 'vs/platform/update/common/update';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { ILogService } from 'vs/platform/log/common/log';
-
-export class UpdateService implements IUpdateService {
-
-	_serviceBrand: any;
-
-	private _state: State = State.Uninitialized;
-	private _availableUpdate: IUpdate = null;
-	private raw: IAutoUpdater;
-	private throttler: Throttler = new Throttler();
-
-	private _onError = new Emitter();
-	get onError(): Event { return this._onError.event; }
-
-	private _onCheckForUpdate = new Emitter();
-	get onCheckForUpdate(): Event { return this._onCheckForUpdate.event; }
-
-	private _onUpdateAvailable = new Emitter<{ url: string; version: string; }>();
-	get onUpdateAvailable(): Event<{ url: string; version: string; }> { return this._onUpdateAvailable.event; }
-
-	private _onUpdateNotAvailable = new Emitter();
-	get onUpdateNotAvailable(): Event { return this._onUpdateNotAvailable.event; }
-
-	private _onUpdateDownloaded = new Emitter();
-	get onUpdateDownloaded(): Event { return this._onUpdateDownloaded.event; }
-
-	private _onUpdateInstalling = new Emitter();
-	get onUpdateInstalling(): Event { return this._onUpdateInstalling.event; }
-
-	private _onUpdateReady = new Emitter();
-	get onUpdateReady(): Event { return this._onUpdateReady.event; }
-
-	private _onStateChange = new Emitter();
-	get onStateChange(): Event { return this._onStateChange.event; }
-
-	@memoize
-	private get onRawError(): Event {
-		return fromNodeEventEmitter(this.raw, 'error', (_, message) => message);
-	}
-
-	@memoize
-	private get onRawUpdateNotAvailable(): Event {
-		return fromNodeEventEmitter(this.raw, 'update-not-available');
-	}
-
-	@memoize
-	private get onRawUpdateAvailable(): Event<{ url: string; version: string; }> {
-		return filterEvent(fromNodeEventEmitter(this.raw, 'update-available', (_, url, version) => ({ url, version })), ({ url }) => !!url);
-	}
-
-	@memoize
-	private get onRawUpdateDownloaded(): Event {
-		return fromNodeEventEmitter(this.raw, 'update-downloaded', (_, releaseNotes, version, date, url, supportsFastUpdate) => ({ releaseNotes, version, date, supportsFastUpdate }));
-	}
-
-	@memoize
-	private get onRawUpdateReady(): Event {
-		return fromNodeEventEmitter(this.raw, 'update-ready');
-	}
-
-	get state(): State {
-		return this._state;
-	}
-
-	private updateState(state: State): void {
-		this._state = state;
-		this._onStateChange.fire(state);
-	}
-
-	get availableUpdate(): IUpdate {
-		return this._availableUpdate;
-	}
-
-	constructor(
-		@IRequestService requestService: IRequestService,
-		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IConfigurationService private configurationService: IConfigurationService,
-		@ITelemetryService private telemetryService: ITelemetryService,
-		@IEnvironmentService private environmentService: IEnvironmentService,
-		@ILogService private logService: ILogService
-	) {
-		if (process.platform === 'win32') {
-			this.raw = new Win32AutoUpdaterImpl(requestService);
-		} else if (process.platform === 'linux') {
-			this.raw = new LinuxAutoUpdaterImpl(requestService);
-		} else if (process.platform === 'darwin') {
-			this.raw = electron.autoUpdater;
-		} else {
-			return;
-		}
-
-		if (this.environmentService.disableUpdates) {
-			return;
-		}
-
-		const channel = this.getUpdateChannel();
-		const feedUrl = this.getUpdateFeedUrl(channel);
-
-		if (!feedUrl) {
-			return; // updates not available
-		}
-
-		try {
-			this.raw.setFeedURL(feedUrl);
-		} catch (e) {
-			return; // application not signed
-		}
-
-		this.updateState(State.Idle);
-
-		// Start checking for updates after 30 seconds
-		this.scheduleCheckForUpdates(30 * 1000)
-			.done(null, err => this.logService.error(err));
-	}
-
-	private scheduleCheckForUpdates(delay = 60 * 60 * 1000): TPromise {
-		return TPromise.timeout(delay)
-			.then(() => this.checkForUpdates())
-			.then(update => {
-				if (update) {
-					// Update found, no need to check more
-					return TPromise.as(null);
-				}
-
-				// Check again after 1 hour
-				return this.scheduleCheckForUpdates(60 * 60 * 1000);
-			});
-	}
-
-	checkForUpdates(explicit = false): TPromise {
-		return this.throttler.queue(() => this._checkForUpdates(explicit))
-			.then(null, err => {
-				if (explicit) {
-					this._onError.fire(err);
-				}
-
-				return null;
-			});
-	}
-
-	private _checkForUpdates(explicit: boolean): TPromise {
-		if (this.state !== State.Idle) {
-			return TPromise.as(null);
-		}
-
-		this._onCheckForUpdate.fire();
-		this.updateState(State.CheckingForUpdate);
-
-		const listeners: IDisposable[] = [];
-		const result = new TPromise((c, e) => {
-			once(this.onRawError)(e, null, listeners);
-			once(this.onRawUpdateNotAvailable)(() => c(null), null, listeners);
-			once(this.onRawUpdateAvailable)(({ url, version }) => url && c({ url, version }), null, listeners);
-			once(this.onRawUpdateDownloaded)(({ version, date, releaseNotes, supportsFastUpdate }) => c({ version, date, releaseNotes, supportsFastUpdate }), null, listeners);
-
-			this.raw.checkForUpdates();
-		}).then(update => {
-			if (!update) {
-				this._onUpdateNotAvailable.fire(explicit);
-				this.updateState(State.Idle);
-				/* __GDPR__
-					"update:notAvailable" : {
-						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					}
-				*/
-				this.telemetryService.publicLog('update:notAvailable', { explicit });
-
-				// LINUX
-			} else if (update.url) {
-				const data: IUpdate = {
-					url: update.url,
-					releaseNotes: '',
-					version: update.version,
-					date: new Date()
-				};
-
-				this._availableUpdate = data;
-				this._onUpdateAvailable.fire({ url: update.url, version: update.version });
-				this.updateState(State.UpdateAvailable);
-				/* __GDPR__
-					"update:available" : {
-						"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"version": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-						"currentVersion": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					}
-				*/
-				this.telemetryService.publicLog('update:available', { explicit, version: update.version, currentVersion: product.commit });
-
-			} else {
-				const data: IRawUpdate = {
-					releaseNotes: update.releaseNotes,
-					version: update.version,
-					date: update.date,
-					supportsFastUpdate: update.supportsFastUpdate
-				};
-
-				this._availableUpdate = data;
-
-				if (update.supportsFastUpdate) {
-					this._onUpdateDownloaded.fire(data);
-					this.updateState(State.UpdateDownloaded);
-				} else {
-					this._onUpdateReady.fire(data);
-					this.updateState(State.UpdateReady);
-				}
-
-				/* __GDPR__
-					"update:downloaded" : {
-						"version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-					}
-				*/
-				this.telemetryService.publicLog('update:downloaded', { version: update.version });
-			}
-
-			return update;
-		}, err => {
-			this.updateState(State.Idle);
-			return TPromise.wrapError(err);
-		});
-
-		return always(result, () => dispose(listeners));
-	}
-
-	private getUpdateChannel(): string {
-		const channel = this.configurationService.getValue('update.channel');
-		return channel === 'none' ? null : product.quality;
-	}
-
-	private getUpdateFeedUrl(channel: string): string {
-		if (!channel) {
-			return null;
-		}
-
-		if (process.platform === 'win32' && !fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
-			return null;
-		}
-
-		if (!product.updateUrl || !product.commit) {
-			return null;
-		}
-
-		const platform = this.getUpdatePlatform();
-
-		return `${product.updateUrl}/api/update/${platform}/${channel}/${product.commit}`;
-	}
-
-	private getUpdatePlatform(): string {
-		if (process.platform === 'linux') {
-			return `linux-${process.arch}`;
-		}
-
-		if (process.platform === 'win32' && process.arch === 'x64') {
-			return 'win32-x64';
-		}
-
-		return process.platform;
-	}
-
-	// for windows fast updates
-	applyUpdate(): TPromise {
-		if (this.state !== State.UpdateDownloaded) {
-			return TPromise.as(null);
-		}
-
-		if (!this.raw.applyUpdate) {
-			return TPromise.as(null);
-		}
-
-		once(this.onRawUpdateReady)(() => {
-			this._onUpdateReady.fire(this._availableUpdate as IRawUpdate);
-			this.updateState(State.UpdateReady);
-		});
-
-		once(this.onRawUpdateNotAvailable)(() => {
-			this._onUpdateNotAvailable.fire(false);
-			this.updateState(State.Idle);
-		});
-
-		this._onUpdateInstalling.fire(this._availableUpdate as IRawUpdate);
-		this.updateState(State.UpdateInstalling);
-		return this.raw.applyUpdate();
-	}
-
-	quitAndInstall(): TPromise {
-		if (!this._availableUpdate) {
-			return TPromise.as(null);
-		}
-
-		if (this._availableUpdate.url) {
-			electron.shell.openExternal(this._availableUpdate.url);
-			return TPromise.as(null);
-		}
-
-		this.logService.trace('update#quitAndInstall(): before lifecycle quit()');
-
-		this.lifecycleService.quit(true /* from update */).done(vetod => {
-			this.logService.trace(`update#quitAndInstall(): after lifecycle quit() with veto: ${vetod}`);
-			if (vetod) {
-				return;
-			}
-
-			// for some reason updating on Mac causes the local storage not to be flushed.
-			// we workaround this issue by forcing an explicit flush of the storage data.
-			// see also https://github.com/Microsoft/vscode/issues/172
-			if (process.platform === 'darwin') {
-				this.logService.trace('update#quitAndInstall(): calling flushStorageData()');
-				electron.session.defaultSession.flushStorageData();
-			}
-
-			this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
-			this.raw.quitAndInstall();
-		});
-
-		return TPromise.as(null);
-	}
-}
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
new file mode 100644
index 00000000000..80562db75bd
--- /dev/null
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import * as fs from 'original-fs';
+import * as path from 'path';
+import * as pfs from 'vs/base/node/pfs';
+import { memoize } from 'vs/base/common/decorators';
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
+import { IRequestService } from 'vs/platform/request/node/request';
+import product from 'vs/platform/node/product';
+import { TPromise, Promise } from 'vs/base/common/winjs.base';
+import { State, IUpdate, StateType } from 'vs/platform/update/common/update';
+import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ILogService } from 'vs/platform/log/common/log';
+import { createUpdateURL, AbstractUpdateService } from 'vs/platform/update/electron-main/abstractUpdateService';
+import { download, asJson } from 'vs/base/node/request';
+import { checksum } from 'vs/base/node/crypto';
+import { tmpdir } from 'os';
+import { spawn } from 'child_process';
+
+function pollUntil(fn: () => boolean, timeout = 1000): TPromise {
+	return new TPromise(c => {
+		const poll = () => {
+			if (fn()) {
+				c(null);
+			} else {
+				setTimeout(poll, timeout);
+			}
+		};
+
+		poll();
+	});
+}
+
+interface IAvailableUpdate {
+	packagePath: string;
+	updateFilePath?: string;
+}
+
+export class Win32UpdateService extends AbstractUpdateService {
+
+	_serviceBrand: any;
+
+	private url: string | undefined;
+	private availableUpdate: IAvailableUpdate | undefined;
+
+	@memoize
+	get cachePath(): TPromise {
+		const result = path.join(tmpdir(), `vscode-update-${process.arch}`);
+		return pfs.mkdirp(result, null).then(() => result);
+	}
+
+	constructor(
+		@ILifecycleService lifecycleService: ILifecycleService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@ITelemetryService private telemetryService: ITelemetryService,
+		@IEnvironmentService environmentService: IEnvironmentService,
+		@IRequestService private requestService: IRequestService,
+		@ILogService logService: ILogService
+	) {
+		super(lifecycleService, configurationService, environmentService, logService);
+	}
+
+	protected setUpdateFeedUrl(quality: string): boolean {
+		if (!fs.existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))) {
+			return false;
+		}
+
+		this.url = createUpdateURL(process.arch === 'x64' ? 'win32-x64' : 'win32', quality);
+		return true;
+	}
+
+	protected doCheckForUpdates(explicit: boolean): void {
+		if (!this.url) {
+			return;
+		}
+
+		this.setState(State.CheckingForUpdates(explicit));
+
+		this.requestService.request({ url: this.url })
+			.then(asJson)
+			.then(update => {
+				if (!update || !update.url || !update.version) {
+					/* __GDPR__
+							"update:notAvailable" : {
+								"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+							}
+						*/
+					this.telemetryService.publicLog('update:notAvailable', { explicit });
+
+					this.setState(State.Idle);
+					return TPromise.as(null);
+				}
+
+				this.setState(State.Downloading(update));
+
+				return this.cleanup(update.version).then(() => {
+					return this.getUpdatePackagePath(update.version).then(updatePackagePath => {
+						return pfs.exists(updatePackagePath).then(exists => {
+							if (exists) {
+								return TPromise.as(updatePackagePath);
+							}
+
+							const url = update.url;
+							const hash = update.hash;
+							const downloadPath = `${updatePackagePath}.tmp`;
+
+							return this.requestService.request({ url })
+								.then(context => download(downloadPath, context))
+								.then(hash ? () => checksum(downloadPath, update.hash) : () => null)
+								.then(() => pfs.rename(downloadPath, updatePackagePath))
+								.then(() => updatePackagePath);
+						});
+					}).then(packagePath => {
+						this.availableUpdate = { packagePath };
+
+						if (update.supportsFastUpdate) {
+							this.setState(State.Downloaded(update));
+						} else {
+							this.setState(State.Ready(update));
+						}
+					});
+				});
+			})
+			.then(null, err => {
+				this.logService.error(err);
+				/* __GDPR__
+					"update:notAvailable" : {
+					"explicit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+					}
+					*/
+				this.telemetryService.publicLog('update:notAvailable', { explicit });
+				this.setState(State.Idle);
+			});
+	}
+
+	private getUpdatePackagePath(version: string): TPromise {
+		return this.cachePath.then(cachePath => path.join(cachePath, `CodeSetup-${product.quality}-${version}.exe`));
+	}
+
+	private cleanup(exceptVersion: string = null): Promise {
+		const filter = exceptVersion ? one => !(new RegExp(`${product.quality}-${exceptVersion}\\.exe$`).test(one)) : () => true;
+
+		return this.cachePath
+			.then(cachePath => pfs.readdir(cachePath)
+				.then(all => Promise.join(all
+					.filter(filter)
+					.map(one => pfs.unlink(path.join(cachePath, one)).then(null, () => null))
+				))
+			);
+	}
+
+	protected doApplyUpdate(): TPromise {
+		if (this.state.type !== StateType.Downloaded || !this.availableUpdate) {
+			return TPromise.as(null);
+		}
+
+		const update = this.state.update;
+		this.setState(State.Updating(update));
+
+		return this.cachePath.then(cachePath => {
+			this.availableUpdate.updateFilePath = path.join(cachePath, `CodeSetup-${product.quality}-${update.version}.flag`);
+
+			return pfs.writeFile(this.availableUpdate.updateFilePath, 'flag').then(() => {
+				const child = spawn(this.availableUpdate.packagePath, ['/verysilent', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+					detached: true,
+					stdio: ['ignore', 'ignore', 'ignore']
+				});
+
+				child.once('exit', () => {
+					this.availableUpdate = undefined;
+					this.setState(State.Idle);
+				});
+
+				const readyMutexName = `${product.win32MutexName}-ready`;
+				const isActive = (require.__$__nodeRequire('windows-mutex') as any).isActive;
+
+				// poll for mutex-ready
+				pollUntil(() => isActive(readyMutexName))
+					.then(() => this.setState(State.Ready(update)));
+			});
+		});
+	}
+
+	protected doQuitAndInstall(): void {
+		if (this.state.type !== StateType.Ready) {
+			return;
+		}
+
+		this.logService.trace('update#quitAndInstall(): running raw#quitAndInstall()');
+
+		if (this.state.update.supportsFastUpdate && this.availableUpdate.updateFilePath) {
+			fs.unlinkSync(this.availableUpdate.updateFilePath);
+		} else {
+			spawn(this.availableUpdate.packagePath, ['/silent', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
+				detached: true,
+				stdio: ['ignore', 'ignore', 'ignore']
+			});
+		}
+	}
+}
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 34e36f495bb..edb19e14670 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -9,7 +9,6 @@ import nls = require('vs/nls');
 import severity from 'vs/base/common/severity';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IAction, Action } from 'vs/base/common/actions';
-import { mapEvent, filterEvent, once } from 'vs/base/common/event';
 import { IDisposable, dispose, empty as EmptyDisposable } from 'vs/base/common/lifecycle';
 import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IMessageService, CloseAction, Severity } from 'vs/platform/message/common/message';
@@ -17,7 +16,7 @@ import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
 import URI from 'vs/base/common/uri';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity';
+import { IActivityService, NumberBadge, IBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
 import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { ReleaseNotesInput } from 'vs/workbench/parts/update/electron-browser/releaseNotesInput';
 import { IGlobalActivity } from 'vs/workbench/common/activity';
@@ -29,10 +28,11 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
-import { IUpdateService, State as UpdateState } from 'vs/platform/update/common/update';
+import { IUpdateService, State as UpdateState, StateType, IUpdate } from 'vs/platform/update/common/update';
 import * as semver from 'semver';
-import { OS, isLinux, isWindows } from 'vs/base/common/platform';
+import { OS } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { IWindowsService } from 'vs/platform/windows/common/windows';
 
 const NotNowAction = new Action(
 	'update.later',
@@ -282,6 +282,21 @@ class CommandAction extends Action {
 	}
 }
 
+export class DownloadNowAction extends Action {
+
+	constructor(
+		private url: string,
+		@IWindowsService private windowsService: IWindowsService
+	) {
+		super('update.downloadNow', nls.localize('download now', "Download Now"), null, true);
+	}
+
+	run(): TPromise {
+		this.windowsService.openExternal(this.url);
+		return TPromise.as(null);
+	}
+}
+
 export class UpdateContribution implements IGlobalActivity {
 
 	private static readonly showCommandsId = 'workbench.action.showCommands';
@@ -295,6 +310,7 @@ export class UpdateContribution implements IGlobalActivity {
 	get name() { return ''; }
 	get cssClass() { return 'update-activity'; }
 
+	private state: UpdateState;
 	private badgeDisposable: IDisposable = EmptyDisposable;
 	private disposables: IDisposable[] = [];
 
@@ -307,27 +323,7 @@ export class UpdateContribution implements IGlobalActivity {
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IActivityService private activityService: IActivityService
 	) {
-		if (isLinux) {
-			mapEvent(updateService.onUpdateAvailable, e => e.version)
-				(this.onUpdateAvailable, this, this.disposables);
-		} else if (isWindows) {
-			// fast updates
-			mapEvent(updateService.onUpdateDownloaded, e => e.version)
-				(this.onUpdateDownloaded, this, this.disposables);
-			mapEvent(updateService.onUpdateInstalling, e => e.version)
-				(this.onUpdateInstalling, this, this.disposables);
-
-			// regular old updates
-			mapEvent(filterEvent(updateService.onUpdateReady, e => !e.supportsFastUpdate), e => e.version)
-				(this.onUpdateAvailable, this, this.disposables);
-
-		} else {
-			mapEvent(updateService.onUpdateReady, e => e.version)
-				(this.onUpdateAvailable, this, this.disposables);
-		}
-
-		updateService.onError(this.onError, this, this.disposables);
-		updateService.onUpdateNotAvailable(this.onUpdateNotAvailable, this, this.disposables);
+		this.state = updateService.state;
 
 		updateService.onStateChange(this.onUpdateStateChange, this, this.disposables);
 		this.onUpdateStateChange(this.updateService.state);
@@ -351,16 +347,110 @@ export class UpdateContribution implements IGlobalActivity {
 	}
 
 	private onUpdateStateChange(state: UpdateState): void {
+		switch (state.type) {
+			case StateType.Idle:
+				if (this.state.type === StateType.CheckingForUpdates && this.state.explicit) {
+					this.onUpdateNotAvailable();
+				}
+				break;
+
+			case StateType.Available:
+				this.onUpdateAvailable(state.update);
+				break;
+
+			case StateType.Downloaded:
+				this.onUpdateDownloaded(state.update);
+				break;
+
+			case StateType.Updating:
+				this.onUpdateUpdating(state.update);
+				break;
+
+			case StateType.Ready:
+				this.onUpdateReady(state.update);
+				break;
+		}
+
+		let badge: IBadge | undefined = undefined;
+
+		if (state.type === StateType.Available || state.type === StateType.Downloaded || state.type === StateType.Ready) {
+			badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
+		} else if (state.type === StateType.CheckingForUpdates || state.type === StateType.Downloading || state.type === StateType.Updating) {
+			badge = new ProgressBadge(() => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
+		}
+
 		this.badgeDisposable.dispose();
 
-		const isUpdateAvailable = isLinux
-			? state === UpdateState.UpdateAvailable
-			: state === UpdateState.UpdateDownloaded || state === UpdateState.UpdateReady;
-
-		if (isUpdateAvailable) {
-			const badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
+		if (badge) {
 			this.badgeDisposable = this.activityService.showActivity(this.id, badge);
 		}
+
+		this.state = state;
+	}
+
+	private onUpdateNotAvailable(): void {
+		this.messageService.show(severity.Info, nls.localize('noUpdatesAvailable', "There are no updates currently available."));
+	}
+
+	// linux
+	private onUpdateAvailable(update: IUpdate): void {
+		if (!this.shouldShowNotification()) {
+			return;
+		}
+
+		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+		const downloadAction = this.instantiationService.createInstance(DownloadNowAction, update.url);
+
+		this.messageService.show(severity.Info, {
+			message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
+			actions: [downloadAction, NotNowAction, releaseNotesAction]
+		});
+	}
+
+	// windows fast updates
+	private onUpdateDownloaded(update: IUpdate): void {
+		if (!this.shouldShowNotification()) {
+			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());
+
+		this.messageService.show(severity.Info, {
+			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, update.productVersion),
+			actions: [installUpdateAction, NotNowAction, releaseNotesAction]
+		});
+	}
+
+	// windows fast updates
+	private onUpdateUpdating(update: IUpdate): void {
+		const neverShowAgain = new NeverShowAgain('update/win32-fast-updates', this.storageService);
+
+		if (!neverShowAgain.shouldShow()) {
+			return;
+		}
+
+		this.messageService.show(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: [CloseAction, neverShowAgain.action]
+		});
+	}
+
+	// windows and mac
+	private onUpdateReady(update: IUpdate): void {
+		if (!this.shouldShowNotification()) {
+			return;
+		}
+
+		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
+		const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () =>
+			this.updateService.quitAndInstall());
+
+		this.messageService.show(severity.Info, {
+			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
+			actions: [applyUpdateAction, NotNowAction, releaseNotesAction]
+		});
 	}
 
 	private shouldShowNotification(): boolean {
@@ -380,91 +470,8 @@ export class UpdateContribution implements IGlobalActivity {
 		return diffDays > 5;
 	}
 
-	// windows fast updates
-	private onUpdateDownloaded(version: string): void {
-		if (!this.shouldShowNotification()) {
-			return;
-		}
-
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
-		const installUpdateAction = new Action('update.applyUpdate', nls.localize('installUpdate', "Install Update"), undefined, true, () => {
-			once(mapEvent(filterEvent(this.updateService.onUpdateReady, e => e.supportsFastUpdate), e => e.version))
-				(this.onWindowsFastUpdateReady, this);
-
-			return this.updateService.applyUpdate();
-		});
-
-		this.messageService.show(severity.Info, {
-			message: nls.localize('updateAvailable', "There's an available update: {0} {1}", product.nameLong, version),
-			actions: [installUpdateAction, NotNowAction, releaseNotesAction]
-		});
-	}
-
-	// windows fast updates
-	private onWindowsFastUpdateReady(version: string): void {
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
-		const restartAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () => this.updateService.quitAndInstall());
-
-		this.messageService.show(severity.Info, {
-			message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
-			actions: [restartAction, NotNowAction, releaseNotesAction]
-		});
-	}
-
-	// windows fast updates
-	private onUpdateInstalling(version: string): void {
-		const neverShowAgain = new NeverShowAgain('update/win32-fast-updates', this.storageService);
-
-		if (!neverShowAgain.shouldShow()) {
-			return;
-		}
-
-		this.messageService.show(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, version),
-			actions: [CloseAction, neverShowAgain.action]
-		});
-	}
-
-	private onUpdateAvailable(version: string): void {
-		if (!this.shouldShowNotification()) {
-			return;
-		}
-
-		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, version);
-
-		if (isLinux) {
-			const downloadAction = new Action('update.download', nls.localize('downloadNow', "Download Now"), undefined, true, () => this.updateService.quitAndInstall());
-
-			this.messageService.show(severity.Info, {
-				message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
-				actions: [downloadAction, NotNowAction, releaseNotesAction]
-			});
-		} else {
-			const applyUpdateAction = new Action('update.applyUpdate', nls.localize('updateNow', "Update Now"), undefined, true, () => this.updateService.quitAndInstall());
-
-			this.messageService.show(severity.Info, {
-				message: nls.localize('updateAvailableAfterRestart', "{0} will be updated after it restarts.", product.nameLong),
-				actions: [applyUpdateAction, NotNowAction, releaseNotesAction]
-			});
-		}
-	}
-
-	private onUpdateNotAvailable(explicit: boolean): void {
-		if (!explicit) {
-			return;
-		}
-
-		this.messageService.show(severity.Info, nls.localize('noUpdatesAvailable', "There are no updates currently available."));
-	}
-
-	private onError(err: any): void {
-		this.messageService.show(severity.Error, err);
-	}
-
 	getActions(): IAction[] {
-		const updateAction = this.getUpdateAction();
-
-		return [
+		const result: IAction[] = [
 			new CommandAction(UpdateContribution.showCommandsId, nls.localize('commandPalette', "Command Palette..."), this.commandService),
 			new Separator(),
 			new CommandAction(UpdateContribution.openSettingsId, nls.localize('settings', "Settings"), this.commandService),
@@ -473,46 +480,48 @@ export class UpdateContribution implements IGlobalActivity {
 			new CommandAction(UpdateContribution.openUserSnippets, nls.localize('userSnippets', "User Snippets"), this.commandService),
 			new Separator(),
 			new CommandAction(UpdateContribution.selectColorThemeId, nls.localize('selectTheme.label', "Color Theme"), this.commandService),
-			new CommandAction(UpdateContribution.selectIconThemeId, nls.localize('themes.selectIconTheme.label', "File Icon Theme"), this.commandService),
-			new Separator(),
-			updateAction
+			new CommandAction(UpdateContribution.selectIconThemeId, nls.localize('themes.selectIconTheme.label', "File Icon Theme"), this.commandService)
 		];
+
+		const updateAction = this.getUpdateAction();
+
+		if (updateAction) {
+			result.push(new Separator(), updateAction);
+		}
+
+		return result;
 	}
 
-	private getUpdateAction(): IAction {
-		switch (this.updateService.state) {
-			case UpdateState.Uninitialized:
-				return new Action('update.notavailable', nls.localize('not available', "Updates Not Available"), undefined, false);
+	private getUpdateAction(): IAction | null {
+		const state = this.updateService.state;
 
-			case UpdateState.CheckingForUpdate:
+		switch (state.type) {
+			case StateType.Uninitialized:
+				return null;
+
+			case StateType.Idle:
+				return new Action('update.check', nls.localize('checkForUpdates', "Check for Updates..."), undefined, true, () =>
+					this.updateService.checkForUpdates(true));
+
+			case StateType.CheckingForUpdates:
 				return new Action('update.checking', nls.localize('checkingForUpdates', "Checking For Updates..."), undefined, false);
 
-			case UpdateState.UpdateAvailable:
-				if (isLinux) {
-					return new Action('update.linux.available', nls.localize('DownloadUpdate', "Download Available Update"), undefined, true, () =>
-						this.updateService.quitAndInstall());
-				}
+			case StateType.Available:
+				return this.instantiationService.createInstance(DownloadNowAction, state.update.url);
 
-				const updateAvailableLabel = isWindows
-					? nls.localize('DownloadingUpdate', "Downloading Update...")
-					: nls.localize('InstallingUpdate', "Installing Update...");
+			case StateType.Downloading:
+				return new Action('update.downloading', nls.localize('DownloadingUpdate', "Downloading Update..."), undefined, false);
 
-				return new Action('update.available', updateAvailableLabel, undefined, false);
-
-			case UpdateState.UpdateDownloaded:
-				return new Action('update.apply', nls.localize('installUpdate...', "Install Update..."), undefined, true, () =>
+			case StateType.Downloaded:
+				return new Action('update.install', nls.localize('installUpdate...', "Install Update..."), undefined, true, () =>
 					this.updateService.applyUpdate());
 
-			case UpdateState.UpdateInstalling:
-				return new Action('update.applying', nls.localize('installingUpdate', "Installing Update..."), undefined, false);
+			case StateType.Updating:
+				return new Action('update.updating', nls.localize('installingUpdate', "Installing Update..."), undefined, false);
 
-			case UpdateState.UpdateReady:
+			case StateType.Ready:
 				return new Action('update.restart', nls.localize('restartToUpdate', "Restart to Update..."), undefined, true, () =>
 					this.updateService.quitAndInstall());
-
-			default:
-				return new Action('update.check', nls.localize('checkForUpdates', "Check for Updates..."), undefined, this.updateService.state === UpdateState.Idle, () =>
-					this.updateService.checkForUpdates(true));
 		}
 	}
 

From 5b7485c410135e847d763ef1abc594ecfb78771f Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 10:37:28 -0800
Subject: [PATCH 432/710] Remove settings search @groupId filters - since group
 ids can now be extension guids, and nobody uses this anyway

---
 .../electron-browser/preferencesSearch.ts         | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index e255837bbcb..763be7bcc05 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -106,17 +106,10 @@ export class LocalSearchProvider implements ISearchProvider {
 	}
 
 	private getGroupFilter(filter: string): IGroupFilter {
-		if (strings.startsWith(filter, '@')) {
-			const groupId = filter.replace(/^@/, '');
-			return (group: ISettingsGroup) => {
-				return group.id.toLowerCase() === groupId.toLowerCase();
-			};
-		} else {
-			const regex = strings.createRegExp(this._filter, false, { global: true });
-			return (group: ISettingsGroup) => {
-				return regex.test(group.title);
-			};
-		}
+		const regex = strings.createRegExp(this._filter, false, { global: true });
+		return (group: ISettingsGroup) => {
+			return regex.test(group.title);
+		};
 	}
 }
 

From f57b024b18b2e5748d201b8be3408dfb1fb35ebb Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Fri, 19 Jan 2018 10:51:24 -0800
Subject: [PATCH 433/710] Use latest emmet helper that has fixes #33818

---
 extensions/emmet/package.json |  2 +-
 extensions/emmet/src/util.ts  |  4 +++-
 extensions/emmet/yarn.lock    | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index 5085e13b2b6..38326f318eb 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -317,7 +317,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.1.20",
+        "vscode-emmet-helper": "^1.1.21",
         "vscode-languageserver-types": "^3.5.0",
         "image-size": "^0.5.2",
         "vscode-nls": "2.0.2"
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index e6e3d58ae97..02ac3f982b3 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -336,7 +336,9 @@ export function getEmmetConfiguration(syntax: string) {
 		showExpandedAbbreviation: emmetConfig['showExpandedAbbreviation'],
 		showAbbreviationSuggestions: emmetConfig['showAbbreviationSuggestions'],
 		syntaxProfiles,
-		variables: emmetConfig['variables']
+		variables: emmetConfig['variables'],
+		excludeLanguages: emmetConfig['excludeLanguages'],
+		showSuggestionsAsSnippets: emmetConfig['showSuggestionsAsSnippets']
 	};
 }
 
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
index 5ba2df336e0..c3294d4438d 100644
--- a/extensions/emmet/yarn.lock
+++ b/extensions/emmet/yarn.lock
@@ -1027,6 +1027,10 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
+jsonc-parser@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -2048,11 +2052,12 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper@^1.1.20:
-  version "1.1.20"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.20.tgz#7523dc7f635f74e4becc44d4e519a9db5055a023"
+vscode-emmet-helper@^1.1.21:
+  version "1.1.21"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-1.1.21.tgz#4c77c2c5f5acc316d9a47cc564a51a732609ef7b"
   dependencies:
     "@emmetio/extract-abbreviation" "^0.1.1"
+    jsonc-parser "^1.0.0"
     vscode-languageserver-types "^3.0.3"
 
 vscode-languageserver-types@^3.0.3:

From 1c6d46db7f0970c77cc162acf9d1ccaf20d39b84 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 10:41:43 -0800
Subject: [PATCH 434/710] Avoid double-counting same settings search query

---
 .../workbench/parts/preferences/browser/preferencesEditor.ts  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index e913c38ddf2..3d60b7d794f 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -112,6 +112,7 @@ export class PreferencesEditor extends BaseEditor {
 
 	private delayedFilterLogging: Delayer;
 	private remoteSearchThrottle: ThrottledDelayer;
+	private _lastReportedFilter: string;
 
 	private lastFocusedWidget: SearchWidget | SideBySidePreferencesWidget = null;
 
@@ -294,7 +295,7 @@ export class PreferencesEditor extends BaseEditor {
 	}
 
 	private reportFilteringUsed(filter: string, counts: IStringDictionary, metadata?: IFilterMetadata): void {
-		if (filter) {
+		if (filter && filter !== this._lastReportedFilter) {
 			let data = {
 				filter,
 				fuzzy: !!metadata,
@@ -313,6 +314,7 @@ export class PreferencesEditor extends BaseEditor {
 				}
 			*/
 			this.telemetryService.publicLog('defaultSettings.filter', data);
+			this._lastReportedFilter = filter;
 		}
 	}
 }

From ca91ad4ee4d3b074dfb8e7a090f00e6eb26b8b8e Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 21:14:04 +0100
Subject: [PATCH 435/710] fix state check

---
 src/vs/platform/update/electron-main/abstractUpdateService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index f7fa618119c..fcbb2303851 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -89,7 +89,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	checkForUpdates(explicit = false): TPromise {
-		if (this.state !== State.Idle) {
+		if (this.state.type !== StateType.Idle) {
 			return TPromise.as(null);
 		}
 

From 0192c680eb8c43e31b0dde9e56c3ce3fdc151223 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 22:13:21 +0100
Subject: [PATCH 436/710] linux: state should be idle after download

---
 src/vs/code/electron-main/menus.ts            |  2 +-
 src/vs/platform/update/common/update.ts       |  1 +
 src/vs/platform/update/common/updateIpc.ts    |  6 +++++
 .../electron-main/abstractUpdateService.ts    | 14 +++++++++++-
 .../electron-main/updateService.linux.ts      | 11 +++++++---
 .../parts/update/electron-browser/update.ts   | 22 ++++---------------
 6 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 7d419505b84..5c1daf2bea3 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -1060,7 +1060,7 @@ export class CodeMenu {
 			case StateType.Available:
 				return [new MenuItem({
 					label: nls.localize('miDownloadUpdate', "Download Available Update"), click: () => {
-						shell.openExternal(state.update.url);
+						this.updateService.downloadUpdate();
 					}
 				})];
 
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index 5a397113d90..a80618c9ebb 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -68,6 +68,7 @@ export interface IUpdateService {
 	readonly state: State;
 
 	checkForUpdates(explicit: boolean): TPromise;
+	downloadUpdate(): TPromise;
 	applyUpdate(): TPromise;
 	quitAndInstall(): TPromise;
 }
\ No newline at end of file
diff --git a/src/vs/platform/update/common/updateIpc.ts b/src/vs/platform/update/common/updateIpc.ts
index 9aef4457e9b..441bdd138e1 100644
--- a/src/vs/platform/update/common/updateIpc.ts
+++ b/src/vs/platform/update/common/updateIpc.ts
@@ -13,6 +13,7 @@ import { IUpdateService, State } from './update';
 
 export interface IUpdateChannel extends IChannel {
 	call(command: 'checkForUpdates', arg: boolean): TPromise;
+	call(command: 'downloadUpdate'): TPromise;
 	call(command: 'applyUpdate'): TPromise;
 	call(command: 'quitAndInstall'): TPromise;
 	call(command: '_getInitialState'): TPromise;
@@ -27,6 +28,7 @@ export class UpdateChannel implements IUpdateChannel {
 		switch (command) {
 			case 'event:onStateChange': return eventToCall(this.service.onStateChange);
 			case 'checkForUpdates': return this.service.checkForUpdates(arg);
+			case 'downloadUpdate': return this.service.downloadUpdate();
 			case 'applyUpdate': return this.service.applyUpdate();
 			case 'quitAndInstall': return this.service.quitAndInstall();
 			case '_getInitialState': return TPromise.as(this.service.state);
@@ -64,6 +66,10 @@ export class UpdateChannelClient implements IUpdateService {
 		return this.channel.call('checkForUpdates', explicit);
 	}
 
+	downloadUpdate(): TPromise {
+		return this.channel.call('downloadUpdate');
+	}
+
 	applyUpdate(): TPromise {
 		return this.channel.call('applyUpdate');
 	}
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index fcbb2303851..742d09737d1 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -11,7 +11,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import product from 'vs/platform/node/product';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IUpdateService, State, StateType } from 'vs/platform/update/common/update';
+import { IUpdateService, State, StateType, Available } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 
@@ -96,6 +96,18 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		return this.throttler.queue(() => TPromise.as(this.doCheckForUpdates(explicit)));
 	}
 
+	downloadUpdate(): TPromise {
+		if (this.state.type !== StateType.Available) {
+			return TPromise.as(null);
+		}
+
+		return this.doDownloadUpdate(this.state);
+	}
+
+	protected doDownloadUpdate(state: Available): TPromise {
+		return TPromise.as(null);
+	}
+
 	applyUpdate(): TPromise {
 		if (this.state.type !== StateType.Ready) {
 			return TPromise.as(null);
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index a8c1ea132b2..a59e24fd722 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -8,12 +8,14 @@
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IRequestService } from 'vs/platform/request/node/request';
-import { State, IUpdate } from 'vs/platform/update/common/update';
+import { State, IUpdate, Available } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 import { createUpdateURL, AbstractUpdateService } from 'vs/platform/update/electron-main/abstractUpdateService';
 import { asJson } from 'vs/base/node/request';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { shell } from 'electron';
 
 export class LinuxUpdateService extends AbstractUpdateService {
 
@@ -71,7 +73,10 @@ export class LinuxUpdateService extends AbstractUpdateService {
 			});
 	}
 
-	protected doQuitAndInstall(): void {
-		// not available
+	protected doDownloadUpdate(state: Available): TPromise {
+		shell.openExternal(state.update.url);
+		this.setState(State.Idle);
+
+		return TPromise.as(null);
 	}
 }
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 87fcca32d3c..e091ce43563 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -32,7 +32,6 @@ import { IUpdateService, State as UpdateState, StateType, IUpdate } from 'vs/pla
 import * as semver from 'semver';
 import { OS } from 'vs/base/common/platform';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { IWindowsService } from 'vs/platform/windows/common/windows';
 
 const NotNowAction = new Action(
 	'update.later',
@@ -282,21 +281,6 @@ class CommandAction extends Action {
 	}
 }
 
-export class DownloadNowAction extends Action {
-
-	constructor(
-		private url: string,
-		@IWindowsService private windowsService: IWindowsService
-	) {
-		super('update.downloadNow', nls.localize('download now', "Download Now"), null, true);
-	}
-
-	run(): TPromise {
-		this.windowsService.openExternal(this.url);
-		return TPromise.as(null);
-	}
-}
-
 export class UpdateContribution implements IGlobalActivity {
 
 	private static readonly showCommandsId = 'workbench.action.showCommands';
@@ -399,7 +383,8 @@ export class UpdateContribution implements IGlobalActivity {
 		}
 
 		const releaseNotesAction = this.instantiationService.createInstance(ShowReleaseNotesAction, update.productVersion);
-		const downloadAction = this.instantiationService.createInstance(DownloadNowAction, update.url);
+		const downloadAction = new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
+			this.updateService.downloadUpdate());
 
 		this.messageService.show(severity.Info, {
 			message: nls.localize('thereIsUpdateAvailable', "There is an available update."),
@@ -507,7 +492,8 @@ export class UpdateContribution implements IGlobalActivity {
 				return new Action('update.checking', nls.localize('checkingForUpdates', "Checking For Updates..."), undefined, false);
 
 			case StateType.Available:
-				return this.instantiationService.createInstance(DownloadNowAction, state.update.url);
+				return new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
+					this.updateService.downloadUpdate());
 
 			case StateType.Downloading:
 				return new Action('update.downloading', nls.localize('DownloadingUpdate', "Downloading Update..."), undefined, false);

From a17dc385a577ae723f191f9efef62be3650e20ff Mon Sep 17 00:00:00 2001
From: Daniel Ye 
Date: Fri, 19 Jan 2018 13:35:04 -0800
Subject: [PATCH 437/710] 2018-01-19. Merged in translations from Transifex.

---
 i18n/chs/extensions/git/out/commands.i18n.json        |  1 +
 i18n/chs/extensions/git/package.i18n.json             |  2 +-
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../vs/workbench/api/node/extHostTreeViews.i18n.json  |  3 ++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  2 +-
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 .../parts/debug/browser/debugActionsWidget.i18n.json  |  3 ++-
 .../electron-browser/extensionTipsService.i18n.json   |  6 ++++--
 .../node/extensionsWorkbenchService.i18n.json         |  3 +++
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 .../electron-browser/files.contribution.i18n.json     |  1 +
 .../logs/electron-browser/logs.contribution.i18n.json |  4 ++++
 .../parts/logs/electron-browser/logsActions.i18n.json |  8 +++++++-
 .../workbench/parts/markers/common/messages.i18n.json |  2 ++
 .../electron-browser/output.contribution.i18n.json    |  1 +
 .../output/electron-browser/outputServices.i18n.json  |  5 ++++-
 .../preferences/browser/keybindingsEditor.i18n.json   |  1 +
 .../preferences/browser/preferencesEditor.i18n.json   |  2 ++
 .../electron-browser/search.contribution.i18n.json    |  3 ++-
 .../electron-browser/terminalActions.i18n.json        |  1 +
 .../electron-browser/terminalService.i18n.json        |  1 +
 .../services/files/node/fileService.i18n.json         |  1 +
 .../electron-browser/keybindingService.i18n.json      |  3 ++-
 i18n/cht/extensions/git/out/commands.i18n.json        |  2 ++
 i18n/cht/extensions/git/package.i18n.json             |  5 +++--
 i18n/cht/src/vs/base/node/ps.i18n.json                |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  1 +
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../contrib/wordHighlighter/wordHighlighter.i18n.json |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  1 +
 .../node/extensionManagementService.i18n.json         |  1 +
 .../vs/platform/theme/common/colorRegistry.i18n.json  | 11 +++++++++++
 .../mainThreadSaveParticipant.i18n.json               |  4 +++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/editor/editorActions.i18n.json      |  5 ++++-
 .../browser/parts/editor/textDiffEditor.i18n.json     |  3 ++-
 .../browser/parts/titlebar/titlebarPart.i18n.json     |  2 ++
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 i18n/cht/src/vs/workbench/common/theme.i18n.json      |  7 +++++++
 .../electron-browser/main.contribution.i18n.json      |  1 +
 .../vs/workbench/electron-browser/window.i18n.json    |  3 ++-
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileActions.i18n.json      |  3 +++
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 .../files/electron-browser/saveErrorHandler.i18n.json |  3 +++
 .../electron-browser/views/explorerViewer.i18n.json   |  1 +
 .../logs/electron-browser/logs.contribution.i18n.json |  4 ++++
 .../parts/logs/electron-browser/logsActions.i18n.json |  4 ++++
 .../electron-browser/output.contribution.i18n.json    |  1 +
 .../output/electron-browser/outputServices.i18n.json  |  5 ++++-
 .../scm/electron-browser/scm.contribution.i18n.json   |  2 ++
 .../parts/scm/electron-browser/scmViewlet.i18n.json   |  2 ++
 .../electron-browser/configureSnippets.i18n.json      |  6 ++++++
 .../electron-browser/terminalActions.i18n.json        |  1 +
 .../electron-browser/terminalColorRegistry.i18n.json  |  3 ++-
 .../services/files/node/fileService.i18n.json         |  1 +
 .../electron-browser/keybindingService.i18n.json      |  3 ++-
 i18n/deu/extensions/git/out/commands.i18n.json        |  1 +
 i18n/deu/extensions/git/package.i18n.json             |  2 +-
 i18n/deu/src/vs/base/node/ps.i18n.json                |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  1 +
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../contrib/wordHighlighter/wordHighlighter.i18n.json |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  1 +
 .../node/extensionManagementService.i18n.json         |  1 +
 .../vs/platform/theme/common/colorRegistry.i18n.json  |  7 +++++++
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 i18n/esn/extensions/git/package.i18n.json             |  1 -
 .../browser/ui/selectBox/selectBoxCustom.i18n.json    |  4 +++-
 i18n/esn/src/vs/base/node/ps.i18n.json                |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  2 ++
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../contrib/wordHighlighter/wordHighlighter.i18n.json |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  4 +++-
 .../node/extensionManagementService.i18n.json         |  1 +
 .../vs/platform/theme/common/colorRegistry.i18n.json  |  1 +
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 i18n/fra/extensions/git/out/autofetch.i18n.json       |  4 +++-
 i18n/fra/extensions/git/out/commands.i18n.json        |  6 ++++++
 i18n/fra/extensions/git/package.i18n.json             |  6 ++++--
 .../browser/ui/selectBox/selectBoxCustom.i18n.json    |  4 +++-
 i18n/fra/src/vs/base/node/ps.i18n.json                |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  2 ++
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../contrib/wordHighlighter/wordHighlighter.i18n.json |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  7 ++++++-
 .../node/extensionManagementService.i18n.json         |  4 ++++
 .../vs/platform/theme/common/colorRegistry.i18n.json  | 11 +++++++++++
 .../vs/workbench/api/node/extHostTreeViews.i18n.json  |  3 ++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  2 +-
 .../parts/editor/editor.contribution.i18n.json        |  1 +
 .../browser/parts/editor/editorActions.i18n.json      |  5 ++++-
 .../browser/parts/editor/textDiffEditor.i18n.json     |  3 ++-
 .../browser/parts/titlebar/titlebarPart.i18n.json     |  2 ++
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 i18n/fra/src/vs/workbench/common/theme.i18n.json      |  7 +++++++
 .../electron-browser/main.contribution.i18n.json      |  1 +
 .../vs/workbench/electron-browser/window.i18n.json    |  3 ++-
 .../parts/debug/browser/debugActionsWidget.i18n.json  |  3 ++-
 .../electron-browser/extensionTipsService.i18n.json   |  6 ++++--
 .../node/extensionsWorkbenchService.i18n.json         |  3 +++
 .../electron-browser/feedback.contribution.i18n.json  |  3 ++-
 .../feedback/electron-browser/feedback.i18n.json      |  1 +
 .../electron-browser/feedbackStatusbarItem.i18n.json  |  4 +++-
 .../fileActions.contribution.i18n.json                |  3 +++
 .../files/electron-browser/fileActions.i18n.json      |  5 +++++
 .../files/electron-browser/fileCommands.i18n.json     |  2 +-
 .../electron-browser/files.contribution.i18n.json     |  1 +
 .../files/electron-browser/saveErrorHandler.i18n.json |  5 +++++
 .../electron-browser/views/explorerViewer.i18n.json   |  1 +
 .../logs/electron-browser/logs.contribution.i18n.json |  4 ++++
 .../parts/logs/electron-browser/logsActions.i18n.json |  7 +++++++
 .../electron-browser/output.contribution.i18n.json    |  1 +
 .../output/electron-browser/outputServices.i18n.json  |  5 ++++-
 .../preferences/browser/preferencesEditor.i18n.json   |  2 ++
 .../scm/electron-browser/scm.contribution.i18n.json   |  5 ++++-
 .../parts/scm/electron-browser/scmViewlet.i18n.json   |  3 +++
 .../electron-browser/search.contribution.i18n.json    |  3 ++-
 .../electron-browser/configureSnippets.i18n.json      |  4 ++++
 .../electron-browser/snippets.contribution.i18n.json  |  3 ++-
 .../electron-browser/snippetsService.i18n.json        |  1 +
 .../electron-browser/terminal.contribution.i18n.json  |  3 +++
 .../electron-browser/terminalActions.i18n.json        |  3 +++
 .../electron-browser/terminalColorRegistry.i18n.json  |  3 ++-
 .../electron-browser/terminalService.i18n.json        |  1 +
 .../services/files/node/fileService.i18n.json         |  1 +
 .../electron-browser/keybindingService.i18n.json      |  3 ++-
 i18n/hun/extensions/git/out/commands.i18n.json        |  1 +
 i18n/hun/extensions/git/package.i18n.json             |  1 -
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../contrib/wordHighlighter/wordHighlighter.i18n.json |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  1 +
 .../vs/platform/theme/common/colorRegistry.i18n.json  | 11 +++++++++++
 .../vs/workbench/api/node/extHostTreeViews.i18n.json  |  3 ++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  2 +-
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  2 ++
 .../files/electron-browser/fileActions.i18n.json      |  7 +++++--
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 .../electron-browser/files.contribution.i18n.json     |  1 +
 .../electron-browser/views/explorerViewer.i18n.json   |  3 ++-
 .../workbench/parts/markers/common/messages.i18n.json |  2 ++
 .../preferences/browser/keybindingsEditor.i18n.json   |  1 +
 .../preferences/browser/preferencesEditor.i18n.json   |  2 ++
 .../electron-browser/snippetsService.i18n.json        |  1 +
 .../electron-browser/terminalService.i18n.json        |  1 +
 i18n/ita/extensions/git/out/autofetch.i18n.json       |  4 +++-
 i18n/ita/extensions/git/out/commands.i18n.json        |  5 +++++
 i18n/ita/extensions/git/package.i18n.json             |  2 +-
 .../browser/ui/selectBox/selectBoxCustom.i18n.json    |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  1 +
 .../src/vs/platform/environment/node/argv.i18n.json   |  2 ++
 .../node/extensionManagementService.i18n.json         |  3 +++
 .../mainThreadSaveParticipant.i18n.json               |  4 +++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/titlebar/titlebarPart.i18n.json     |  2 ++
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 i18n/ita/src/vs/workbench/common/theme.i18n.json      |  7 +++++++
 .../vs/workbench/electron-browser/window.i18n.json    |  3 ++-
 .../parts/debug/browser/debugActionsWidget.i18n.json  |  3 ++-
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 i18n/jpn/extensions/git/out/commands.i18n.json        |  1 +
 .../vs/workbench/api/node/extHostTreeViews.i18n.json  |  3 ++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  2 +-
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 .../electron-browser/extensionTipsService.i18n.json   |  6 ++++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 .../electron-browser/files.contribution.i18n.json     |  1 +
 .../preferences/browser/keybindingsEditor.i18n.json   |  1 +
 .../electron-browser/terminalService.i18n.json        |  1 +
 i18n/kor/extensions/git/out/autofetch.i18n.json       |  3 ++-
 i18n/kor/extensions/git/out/commands.i18n.json        |  5 +++++
 i18n/kor/extensions/git/package.i18n.json             |  5 +++--
 .../browser/ui/selectBox/selectBoxCustom.i18n.json    |  4 +++-
 .../src/vs/platform/environment/node/argv.i18n.json   |  5 ++++-
 .../node/extensionManagementService.i18n.json         |  1 +
 .../mainThreadSaveParticipant.i18n.json               |  4 +++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/editor/textDiffEditor.i18n.json     |  3 ++-
 .../browser/parts/titlebar/titlebarPart.i18n.json     |  2 ++
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 i18n/kor/src/vs/workbench/common/theme.i18n.json      |  6 ++++++
 .../vs/workbench/electron-browser/window.i18n.json    |  3 ++-
 .../parts/debug/browser/debugActionsWidget.i18n.json  |  3 ++-
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 i18n/ptb/extensions/git/out/commands.i18n.json        |  4 ++++
 i18n/ptb/extensions/git/package.i18n.json             |  1 -
 .../editor/common/view/editorColorRegistry.i18n.json  |  1 +
 .../vs/editor/contrib/gotoError/gotoError.i18n.json   |  2 ++
 .../src/vs/platform/environment/node/argv.i18n.json   |  1 +
 .../vs/platform/theme/common/colorRegistry.i18n.json  | 10 ++++++++++
 .../vs/workbench/api/node/extHostTreeViews.i18n.json  |  3 ++-
 .../browser/actions/toggleSidebarPosition.i18n.json   |  2 +-
 .../browser/actions/workspaceCommands.i18n.json       |  3 ++-
 .../parts/editor/editor.contribution.i18n.json        |  1 +
 .../browser/parts/editor/editorActions.i18n.json      |  5 ++++-
 .../browser/parts/views/viewsViewlet.i18n.json        |  2 +-
 .../electron-browser/main.contribution.i18n.json      |  1 +
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../electron-browser/feedback.contribution.i18n.json  |  3 ++-
 .../feedback/electron-browser/feedback.i18n.json      |  1 +
 .../fileActions.contribution.i18n.json                |  2 ++
 .../files/electron-browser/fileActions.i18n.json      |  4 ++++
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 .../electron-browser/files.contribution.i18n.json     |  1 +
 .../electron-browser/views/explorerViewer.i18n.json   |  1 +
 .../parts/logs/electron-browser/logsActions.i18n.json |  1 +
 .../workbench/parts/markers/common/messages.i18n.json |  2 ++
 .../preferences/browser/keybindingsEditor.i18n.json   |  1 +
 .../preferences/browser/preferencesEditor.i18n.json   |  2 ++
 .../electron-browser/search.contribution.i18n.json    |  3 ++-
 .../electron-browser/configureSnippets.i18n.json      |  1 +
 .../electron-browser/snippetsService.i18n.json        |  1 +
 .../electron-browser/terminal.contribution.i18n.json  |  2 ++
 .../electron-browser/terminalService.i18n.json        |  1 +
 i18n/rus/extensions/git/package.i18n.json             |  1 -
 i18n/rus/src/vs/base/node/ps.i18n.json                |  4 +++-
 .../editor/common/config/commonEditorConfig.i18n.json |  1 +
 .../src/vs/platform/environment/node/argv.i18n.json   |  2 ++
 .../node/extensionManagementService.i18n.json         |  2 ++
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 i18n/trk/extensions/git/package.i18n.json             |  1 -
 .../node/extensionManagementService.i18n.json         |  1 +
 .../browser/actions/toggleSidebarPosition.i18n.json   |  1 -
 .../browser/parts/views/viewsViewlet.i18n.json        |  4 +---
 .../electron-browser/extensionTipsService.i18n.json   |  4 ++--
 .../fileActions.contribution.i18n.json                |  1 +
 .../files/electron-browser/fileCommands.i18n.json     |  1 -
 250 files changed, 529 insertions(+), 143 deletions(-)

diff --git a/i18n/chs/extensions/git/out/commands.i18n.json b/i18n/chs/extensions/git/out/commands.i18n.json
index dcd0b9e0ae9..a19bebe875b 100644
--- a/i18n/chs/extensions/git/out/commands.i18n.json
+++ b/i18n/chs/extensions/git/out/commands.i18n.json
@@ -74,6 +74,7 @@
 	"push with tags success": "已成功带标签进行推送。",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
 	"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
+	"never again": "确定，且不再显示",
 	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
 	"no changes stash": "没有要储藏的更改。",
 	"provide stash message": "提供储藏消息(可选)",
diff --git a/i18n/chs/extensions/git/package.i18n.json b/i18n/chs/extensions/git/package.i18n.json
index 33772606c95..7b47c05b8f9 100644
--- a/i18n/chs/extensions/git/package.i18n.json
+++ b/i18n/chs/extensions/git/package.i18n.json
@@ -60,7 +60,7 @@
 	"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
 	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
 	"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
-	"config.checkoutType": "控制运行“签出到...”命令时列出的分支的类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标记，\"remote\" 只显示远程分支。",
+	"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
 	"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
 	"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
 	"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
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 1613d026f4c..2e70001e92c 100644
--- a/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/chs/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // Do not edit this file. It is machine generated.
 {
 	"title.wo_source": "({0}/{1})",
+	"markerAction.next.label": "转到下一个问题 (错误、警告、信息)",
+	"markerAction.previous.label": "转到上一个问题 (错误、警告、信息)",
 	"editorMarkerNavigationError": "编辑器标记导航小组件错误颜色。",
 	"editorMarkerNavigationWarning": "编辑器标记导航小组件警告颜色。",
 	"editorMarkerNavigationInfo": "编辑器标记导航小组件信息颜色。",
diff --git a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index 903f7203bbb..26bd748a8a9 100644
--- a/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/chs/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。"
+	"treeView.notRegistered": "没有注册 ID 为“{0}”的树形图。",
+	"treeView.duplicateElement": "ID 为 {0} 的元素已被注册"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 1893d29afa7..c8121010a5a 100644
--- a/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "切换边栏位置",
+	"toggleSidebarPosition": "切换边栏位置",
 	"view": "查看"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index e9347e0a6fe..8da27417ba2 100644
--- a/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/chs/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "从侧边栏中隐藏"
+	"hideView": "隐藏"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
index fd9702e842b..97d6fae2b3f 100644
--- a/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"debugToolBarBackground": "调试工具栏背景颜色。"
+	"debugToolBarBackground": "调试工具栏背景颜色。",
+	"debugToolBarBorder": "调试工具栏边框颜色。"
 }
\ 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 5d553a4d9cd..325749e3e0c 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
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "不再显示",
+	"close": "关闭",
 	"workspaceRecommendation": "当前工作区的用户推荐此扩展。",
 	"fileBasedRecommendation": "根据您最近打开的文件推荐此扩展。",
 	"exeBasedRecommendation": "根据你安装的 {0}，向你推荐此扩展。",
@@ -11,8 +13,8 @@
 	"reallyRecommendedExtensionPack": "建议对这种类型的文件使用“{0}”扩展包。",
 	"showRecommendations": "显示建议",
 	"install": "安装",
-	"neverShowAgain": "不再显示",
-	"close": "关闭",
+	"showLanguageExtensions": "商店中有可以对 \".{0}\" 文件提供帮助的扩展。",
+	"searchMarketplace": "搜索应用商店",
 	"workspaceRecommended": "此工作区具有扩展建议。",
 	"installAll": "全部安装",
 	"ignoreExtensionRecommendations": "你是否要忽略所有推荐的扩展?",
diff --git a/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
index 93fab46db22..d11701056cf 100644
--- a/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
@@ -4,6 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"installingVSIXExtension": "从 VSIX 安装扩展...",
+	"installingMarketPlaceExtension": "正在从应用商店安装扩展...",
+	"uninstallingExtension": "正在卸载扩展...",
 	"enableDependeciesConfirmation": "启用“{0}”也会启用其依赖项。是否要继续?",
 	"enable": "是",
 	"doNotEnable": "否",
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 2854354d6af..93681537820 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
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "放弃你的更改并还原为磁盘上的内容",
 	"copyPathOfActive": "复制活动文件的路径",
 	"saveAllInGroup": "保存组中的全部内容",
+	"saveFiles": "保存所有文件",
 	"revert": "还原文件",
 	"compareActiveWithSaved": "比较活动与已保存的文件",
 	"closeEditor": "关闭编辑器",
diff --git a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 5687f75d023..e9a10faa823 100644
--- a/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "另存为...",
 	"save": "保存",
 	"saveAll": "全部保存",
-	"saveFiles": "保存所有文件",
 	"removeFolderFromWorkspace": "将文件夹从工作区删除",
 	"genericRevertError": "未能还原“{0}”: {1}",
 	"modifiedLabel": "{0} (磁盘上) ↔ {1}",
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 da879d0ffdd..1d8701fe103 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
@@ -36,6 +36,7 @@
 	"editorConfigurationTitle": "编辑器",
 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
 	"explorerConfigurationTitle": "文件资源管理器",
+	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。",
 	"autoReveal": "控制资源管理器是否应在打开文件时自动显示并选择它们。",
 	"enableDragAndDrop": "控制资源管理器是否应该允许通过拖放移动文件和文件夹。",
 	"confirmDragAndDrop": "控制在资源管理器内拖放移动文件或文件夹时是否进行确认。",
diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
index c1b32a5c26c..605730c3691 100644
--- a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
@@ -4,5 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"mainLog": "日志(主进程)",
+	"sharedLog": "日志(共享进程)",
+	"rendererLog": "日志(窗口进程)",
+	"extensionsLog": "日志(扩展主机)",
 	"developer": "开发者"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
index 98d55d28fe6..66dcbba199b 100644
--- a/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
@@ -9,10 +9,16 @@
 	"mainProcess": "主进程",
 	"sharedProcess": "共享进程",
 	"rendererProcess": "窗口",
+	"extensionHost": "扩展主机",
 	"selectProcess": "选择进程",
+	"openLogFile": "打开日志文件...",
+	"setLogLevel": "设置日志级别",
+	"trace": "跟踪",
 	"debug": "调试",
 	"info": "信息",
 	"warn": "警告",
 	"err": "错误",
-	"off": "关闭"
+	"critical": "严重",
+	"off": "关闭",
+	"selectLogLevel": "选择日志级别"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
index 7e174f3cfaf..8f40a40df02 100644
--- a/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/markers/common/messages.i18n.json
@@ -5,6 +5,8 @@
 // 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": "问题",
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 a96772cdf43..8942e4d51b6 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
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"output": "输出",
+	"logViewer": "日志查看器",
 	"viewCategory": "查看",
 	"clearOutput.label": "清除输出"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
index 8b6ad71cd4e..9d92ce92cd2 100644
--- a/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
@@ -3,4 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"output": "{0} - 输出",
+	"channel": "“{0}”的输出通道"
+}
\ 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 34f4d8ea701..2ddff381a9b 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
@@ -17,6 +17,7 @@
 	"resetLabel": "重置键绑定",
 	"showConflictsLabel": "显示冲突",
 	"copyLabel": "复制",
+	"copyCommandLabel": "拷贝命令",
 	"error": "编辑键绑定时发生错误“{0}”。请打开 \"keybindings.json\" 文件并检查。",
 	"command": "命令",
 	"keybinding": "键绑定",
diff --git a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index c40e2e7cf77..56b8e2afaaf 100644
--- a/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -11,6 +11,8 @@
 	"oneSettingFound": "1 个设置匹配",
 	"settingsFound": "{0} 个设置匹配",
 	"totalSettingsMessage": "总计 {0} 个设置",
+	"nlpResult": "自然语言结果",
+	"filterResult": "筛选结果",
 	"defaultSettings": "默认设置",
 	"defaultFolderSettings": "默认文件夹设置",
 	"defaultEditorReadonly": "在右侧编辑器中编辑以覆盖默认值。",
diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index d457d977632..b75ed7a9817 100644
--- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -22,5 +22,6 @@
 	"useRipgrep": "控制是否在文本和文件搜索中使用 ripgrep",
 	"useIgnoreFiles": "控制搜索文件时是否使用 .gitignore 和 .ignore 文件。",
 	"search.quickOpen.includeSymbols": "配置为在 Quick Open 文件结果中包括全局符号搜索的结果。",
-	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。"
+	"search.followSymlinks": "控制是否在搜索中跟踪符号链接。",
+	"search.smartCase": "若搜索词全为小写，则不区分大小写进行搜索，否则区分大小写进行搜索"
 }
\ No newline at end of file
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index ca6d8ab62f9..6db35403434 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
@@ -12,6 +12,7 @@
 	"workbench.action.terminal.selectAll": "全选",
 	"workbench.action.terminal.deleteWordLeft": "删除左侧的字符",
 	"workbench.action.terminal.deleteWordRight": "删除右侧的字符",
+	"workbench.action.terminal.enterLineNavigationMode": "进入按行导航模式",
 	"workbench.action.terminal.new": "新建集成终端",
 	"workbench.action.terminal.new.short": "新的终端",
 	"workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端",
diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index d0a2a31bbb9..feb3b9cc8cc 100644
--- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -7,6 +7,7 @@
 	"terminal.integrated.chooseWindowsShellInfo": "可通过选择“自定义”按钮来更改默认的终端 shell。",
 	"customize": "自定义",
 	"cancel": "取消",
+	"never again": "确定，且不再显示",
 	"terminal.integrated.chooseWindowsShell": "选择首选的终端 shell，你可稍后在设置中进行更改",
 	"terminalService.terminalCloseConfirmationSingular": "存在一个活动的终端会话，是否要终止此会话?",
 	"terminalService.terminalCloseConfirmationPlural": "存在 {0} 个活动的终端会话，是否要终止这些会话?"
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 b385a7a0f15..234d233e533 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
@@ -10,6 +10,7 @@
 	"fileTooLargeError": "文件太大，无法打开",
 	"fileNotFoundError": "找不到文件({0})",
 	"fileBinaryError": "文件似乎是二进制文件，无法作为文档打开",
+	"filePermission": "写入文件时权限被拒绝 ({0})",
 	"fileExists": "已存在要创建的文件 ({0})",
 	"fileMoveConflict": "无法移动/复制。文件已存在于目标位置。",
 	"unableToMoveCopyError": "无法移动/复制。文件将替换其所在的文件夹。",
diff --git a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
index af87ffb3672..6b16deb483d 100644
--- a/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ b/i18n/chs/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
@@ -22,5 +22,6 @@
 	"keybindings.json.when": "键处于活动状态时的条件。",
 	"keybindings.json.args": "要传递给命令以执行的参数。",
 	"keyboardConfigurationTitle": "键盘",
-	"dispatch": "控制按键的分派逻辑以使用 \"code\" (推荐) 或 \"keyCode\"。"
+	"dispatch": "控制按键的分派逻辑以使用 \"code\" (推荐) 或 \"keyCode\"。",
+	"touchbar.enabled": "启用键盘上的 macOS 触控栏按钮 (若可用)。"
 }
\ 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 3b5fb4974c3..3362f487b3c 100644
--- a/i18n/cht/extensions/git/out/commands.i18n.json
+++ b/i18n/cht/extensions/git/out/commands.i18n.json
@@ -42,6 +42,7 @@
 	"yes discard tracked": "捨棄 1 個追蹤的檔案",
 	"yes discard tracked multiple": "捨棄 {0} 個追蹤的檔案",
 	"unsaved files single": "下列檔案尚未儲存： {0}。\n\n您要在認可之前進行儲存嗎？",
+	"unsaved files": "有 {0} 個未儲存檔案。\n\n您要在認可之前進行儲存嗎？",
 	"save and commit": "儲存全部且認可",
 	"commit": "無論如何仍認可",
 	"no staged changes": "沒有暫存變更進行提交\n\n您希望自動暫存您所有變更並直接提交?",
@@ -73,6 +74,7 @@
 	"push with tags success": "已成功使用標籤推送。",
 	"pick remote": "挑選要發行分支 '{0}' 的目標遠端:",
 	"sync is unpredictable": "此動作會將認可發送至 '{0}' 及從中提取認可。",
+	"never again": "確定，不要再顯示",
 	"no remotes to publish": "您的儲存庫未設定要發行的遠端目標。",
 	"no changes stash": "沒有變更可供隱藏。",
 	"provide stash message": "可選擇提供隱藏訊息",
diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json
index 5bb3d198bb4..46908731864 100644
--- a/i18n/cht/extensions/git/package.i18n.json
+++ b/i18n/cht/extensions/git/package.i18n.json
@@ -54,12 +54,12 @@
 	"command.stashPopLatest": "快顯上一次的隱藏",
 	"config.enabled": "是否啟用 GIT",
 	"config.path": "Git 可執行檔的路徑",
+	"config.autoRepositoryDetection": "是否自動偵測儲存庫",
 	"config.autorefresh": "是否啟用自動重新整理",
 	"config.autofetch": "是否啟用自動擷取",
 	"config.enableLongCommitWarning": "是否發出長認可訊息的警告",
 	"config.confirmSync": "請先確認再同步處理 GIT 存放庫",
 	"config.countBadge": "控制 git 徽章計數器。[全部] 會計算所有變更。[已追蹤] 只會計算追蹤的變更。[關閉] 會將其關閉。",
-	"config.checkoutType": "控制在執行 [簽出至...] 時，會列出那些類型的分支。[全部] 會顯示所有參考，[本機] 只會顯示本機分支，[標記] 只會顯示標記，[遠端] 只會顯示遠端分支。",
 	"config.ignoreLegacyWarning": "略過舊的 Git 警告",
 	"config.ignoreMissingGitWarning": "忽略遺漏 Git 時的警告",
 	"config.ignoreLimitWarning": "當儲存庫中有過多變更時，略過警告。",
@@ -72,5 +72,6 @@
 	"colors.deleted": "刪除資源的顏色",
 	"colors.untracked": "未追蹤資源的顏色。",
 	"colors.ignored": "忽略資源的顏色。",
-	"colors.conflict": "帶有衝突資源的顏色。"
+	"colors.conflict": "帶有衝突資源的顏色。",
+	"colors.submodule": "子模組資源的顏色"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/base/node/ps.i18n.json b/i18n/cht/src/vs/base/node/ps.i18n.json
index 8b6ad71cd4e..8a8bc9149d5 100644
--- a/i18n/cht/src/vs/base/node/ps.i18n.json
+++ b/i18n/cht/src/vs/base/node/ps.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"collecting": "收集 CPU 與記憶體資訊中，可能需要幾秒鐘的時間。"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
index e45ee33a693..1cd1bd85b24 100644
--- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -72,6 +72,7 @@
 	"cursorBlinking": "控制游標動畫樣式，可能的值為 'blink'、'smooth'、'phase'、'expand' 和 'solid'",
 	"mouseWheelZoom": "使用滑鼠滾輪並按住 Ctrl 時，縮放編輯器的字型",
 	"cursorStyle": "控制游標樣式。接受的值為 'block'、'block-outline'、'line'、'line-thin'、'underline' 及 'underline-thin'",
+	"lineCursorWidth": "控制游標寬度，當 editor.cursorStyle 設定為 'line' 時。",
 	"fontLigatures": "啟用連字字型",
 	"hideCursorInOverviewRuler": "控制游標是否應隱藏在概觀尺規中。",
 	"renderWhitespace": "控制編輯器轉譯空白字元的方式，可能為 'none'、'boundary' 及 'all'。'boundary' 選項不會轉譯字組間的單一空格。",
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 4513171b5a0..ab8fae3d2ec 100644
--- a/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/cht/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "目前游標位置行的反白顯示背景色彩。",
 	"lineHighlightBorderBox": "目前游標位置行之周圍框線的背景色彩。",
+	"rangeHighlight": "突顯顯示範圍的背景顏色，例如快速開啟和尋找功能。不能使用非透明的顏色來隱藏底層的樣式。",
 	"caret": "編輯器游標的色彩。",
 	"editorCursorBackground": "編輯器游標的背景色彩。允許自訂區塊游標重疊的字元色彩。",
 	"editorWhitespaces": "編輯器中空白字元的色彩。",
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 6dedbdd9c96..600c7e5e3d5 100644
--- a/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/cht/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"wordHighlight": "讀取存取符號時的背景顏色，如讀取變數。不能使用非透明的顏色來隱藏底層的樣式。",
+	"wordHighlightStrong": "寫入存取符號時的背景顏色，如寫入變數。不能使用非透明的顏色來隱藏底層的樣式。",
 	"overviewRulerWordHighlightForeground": "符號醒目提示的概觀尺規標記色彩。",
 	"overviewRulerWordHighlightStrongForeground": "寫入權限符號醒目提示的概觀尺規標記色彩。",
 	"wordHighlight.next.label": "移至下一個反白符號",
diff --git a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
index b57662f507d..4e6ecb355e3 100644
--- a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json
@@ -30,6 +30,7 @@
 	"inspect-extensions": "允許對擴充功能進行除錯和分析。檢查開發工具的連接 uri。",
 	"inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。",
 	"disableGPU": "停用 GPU 硬體加速。",
+	"uploadLogs": "上傳目前的工作階段紀錄至安全的端點。",
 	"usage": "使用方式",
 	"options": "選項",
 	"paths": "路徑",
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 29b7e86d734..09a519ce52e 100644
--- a/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/cht/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,6 +9,7 @@
 	"installingOutdatedExtension": "已安裝此擴充功能的較新版本。是否要使用舊版本覆蓋此項？",
 	"override": "覆寫",
 	"cancel": "取消",
+	"errorInstallingDependencies": "安裝相依套件時發生錯誤。{0}",
 	"notFoundCompatible": "無法安裝 '{0}'；沒有任何與 VS Code 相容的可用版本 '{1}'。",
 	"notFoundCompatibleDependency": "無法安裝，因為找不到相容於 VS Code 目前版本 '{1}' 的相依擴充功能 '{0}'。",
 	"quitCode": "無法安裝擴充功能。重新安裝以前請重啟 VS Code。",
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 03e619b672c..b78729f262f 100644
--- a/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/cht/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -63,7 +63,12 @@
 	"editorWidgetBorder": "編輯器小工具的邊界色彩。小工具選擇擁有邊界或色彩未被小工具覆寫時，才會使用色彩。",
 	"editorSelectionBackground": "編輯器選取範圍的色彩。",
 	"editorSelectionForeground": "為選取的文字顏色高對比化",
+	"editorInactiveSelection": "在非使用中的編輯器的選取項目顏色。不能使用非透明的顏色來隱藏底層的樣式。",
+	"editorSelectionHighlight": "與選取項目相同的區域顏色。不能使用非透明的顏色來隱藏底層的樣式。",
 	"editorFindMatch": "符合目前搜尋的色彩。",
+	"findMatchHighlight": "符合搜尋條件的其他項目的顏色。不能使用非透明的顏色來隱藏底層的樣式。",
+	"findRangeHighlight": "為限制搜索的範圍著色。不能使用非透明的顏色來隱藏底層的樣式。",
+	"hoverHighlight": "突顯懸停顯示的文字。不能使用非透明的顏色來隱藏底層的樣式。",
 	"hoverBackground": "編輯器動態顯示的背景色彩。",
 	"hoverBorder": "編輯器動態顯示的框線色彩。",
 	"activeLinkForeground": "使用中之連結的色彩。",
@@ -71,6 +76,12 @@
 	"diffEditorRemoved": "移除文字的背景色彩。",
 	"diffEditorInsertedOutline": "插入的文字外框色彩。",
 	"diffEditorRemovedOutline": "移除的文字外框色彩。",
+	"mergeCurrentHeaderBackground": "目前內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
+	"mergeCurrentContentBackground": "目前內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
+	"mergeIncomingHeaderBackground": "傳入內嵌合併衝突中的深色標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
+	"mergeIncomingContentBackground": "傳入內嵌合併衝突中的內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
+	"mergeCommonHeaderBackground": "內嵌合併衝突中的共同始祖標題背景。不能使用非透明的顏色來隱藏底層的樣式。",
+	"mergeCommonContentBackground": "內嵌合併衝突中的共同始祖內容背景。不能使用非透明的顏色來隱藏底層的樣式。",
 	"mergeBorder": "內嵌合併衝突中標頭及分隔器的邊界色彩。",
 	"overviewRulerCurrentContentForeground": "目前內嵌合併衝突的概觀尺規前景。",
 	"overviewRulerIncomingContentForeground": "傳入內嵌合併衝突的概觀尺規前景。",
diff --git a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 8b6ad71cd4e..c98475d49db 100644
--- a/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/cht/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"saveParticipants": "執行儲存參與者..."
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 08df7a29ce5..16f408d9bec 100644
--- a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "切換提要欄位位置",
 	"view": "檢視"
 }
\ 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 b0ae21a8fc3..6b3df89947b 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
@@ -48,5 +48,8 @@
 	"moveEditorLeft": "將編輯器左移",
 	"moveEditorRight": "將編輯器右移",
 	"moveEditorToPreviousGroup": "將編輯器移入上一個群組",
-	"moveEditorToNextGroup": "將編輯器移入下一個群組"
+	"moveEditorToNextGroup": "將編輯器移入下一個群組",
+	"moveEditorToFirstGroup": "將編輯器移動到第一個群組",
+	"moveEditorToSecondGroup": "將編輯器移動到第二個群組",
+	"moveEditorToThirdGroup": "將編輯器移動到第三個群組"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
index 71cfbf73585..b24baa1a2f4 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
@@ -10,5 +10,6 @@
 	"editableEditorWithInputAriaLabel": "{0}。文字檔案比較編輯器。",
 	"editableEditorAriaLabel": "文字檔比較編輯器。",
 	"navigate.next.label": "下一個變更",
-	"navigate.prev.label": "上一個變更"
+	"navigate.prev.label": "上一個變更",
+	"toggleIgnoreTrimWhitespace.label": "忽略修剪空白字元"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
index 03d11a86fb4..5b3642aebed 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
@@ -5,5 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"patchedWindowTitle": "[不支援]",
+	"userIsAdmin": "[系統管理員]",
+	"userIsSudo": "[超級使用者]",
 	"devExtensionWindowTitlePrefix": "[Extension Development Host]"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index e0fd97c7bae..529cc5594d3 100644
--- a/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/cht/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "從提要欄位隱藏"
+	"hideView": "隱藏"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/common/theme.i18n.json b/i18n/cht/src/vs/workbench/common/theme.i18n.json
index 0ca701a7da9..701339a9f63 100644
--- a/i18n/cht/src/vs/workbench/common/theme.i18n.json
+++ b/i18n/cht/src/vs/workbench/common/theme.i18n.json
@@ -6,9 +6,13 @@
 {
 	"tabActiveBackground": "使用中之索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
 	"tabInactiveBackground": "非使用中之索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
+	"tabHoverBackground": "當暫留索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
+	"tabUnfocusedHoverBackground": "當暫留非焦點群組中索引標籤的背景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
 	"tabBorder": "用以分隔索引標籤彼此的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
 	"tabActiveBorder": "用以醒目提示使用中索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
 	"tabActiveUnfocusedBorder": "用以在非焦點群組中醒目提示使用中索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
+	"tabHoverBorder": "用以反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
+	"tabUnfocusedHoverBorder": "在非焦點群組中反白顯示暫留時索引標籤的框線。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。 ",
 	"tabActiveForeground": "使用中的群組內，使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
 	"tabInactiveForeground": "使用中的群組內，非使用中之索引標籤的前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
 	"tabUnfocusedActiveForeground": "非焦點群組中的使用中索引標籤前景色彩。索引標籤是編輯器在編輯器區域中的容器。同一個編輯器群組中的多個索引標籤可以同時開啟。可能會有多個編輯器群組。",
@@ -16,6 +20,7 @@
 	"editorGroupBackground": "編輯器群組的背景色彩。編輯器群組是編輯器的容器。當拖曳編輯器群組時會顯示背景色彩。",
 	"tabsContainerBackground": "當索引標籤啟用的時候編輯器群組標題的背景色彩。編輯器群組是編輯器的容器。",
 	"tabsContainerBorder": "當索引標籤啟用時，編輯器群組標題的框線色彩。編輯器群組是編輯器的容器。",
+	"editorGroupHeaderBackground": "當索引標籤禁用的時候編輯器群組標題的背景顏色 (`\"workbench.editor.showTabs\": false`)。編輯器群組是編輯器的容器。",
 	"editorGroupBorder": "用以分隔多個編輯器群組彼此的色彩。編輯器群組是編輯器的容器。",
 	"editorDragAndDropBackground": "拖拉編輯器時的背景顏色,可設置透明度讓內容穿透顯示.",
 	"panelBackground": "面板的前景色彩。面板會顯示在編輯器區域的下方，其中包含諸如輸出與整合式終端機等檢視。",
@@ -32,6 +37,8 @@
 	"statusBarNoFolderBorder": "未開啟資料夾時，用以分隔資訊看板與編輯器的狀態列框線色彩。狀態列會顯示在視窗的底部。 ",
 	"statusBarItemActiveBackground": "按下滑鼠按鈕時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
 	"statusBarItemHoverBackground": "動態顯示時，狀態列項目的背景色彩。狀態列會顯示在視窗的底部。",
+	"statusBarProminentItemBackground": "狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
+	"statusBarProminentItemHoverBackground": "當暫留狀態列突出項目的背景顏色。突出項目比狀態列的其他項目更顯眼，用於表示重要性更高。從命令選擇區變更模式 `切換 Tab 鍵移動焦點` 來檢視範例。狀態列會顯示在視窗的底部。",
 	"activityBarBackground": "活動列背景的色彩。活動列會顯示在最左側或最右側，並可切換不同的提要欄位檢視。",
 	"activityBarForeground": "活動列的前背景色彩(例如用於圖示)。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
 	"activityBarBorder": "用以分隔提要欄位的活動列框線色彩。此活動列會顯示在最左側或最右側，讓您可以切換提要欄位的不同檢視。",
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 c719faa3f8f..7ed98a41d84 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
@@ -30,6 +30,7 @@
 	"closeOnFocusLost": "控制是否在 Quick Open 失去焦點時自動關閉。",
 	"openDefaultSettings": "控制開啟設定時是否也會開啟顯示所有預設設定的編輯器。",
 	"sideBarLocation": "控制項資訊看板的位置。可顯示於 Workbench 的左方或右方。",
+	"panelDefaultLocation": "控制面板的預設位置。可顯示在 Workbench 的底部或是右方。",
 	"statusBarVisibility": "控制 Workbench 底端狀態列的可視性。",
 	"activityBarVisibility": "控制活動列在 workbench 中的可見度。",
 	"fontAliasing": "在 Workbench 中控制字型鋸齒化的方法。- 預設: 子像素字型平滑處理。在大部分非 Retina 顯示器上會顯示出最銳利的文字- 已消除鋸齒: 相對於子像素，根據像素層級平滑字型。可讓字型整體顯得較細- 無: 停用字型平滑處理。文字會以鋸齒狀的銳邊顯示 ",
diff --git a/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
index 84c2c075664..8db2840ff19 100644
--- a/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
+++ b/i18n/cht/src/vs/workbench/electron-browser/window.i18n.json
@@ -9,5 +9,6 @@
 	"cut": "剪下",
 	"copy": "複製",
 	"paste": "貼上",
-	"selectAll": "全選"
+	"selectAll": "全選",
+	"runningAsRoot": "不建議以 root 身分執行 {0}。"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 0f331df92b8..ac9779dde41 100644
--- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "不要再顯示",
+	"close": "關閉",
 	"workspaceRecommendation": "根據目前工作區的使用者，建議您使用此延伸模組。",
 	"fileBasedRecommendation": "根據您最近開啟的檔案，建議您使用此延伸模組。",
 	"exeBasedRecommendation": "因為您已安裝 {0}，所以建議您使用此延伸模組。",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。",
 	"showRecommendations": "顯示建議",
 	"install": "安裝",
-	"neverShowAgain": "不要再顯示",
-	"close": "關閉",
 	"workspaceRecommended": "此工作區具有擴充功能建議。",
 	"installAll": "全部安裝",
 	"ignoreExtensionRecommendations": "是否略過所有的延伸模組建議?",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 0203e579bac..8b0fa7e726f 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "捨棄您的變更並還原成磁碟上的內容",
 	"copyPathOfActive": "複製使用中檔案的路徑",
 	"saveAllInGroup": "全部儲存在群組中",
+	"saveFiles": "儲存所有檔案",
 	"revert": "還原檔案",
 	"compareActiveWithSaved": "比較使用中的檔案和已儲存的檔案",
 	"closeEditor": "關閉編輯器",
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 033e57751ec..e173bdcc79b 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
@@ -18,6 +18,7 @@
 	"deleteButtonLabelRecycleBin": "移至資源回收筒(&&M)",
 	"deleteButtonLabelTrash": "移至垃圾筒(&&M)",
 	"deleteButtonLabel": "刪除(&&D)",
+	"dirtyMessageFilesDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?",
 	"dirtyMessageFolderOneDelete": "您要刪除的資料夾中 1 個檔案有未儲存的變更。要繼續嗎?",
 	"dirtyMessageFolderDelete": "您要刪除的資料夾中 {0} 個檔案有未儲存的變更。要繼續嗎?",
 	"dirtyMessageFileDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?",
@@ -34,6 +35,8 @@
 	"importFiles": "匯入檔案",
 	"confirmOverwrite": "目的資料夾中已有同名的檔案或資料夾。要取代它嗎?",
 	"replaceButtonLabel": "取代(&&R)",
+	"fileDeleted": "檔案被刪除或移動的同時",
+	"fileIsAncestor": "要複製的檔案是在目地資料夾的上層 ",
 	"duplicateFile": "複製",
 	"globalCompareFile": "使用中檔案的比較對象...",
 	"openFileToCompare": "先開啟檔案以與其他檔案進行比較",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 4a3f606e9a7..fabee1658dc 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "另存新檔...",
 	"save": "儲存",
 	"saveAll": "全部儲存",
-	"saveFiles": "儲存所有檔案",
 	"removeFolderFromWorkspace": "將資料夾從工作區移除",
 	"genericRevertError": "無法還原 '{0}': {1}",
 	"modifiedLabel": "{0} (在磁碟上) ↔ {1}",
diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
index 6f482834b34..1b0a86e7ea2 100644
--- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
@@ -10,6 +10,9 @@
 	"overwrite": "覆寫",
 	"retry": "重試",
 	"discard": "捨棄",
+	"readonlySaveErrorAdmin": "無法儲存 '{0}': 檔案有防寫保護。請選取 [以系統管理者身分覆寫] 來做為系統管理者身分重試。 ",
+	"readonlySaveError": "無法儲存 '{0}': 檔案有防寫保護。請選取 [覆寫] 以嚐試移除保護。 ",
+	"permissionDeniedSaveError": "無法儲存 '{0}': 權限不足。請選取 [以系統管理者身分重試] 做為系統管理者身分重試。 ",
 	"genericSaveError": "無法儲存 '{0}': {1}",
 	"staleSaveError": "無法儲存 '{0}': 磁碟上的內容較新。請按一下 [比較]，比較您的版本與磁碟上的版本。",
 	"compareChanges": "比較",
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 bc42ca6193f..99aeb2ac46a 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
@@ -10,6 +10,7 @@
 	"dropFolder": "要在工作區新增資料夾嗎?",
 	"addFolders": "新增資料夾(&A)",
 	"addFolder": "新增資料夾(&A)",
+	"confirmMultiMove": "確定要移動以下 {0} 個文件嗎？",
 	"confirmMove": "確定要移動 '{0}' 嗎?",
 	"doNotAskAgain": "不要再詢問我",
 	"moveButtonLabel": "移動(&&M)",
diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
index 801a62c062a..2049a7686db 100644
--- a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
@@ -4,5 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"mainLog": "紀錄 (主要) ",
+	"sharedLog": "紀錄 (共享) ",
+	"rendererLog": "紀錄 (視窗)",
+	"extensionsLog": "紀錄 (延伸主機) ",
 	"developer": "開發人員"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
index ddfff57509f..ce58da3b756 100644
--- a/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
@@ -6,15 +6,19 @@
 {
 	"openLogsFolder": "開啟紀錄資料夾",
 	"showLogs": "顯示紀錄...。",
+	"mainProcess": "主要",
+	"sharedProcess": "共享",
 	"rendererProcess": "視窗",
 	"extensionHost": "延伸主機",
 	"selectProcess": "選取程序",
+	"openLogFile": "開啟紀錄檔案...",
 	"setLogLevel": "設定記錄層級",
 	"trace": "追蹤",
 	"debug": "偵錯",
 	"info": "資訊",
 	"warn": "警告",
 	"err": "錯誤",
+	"critical": "嚴重",
 	"off": "關閉",
 	"selectLogLevel": "選擇紀錄層級"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 223611af94e..8199db7ebb6 100644
--- a/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"output": "輸出",
+	"logViewer": "紀錄檢視器",
 	"viewCategory": "檢視",
 	"clearOutput.label": "清除輸出"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
index 8b6ad71cd4e..23c47ff24dc 100644
--- a/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
@@ -3,4 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"output": "{0} - 輸出",
+	"channel": "'{0}' 的輸出通道"
+}
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
index 813fb7021bf..5485a14415f 100644
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
@@ -8,6 +8,8 @@
 	"source control": "原始檔控制",
 	"toggleSCMViewlet": "顯示 SCM",
 	"view": "檢視",
+	"scmConfigurationTitle": "原始碼管理 (SCM)",
 	"alwaysShowProviders": "是否總是顯示原始檔控制提供者區段",
+	"diffDecorations": "控制差異裝飾於編輯器中",
 	"inputCounter": "控制何時顯示輸入計數器"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 29439ddb2cf..2b766995de4 100644
--- a/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -7,6 +7,8 @@
 	"scm providers": "原始檔控制提供者",
 	"hideRepository": "隱藏",
 	"commitMessageInfo": "在目前行數有 {0} 個字元",
+	"commitMessageCountdown": "在目前行數剩餘 {0} 個字元",
+	"commitMessageWarning": "在目前行數有 {0} 個字元已超過 {1} 個",
 	"installAdditionalSCMProviders": "安裝額外SCM提供者...",
 	"no open repo": "沒有使用中的原始檔控制提供者。",
 	"source control": "原始檔控制",
diff --git a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
index 70a8a6e6943..dfb95035915 100644
--- a/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
@@ -4,6 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"global.scope": "(全域)",
 	"global.1": "({0})",
+	"new.global": "新增全域程式碼片段檔案...",
+	"group.global": "現有程式碼片段",
+	"new.global.sep": "新增程式碼片段",
+	"openSnippet.pickLanguage": "選取程式碼片段檔案或建立程式碼片段",
+	"openSnippet.label": "設定使用者程式碼片段",
 	"preferences": "喜好設定"
 }
\ No newline at end of file
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index 5adfeb27fed..3338d6ea3da 100644
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -15,6 +15,7 @@
 	"workbench.action.terminal.new": "建立新的整合式終端機",
 	"workbench.action.terminal.new.short": "新增終端機",
 	"workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄",
+	"workbench.action.terminal.newInActiveWorkspace": "建立新的整合式終端機 (於目前工作區)",
 	"workbench.action.terminal.focus": "聚焦終端機",
 	"workbench.action.terminal.focusNext": "聚焦下一個終端機",
 	"workbench.action.terminal.focusPrevious": "聚焦上一個終端機",
diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
index 3effe14e672..3c4cccada80 100644
--- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
@@ -8,5 +8,6 @@
 	"terminal.foreground": "終端機的前景色彩。",
 	"terminalCursor.foreground": "終端機游標的前景色彩。",
 	"terminalCursor.background": "終端機游標的背景色彩。允許區塊游標重疊於自訂字元色彩。",
-	"terminal.selectionBackground": "終端機的選取項目背景色彩。"
+	"terminal.selectionBackground": "終端機的選取項目背景色彩。",
+	"terminal.ansiColor": "終端機中的 '{0}' ANSI 色彩。"
 }
\ 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 de69c42ba6c..d44f480acd2 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
@@ -10,6 +10,7 @@
 	"fileTooLargeError": "檔案太大無法開啟",
 	"fileNotFoundError": "找不到檔案 ({0})",
 	"fileBinaryError": "檔案似乎是二進位檔，因此無法當做文字開啟",
+	"filePermission": "寫至檔案 ({0}) 的權限遭拒",
 	"fileExists": "要建立的檔案已存在 ({0})",
 	"fileMoveConflict": "無法移動/複製。目的地已存在檔案。",
 	"unableToMoveCopyError": "無法移動/複製。檔案會取代其所在的資料夾。",
diff --git a/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
index 3d15720ddec..2068790ab0f 100644
--- a/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ b/i18n/cht/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
@@ -22,5 +22,6 @@
 	"keybindings.json.when": "按鍵為使用中時的條件。",
 	"keybindings.json.args": "要傳遞至命令加以執行的引數。",
 	"keyboardConfigurationTitle": "鍵盤",
-	"dispatch": "控制按下按鍵時的分派邏輯 (使用 'code' (建議使用) 或 'keyCode')。"
+	"dispatch": "控制按下按鍵時的分派邏輯 (使用 'code' (建議使用) 或 'keyCode')。",
+	"touchbar.enabled": "啟用鍵盤上的 macOS 觸摸板按鈕 (如果可用)。"
 }
\ 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 e26a7235e02..106aebcff97 100644
--- a/i18n/deu/extensions/git/out/commands.i18n.json
+++ b/i18n/deu/extensions/git/out/commands.i18n.json
@@ -43,6 +43,7 @@
 	"yes discard tracked multiple": "{0} verfolgte Dateien verwerfen",
 	"unsaved files single": "Die folgende Datei ist nicht gespeichert: {0}.\n\nMöchten Sie diese vor dem Committen speichern?",
 	"unsaved files": "{0} Dateien sind nicht gespeichert.\n\nMöchten Sie diese vor dem Committen speichern?",
+	"save and commit": "Alles speichern und committen",
 	"commit": "Trotzdem committen",
 	"no staged changes": "Es sind keine Änderungen bereitgestellt.\n\nMöchten Sie alle Ihre Änderungen automatisch bereitstellen und direkt committen?",
 	"always": "Immer",
diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json
index f2ecf957937..eba5779a178 100644
--- a/i18n/deu/extensions/git/package.i18n.json
+++ b/i18n/deu/extensions/git/package.i18n.json
@@ -54,12 +54,12 @@
 	"command.stashPopLatest": "Pop für letzten Stash ausführen",
 	"config.enabled": "Gibt an, ob Git aktiviert ist.",
 	"config.path": "Der Pfad zur ausführbaren Git-Datei.",
+	"config.autoRepositoryDetection": "Ob Repositorien automatisch erkannt werden sollen",
 	"config.autorefresh": "Gibt an, ob die automatische Aktualisierung aktiviert ist.",
 	"config.autofetch": "Gibt an, ob automatischer Abruf aktiviert ist.",
 	"config.enableLongCommitWarning": "Gibt an, ob Warnungen zu langen Commitnachrichten erfolgen sollen.",
 	"config.confirmSync": "Vor dem Synchronisieren von Git-Repositorys bestätigen.",
 	"config.countBadge": "Steuert die Git-Badgeanzahl. \"Alle\" zählt alle Änderungen. \"tracked\" (Nachverfolgt) zählt nur die nachverfolgten Änderungen. \"off\" (Aus) deaktiviert dies.",
-	"config.checkoutType": "Steuert, welcher Branchtyp beim Ausführen von \"Auschecken an...\" aufgelistet wird. \"Alle\" zeigt alle Verweise an, \"Lokal\" nur die lokalen Branches, \"Tags\" zeigt nur Tags an, und \"Remote\" zeigt nur Remotebranches an.",
 	"config.ignoreLegacyWarning": "Ignoriert die Legacy-Git-Warnung.",
 	"config.ignoreMissingGitWarning": "Ignoriert die Warnung, wenn Git fehlt",
 	"config.ignoreLimitWarning": "Ignoriert Warnung bei zu hoher Anzahl von Änderungen in einem Repository",
diff --git a/i18n/deu/src/vs/base/node/ps.i18n.json b/i18n/deu/src/vs/base/node/ps.i18n.json
index 8b6ad71cd4e..eb881148d8c 100644
--- a/i18n/deu/src/vs/base/node/ps.i18n.json
+++ b/i18n/deu/src/vs/base/node/ps.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"collecting": "Sammeln von CPU- und Speicherinformationen. Dies kann einige Sekunden dauern."
+}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 3bd907833f1..ed57dd20d06 100644
--- a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -72,6 +72,7 @@
 	"cursorBlinking": "Steuert den Cursoranimationsstil. Gültige Werte sind \"blink\", \"smooth\", \"phase\", \"expand\" und \"solid\".",
 	"mouseWheelZoom": "Schriftart des Editors vergrößern, wenn das Mausrad verwendet und die STRG-TASTE gedrückt wird",
 	"cursorStyle": "Steuert den Cursorstil. Gültige Werte sind  \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" und \"underline-thin\".",
+	"lineCursorWidth": "Steuert die Breite des Cursors, falls editor.cursorStyle auf \"line\" gestellt ist.",
 	"fontLigatures": "Aktiviert Schriftartligaturen.",
 	"hideCursorInOverviewRuler": "Steuert die Sichtbarkeit des Cursors im Übersichtslineal.",
 	"renderWhitespace": "Steuert, wie der Editor Leerzeichen rendert. Mögliche Optionen: \"none\", \"boundary\" und \"all\". Die Option \"boundary\" rendert keine einzelnen Leerzeichen zwischen Wörtern.",
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 512b6893918..7c9c0c38962 100644
--- a/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/deu/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "Hintergrundfarbe zur Hervorhebung der Zeile an der Cursorposition.",
 	"lineHighlightBorderBox": "Hintergrundfarbe für den Rahmen um die Zeile an der Cursorposition.",
+	"rangeHighlight": "Hintergrundfarbe hervorgehobener Bereiche, beispielsweise durch Features wie Quick Open und Suche. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
 	"caret": "Farbe des Cursors im Editor.",
 	"editorCursorBackground": "Hintergrundfarbe vom Editor-Cursor. Erlaubt die Anpassung der Farbe von einem Zeichen, welches von einem Block-Cursor überdeckt wird.",
 	"editorWhitespaces": "Farbe der Leerzeichen im Editor.",
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 cc799cdb63a..f0964e09e29 100644
--- a/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // 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.",
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 f6176a5826f..494db968f98 100644
--- a/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/deu/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"wordHighlight": "Hintergrundfarbe eines Symbols bei Lesezugriff, beispielsweise dem Lesen einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
+	"wordHighlightStrong": "Hintergrundfarbe eines Symbols bei Schreibzugriff, beispielsweise dem Schreiben einer Variable. Die Farbe muss durchsichtig sein, um nicht dahinterliegende Dekorationen zu verbergen.",
 	"overviewRulerWordHighlightForeground": "Übersichtslineal-Markierungsfarbe für Symbolhervorhebungen.",
 	"overviewRulerWordHighlightStrongForeground": "Übersichtslineal-Markierungsfarbe für Schreibzugriffs-Symbolhervorhebungen.",
 	"wordHighlight.next.label": "Gehe zur nächsten Symbolhervorhebungen",
diff --git a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
index 973f6daca81..dac01ef64d6 100644
--- a/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/deu/src/vs/platform/environment/node/argv.i18n.json
@@ -30,6 +30,7 @@
 	"inspect-extensions": "Erlaubt Debugging und Profiling für Erweiterungen. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
 	"inspect-brk-extensions": "Erlaubt Debugging und Profiling für Erweiterungen, wobei der Erweiterungs-Host nach dem Starten pausiert wird. Überprüfen Sie die Entwicklertools für die Verbindungs-URI.",
 	"disableGPU": "Deaktiviert die GPU-Hardwarebeschleunigung.",
+	"uploadLogs": "Lädt die Logs der aktuellen Sitzung an einem sicheren Endpunkt hoch.",
 	"usage": "Verwendung",
 	"options": "Optionen",
 	"paths": "Pfade",
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 503ec4aa8a3..bd3552bcdfe 100644
--- a/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/deu/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,6 +9,7 @@
 	"installingOutdatedExtension": "Eine neuere Version dieser Erweiterung ist bereits installiert. Möchten Sie diese mit der älteren Version überschreiben?",
 	"override": "Überschreiben",
 	"cancel": "Abbrechen",
+	"errorInstallingDependencies": "Fehler während Installation der Abhängigkeiten. {0}",
 	"notFoundCompatible": "'{0}' kann nicht installiert werden: Es gibt keine mit VS Code '{1}' kompatible Version.",
 	"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.",
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 38654cc7985..9159f1402da 100644
--- a/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/deu/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -63,7 +63,10 @@
 	"editorWidgetBorder": "Rahmenfarbe von Editorwigdets. Die Farbe wird nur verwendet, wenn für das Widget ein Rahmen verwendet wird und die Farbe nicht von einem Widget überschrieben wird.",
 	"editorSelectionBackground": "Farbe der Editor-Auswahl.",
 	"editorSelectionForeground": "Farbe des gewählten Text für einen hohen Kontrast",
+	"editorInactiveSelection": "Farbe der Auswahl in einem inaktiven Editor. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
+	"editorSelectionHighlight": "Farbe für Bereiche, deren Inhalt der Auswahl entspricht. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
 	"editorFindMatch": "Farbe des aktuellen Suchergebnisses.",
+	"findMatchHighlight": "Farbe der anderen Suchergebnisse. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
 	"hoverBackground": "Background color of the editor hover.",
 	"hoverBorder": "Rahmenfarbe des Editor-Mauszeigers.",
 	"activeLinkForeground": "Farbe der aktiven Links.",
@@ -71,6 +74,10 @@
 	"diffEditorRemoved": "Hintergrundfarbe für entfernten Text.",
 	"diffEditorInsertedOutline": "Konturfarbe für eingefügten Text.",
 	"diffEditorRemovedOutline": "Konturfarbe für entfernten Text.",
+	"mergeCurrentHeaderBackground": "Aktueller Kopfzeilenhintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen.",
+	"mergeCurrentContentBackground": "Aktueller Inhaltshintergrund in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
+	"mergeIncomingHeaderBackground": "Hintergrund für eingehende Kopfzeile in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
+	"mergeIncomingContentBackground": "Hintergrund für eingehenden Inhalt in Inline-Mergingkonflikten. Die Farbe muss durchsichtig sein, um dahinterliegende Dekorationen nicht zu verbergen. ",
 	"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. ",
diff --git a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index c676a1ca340..c0039e0b445 100644
--- a/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Position der Seitenleiste wechseln",
 	"view": "Anzeigen"
 }
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index 147a1680ae9..8b6ad71cd4e 100644
--- a/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/deu/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "Auf Randleiste ausblenden"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 5da27da0751..8ece38ff002 100644
--- a/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Nicht mehr anzeigen",
+	"close": "Schließen",
 	"workspaceRecommendation": "Diese Erweiterung wird von Benutzern des aktuellen Arbeitsbereichs empfohlen.",
 	"fileBasedRecommendation": "Ausgehend von den kürzlich geöffneten Dateien wird diese Erweiterung empfohlen.",
 	"exeBasedRecommendation": "Diese Erweiterung wird empfohlen, da Sie {0} installiert haben.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "Für diesen Dateityp wird das Erweiterungspaket \"{0}\" empfohlen.",
 	"showRecommendations": "Empfehlungen anzeigen",
 	"install": "Installieren",
-	"neverShowAgain": "Nicht mehr anzeigen",
-	"close": "Schließen",
 	"workspaceRecommended": "Für diesen Arbeitsbereich sind Erweiterungsempfehlungen verfügbar.",
 	"installAll": "Alle installieren",
 	"ignoreExtensionRecommendations": "Möchten Sie alle Erweiterungsempfehlungen ignorieren?",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index e8abcac28b7..f77129048a6 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Änderungen verwerfen und Datenträgerinhalte wiederherstellen",
 	"copyPathOfActive": "Pfad der aktiven Datei kopieren",
 	"saveAllInGroup": "Alle in der Gruppe speichern",
+	"saveFiles": "Alle Dateien speichern",
 	"revert": "Datei wiederherstellen",
 	"compareActiveWithSaved": "Aktive Datei mit gespeicherter Datei vergleichen",
 	"closeEditor": "Editor schließen",
diff --git a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 216d652c91a..4113e1a3018 100644
--- a/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/deu/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Speichern unter...",
 	"save": "Speichern",
 	"saveAll": "Alle speichern",
-	"saveFiles": "Alle Dateien speichern",
 	"removeFolderFromWorkspace": "Ordner aus dem Arbeitsbereich entfernen",
 	"genericRevertError": "Fehler beim Zurücksetzen von '{0}': {1}",
 	"modifiedLabel": "{0} (auf Datenträger) ↔ {1}",
diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json
index c0bb492d13e..9dab8cc59ce 100644
--- a/i18n/esn/extensions/git/package.i18n.json
+++ b/i18n/esn/extensions/git/package.i18n.json
@@ -59,7 +59,6 @@
 	"config.enableLongCommitWarning": "Si se debe advertir sobre los mensajes de confirmación largos",
 	"config.confirmSync": "Confirmar antes de sincronizar repositorios GIT",
 	"config.countBadge": "Controla el contador de insignia de Git. \"Todo\" cuenta todos los cambios. \"Seguimiento\" solamente cuenta los cambios realizados. \"Desactivado\" lo desconecta.",
-	"config.checkoutType": "Controla el tipo de ramas listadas cuando ejecuta \"Desproteger\". \"Todo\" muetra todas las referencias, \"local\" solamente las ramas locales y \"remoto\" las ramas remotas.",
 	"config.ignoreLegacyWarning": "Ignora las advertencias hereradas de Git",
 	"config.ignoreMissingGitWarning": "Ignora la advertencia cuando falta Git",
 	"config.ignoreLimitWarning": "\nIgnora advertencias cuando se encuentran muchos cambios en un repositorio.",
diff --git a/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
index 8b6ad71cd4e..ed15423097d 100644
--- a/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ b/i18n/esn/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"selectAriaOption": "{0}"
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/base/node/ps.i18n.json b/i18n/esn/src/vs/base/node/ps.i18n.json
index 8b6ad71cd4e..a4dbd804fb4 100644
--- a/i18n/esn/src/vs/base/node/ps.i18n.json
+++ b/i18n/esn/src/vs/base/node/ps.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"collecting": "Recopilando información de memoria y CPU. Esto puede tardar unos segundos. "
+}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
index b156efc4162..9e12f7523e1 100644
--- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -14,6 +14,7 @@
 	"lineNumbers.on": "Los números de línea se muestran como un número absoluto.",
 	"lineNumbers.relative": "Los números de línea se muestran como distancia en líneas a la posición del cursor.",
 	"lineNumbers.interval": "Los números de línea se muestran cada 10 líneas.",
+	"lineNumbers": "Controla la visualización de números de línea. Los valores posibles son 'on', 'off', 'relative' e 'interval'.",
 	"rulers": "Representar reglas verticales después de un cierto número de caracteres monoespacio. Usar multiples valores para multiples reglas. No se dibuja ninguna regla si la matriz esta vacía.",
 	"wordSeparators": "Caracteres que se usarán como separadores de palabras al realizar operaciones o navegaciones relacionadas con palabras.",
 	"tabSize": "El número de espacios a los que equivale una tabulación. Este valor se invalida según el contenido del archivo cuando `editor.detectIndentation` está activado.",
@@ -71,6 +72,7 @@
 	"cursorBlinking": "Controlar el estilo de animación del cursor. Los valores posibles son \"blink\", \"smooth\", \"phase\", \"expand\" y \"solid\".",
 	"mouseWheelZoom": "Ampliar la fuente del editor cuando se use la rueda del mouse mientras se presiona Ctrl",
 	"cursorStyle": "Controla el estilo del cursor. Los valores aceptados son \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" y \"underline-thin\"",
+	"lineCursorWidth": "Controla el ancho del cursor cuando editor.cursorStyle se establece a 'line'",
 	"fontLigatures": "Habilita las ligaduras tipográficas.",
 	"hideCursorInOverviewRuler": "Controla si el cursor debe ocultarse en la regla de visión general.",
 	"renderWhitespace": "Controla cómo debe representar el editor los espacios en blanco. Las posibilidades son \"none\", \"boundary\" y \"all\". La opción \"boundary\" no representa los espacios individuales entre palabras.",
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 e60652a0dd4..240fd1d7416 100644
--- a/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/esn/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "Color de fondo del resaltado de línea 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.",
 	"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.",
 	"editorWhitespaces": "Color de los caracteres de espacio en blanco del editor.",
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 3320bca40f6..19b5ca523e8 100644
--- a/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // 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.",
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 22f02c80487..700a3162a41 100644
--- a/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/esn/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"wordHighlight": "Color de fondo de un símbolo durante el acceso de lectura, como leer una variable. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
+	"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.",
 	"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",
diff --git a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
index 7e6ced9e2f1..65665985d3d 100644
--- a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json
@@ -33,5 +33,7 @@
 	"usage": "Uso",
 	"options": "opciones",
 	"paths": "rutas de acceso",
-	"optionsUpperCase": "Opciones"
+	"optionsUpperCase": "Opciones",
+	"extensionsManagement": "Gestión de extensiones",
+	"troubleshooting": "Solución de problemas"
 }
\ 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 d1ce3f10c5f..f654894f7d5 100644
--- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,6 +9,7 @@
 	"installingOutdatedExtension": "Una versión más nueva de esta extensión ya está instalada. ¿Desea anular esto con la versión anterior?",
 	"override": "Anular",
 	"cancel": "Cancelar",
+	"errorInstallingDependencies": "Error instalando dependencias. {0}",
 	"notFoundCompatibleDependency": "No se puede instalar porque no se encuentra la extensión dependiente '{0}' compatible con la versión actual '{1}' del VS Code.",
 	"uninstallDependeciesConfirmation": "¿Quiere desinstalar solo '{0}' o también sus dependencias?",
 	"uninstallOnly": "Solo",
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 d2e9d5e7292..139c4515643 100644
--- a/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/esn/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -63,6 +63,7 @@
 	"editorWidgetBorder": "Color de borde de los widgets del editor. El color solo se usa si el widget elige tener un borde y no invalida el color.",
 	"editorSelectionBackground": "Color de la selección del editor.",
 	"editorSelectionForeground": "Color del texto seleccionado para alto contraste.",
+	"editorInactiveSelection": "Color de la selección en un editor inactivo. El color no debe ser opaco para no ocultar las decoraciones subyacentes.",
 	"editorFindMatch": "Color de la coincidencia de búsqueda actual.",
 	"hoverBackground": "Color de fondo al mantener el puntero en el editor.",
 	"hoverBorder": "Color del borde al mantener el puntero en el editor.",
diff --git a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 9caf1c7c012..ac538fe6a5b 100644
--- a/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Alternar la ubicación de la barra lateral",
 	"view": "Ver"
 }
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index e4776f8c605..8b6ad71cd4e 100644
--- a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "Ocultar en la barra lateral"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index a0c3a72ce3f..90cb60f6caf 100644
--- a/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "No volver a mostrar",
+	"close": "Cerrar",
 	"workspaceRecommendation": "Esta extensión es recomendada por los usuarios del espacio de trabajo actual.",
 	"fileBasedRecommendation": "Esta extensión se recomienda basado en los archivos que abrió recientemente.",
 	"exeBasedRecommendation": "Se recomienda esta extensión porque tiene instalado {0} . ",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "Para este tipo de fichero, se recomienda el paquete de extensión '{0}'.",
 	"showRecommendations": "Mostrar recomendaciones",
 	"install": "Instalar",
-	"neverShowAgain": "No volver a mostrar",
-	"close": "Cerrar",
 	"workspaceRecommended": "Esta área de trabajo tiene recomendaciones de extensión.",
 	"installAll": "Instalar todo",
 	"ignoreExtensionRecommendations": "¿Desea ignorar todas las recomendaciones de la extensión?",
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 619e931bff1..a73d898f487 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Descartar los cambios y volver al contenido del disco",
 	"copyPathOfActive": "Copiar ruta del archivo activo",
 	"saveAllInGroup": "Guardar todo en el grupo",
+	"saveFiles": "Guardar todos los archivos",
 	"revert": "Revertir archivo",
 	"compareActiveWithSaved": "Comparar el archivo activo con el guardado",
 	"closeEditor": "Cerrar editor",
diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 41e7bc8dcaf..2228202fde4 100644
--- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Guardar como...",
 	"save": "Guardar",
 	"saveAll": "Guardar todos",
-	"saveFiles": "Guardar todos los archivos",
 	"removeFolderFromWorkspace": "Quitar carpeta del área de trabajo",
 	"modifiedLabel": "{0} (en el disco) ↔ {1}",
 	"openFileToReveal": "Abrir un archivo antes para mostrarlo",
diff --git a/i18n/fra/extensions/git/out/autofetch.i18n.json b/i18n/fra/extensions/git/out/autofetch.i18n.json
index 54fcbb321ef..e5a3f00f716 100644
--- a/i18n/fra/extensions/git/out/autofetch.i18n.json
+++ b/i18n/fra/extensions/git/out/autofetch.i18n.json
@@ -6,5 +6,7 @@
 {
 	"yes": "Oui",
 	"read more": "Lire la suite",
-	"no": "Non"
+	"no": "Non",
+	"not now": "Me demander plus tard",
+	"suggest auto fetch": "Voulez-vous que Code exécute périodiquement `git fetch` ?"
 }
\ 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 cc941a646ad..0ab84d9bc6f 100644
--- a/i18n/fra/extensions/git/out/commands.i18n.json
+++ b/i18n/fra/extensions/git/out/commands.i18n.json
@@ -41,6 +41,10 @@
 	"confirm discard all 2": "{0}\n\nCette opération est IRRÉVERSIBLE, votre plage de travail actuelle sera DÉFINITIVEMENT PERDUE.",
 	"yes discard tracked": "Ignorer 1 fichier suivi",
 	"yes discard tracked multiple": "Ignorer {0} fichiers suivis",
+	"unsaved files single": "Le fichier suivant n'est pas enregistré : {0}.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
+	"unsaved files": "Il y a {0} fichiers non enregistrés.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
+	"save and commit": "Tout enregistrer et Effectuer le commit",
+	"commit": "Effectuer le commit quand même",
 	"no staged changes": "Aucune modification en attente à valider.\n\nVoulez-vous automatiquement mettre en attente toutes vos modifications et les valider directement ?",
 	"always": "Toujours",
 	"no changes": "Il n'existe aucun changement à valider.",
@@ -65,10 +69,12 @@
 	"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
 	"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
 	"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
+	"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
 	"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).",
 	"provide stash message": "Spécifier éventuellement un message pour la remise (stash)",
diff --git a/i18n/fra/extensions/git/package.i18n.json b/i18n/fra/extensions/git/package.i18n.json
index 188e2b5ba4a..a1ed0d37d5d 100644
--- a/i18n/fra/extensions/git/package.i18n.json
+++ b/i18n/fra/extensions/git/package.i18n.json
@@ -54,12 +54,13 @@
 	"command.stashPopLatest": "Appliquer et supprimer la dernière remise",
 	"config.enabled": "Indique si git est activé",
 	"config.path": "Chemin d'accès à l'exécutable git",
+	"config.autoRepositoryDetection": "Si les dépôts doivent être détectés automatiquement",
 	"config.autorefresh": "Indique si l'actualisation automatique est activée",
 	"config.autofetch": "Indique si la récupération automatique est activée",
 	"config.enableLongCommitWarning": "Indique si les longs messages de validation doivent faire l'objet d'un avertissement",
 	"config.confirmSync": "Confirmer avant de synchroniser des dépôts git",
 	"config.countBadge": "Contrôle le compteur de badges Git. La valeur 'toutes' compte toutes les modifications. La valeur 'suivies' compte uniquement les modifications suivies. La valeur 'désactivé' désactive le compteur.",
-	"config.checkoutType": "Contrôle le type des branches répertoriées pendant l'exécution de 'Extraire vers...'. La valeur 'toutes' montre toutes les références, la valeur 'locales' montre uniquement les branches locales, la valeur 'balises' montre uniquement les balises et la valeur 'distantes' montre uniquement les branches distantes.",
+	"config.checkoutType": "Contrôle quel type de branches sont répertoriées pendant l'exécution de 'Extraire vers...'. `all` affiche toutes les références, `local` affiche uniquement les branches locales, `tags` affiche uniquement les balises et la valeur `remote` montre uniquement les branches distantes.",
 	"config.ignoreLegacyWarning": "Ignore l'avertissement Git hérité",
 	"config.ignoreMissingGitWarning": "Ignore l'avertissement quand Git est manquant",
 	"config.ignoreLimitWarning": "Ignore l'avertissement quand il y a trop de modifications dans un dépôt",
@@ -72,5 +73,6 @@
 	"colors.deleted": "Couleur pour les ressources supprimées.",
 	"colors.untracked": "Couleur pour les ressources non tracées.",
 	"colors.ignored": "Couleur des ressources ignorées.",
-	"colors.conflict": "Couleur pour les ressources avec des conflits."
+	"colors.conflict": "Couleur pour les ressources avec des conflits.",
+	"colors.submodule": "Couleur pour les ressources de sous-module."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
index 8b6ad71cd4e..ed15423097d 100644
--- a/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ b/i18n/fra/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"selectAriaOption": "{0}"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/base/node/ps.i18n.json b/i18n/fra/src/vs/base/node/ps.i18n.json
index 8b6ad71cd4e..a67aa7a91d1 100644
--- a/i18n/fra/src/vs/base/node/ps.i18n.json
+++ b/i18n/fra/src/vs/base/node/ps.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"collecting": "Récupération des informations processeur et mémoire. Cela peut prendre quelques secondes."
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 406f474987e..4beaeedee28 100644
--- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -14,6 +14,7 @@
 	"lineNumbers.on": "Les numéros de ligne sont affichés en nombre absolu.",
 	"lineNumbers.relative": "Les numéros de ligne sont affichés sous la forme de distance en lignes à la position du curseur.",
 	"lineNumbers.interval": "Les numéros de ligne sont affichés toutes les 10 lignes.",
+	"lineNumbers": "Contrôle l’affichage des numéros de ligne. Les valeurs possibles sont 'on', 'off', 'relative' et 'interval'.",
 	"rulers": "Afficher les règles verticales après un certain nombre de caractères à espacement fixe. Utiliser plusieurs valeurs pour plusieurs règles. Aucune règle n'est dessinée si le tableau est vide",
 	"wordSeparators": "Caractères utilisés comme séparateurs de mots durant la navigation ou les opérations basées sur les mots",
 	"tabSize": "Le nombre d'espaces correspondant à une tabulation. Ce paramètre est remplacé en fonction du contenu du fichier quand 'editor.detectIndentation' est activé.",
@@ -71,6 +72,7 @@
 	"cursorBlinking": "Contrôle le style d'animation du curseur. Valeurs possibles : 'blink', 'smooth', 'phase', 'expand' et 'solid'",
 	"mouseWheelZoom": "Agrandir ou réduire la police de l'éditeur quand l'utilisateur fait tourner la roulette de la souris tout en maintenant la touche Ctrl enfoncée",
 	"cursorStyle": "Contrôle le style du curseur. Les valeurs acceptées sont 'block', 'block-outline', 'line', 'line-thin', 'underline' et 'underline-thin'",
+	"lineCursorWidth": "Contrôle la largeur du curseur quand editor.cursorStyle est à 'line'",
 	"fontLigatures": "Active les ligatures de police",
 	"hideCursorInOverviewRuler": "Contrôle si le curseur doit être masqué dans la règle d'aperçu.",
 	"renderWhitespace": "Contrôle la façon dont l'éditeur affiche les espaces blancs. Il existe trois options possibles : 'none', 'boundary' et 'all'. L'option 'boundary' n'affiche pas les espaces uniques qui séparent les mots.",
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 f2cc0b4325a..aff67fd2a97 100644
--- a/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/fra/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "Couleur d'arrière-plan de la mise en surbrillance de la ligne à la position du curseur.",
 	"lineHighlightBorderBox": "Couleur d'arrière-plan de la bordure autour de la ligne à la position du curseur.",
+	"rangeHighlight": "Couleur d'arrière-plan des plages mises en surbrillance, par exemple par les fonctionnalités d'ouverture rapide et de recherche. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
 	"caret": "Couleur du curseur de l'éditeur.",
 	"editorCursorBackground": "La couleur de fond du curseur de l'éditeur. Permet de personnaliser la couleur d'un caractère survolé par un curseur de bloc.",
 	"editorWhitespaces": "Couleur des espaces blancs dans l'éditeur.",
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 e09d1ef1ebe..fc4679bba93 100644
--- a/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // 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.",
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 9b718f92008..8e43823c7ac 100644
--- a/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/fra/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"wordHighlight": "Couleur d'arrière-plan d'un symbole durant l'accès en lecture, par exemple la lecture d'une variable. La couleur ne doit pas être opaque pour ne pas masquer les décorations sous-jacentes.",
+	"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.",
 	"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.",
 	"wordHighlight.next.label": "Aller à la prochaine mise en évidence de symbole",
diff --git a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
index 7b909d1fca4..217c685dc72 100644
--- a/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/fra/src/vs/platform/environment/node/argv.i18n.json
@@ -30,8 +30,13 @@
 	"inspect-extensions": "Autorise le débogage et le profilage des extensions. Vérifier les outils de développements pour l'uri de connexion.",
 	"inspect-brk-extensions": "Autorise le débogage et le profilage des extensions avec l'hôte d'extensions en pause après le démarrage. Vérifier les outils de développement pour l'uri de connexion.",
 	"disableGPU": "Désactivez l'accélération matérielle du GPU.",
+	"uploadLogs": "Upload les logs depuis la session actuelle vers le endpoint sécurisé.",
 	"usage": "Utilisation",
 	"options": "options",
 	"paths": "chemins",
-	"optionsUpperCase": "Options"
+	"stdinWindows": "Pour lire la sortie d’un autre programme, ajouter '-' (ex. 'echo Bonjour tout le monde | {0} -')",
+	"stdinUnix": "Pour lire depuis stdin, ajouter '-' (ex. 'ps aux | grep code | {0} -')",
+	"optionsUpperCase": "Options",
+	"extensionsManagement": "Gestion des extensions",
+	"troubleshooting": "Dépannage"
 }
\ 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 40c901eec8f..ccd0c9dadfd 100644
--- a/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/fra/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,7 +9,11 @@
 	"installingOutdatedExtension": "Une version plus récente de cette extension est déjà installée. Voulez-vous remplacer celle-ci avec l'ancienne version ?",
 	"override": "Remplacer",
 	"cancel": "Annuler",
+	"errorInstallingDependencies": "Erreur lors de l'installation des dépendances. {0}",
+	"notFoundCompatible": "Impossible d’installer '{0}'; Il n’y a pas de version disponible compatible avec VS Code '{1}'.",
 	"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",
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 2d46ac2791e..125c9debbca 100644
--- a/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/fra/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -63,7 +63,12 @@
 	"editorWidgetBorder": "Couleur de bordure des widgets de l'éditeur. La couleur est utilisée uniquement si le widget choisit d'avoir une bordure et si la couleur n'est pas remplacée par un widget.",
 	"editorSelectionBackground": "Couleur de la sélection de l'éditeur.",
 	"editorSelectionForeground": "Couleur du texte sélectionné pour le contraste élevé.",
+	"editorInactiveSelection": "Couleur de sélection dans un éditeur inactif. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"editorSelectionHighlight": "Couleur des régions avec le même contenu que la sélection. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
 	"editorFindMatch": "Couleur du résultat de recherche actif.",
+	"findMatchHighlight": "Couleur des autres résultats de recherche correspondants. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"findRangeHighlight": "Couleur de la plage limitant la recherche. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"hoverHighlight": "Mettre en surbrillance ci-dessous le mot pour lequel un survol est affiché. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
 	"hoverBackground": "Couleur d'arrière-plan du pointage de l'éditeur.",
 	"hoverBorder": "Couleur de bordure du pointage de l'éditeur.",
 	"activeLinkForeground": "Couleur des liens actifs.",
@@ -71,6 +76,12 @@
 	"diffEditorRemoved": "Couleur d'arrière-plan du texte supprimé.",
 	"diffEditorInsertedOutline": "Couleur de contour du texte inséré.",
 	"diffEditorRemovedOutline": "Couleur de contour du texte supprimé.",
+	"mergeCurrentHeaderBackground": "Arrière-plan de l'en-tête en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"mergeCurrentContentBackground": "Arrière-plan du contenu en cours dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"mergeIncomingHeaderBackground": "Arrière-plan de l'en-tête qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"mergeIncomingContentBackground": "Arrière-plan du contenu qui arrive dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"mergeCommonHeaderBackground": "Arrière-plan de l'en-tête de l'ancêtre commun dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
+	"mergeCommonContentBackground": "Arrière-plan du contenu de l'ancêtre commun dans les conflits de fusion inline. La couleur doit ne pas être opaque afin de ne pas masquer les décorations sous-jacentes.",
 	"mergeBorder": "Couleur de bordure des en-têtes et du séparateur dans les conflits de fusion inline.",
 	"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.",
diff --git a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index 42b1301caed..2475bc3e519 100644
--- a/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/fra/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite."
+	"treeView.notRegistered": "Aucune arborescence avec l'ID '{0}' n'est inscrite.",
+	"treeView.duplicateElement": "L'élément avec l'id {0} est déjà inscrit"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 0ea0c59d765..053ff77f9f9 100644
--- a/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Activer/désactiver l'emplacement de la barre latérale",
+	"toggleSidebarPosition": "Activer/désactiver la position de la barre latérale",
 	"view": "Affichage"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
index 0db82346ee1..22a325e3fa6 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json
@@ -20,6 +20,7 @@
 	"closeAllUnmodified": "Fermer les éléments non modifiés",
 	"closeAll": "Tout fermer",
 	"keepOpen": "Garder ouvert",
+	"toggleInlineView": "Activer/désactiver l'affichage Inline",
 	"showOpenedEditors": "Afficher les éditeurs ouverts",
 	"keepEditor": "Conserver l'éditeur",
 	"closeEditorsInGroup": "Fermer tous les éditeurs du groupe",
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 e7febec4eda..a2562d91fe9 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
@@ -48,5 +48,8 @@
 	"moveEditorLeft": "Déplacer l'éditeur vers la gauche",
 	"moveEditorRight": "Déplacer l'éditeur vers la droite",
 	"moveEditorToPreviousGroup": "Déplacer l'éditeur vers le groupe précédent",
-	"moveEditorToNextGroup": "Déplacer l'éditeur vers le groupe suivant"
+	"moveEditorToNextGroup": "Déplacer l'éditeur vers le groupe suivant",
+	"moveEditorToFirstGroup": "Déplacer l'éditeur vers le premier groupe",
+	"moveEditorToSecondGroup": "Déplacer l'éditeur vers le second groupe",
+	"moveEditorToThirdGroup": "Déplacer l'éditeur vers le troisième groupe"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
index c8b5ce11fb1..3a04eca1120 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
@@ -10,5 +10,6 @@
 	"editableEditorWithInputAriaLabel": "{0}. Éditeur de comparaison de fichier texte.",
 	"editableEditorAriaLabel": "Éditeur de comparaison de fichier texte.",
 	"navigate.next.label": "Modification suivante",
-	"navigate.prev.label": "Modification précédente"
+	"navigate.prev.label": "Modification précédente",
+	"toggleIgnoreTrimWhitespace.label": "Ignorer la suppression des espaces"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
index d9f31d9c850..3d0b4541c12 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
@@ -5,5 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"patchedWindowTitle": "[Non prise en charge]",
+	"userIsAdmin": "[Administrator]",
+	"userIsSudo": "[Superuser]",
 	"devExtensionWindowTitlePrefix": "[Hôte de développement d'extension]"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index 3ed5e9fc685..dd1dfbd52dd 100644
--- a/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/fra/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "Masquer dans la barre latérale"
+	"hideView": "Masquer"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/common/theme.i18n.json b/i18n/fra/src/vs/workbench/common/theme.i18n.json
index d89c104a156..42755eb915e 100644
--- a/i18n/fra/src/vs/workbench/common/theme.i18n.json
+++ b/i18n/fra/src/vs/workbench/common/theme.i18n.json
@@ -6,9 +6,13 @@
 {
 	"tabActiveBackground": "Couleur d'arrière-plan de l'onglet actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
 	"tabInactiveBackground": "Couleur d'arrière-plan de l'onglet inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
+	"tabHoverBackground": "Couleur de l'onglet d’arrière-plan lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
+	"tabUnfocusedHoverBackground": "Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
 	"tabBorder": "Bordure séparant les onglets les uns des autres. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
 	"tabActiveBorder": "Bordure pour mettre en évidence les onglets actifs. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
 	"tabActiveUnfocusedBorder": "Bordure pour mettre en évidence les onglets actifs dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'édition. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
+	"tabHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
+	"tabUnfocusedHoverBorder": "Bordure avec laquelle surligner les onglets lors du survol dans un groupe n'ayant pas le focus. Couleur de l'onglet d’arrière-plan dans un groupe n'ayant pas le focus lors du survol. Les onglets sont les conteneurs pour les éditeurs dans la zone de l’éditeur. Plusieurs onglets peuvent être ouverts dans un groupe d'éditeur. Il peut y avoir plusieurs groupes d’éditeur.",
 	"tabActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
 	"tabInactiveForeground": "Couleur de premier plan de l'onglet inactif dans un groupe actif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
 	"tabUnfocusedActiveForeground": "Couleur de premier plan de l'onglet actif dans un groupe inactif. Les onglets sont les conteneurs des éditeurs dans la zone d'éditeurs. Vous pouvez ouvrir plusieurs onglets dans un groupe d'éditeurs. Il peut exister plusieurs groupes d'éditeurs.",
@@ -16,6 +20,7 @@
 	"editorGroupBackground": "Couleur d'arrière-plan d'un groupe d'éditeurs. Les groupes d'éditeurs sont les conteneurs des éditeurs. La couleur d'arrière-plan s'affiche pendant le glissement de groupes d'éditeurs.",
 	"tabsContainerBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
 	"tabsContainerBorder": "Couleur de bordure de l'en-tête du titre du groupe d'éditeurs quand les onglets sont activés. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
+	"editorGroupHeaderBackground": "Couleur d'arrière-plan de l'en-tête du titre du groupe d'éditeurs quand les onglets sont désactivés (`\"workbench.editor.showTabs\": false`). Les groupes d'éditeurs sont les conteneurs des éditeurs.",
 	"editorGroupBorder": "Couleur séparant plusieurs groupes d'éditeurs les uns des autres. Les groupes d'éditeurs sont les conteneurs des éditeurs.",
 	"editorDragAndDropBackground": "Couleur d'arrière-plan lors du déplacement des éditeurs par glissement. La couleur doit avoir une transparence pour que le contenu de l'éditeur soit visible à travers.",
 	"panelBackground": "Couleur d'arrière-plan du panneau. Les panneaux s'affichent sous la zone d'éditeurs et contiennent des affichages tels que la sortie et le terminal intégré.",
@@ -32,6 +37,8 @@
 	"statusBarNoFolderBorder": "Couleur de la bordure qui sépare la barre latérale et l’éditeur lorsque aucun dossier ne s’ouvre la barre d’état. La barre d’état s’affiche en bas de la fenêtre.",
 	"statusBarItemActiveBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un clic. La barre d'état est affichée en bas de la fenêtre.",
 	"statusBarItemHoverBackground": "Couleur d'arrière-plan de l'élément de la barre d'état durant un pointage. La barre d'état est affichée en bas de la fenêtre.",
+	"statusBarProminentItemBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
+	"statusBarProminentItemHoverBackground": "Couleur d'arrière-plan des éléments importants de la barre d'état lors du survol. Les éléments importants se différencient des autres entrées de la barre d'état pour indiquer l'importance. Changer le mode `Appuyer sur la touche tabulation déplace le focus` depuis la palette de commandes pour voir un exemple. La barre d'état est affichée en bas de la fenêtre.",
 	"activityBarBackground": "Couleur d'arrière-plan de la barre d'activités. La barre d'activités s'affiche complètement à gauche ou à droite, et permet de naviguer entre les affichages de la barre latérale.",
 	"activityBarForeground": "Couleur de premier plan de la barre d'activités (par ex., utilisée pour les icônes). La barre d'activités s'affiche complètement à gauche ou à droite, et permet de parcourir les vues de la barre latérale.",
 	"activityBarBorder": "Couleur de bordure de la barre d'activités faisant la séparation avec la barre latérale. La barre d'activités, située à l'extrême droite ou gauche, permet de parcourir les vues de la barre latérale.",
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 ad524f220e9..d44b504894c 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
@@ -30,6 +30,7 @@
 	"closeOnFocusLost": "Contrôle si Quick Open doit se fermer automatiquement, une fois qu'il a perdu le focus.",
 	"openDefaultSettings": "Contrôle si l'ouverture des paramètres entraîne également l'ouverture d'un éditeur qui affiche tous les paramètres par défaut.",
 	"sideBarLocation": "Contrôle l'emplacement de la barre latérale. Elle peut s'afficher à gauche ou à droite du banc d'essai.",
+	"panelDefaultLocation": "Contrôle l’emplacement par défaut du panneau. Il peut être affiché soit en bas ou à droite du banc d'essai.",
 	"statusBarVisibility": "Contrôle la visibilité de la barre d'état au bas du banc d'essai.",
 	"activityBarVisibility": "Contrôle la visibilité de la barre d'activités dans le banc d'essai.",
 	"fontAliasing": "Contrôle la méthode de font aliasing dans le workbench.\n- par défaut : Lissage des polices de sous-pixel. Sur la plupart des affichages non-ratina, cela vous donnera le texte le plus vif\n- crénelées : Lisse les polices au niveau du pixel, plutôt que les sous-pixels. Peut faire en sorte que la police apparaisse plus légère dans l’ensemble \n- none : désactive le lissage des polices. Le texte s'affichera avec des bordures dentelées",
diff --git a/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json b/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
index 96dc00191af..25e0b269de1 100644
--- a/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
+++ b/i18n/fra/src/vs/workbench/electron-browser/window.i18n.json
@@ -9,5 +9,6 @@
 	"cut": "Couper",
 	"copy": "Copier",
 	"paste": "Coller",
-	"selectAll": "Tout Sélectionner"
+	"selectAll": "Tout Sélectionner",
+	"runningAsRoot": "Il est déconseillé d’exécuter {0} en tant qu’utilisateur root."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
index 2cfe628ea39..07d9f8f5644 100644
--- a/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"debugToolBarBackground": "Couleur d'arrière-plan de la barre d'outils de débogage."
+	"debugToolBarBackground": "Couleur d'arrière-plan de la barre d'outils de débogage.",
+	"debugToolBarBorder": "Couleur de bordure de la barre d'outils de débogage."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index deaa7b6f422..01219f8b3f8 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Ne plus afficher",
+	"close": "Fermer",
 	"workspaceRecommendation": "Cette extension est recommandée par les utilisateurs de l’espace de travail actuel.",
 	"fileBasedRecommendation": "Cette extension est recommandée basé sur les fichiers que vous avez ouverts récemment.",
 	"exeBasedRecommendation": "Cette extension est recommandée parce que {0} est installé.",
@@ -11,8 +13,8 @@
 	"reallyRecommendedExtensionPack": "Le pack d’extensions '{0}' est recommandé pour ce type de fichier.",
 	"showRecommendations": "Afficher les recommandations",
 	"install": "Installer",
-	"neverShowAgain": "Ne plus afficher",
-	"close": "Fermer",
+	"showLanguageExtensions": "Le Marketplace a des extensions qui peuvent aider avec les fichiers '.{0}'",
+	"searchMarketplace": "Rechercher dans le Marketplace",
 	"workspaceRecommended": "Cet espace de travail a des recommandations d'extension.",
 	"installAll": "Tout installer",
 	"ignoreExtensionRecommendations": "Voulez-vous ignorer toutes les recommandations d’extensions ?",
diff --git a/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
index 8ea9b909100..b3a917afeda 100644
--- a/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json
@@ -4,6 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"installingVSIXExtension": "Installation d'extension depuis un VSIX...",
+	"installingMarketPlaceExtension": "Installation d'extension depuis le Marketplace...",
+	"uninstallingExtension": "Désinstallation d'extension...",
 	"enableDependeciesConfirmation": "L'activation de '{0}' entraîne également l'activation de ses dépendances. Voulez-vous continuer ?",
 	"enable": "Oui",
 	"doNotEnable": "Non",
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
index 92f8f5bfde6..2cd1d40a124 100644
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"workbenchConfigurationTitle": "Banc d'essai"
+	"workbenchConfigurationTitle": "Banc d'essai",
+	"feedbackVisibility": "Contrôle la visibilité du feedback Twitter (smiley) dans la barre d'état au bas du banc d'essai."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
index a7605d084cd..45a05b23cfe 100644
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
@@ -16,6 +16,7 @@
 	"request a missing feature": "Demander une fonctionnalité manquante",
 	"tell us why?": "Pourquoi ?",
 	"commentsHeader": "Commentaires",
+	"showFeedback": "Afficher le Smiley Feedback dans la barre d'état",
 	"tweet": "Tweet",
 	"character left": "caractère restant",
 	"characters left": "caractères restants",
diff --git a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
index 8b6ad71cd4e..16a5fa73cb2 100644
--- a/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"hide": "Masquer"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 6b95908d9ab..1b0804c3433 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Ignorer les modifications locales et restaurer le contenu sur disque",
 	"copyPathOfActive": "Copier le chemin du fichier actif",
 	"saveAllInGroup": "Enregistrer tout dans le groupe",
+	"saveFiles": "Enregistrer tous les fichiers",
 	"revert": "Rétablir le fichier",
 	"compareActiveWithSaved": "Compare le fichier actif avec celui enregistré",
 	"closeEditor": "Fermer l'éditeur",
@@ -21,7 +22,9 @@
 	"copyPath": "Copier le chemin",
 	"saveAll": "Enregistrer tout",
 	"compareWithSaved": "Comparer avec celui enregistré",
+	"compareWithSelected": "Comparer avec ce qui est sélectionné",
 	"compareSource": "Sélectionner pour comparer",
+	"compareSelected": "Comparer le sélectionné",
 	"close": "Fermer",
 	"closeOthers": "Fermer les autres",
 	"closeUnmodified": "Fermer les éléments non modifiés",
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 c54a8d0847c..90edc5bf9f2 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
@@ -18,15 +18,18 @@
 	"deleteButtonLabelRecycleBin": "&&Déplacer vers la Corbeille",
 	"deleteButtonLabelTrash": "&&Déplacer vers la Poubelle",
 	"deleteButtonLabel": "S&&upprimer",
+	"dirtyMessageFilesDelete": "Vous supprimez des fichiers dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
 	"dirtyMessageFolderOneDelete": "Vous supprimez un dossier contenant 1 fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
 	"dirtyMessageFolderDelete": "Vous supprimez un dossier contenant {0} fichiers dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
 	"dirtyMessageFileDelete": "Vous supprimez un fichier dont les changements n'ont pas été enregistrés. Voulez-vous continuer ?",
 	"dirtyWarning": "Vous perdrez vos modifications, si vous ne les enregistrez pas.",
+	"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 !",
@@ -34,6 +37,8 @@
 	"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",
+	"fileDeleted": "Le fichier a été supprimé ou déplacé pendant ce temps",
+	"fileIsAncestor": "Le fichier à copier est un ancêtre du dossier destination",
 	"duplicateFile": "Doublon",
 	"globalCompareFile": "Comparer le fichier actif à...",
 	"openFileToCompare": "Ouvrez d'abord un fichier pour le comparer à un autre fichier.",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 01118df61d2..a8dcaebe5a2 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,8 +10,8 @@
 	"saveAs": "Enregistrer sous...",
 	"save": "Enregistrer",
 	"saveAll": "Enregistrer tout",
-	"saveFiles": "Enregistrer tous les fichiers",
 	"removeFolderFromWorkspace": "Supprimer le dossier de l'espace de travail",
+	"genericRevertError": "Échec pour faire revenir '{0}' : {1}",
 	"modifiedLabel": "{0} (sur le disque) ↔ {1}",
 	"openFileToReveal": "Ouvrir d'abord un fichier à révéler",
 	"openFileToCopy": "Ouvrir d'abord un fichier pour copier son chemin"
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index 906663f100a..9427b00fc2a 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -36,6 +36,7 @@
 	"editorConfigurationTitle": "Éditeur",
 	"formatOnSave": "Met en forme un fichier au moment de l'enregistrement. Un formateur doit être disponible, le fichier ne doit pas être enregistré automatiquement, et l'éditeur ne doit pas être en cours d'arrêt.",
 	"explorerConfigurationTitle": "Explorateur de fichiers",
+	"openEditorsVisible": "Nombre d'éditeurs affichés dans le volet Éditeurs ouverts.",
 	"autoReveal": "Contrôle si l'Explorateur doit automatiquement afficher et sélectionner les fichiers à l'ouverture.",
 	"enableDragAndDrop": "Contrôle si l'explorateur doit autoriser le déplacement de fichiers et de dossiers par glisser-déplacer.",
 	"confirmDragAndDrop": "Contrôle si l’Explorateur doit demander confirmation lors du déplacement de fichiers ou de dossiers via glisser-déposer.",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
index e1888e6d1c2..0c4d859caa4 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json
@@ -5,9 +5,14 @@
 // Do not edit this file. It is machine generated.
 {
 	"userGuide": "Utiliser les actions dans la barre d’outils de l’éditeur vers la droite pour soit **annuler** vos modifications ou **écraser** le contenu sur le disque avec vos modifications",
+	"overwriteElevated": "Remplacer en tant qu'Admin...",
+	"saveElevated": "Réessayer en tant qu'Admin...",
 	"overwrite": "Remplacer",
 	"retry": "Réessayer",
 	"discard": "Abandonner",
+	"readonlySaveErrorAdmin": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour réessayer en tant qu'administrateur.",
+	"readonlySaveError": "Échec de l'enregistrement de '{0}' : le fichier est protégé en écriture. Sélectionnez 'Remplacer' pour essayer de supprimer la protection.",
+	"permissionDeniedSaveError": "Échec de l'enregistrement de '{0}' : Permissions insuffisantes. Sélectionnez 'Remplacer en tant qu'Admin' pour réessayer en tant qu'administrator.",
 	"genericSaveError": "Échec d'enregistrement de '{0}' ({1}).",
 	"staleSaveError": "Échec de l'enregistrement de '{0}' : le contenu sur disque est plus récent. Cliquez sur **Comparer** pour comparer votre version à celle située sur le disque.",
 	"compareChanges": "Comparer",
diff --git a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index 631a14a1cef..64edc5f6461 100644
--- a/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -10,6 +10,7 @@
 	"dropFolder": "Voulez-vous ajouter le dossier à l’espace de travail ?",
 	"addFolders": "&&Ajouter les dossiers",
 	"addFolder": "&&Ajouter le dossier",
+	"confirmMultiMove": "Êtes-vous sûr de vouloir déplacer les fichiers '{0}' suivants ?",
 	"confirmMove": "Êtes-vous certain de vouloir déplacer '{0}' ?",
 	"doNotAskAgain": "Ne plus me demander",
 	"moveButtonLabel": "&&Déplacer",
diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
index 9af3f02e1b1..b5604efd4c8 100644
--- a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json
@@ -4,5 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"mainLog": "Journal (Principal)",
+	"sharedLog": "Journal (Partagé)",
+	"rendererLog": "Journal (Fenêtre)",
+	"extensionsLog": "Journal (Hôte d'extension)",
 	"developer": "Développeur"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
index 53a40630054..6d8707bc4eb 100644
--- a/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
@@ -5,13 +5,20 @@
 // Do not edit this file. It is machine generated.
 {
 	"openLogsFolder": "Ouvrir le dossier des journaux",
+	"showLogs": "Afficher les journaux...",
+	"mainProcess": "Principal",
+	"sharedProcess": "Partagé",
 	"rendererProcess": "Fenêtre",
+	"extensionHost": "Hôte d'extension",
 	"selectProcess": "Sélectionner le processus",
+	"openLogFile": "Ouvrir le fichier de log...",
 	"setLogLevel": "Définir le niveau de journalisation (log)",
+	"trace": "Trace",
 	"debug": "Déboguer",
 	"info": "Informations",
 	"warn": "Avertissement",
 	"err": "Erreur",
+	"critical": "Critique",
 	"off": "Désactivé",
 	"selectLogLevel": "Sélectionner le niveau de journalisation (log)"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
index 1298d315d6c..7666fba29aa 100644
--- a/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/output/electron-browser/output.contribution.i18n.json
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"output": "Sortie",
+	"logViewer": "Visualiseur de journal",
 	"viewCategory": "Affichage",
 	"clearOutput.label": "Effacer la sortie"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json b/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
index 8b6ad71cd4e..2ae62f64fbe 100644
--- a/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/output/electron-browser/outputServices.i18n.json
@@ -3,4 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"output": "{0} - Sortie",
+	"channel": "Canal de sortie pour '{0}'"
+}
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index c7b2dfd5e8a..a41e960d2e8 100644
--- a/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -11,6 +11,8 @@
 	"oneSettingFound": "1 paramètre correspondant",
 	"settingsFound": "{0} paramètres correspondants",
 	"totalSettingsMessage": "Total de {0} paramètres",
+	"nlpResult": "Résultats en langage naturel",
+	"filterResult": "Résultats filtrés",
 	"defaultSettings": "Paramètres par défaut",
 	"defaultFolderSettings": "Paramètres de dossier par défaut",
 	"defaultEditorReadonly": "Modifier dans l’éditeur du côté droit pour substituer les valeurs par défaut.",
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
index 48bc93f989d..2d2ad3ba485 100644
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json
@@ -8,5 +8,8 @@
 	"source control": "Contrôle de code source",
 	"toggleSCMViewlet": "Afficher SCM",
 	"view": "Afficher",
-	"scmConfigurationTitle": "SCM"
+	"scmConfigurationTitle": "SCM",
+	"alwaysShowProviders": "S'il faut toujours afficher la section Fournisseur de contrôle de code source.",
+	"diffDecorations": "Contrôle les décorations diff dans l'éditeur",
+	"inputCounter": "Contrôle quand afficher le compteur de saisie"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
index 4852691d7f0..e262a05e669 100644
--- a/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json
@@ -6,6 +6,9 @@
 {
 	"scm providers": "Fournisseurs de contrôle de code source",
 	"hideRepository": "Masquer",
+	"commitMessageInfo": "{0} caractères sur la ligne actuelle",
+	"commitMessageCountdown": "{0} caractères restants sur la ligne actuelle",
+	"commitMessageWarning": "{0} caractères sur {1} sur la ligne actuelle",
 	"installAdditionalSCMProviders": "Installer des fournisseurs SCM supplémentaires...",
 	"no open repo": "Il n’y a aucun fournisseur de contrôle de code source actif.",
 	"source control": "Contrôle de code source",
diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 578f575ae02..f5dbbc47515 100644
--- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -22,5 +22,6 @@
 	"useRipgrep": "Contrôle si ripgrep doit être utilisé dans la recherche de texte et de fichier",
 	"useIgnoreFiles": "Contrôle s'il faut utiliser les fichiers .gitignore et .ignore par défaut pendant la recherche de fichiers.",
 	"search.quickOpen.includeSymbols": "Configurez l'ajout des résultats d'une recherche de symboles globale dans le fichier de résultats pour Quick Open.",
-	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche."
+	"search.followSymlinks": "Contrôle s'il faut suivre les symlinks pendant la recherche.",
+	"search.smartCase": "Recherches de manière non case-sensitive si le modèle est entièrement en minuscules, dans le cas contraire, recherche de manière case-sensitive"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
index 7b7ad15376c..4823418ee4d 100644
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
@@ -5,5 +5,9 @@
 // Do not edit this file. It is machine generated.
 {
 	"global.1": "({0})",
+	"new.global": "Nouveau fichier d'extraits globaux...",
+	"group.global": "Extraits existants",
+	"openSnippet.pickLanguage": "Sélectionner le fichier d'extraits ou créer des extraits",
+	"openSnippet.label": "Configurer les extraits de l’utilisateur",
 	"preferences": "Préférences"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
index b30a97f875d..1917de0f41a 100644
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.i18n.json
@@ -8,5 +8,6 @@
 	"snippetSchema.json": "Configuration de l'extrait de code utilisateur",
 	"snippetSchema.json.prefix": "Préfixe à utiliser durant la sélection de l'extrait de code dans IntelliSense",
 	"snippetSchema.json.body": "Contenu de l'extrait de code. Utilisez '$1', '${1:defaultText}' pour définir les positions du curseur, utilisez '$0' pour la position finale du curseur. Insérez les valeurs de variable avec '${varName}' et '${varName:defaultText}', par ex., 'Il s'agit du fichier : $TM_FILENAME'.",
-	"snippetSchema.json.description": "Description de l'extrait de code."
+	"snippetSchema.json.description": "Description de l'extrait de code.",
+	"snippetSchema.json.scope": "Une liste des noms de langages auxquels s’applique cet extrait de code, par exemple 'typescript,javascript'."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
index a5340df3092..a21a67fed20 100644
--- a/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"invalid.path.0": "Chaîne attendue dans 'contributes.{0}.path'. Valeur fournie : {1}",
+	"invalid.language.0": "Si le langage est omis, la valeur de 'contributes.{0}.path' doit être un fichier `.code-snippets`. Valeur fournie : {1}",
 	"invalid.language": "Langage inconnu dans 'contributes.{0}.language'. Valeur fournie : {1}",
 	"invalid.path.1": "'contributes.{0}.path' ({1}) est censé être inclus dans le dossier ({2}) de l'extension. Cela risque de rendre l'extension non portable.",
 	"vscode.extension.contributes.snippets": "Ajoute des extraits de code.",
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
index 8e54d84198f..c372a7b1d75 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
@@ -14,6 +14,7 @@
 	"terminal.integrated.shell.windows": "Le chemin du shell que le terminal utilise sous Windows. Lors de l’utilisation de shells fournies avec Windows (cmd, PowerShell ou Bash sur Ubuntu).",
 	"terminal.integrated.shellArgs.windows": "Arguments de ligne de commande à utiliser sur le terminal Windows.",
 	"terminal.integrated.rightClickCopyPaste": "Une fois le paramètre défini, le menu contextuel cesse de s'afficher quand l'utilisateur clique avec le bouton droit dans le terminal. À la place, une opération de copie est effectuée quand il existe une sélection, et une opération de collage est effectuée en l'absence de sélection.",
+	"terminal.integrated.copyOnSelection": "Une fois le paramètre défini, le texte sélectionné dans le terminal sera copié dans le presse-papiers.",
 	"terminal.integrated.fontFamily": "Contrôle la famille de polices du terminal. La valeur par défaut est la valeur associée à editor.fontFamily.",
 	"terminal.integrated.fontSize": "Contrôle la taille de police en pixels du terminal.",
 	"terminal.integrated.lineHeight": "Contrôle la hauteur de ligne du terminal. La multiplication de ce nombre par la taille de police du terminal permet d'obtenir la hauteur de ligne réelle en pixels.",
@@ -24,10 +25,12 @@
 	"terminal.integrated.setLocaleVariables": "Contrôle si les variables locales sont définies au démarrage du terminal. La valeur par défaut est true sur OS X, false sur les autres plateformes.",
 	"terminal.integrated.cwd": "Chemin explicite de lancement du terminal. Il est utilisé comme répertoire de travail actif du processus d'interpréteur de commandes. Cela peut être particulièrement utile dans les paramètres d'espace de travail, si le répertoire racine n'est pas un répertoire de travail actif adéquat.",
 	"terminal.integrated.confirmOnExit": "Indique s'il est nécessaire de confirmer l'existence de sessions de terminal actives au moment de quitter.",
+	"terminal.integrated.enableBell": "Si le terminal bell est activé ou non.",
 	"terminal.integrated.commandsToSkipShell": "Ensemble d'ID de commandes dont les combinaisons de touches sont gérées par Code au lieu d'être envoyées à l'interpréteur de commandes. Cela permet d'utiliser des combinaisons de touches qui sont normalement consommées par l'interpréteur de commandes et d'obtenir le même résultat quand le terminal n'a pas le focus, par exemple Ctrl+P pour lancer Quick Open.",
 	"terminal.integrated.env.osx": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous OS X",
 	"terminal.integrated.env.linux": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Linux",
 	"terminal.integrated.env.windows": "Objet avec les variables d’environnement qui seront ajoutées au processus VS Code pour être utilisées par le terminal sous Windows",
+	"terminal.integrated.showExitAlert": "Afficher une alerte `Le processus terminal s’est arrêté avec le code de sortie` lorsque le code de sortie est différent de zéro.",
 	"terminalCategory": "Terminal",
 	"viewCategory": "Affichage"
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
index b1d65f3e2d3..c4ad53ee08a 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json
@@ -12,8 +12,11 @@
 	"workbench.action.terminal.selectAll": "Tout Sélectionner",
 	"workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche",
 	"workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite",
+	"workbench.action.terminal.enterLineNavigationMode": "Saisir la ligne de mode de navigation",
 	"workbench.action.terminal.new": "Créer un terminal intégré",
 	"workbench.action.terminal.new.short": "Nouveau terminal",
+	"workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal",
+	"workbench.action.terminal.newInActiveWorkspace": "Créer un nouveau Terminal intégré (dans l'espace de travail actif)",
 	"workbench.action.terminal.focus": "Focus sur le terminal",
 	"workbench.action.terminal.focusNext": "Focus sur le terminal suivant",
 	"workbench.action.terminal.focusPrevious": "Focus sur le terminal précédent",
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
index 4908dd97c81..89f1b826995 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalColorRegistry.i18n.json
@@ -8,5 +8,6 @@
 	"terminal.foreground": "Couleur de premier plan du terminal.",
 	"terminalCursor.foreground": "La couleur de premier plan du curseur du terminal.",
 	"terminalCursor.background": "La couleur d’arrière-plan du curseur terminal. Permet de personnaliser la couleur d’un caractère recouvert par un curseur de bloc.",
-	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal."
+	"terminal.selectionBackground": "La couleur d’arrière-plan de sélection du terminal.",
+	"terminal.ansiColor": "Couleur ansi '{0}' dans le terminal."
 }
\ No newline at end of file
diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index 531697fe3da..64dece8c292 100644
--- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -7,6 +7,7 @@
 	"terminal.integrated.chooseWindowsShellInfo": "Vous pouvez changer l'interpréteur de commandes par défaut du terminal en sélectionnant le bouton Personnaliser.",
 	"customize": "Personnaliser",
 	"cancel": "Annuler",
+	"never again": "OK, Ne plus afficher",
 	"terminal.integrated.chooseWindowsShell": "Sélectionnez votre interpréteur de commandes de terminal favori. Vous pouvez le changer plus tard dans vos paramètres",
 	"terminalService.terminalCloseConfirmationSingular": "Il existe une session de terminal active. Voulez-vous la tuer ?",
 	"terminalService.terminalCloseConfirmationPlural": "Il existe {0} sessions de terminal actives. Voulez-vous les tuer ?"
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 6ba63445dd2..f83d0f45ec2 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
@@ -10,6 +10,7 @@
 	"fileTooLargeError": "Fichier trop volumineux pour être ouvert",
 	"fileNotFoundError": "Fichier introuvable ({0})",
 	"fileBinaryError": "Il semble que le fichier soit binaire. Impossible de l'ouvrir en tant que texte",
+	"filePermission": "Autorisation refusée en écrivant dans le fichier ({0})",
 	"fileExists": "Le fichier à créer existe déjà ({0})",
 	"fileMoveConflict": "Déplacement/copie impossible. Le fichier existe déjà dans la destination.",
 	"unableToMoveCopyError": "Impossible de déplacer/copier. Le fichier remplace le dossier qui le contient.",
diff --git a/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json b/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
index 232203467df..e217d8d597b 100644
--- a/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
+++ b/i18n/fra/src/vs/workbench/services/keybinding/electron-browser/keybindingService.i18n.json
@@ -22,5 +22,6 @@
 	"keybindings.json.when": "Condition quand la touche est active.",
 	"keybindings.json.args": "Arguments à passer à la commande à exécuter.",
 	"keyboardConfigurationTitle": "Clavier",
-	"dispatch": "Contrôle la logique de distribution des appuis sur les touches pour utiliser soit 'code' (recommandé), soit 'keyCode'."
+	"dispatch": "Contrôle la logique de distribution des appuis sur les touches pour utiliser soit 'code' (recommandé), soit 'keyCode'.",
+	"touchbar.enabled": "Active les boutons de la touchbar macOS sur le clavier si disponible."
 }
\ 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 712e3b40563..80f41babc05 100644
--- a/i18n/hun/extensions/git/out/commands.i18n.json
+++ b/i18n/hun/extensions/git/out/commands.i18n.json
@@ -74,6 +74,7 @@
 	"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}'.",
+	"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.",
 	"provide stash message": "Adja meg a stash-hez tartozó üzenet (nem kötelező)",
diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json
index 87388db14f4..52f61e79d5d 100644
--- a/i18n/hun/extensions/git/package.i18n.json
+++ b/i18n/hun/extensions/git/package.i18n.json
@@ -60,7 +60,6 @@
 	"config.enableLongCommitWarning": "Figyelmeztessen-e az alkalmazás hosszú beadási üzenet esetén",
 	"config.confirmSync": "Megerősítés kérése git forráskódtárak szinkronizálása előtt",
 	"config.countBadge": "Meghatározza a git jelvényen megjelenő számláló működését. Az `all` minden módosítást számol, a `tracked` csak a követkett változtatásokat. Az `off` kikapcsolja a jelvényt.",
-	"config.checkoutType": "Meghatározza, hogy milyen típusú ágak jelenjenek meg a `Checkout adott helyről... ` parancs futtatása esetén. Az  `all` esetén az összes ref megjelenik, `local` esetén csak a helyi ágak, `tags` esetén csak a címkék, `remote` esetén pedig csak a távoli ágak.",
 	"config.ignoreLegacyWarning": "Régi gittel kapcsolatos figyelmeztetés figyelmen kívül hagyása",
 	"config.ignoreMissingGitWarning": "Figyelmeztetés figyelmen kívül hagyása, ha a Git hiányzik",
 	"config.ignoreLimitWarning": "Túl sok módosítás esetén megjelenő figyelmeztetés figyelmen kívül hagyása",
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 5238b0d9399..bcb0b0e54d5 100644
--- a/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/hun/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "A kurzor pozícióján található sor kiemelési háttérszíne.",
 	"lineHighlightBorderBox": "A kurzor pozícióján található sor keretszíne.",
+	"rangeHighlight": "A kiemelt területek háttérszíne, pl. a gyors megnyitás és keresés funkcióknál. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"caret": "A szerkesztőablak kurzorának színe.",
 	"editorCursorBackground": "A szerkesztőablak kurzorának háttérszíne. Lehetővé teszik az olyan karakterek színének módosítását, amelyek fölött egy blokk-típusú kurzor áll.",
 	"editorWhitespaces": "A szerkesztőablakban található szóköz karakterek színe.",
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 6689a8e1f95..657741e4ffd 100644
--- a/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // 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.",
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 92c1811fa1e..d251158c987 100644
--- a/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
+++ b/i18n/hun/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"wordHighlight": "Szimbólumok háttérszíne olvasási hozzáférés, páldául változó olvasása esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"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.",
 	"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.",
 	"wordHighlight.next.label": "Ugrás a következő kiemelt szimbólumhoz",
diff --git a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
index 400ec23c073..f2b86a65d34 100644
--- a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json
@@ -30,6 +30,7 @@
 	"inspect-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz.",
 	"inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ",
 	"disableGPU": "Hardveres gyorsítás letiltása.",
+	"uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.",
 	"usage": "Használat",
 	"options": "beállítások",
 	"paths": "elérési utak",
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 dce5fb0ac3d..e489cf247bf 100644
--- a/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/hun/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -63,7 +63,12 @@
 	"editorWidgetBorder": "A szerkesztőablak-modulok keretszíne. A szín csak akkor van használva, ha a modul beállítása alapján rendelkezik kerettel, és a színt nem írja felül a modul.",
 	"editorSelectionBackground": "A szerkesztőablak-szakasz színe.",
 	"editorSelectionForeground": "A kijelölt szöveg színe nagy kontrasztú téma esetén.",
+	"editorInactiveSelection": "Az inaktív szerkesztőablakban található kijelölések színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"editorSelectionHighlight": "A kijelöléssel megegyező tartalmú területek színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"editorFindMatch": "A keresés jelenlegi találatának színe.",
+	"findMatchHighlight": "A keresés további találatainak színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"findRangeHighlight": "A keresést korlátozó terület színe. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"hoverHighlight": "Kiemelés azon szó alatt, amely fölött lebegő elem jelenik meg. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"hoverBackground": "A szerkesztőablakban lebegő elemek háttérszíne.",
 	"hoverBorder": "A szerkesztőablakban lebegő elemek keretszíne.",
 	"activeLinkForeground": "Az aktív hivatkozások háttérszíne.",
@@ -71,6 +76,12 @@
 	"diffEditorRemoved": "Az eltávolított szövegek háttérszíne.",
 	"diffEditorInsertedOutline": "A beillesztett szövegek körvonalának színe.",
 	"diffEditorRemovedOutline": "Az eltávolított szövegek körvonalának színe.",
+	"mergeCurrentHeaderBackground": "A helyi tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"mergeCurrentContentBackground": "A helyi tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"mergeIncomingHeaderBackground": "A beérkező tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"mergeIncomingContentBackground": "A beérkező tartalom háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"mergeCommonHeaderBackground": "A közös ős tartalom fejlécének háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
+	"mergeCommonContentBackground": "A közös ős tartalmának háttérszíne sorok között megjelenített összeolvasztási konfliktusok esetén. A színnek áttetszőnek kell lennie, hogy ne fedje el az alatta lévő dekorátorokat.",
 	"mergeBorder": "A fejlécek és az elválasztó sáv keretszíne a sorok között megjelenített összeolvasztási konfliktusok esetén.",
 	"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.",
diff --git a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index adbae4c28f4..d46c5a08986 100644
--- a/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/hun/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet."
+	"treeView.notRegistered": "Nincs '{0}' azonosítóval regisztrált fanézet.",
+	"treeView.duplicateElement": "Már van {0} azonosítójú elem regisztrálva"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index b5b22901d6a..8846afdbff9 100644
--- a/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Oldalsáv helyének váltása",
+	"toggleSidebarPosition": "Oldalsáv helyzetének váltása",
 	"view": "Nézet"
 }
\ No newline at end of file
diff --git a/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index b21a79bc546..b88b3f6c04e 100644
--- a/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/hun/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "Elrejtés az oldalsávról"
+	"hideView": "Elrejtés"
 }
\ 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 bc83f527961..27e3da174c1 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
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Ne jelenjen meg újra",
+	"close": "Bezárás",
 	"workspaceRecommendation": "Ez a kiegészítő az aktuális munkaterület felhasználói által ajánlott.",
 	"fileBasedRecommendation": "Ez a kiegészítő a közelmúltban megnyitott fájlok alapján ajánlott.",
 	"exeBasedRecommendation": "Ez a kiegészítő azért ajánlott, mert a következő telepítve van: {0}.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.",
 	"showRecommendations": "Ajánlatok megjelenítése",
 	"install": "Telepítés",
-	"neverShowAgain": "Ne jelenítse meg újra",
-	"close": "Bezárás",
 	"workspaceRecommended": "A munkaterülethez vannak javasolt kiegészítők",
 	"installAll": "Összes telepítése",
 	"ignoreExtensionRecommendations": "Figyelmen kívül akarja hagyni az összes javasolt kiegészítőt?",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index f08e18c1fc1..d115d415af9 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Saját módosítások elvetése és a lemezen lévő tartalom visszaállítása",
 	"copyPathOfActive": "Aktív fájl elérési útjának másolása",
 	"saveAllInGroup": "Összes mentése a csoportban",
+	"saveFiles": "Összes fájl mentése",
 	"revert": "Fájl visszaállítása",
 	"compareActiveWithSaved": "Aktív fájl összehasonlítása a mentett változattal",
 	"closeEditor": "Szerkesztőablak bezárása",
@@ -23,6 +24,7 @@
 	"compareWithSaved": "Összehasonlítás a mentett változattal",
 	"compareWithSelected": "Összehasonlítás a kiválasztottal",
 	"compareSource": "Kijelölés összehasonlításhoz",
+	"compareSelected": "Kiválasztottak összehasonlítása",
 	"close": "Bezárás",
 	"closeOthers": "Többi bezárása",
 	"closeUnmodified": "Nem módosultak bezárása",
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 c9d588b8217..7c5ad91feba 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
@@ -18,17 +18,20 @@
 	"deleteButtonLabelRecycleBin": "Áthelyezés a lo&&mtárba",
 	"deleteButtonLabelTrash": "Áthelyezés a &&kukába",
 	"deleteButtonLabel": "&&Törlés",
+	"dirtyMessageFilesDelete": "Olyan fájlokat készül törölni, amelyek nem mentett változtatásokat tartalmaznak. Folytatja?",
 	"dirtyMessageFolderOneDelete": "Törölni készül egy olyan mappát, melyben egy nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
 	"dirtyMessageFolderDelete": "Törölni készül egy olyan mappát, melyben {0} nem mentett változtatásokat tartalmazó fájl van. Folytatja?",
 	"dirtyMessageFileDelete": "Törölni készül egy olyan fájlt, amely nem mentett változtatásokat tartalmaz. Folytatja?",
 	"dirtyWarning": "A módosítások elvesznek, ha nem menti őket.",
+	"confirmMoveTrashMessageMultiple": "Törli a következő {0} fájlt?",
 	"confirmMoveTrashMessageFolder": "Törli a(z) '{0}' nevű mappát és a teljes tartalmát?",
 	"confirmMoveTrashMessageFile": "Törli a(z) '{0}' nevű fájlt?",
 	"undoBin": "Helyreállíthatja a lomtárból.",
 	"undoTrash": "Helyreállíthatja a kukából.",
 	"doNotAskAgain": "Ne kérdezze meg újra",
-	"confirmDeleteMessageFolder": "Törli a(z) {0} mappát és a teljes tartalmát?",
-	"confirmDeleteMessageFile": "Véglegesen törli a következőt: {0}?",
+	"confirmDeleteMessageMultiple": "Véglegesen törli a következő {0} fájlt?",
+	"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!",
 	"permDelete": "Végleges törlés",
 	"importFiles": "Fájlok importálása",
diff --git a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 7c49a5eefb2..57192b1bc98 100644
--- a/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Mentés másként...",
 	"save": "Mentés",
 	"saveAll": "Összes mentése",
-	"saveFiles": "Összes fájl mentése",
 	"removeFolderFromWorkspace": "Mappa eltávolítása a munkaterületről",
 	"genericRevertError": "Nem sikerült a(z) '{0}' visszaállítása: {1}",
 	"modifiedLabel": "{0} (a lemezen) ↔ {1}",
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 6cd44ae8d9b..c8272df7913 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
@@ -36,6 +36,7 @@
 	"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é.",
 	"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.",
 	"enableDragAndDrop": "Meghatározza, hogy a fájlkezelőben áthelyezhetők-e a fájlok és mappák húzással.",
 	"confirmDragAndDrop": "Meghatározza, hogy a fájlkezelő kérjen-e megerősítést fájlok és mappák húzással történő áthelyezése esetén.",
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 e00a7141ecf..a171c2f9995 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
@@ -10,7 +10,8 @@
 	"dropFolder": "Szeretné hozzáadni a mappát a munkaterülethez?",
 	"addFolders": "Mappák hozzá&&adása",
 	"addFolder": "Mappa hozzá&&adása",
-	"confirmMove": "Biztosan át szeretné helyezni a következőt: '{0}'?",
+	"confirmMultiMove": "Át szeretné helyezni a következő {0} fájlt?",
+	"confirmMove": "Át szeretné helyezni a(z) '{0}' nevű fájlt?",
 	"doNotAskAgain": "Ne kérdezze meg újra",
 	"moveButtonLabel": "&&Áthelyezés",
 	"confirmOverwriteMessage": "A célmappában már létezik '{0}' nevű elem. Le szeretné cserélni?",
diff --git a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
index efb38ebffa8..12347f91b9e 100644
--- a/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/markers/common/messages.i18n.json
@@ -5,6 +5,8 @@
 // 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",
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 5f23e1e85aa..878fe224656 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
@@ -17,6 +17,7 @@
 	"resetLabel": "Billentyűparancs visszaállítása",
 	"showConflictsLabel": "Konfliktusok megjelenítése",
 	"copyLabel": "Másolás",
+	"copyCommandLabel": "Parancs másolása",
 	"error": "'{0}' hiba a billentyűparancsok szerkesztése közben. Nyissa meg a 'keybindings.json' fájlt, és ellenőrizze!",
 	"command": "Parancs",
 	"keybinding": "Billentyűparancs",
diff --git a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 9b9670df23c..dd151493ad8 100644
--- a/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -11,6 +11,8 @@
 	"oneSettingFound": "1 illeszkedő beállítás",
 	"settingsFound": "{0} illeszkedő beállítás",
 	"totalSettingsMessage": "Összesen {0} beállítás",
+	"nlpResult": "Természetes nyelvi keresés eredményei",
+	"filterResult": "Szűrt találatok",
 	"defaultSettings": "Alapértelmezett beállítások",
 	"defaultFolderSettings": "Alapértelmezett mappabeállítások",
 	"defaultEditorReadonly": "A jobb oldalon lévő szerkesztőablak tartalmának módosításával írhatja felül az alapértelmezett beállításokat.",
diff --git a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
index ef351110a21..3931f7acd24 100644
--- a/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"invalid.path.0": "Hiányzó karakterlánc a `contributes.{0}.path`-ban. A megadott érték: {1}",
+	"invalid.language.0": "Nyelv elhagyása esetén a `contributes.{0}.path` értékének egy `.code-snippets`-fájlnak kell lennie. A megadott érték: {1}",
 	"invalid.language": "Ismeretlen nyelv található a következőben: `contributes.{0}.language`. 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ó.",
 	"vscode.extension.contributes.snippets": "Kódrészleteket szolgáltat.",
diff --git a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index ea617c7168d..1a4fb7a15a1 100644
--- a/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/hun/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -7,6 +7,7 @@
 	"terminal.integrated.chooseWindowsShellInfo": "Megváltoztathatja az alapértelmezett terminált a testreszabás gomb választásával.",
 	"customize": "Testreszabás",
 	"cancel": "Mégse",
+	"never again": "Rendben, ne jelenjen meg újra",
 	"terminal.integrated.chooseWindowsShell": "Válassza ki a preferált terminál shellt! Ez később módosítható a beállításokban.",
 	"terminalService.terminalCloseConfirmationSingular": "Van egy aktív terminálmunkamenet. Szeretné megszakítani?",
 	"terminalService.terminalCloseConfirmationPlural": "{0} aktív terminálmunkamenet van. Szeretné megszakítani?"
diff --git a/i18n/ita/extensions/git/out/autofetch.i18n.json b/i18n/ita/extensions/git/out/autofetch.i18n.json
index ffe7f9d6f24..96f76ecafff 100644
--- a/i18n/ita/extensions/git/out/autofetch.i18n.json
+++ b/i18n/ita/extensions/git/out/autofetch.i18n.json
@@ -6,5 +6,7 @@
 {
 	"yes": "Sì",
 	"read more": "Altre informazioni",
-	"no": "No"
+	"no": "No",
+	"not now": "Chiedimelo in seguito",
+	"suggest auto fetch": "Desideri che Code esegua `git fetch` periodicamente?"
 }
\ 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 d7970a8aad2..167af56bf54 100644
--- a/i18n/ita/extensions/git/out/commands.i18n.json
+++ b/i18n/ita/extensions/git/out/commands.i18n.json
@@ -41,6 +41,10 @@
 	"confirm discard all 2": "{0}\n\nQuesta operazione è IRREVERSIBILE. Il working set corrente andrà PERSO PER SEMPRE.",
 	"yes discard tracked": "Rimuovi 1 file di cui viene tenuta traccia",
 	"yes discard tracked multiple": "Rimuovi {0} file di cui viene tenuta traccia",
+	"unsaved files single": "Il seguente file non è stato salvato: {0}\n\nVuoi salvarlo prima di eseguirne il commit? ",
+	"unsaved files": "Ci sono {0} file non ancora salvati.\n\nVuoi salvarli prima di eseguirne il commit? ",
+	"save and commit": "Salva tutto & esegui Commit",
+	"commit": "Esegui il Commit comunque",
 	"no staged changes": "Non ci sono modifiche in stage di cui eseguire il commit.\n\nSI desidera mettere in stage automaticamente tutte le modifiche ed eseguirne il commit direttamente?",
 	"always": "Sempre",
 	"no changes": "Non ci sono modifiche di cui eseguire il commit.",
@@ -65,6 +69,7 @@
 	"pick remote pull repo": "Selezionare un repository remoto da cui effettuare il pull del ramo",
 	"no remotes to push": "Il repository non contiene elementi remoti configurati come destinazione del push.",
 	"nobranch": "Estrarre un ramo per eseguire il push in un elemento remoto.",
+	"confirm publish branch": "La branch '{0}' non ha una branch corrispondente a monte. Desideri pubblicarla?",
 	"ok": "OK",
 	"push with tags success": "Il push con tag è riuscito.",
 	"pick remote": "Selezionare un repository remoto in cui pubblicare il ramo '{0}':",
diff --git a/i18n/ita/extensions/git/package.i18n.json b/i18n/ita/extensions/git/package.i18n.json
index 9e6cd77fdcb..5d58b8449e0 100644
--- a/i18n/ita/extensions/git/package.i18n.json
+++ b/i18n/ita/extensions/git/package.i18n.json
@@ -54,12 +54,12 @@
 	"command.stashPopLatest": "Preleva accantonamento più recente",
 	"config.enabled": "Indica se GIT è abilitato",
 	"config.path": "Percorso dell'eseguibile di GIT",
+	"config.autoRepositoryDetection": "Se i repository devono essere rilevati automaticamente",
 	"config.autorefresh": "Indica se l'aggiornamento automatico è abilitato",
 	"config.autofetch": "Indica se il recupero automatico è abilitato",
 	"config.enableLongCommitWarning": "Indica se visualizzare un avviso in caso di messaggi di commit lunghi",
 	"config.confirmSync": "Conferma prima di sincronizzare i repository GIT",
 	"config.countBadge": "Controlla il contatore delle notifiche git. Con `all` vengono conteggiate tutte le modifiche. Con `tracked` vengono conteggiate solo le revisioni. Con `off` il contatore è disattivato.",
-	"config.checkoutType": "Controlla il tipo di branch mostrati eseguendo il comando `Checkout in...`. `all` mostra tutti i refs, `local` mostra solamente i branch locali, `tags` mostra solamente i tag e `remote` mostra solamente i branch remoti.",
 	"config.ignoreLegacyWarning": "Ignora l'avvertimento legacy di Git",
 	"config.ignoreMissingGitWarning": "Ignora il messaggio di avviso quando manca Git",
 	"config.ignoreLimitWarning": "Ignora il messaggio di avviso quando ci sono troppi cambiamenti in un repository",
diff --git a/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
index 8b6ad71cd4e..ed15423097d 100644
--- a/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ b/i18n/ita/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"selectAriaOption": "{0}"
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 8d193dcadbd..71aff162568 100644
--- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -14,6 +14,7 @@
 	"lineNumbers.on": "I numeri di riga vengono visualizzati come numeri assoluti.",
 	"lineNumbers.relative": "I numeri di riga vengono visualizzati come distanza in linee alla posizione del cursore.",
 	"lineNumbers.interval": "I numeri di riga vengono visualizzati ogni 10 righe.",
+	"lineNumbers": "Controlla la visualizzazione dei numeri di riga. I valori possibili sono 'on', 'off', 'relativi' ed 'intervallo'.",
 	"rulers": "Mostra righelli verticali dopo un certo numero di caratteri a spaziatura fissa. Utilizza più valori  per più righelli. Nessun righello viene disegnati se la matrice è vuota",
 	"wordSeparators": "Caratteri che verranno usati come separatori di parola quando si eseguono operazioni o spostamenti correlati a parole",
 	"tabSize": "Il numero di spazi corrispondenti ad un carattere Tab. Questa impostazione viene sottoposta a override in base al contenuto dei file quando 'editor.detectIndentation' è 'on'.",
diff --git a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
index bf517983deb..c1d35df0230 100644
--- a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json
@@ -33,5 +33,7 @@
 	"usage": "Utilizzo",
 	"options": "opzioni",
 	"paths": "percorsi",
+	"stdinWindows": "Per leggere l'output da un altro programma, aggiungere alla fine '-' (ad esempio 'echo Hello World | {0} -')",
+	"stdinUnix": "Per leggere da stdin, aggiungere alla fine '-' (ad esempio 'ps aux | grep code | {0} -')",
 	"optionsUpperCase": "Opzioni"
 }
\ 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 d95dd9e9e67..d13d2b8b626 100644
--- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,7 +9,10 @@
 	"installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?",
 	"override": "Eseguire l'override",
 	"cancel": "Annulla",
+	"notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.",
 	"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",
diff --git a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 8b6ad71cd4e..4bc65098ea9 100644
--- a/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/ita/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"saveParticipants": "Esecuzione del salvataggio partecipanti..."
+}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 4f3f7993c31..e851ba0b17e 100644
--- a/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Attiva/Disattiva posizione della barra laterale",
 	"view": "Visualizza"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
index 5a69f46955d..d4f0af0c2c3 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
@@ -5,5 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"patchedWindowTitle": "[Non supportata]",
+	"userIsAdmin": "[Amministratore]",
+	"userIsSudo": "[Superutente]",
 	"devExtensionWindowTitlePrefix": "[Host di sviluppo estensione]"
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index f5ecae5746b..8b6ad71cd4e 100644
--- a/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/ita/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "Nascondi da barra laterale"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/common/theme.i18n.json b/i18n/ita/src/vs/workbench/common/theme.i18n.json
index f33262a82e2..fb8298647d6 100644
--- a/i18n/ita/src/vs/workbench/common/theme.i18n.json
+++ b/i18n/ita/src/vs/workbench/common/theme.i18n.json
@@ -6,9 +6,13 @@
 {
 	"tabActiveBackground": "Colore di sfondo delle schede attive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabInactiveBackground": "Colore di sfondo delle schede inattive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
+	"tabHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
+	"tabUnfocusedHoverBackground": "Colore di sfondo al passaggio del mouse sulle schede in un gruppo non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabBorder": "Bordo per separare le schede l'una dall'altra. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabActiveBorder": "Bordo per evidenziare le schede attive. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabActiveUnfocusedBorder": "Bordo per evidenziare le schede attive in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
+	"tabHoverBorder": "Bordo da utilizzare per evidenziare la scheda al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
+	"tabUnfocusedHoverBorder": "Bordo da utilizzare per evidenziare la scheda non attiva al passaggio del mouse. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabActiveForeground": "Colore di primo piano delle schede attive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabInactiveForeground": "Colore di primo piano delle schede inattive in un gruppo attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
 	"tabUnfocusedActiveForeground": "Colore primo piano delle schede attive in un gruppo con stato non attivo. Le schede sono i contenitori degli editor nell'area degli editor. È possibile aprire più schede in un gruppo di editor e possono esistere più gruppi di editor.",
@@ -16,6 +20,7 @@
 	"editorGroupBackground": "Colore di sfondo di un gruppo di editor. I gruppi di editor sono contenitori di editor. Il colore di sfondo viene visualizzato quando si trascinano i gruppi di editor in un'altra posizione.",
 	"tabsContainerBackground": "Colore di sfondo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
 	"tabsContainerBorder": "Colore del bordo dell'intestazione del titolo di gruppo di editor, quando le schede sono abilitate. I gruppi di editor sono i contenitori degli editor.",
+	"editorGroupHeaderBackground": "Colore di sfondo dell'intestazione del titolo dell'editor quando le schede sono disabilitate (`\"workbench.editor.showTabs\": false`). I gruppi di editor sono contenitori di editor.",
 	"editorGroupBorder": "Colore per separare più gruppi di editor l'uno dall'altro. I gruppi di editor sono i contenitori degli editor.",
 	"editorDragAndDropBackground": "Colore di sfondo quando si trascinano gli editor. Il colore dovrebbe avere una trasparenza impostata in modo che il contenuto dell'editor sia ancora visibile.",
 	"panelBackground": "Colore di sfondo dei pannelli. I pannelli sono visualizzati sotto l'area degli editor e contengono visualizzazioni quali quella di output e del terminale integrato.",
@@ -32,6 +37,8 @@
 	"statusBarNoFolderBorder": "Colore del bordo della barra di stato che la separa dalla barra laterale e dall'editor quando non ci sono cartelle aperte. La barra di stato è visualizzata nella parte inferiore della finestra.",
 	"statusBarItemActiveBackground": "Colore di sfondo degli elementi della barra di stato quando si fa clic. La barra di stato è visualizzata nella parte inferiore della finestra.",
 	"statusBarItemHoverBackground": "Colore di sfondo degli elementi della barra di stato al passaggio del mouse. La barra di stato è visualizzata nella parte inferiore della finestra.",
+	"statusBarProminentItemBackground": "Colore di sfondo degli elementi rilevanti della barra di stato. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
+	"statusBarProminentItemHoverBackground": "Colore di sfondo degli elementi rilevanti della barra di stato al passaggio del mouse. Gli elementi rilevanti spiccano rispetto ad altre voci della barra di stato. Per vedere un esempio, cambiare la modalità `Toggle Tab Key Moves Focus` nella barra dei comandi. La barra di stato è visualizzata nella parte inferiore della finestra.",
 	"activityBarBackground": "Colore di sfondo della barra attività. La barra attività viene visualizzata nella parte inferiore sinistra/destra e consente il passaggio tra diverse visualizzazioni della barra laterale",
 	"activityBarForeground": "Colore primo piano della barra attività (ad es. quello utilizzato per le icone). La barra attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
 	"activityBarBorder": "Colore del bordo della barra attività che la separa dalla barra laterale. La barra di attività viene mostrata all'estrema sinistra o destra e permette di alternare le visualizzazioni della barra laterale.",
diff --git a/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json b/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
index 8c2277fae11..a589565cc73 100644
--- a/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
+++ b/i18n/ita/src/vs/workbench/electron-browser/window.i18n.json
@@ -9,5 +9,6 @@
 	"cut": "Taglia",
 	"copy": "Copia",
 	"paste": "Incolla",
-	"selectAll": "Seleziona tutto"
+	"selectAll": "Seleziona tutto",
+	"runningAsRoot": "Non è consigliabile eseguire {0} come utente root."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
index 2e0a0d42956..dad36665ecd 100644
--- a/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"debugToolBarBackground": "Colore di sfondo della barra degli strumenti di debug."
+	"debugToolBarBackground": "Colore di sfondo della barra degli strumenti di debug.",
+	"debugToolBarBorder": "Colore del bordo della barra degli strumenti di debug."
 }
\ No newline at end of file
diff --git a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 2623cd6b56b..fbdc3b5e322 100644
--- a/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Non visualizzare più questo messaggio",
+	"close": "Chiudi",
 	"workspaceRecommendation": "Questa estensione è consigliata dagli utenti dell'area di lavoro corrente.",
 	"fileBasedRecommendation": "Questa estensione è raccomandata in base ai file aperti di recente.",
 	"exeBasedRecommendation": "Questa estensione è consigliata perché avete installato {0}.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "Per questo tipo di file è consigliabile usare il pacchetto di estensione '{0}'.",
 	"showRecommendations": "Mostra gli elementi consigliati",
 	"install": "Installa",
-	"neverShowAgain": "Non visualizzare più questo messaggio",
-	"close": "Chiudi",
 	"workspaceRecommended": "Per questa area di lavoro sono disponibili estensioni consigliate.",
 	"installAll": "Installa tutto",
 	"ignoreExtensionRecommendations": "Ignorare tutti i suggerimenti per le estensioni?",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 4a78ba42023..a1c5eca5548 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Annullare le modifiche e tornare al contenuto sul disco",
 	"copyPathOfActive": "Copia percorso del file attivo",
 	"saveAllInGroup": "Salva tutto nel gruppo",
+	"saveFiles": "Salva tutti i file",
 	"revert": "Ripristina file",
 	"compareActiveWithSaved": "Confronta file attivo con file salvato",
 	"closeEditor": "Chiudi editor",
diff --git a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 34188204b43..4e2f71fcbb4 100644
--- a/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/ita/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Salva con nome...",
 	"save": "Salva",
 	"saveAll": "Salva tutto",
-	"saveFiles": "Salva tutti i file",
 	"removeFolderFromWorkspace": "Rimuovi cartella dall'area di lavoro",
 	"openFileToReveal": "Aprire prima un file per visualizzarlo",
 	"openFileToCopy": "Aprire prima un file per copiarne il percorso"
diff --git a/i18n/jpn/extensions/git/out/commands.i18n.json b/i18n/jpn/extensions/git/out/commands.i18n.json
index 2dfc5f400ac..5411af2ba63 100644
--- a/i18n/jpn/extensions/git/out/commands.i18n.json
+++ b/i18n/jpn/extensions/git/out/commands.i18n.json
@@ -74,6 +74,7 @@
 	"push with tags success": "タグが正常にプッシュされました。",
 	"pick remote": "リモートを選んで、ブランチ '{0}' を次に公開します:",
 	"sync is unpredictable": "このアクションはコミットを '{0}' との間でプッシュしたりプルしたりします。",
+	"never again": "OK、今後は表示しない",
 	"no remotes to publish": "リポジトリには、発行先として構成されているリモートがありません。",
 	"no changes stash": "スタッシュする変更がありません。",
 	"provide stash message": "必要に応じてスタッシュ メッセージを入力してください",
diff --git a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index 3d99fafeeda..ee062e8f6d2 100644
--- a/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/jpn/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。"
+	"treeView.notRegistered": "ID '{0}' のツリー ビューは登録されていません。",
+	"treeView.duplicateElement": "id [0] の要素はすでに登録されています。"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 4faa6069b27..9196d2adf6f 100644
--- a/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "サイド バーの位置の切り替え",
+	"toggleSidebarPosition": "サイド バーの位置の切り替え",
 	"view": "表示"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index 39d2dcfed3e..2c65d714079 100644
--- a/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/jpn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "サイド バーから非表示"
+	"hideView": "非表示"
 }
\ No newline at end of file
diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 07e196a71f5..66ecd5fbfca 100644
--- a/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "今後は表示しない",
+	"close": "閉じる",
 	"workspaceRecommendation": "現在のワークスペースのユーザーによってこの拡張機能が推奨されています。",
 	"fileBasedRecommendation": "最近開いたファイルに基づいてこの拡張機能が推奨されます。",
 	"exeBasedRecommendation": "{0} がインストールされているため、この拡張機能を推奨します。",
@@ -11,8 +13,8 @@
 	"reallyRecommendedExtensionPack": "このファイルの種類には拡張機能パック '{0}' が推奨されます。",
 	"showRecommendations": "推奨事項を表示",
 	"install": "インストール",
-	"neverShowAgain": "今後は表示しない",
-	"close": "閉じる",
+	"showLanguageExtensions": "'.{0}' ファイルに役立つ拡張機能が Marketplace にあります",
+	"searchMarketplace": "Marketplace を検索",
 	"workspaceRecommended": "このワークスペースには拡張機能の推奨事項があります。",
 	"installAll": "すべてインストール",
 	"ignoreExtensionRecommendations": "すべての拡張機能の推奨事項を無視しますか?",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 8c1cdd182ee..cea92a2d16e 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "変更を破棄してディスク上の内容に戻る",
 	"copyPathOfActive": "アクティブ ファイルのパスのコピー",
 	"saveAllInGroup": "グループ内のすべてを保存する",
+	"saveFiles": "すべてのファイルを保存",
 	"revert": "ファイルを元に戻す",
 	"compareActiveWithSaved": "保存済みファイルと作業中のファイルを比較",
 	"closeEditor": "エディターを閉じる",
diff --git a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index e49e3964c1f..108a656a68a 100644
--- a/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "名前を付けて保存...",
 	"save": "保存",
 	"saveAll": "すべて保存",
-	"saveFiles": "すべてのファイルを保存",
 	"removeFolderFromWorkspace": "ワークスペースからフォルダーを削除",
 	"genericRevertError": "元へ戻すことに失敗しました '{0}': {1}",
 	"modifiedLabel": "{0} (ローカル) ↔ {1}",
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 9527bde4049..811c013e55b 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
@@ -36,6 +36,7 @@
 	"editorConfigurationTitle": "エディター",
 	"formatOnSave": "ファイルを保存するときにフォーマットしてください。フォーマッタを使用可能にして、ファイルを自動保存せず、エディターをシャットダウンしないでください。",
 	"explorerConfigurationTitle": "エクスプローラー",
+	"openEditorsVisible": "[開いているエディター] ウィンドウに表示するエディターの数。",
 	"autoReveal": "エクスプローラーでファイルを開くとき、自動的にファイルの内容を表示して選択するかどうかを制御します。",
 	"enableDragAndDrop": "ドラッグ アンド ドロップを使用したファイルとフォルダーの移動をエクスプローラーが許可するかどうかを制御します。",
 	"confirmDragAndDrop": "ドラッグ アンド ドロップを使用したファイルやフォルダーの移動時にエクスプローラーが確認を求めるかどうかを制御します。",
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 d1d1439074e..c440e97085d 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
@@ -17,6 +17,7 @@
 	"resetLabel": "キー バインドのリセット",
 	"showConflictsLabel": "競合の表示",
 	"copyLabel": "コピー",
+	"copyCommandLabel": "コピー コマンド",
 	"error": "キー バインドの編集中にエラー '{0}' が発生しました。'keybindings.json' ファイルを開いてご確認ください。",
 	"command": "コマンド",
 	"keybinding": "キー バインド",
diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index 95f2aea84fd..37aa8bbba38 100644
--- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -7,6 +7,7 @@
 	"terminal.integrated.chooseWindowsShellInfo": "カスタマイズ ボタンを選択して、既定のターミナル シェルを変更できます。",
 	"customize": "カスタマイズする",
 	"cancel": "キャンセル",
+	"never again": "今後は表示しない",
 	"terminal.integrated.chooseWindowsShell": "優先するターミナル シェルを選択します。これは後で設定から変更できます",
 	"terminalService.terminalCloseConfirmationSingular": "アクティブなターミナル セッションが 1 つあります。中止しますか?",
 	"terminalService.terminalCloseConfirmationPlural": "アクティブなターミナル セッションが {0} 個あります。中止しますか?"
diff --git a/i18n/kor/extensions/git/out/autofetch.i18n.json b/i18n/kor/extensions/git/out/autofetch.i18n.json
index 88fc1cbb4d5..1a491bc8a6d 100644
--- a/i18n/kor/extensions/git/out/autofetch.i18n.json
+++ b/i18n/kor/extensions/git/out/autofetch.i18n.json
@@ -7,5 +7,6 @@
 	"yes": "예",
 	"read more": "자세히 알아보기",
 	"no": "아니요",
-	"not now": "나중에 물어보기"
+	"not now": "나중에 물어보기",
+	"suggest auto fetch": "Code가 주기적으로 `git fetch`를 실행할까요?"
 }
\ 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 7ec5dec31a3..97749e34962 100644
--- a/i18n/kor/extensions/git/out/commands.i18n.json
+++ b/i18n/kor/extensions/git/out/commands.i18n.json
@@ -41,6 +41,10 @@
 	"confirm discard all 2": "{0}\n\n이 작업은 되돌릴 수 없으며, 현재 작업 설정이 영구적으로 손실됩니다.",
 	"yes discard tracked": "1개의 추적된 파일 취소",
 	"yes discard tracked multiple": "{0}개의 추적된 파일 취소",
+	"unsaved files single": "다음 파일이 저장되지 않았습니다: {0}.\n\n제출하기 전에 저장할까요?",
+	"unsaved files": "저장되지 않은 {0}개의 파일들이 있습니다.\n\n제출하기 전에 저장할까요?",
+	"save and commit": "모두 저장하고 제출",
+	"commit": "그냥 제출",
 	"no staged changes": "저장할 단계적 변경 사항이 없습니다.\n\n모든 변경 사항을 자동으로 스테이징하고 직접 저장하시겠습니까?",
 	"always": "항상",
 	"no changes": "커밋할 변경 내용이 없습니다.",
@@ -65,6 +69,7 @@
 	"pick remote pull repo": "분기를 가져올 원격 선택",
 	"no remotes to push": "리포지토리에 푸시하도록 구성된 원격이 없습니다.",
 	"nobranch": "원격에 푸시할 분기를 체크 아웃하세요.",
+	"confirm publish branch": "'{0}' 분기에는 상향 분기가 없습니다. 이 분기를 게시하시겠습니까?",
 	"ok": "확인",
 	"push with tags success": "태그와 함께 푸시되었습니다.",
 	"pick remote": "'{0}' 분기를 다음에 게시하려면 원격을 선택하세요.",
diff --git a/i18n/kor/extensions/git/package.i18n.json b/i18n/kor/extensions/git/package.i18n.json
index 33448449d9e..8e38cc88df5 100644
--- a/i18n/kor/extensions/git/package.i18n.json
+++ b/i18n/kor/extensions/git/package.i18n.json
@@ -54,12 +54,12 @@
 	"command.stashPopLatest": "최신 슬래시 표시",
 	"config.enabled": "Git 사용 여부",
 	"config.path": "Git 실행 파일의 경로",
+	"config.autoRepositoryDetection": "리포지토리가 자동 감지되어야 하는지 여부",
 	"config.autorefresh": "자동 새로 고침 사용 여부",
 	"config.autofetch": "자동 가져오기 사용 여부",
 	"config.enableLongCommitWarning": "긴 커밋 메시지에 대해 경고할지 여부입니다.",
 	"config.confirmSync": "Git 리포지토리를 동기화하기 전에 확인합니다.",
 	"config.countBadge": "Git 배지 카운터를 제어합니다. `all`이면 변경 내용을 모두 계산하고, `tracked`이면 추적된 변경 내용만 계산하고, `off`이면 해제합니다.",
-	"config.checkoutType": "`다음으로 체크 아웃...`을 실행할 때 나열되는 분기 유형을 제어합니다. `all`이면 모든 참조를 표시하고, `local`이면 로컬 분기만 표시하고, `tags`이면 태그만 표시하고, `remote`이면 원격 분기만 표시합니다.",
 	"config.ignoreLegacyWarning": "레거시 Git 경고를 무시합니다.",
 	"config.ignoreMissingGitWarning": "Git이 없으면 경고를 무시합니다.",
 	"config.ignoreLimitWarning": "리포지토리에 변경 내용이 너무 많으면 경고를 무시합니다.",
@@ -72,5 +72,6 @@
 	"colors.deleted": "삭제된 리소스의 색상입니다.",
 	"colors.untracked": "추적되지 않은 리소스의 색상입니다.",
 	"colors.ignored": "무시된 리소스의 색상입니다.",
-	"colors.conflict": "충돌이 발생한 리소스의 색상입니다."
+	"colors.conflict": "충돌이 발생한 리소스의 색상입니다.",
+	"colors.submodule": "서브모듈 자원의 색상"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json b/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
index 8b6ad71cd4e..ed15423097d 100644
--- a/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
+++ b/i18n/kor/src/vs/base/browser/ui/selectBox/selectBoxCustom.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"selectAriaOption": "{0}"
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
index ccaf072898e..afaf41e4aa2 100644
--- a/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/kor/src/vs/platform/environment/node/argv.i18n.json
@@ -34,5 +34,8 @@
 	"options": "옵션",
 	"paths": "경로",
 	"stdinWindows": "다른 프로그램의 출력을 읽으려면, '-'를 추가하십시오. (예: 'echo Hello World | {0} -')",
-	"optionsUpperCase": "옵션"
+	"stdinUnix": "stdin에서 읽어오려면, '-'를 추가하십시오.(예. 'ps aux | grep code | {0} -')",
+	"optionsUpperCase": "옵션",
+	"extensionsManagement": "확장 관리",
+	"troubleshooting": "문제 해결"
 }
\ 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 651652bfe31..01c78cf0a53 100644
--- a/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/kor/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -12,6 +12,7 @@
 	"notFoundCompatible": "'{0}'을(를) 설치할 수 없습니다; VS Code '{1}'과 호환되는 버전이 없습니다.",
 	"notFoundCompatibleDependency": "VS Code의 현재 버전 '{1}'과(와) 호환되는 종속된 확장 '{0}'을(를) 찾을 수 없으므로 설치할 수 없습니다.",
 	"quitCode": "확장을 설치할 수 없습니다. 다시 설치하기 위해 VS Code를 종료하고 다시 시작하십시오.",
+	"exitCode": "확장을 설치할 수 없습니다. 다시 설치하기 전에 VS 코드를 종료한 후 다시 시작하십시오. ",
 	"uninstallDependeciesConfirmation": "'{0}'만 제거할까요, 아니면 종속성도 제거할까요?",
 	"uninstallOnly": "만",
 	"uninstallAll": "모두",
diff --git a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
index 8b6ad71cd4e..9f96e3885f7 100644
--- a/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
+++ b/i18n/kor/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"saveParticipants": "실행중인 저장 관계자..."
+}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 2ad17264baf..091e1d88413 100644
--- a/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "사이드바 위치 설정/해제",
 	"view": "보기"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
index 13977c6a009..aaa9957a9bf 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json
@@ -10,5 +10,6 @@
 	"editableEditorWithInputAriaLabel": "{0}. 텍스트 파일 비교 편집기입니다.",
 	"editableEditorAriaLabel": "텍스트 파일 비교 편집기입니다.",
 	"navigate.next.label": "다음 변경 내용",
-	"navigate.prev.label": "이전 변경 내용"
+	"navigate.prev.label": "이전 변경 내용",
+	"toggleIgnoreTrimWhitespace.label": "자르기 공백 무시"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
index fbf734ff7aa..4777ec24002 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/titlebar/titlebarPart.i18n.json
@@ -5,5 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"patchedWindowTitle": "[지원되지 않음]",
+	"userIsAdmin": "[관리자]",
+	"userIsSudo": "[슈퍼유저]",
 	"devExtensionWindowTitlePrefix": "[확장 개발 호스트]"
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index b4ccb557e6a..8b6ad71cd4e 100644
--- a/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/kor/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "사이드바에서 숨기기"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/common/theme.i18n.json b/i18n/kor/src/vs/workbench/common/theme.i18n.json
index 4cd1b7fa581..cbb96bc285b 100644
--- a/i18n/kor/src/vs/workbench/common/theme.i18n.json
+++ b/i18n/kor/src/vs/workbench/common/theme.i18n.json
@@ -6,9 +6,13 @@
 {
 	"tabActiveBackground": "활성 탭 배경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
 	"tabInactiveBackground": "비활성 탭 배경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
+	"tabHoverBackground": "마우스 커서를 올려놓았을 때의 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
+	"tabUnfocusedHoverBackground": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 탭 배경색. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
 	"tabBorder": "탭을 서로 구분하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
 	"tabActiveBorder": "활성 탭을 강조 표시하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
 	"tabActiveUnfocusedBorder": "포커스가 없는 그룹에서 활성 탭을 강조 표시하기 위한 테두리입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
+	"tabHoverBorder": "마우스 커서를 올려놓았을 때 활성 탭의 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
+	"tabUnfocusedHoverBorder": "마우스 커서를 올려놓았을 때 포커스를 받지 못한 그룹에서 활성 탭 테두리. 탭은 편집 영역에서 편집기를 감싸고 있습니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 편집기 그룹이 여러 개일 수 있습니다.",
 	"tabActiveForeground": "활성 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
 	"tabInactiveForeground": "활성 그룹의 비활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
 	"tabUnfocusedActiveForeground": "포커스가 없는 그룹의 활성 탭 전경색입니다. 탭은 편집기 영역에서 편집기의 컨테이너입니다. 한 편집기 그룹에서 여러 탭을 열 수 있습니다. 여러 편집기 그룹이 있을 수 있습니다.",
@@ -33,6 +37,8 @@
 	"statusBarNoFolderBorder": "열린 폴더가 없을 때 사이드바 및 편집기와 구분하는 상태 표시줄 테두리 색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
 	"statusBarItemActiveBackground": "클릭할 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
 	"statusBarItemHoverBackground": "마우스로 가리킬 때의 상태 표시줄 항목 배경색입니다. 상태 표시줄은 창의 맨 아래에 표시됩니다.",
+	"statusBarProminentItemBackground": " 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
+	"statusBarProminentItemHoverBackground": "마우스 커서를 올렸을 때 상태 표시줄 주요 항목 배경 색. 주요 항목은 중요성을 알려주기 위해 다른 상태 표시줄 항목보다 눈에 띕니다. 예제를 보기 위해 명령 팔레트에서 '포커스 이동을 위해 탭 키 토글' 모드를 변경합니다. 창 아래쪽에 상태 표시줄이 나타납니다.",
 	"activityBarBackground": "작업 막대 배경색입니다. 작업 막대는 맨 왼쪽이나 오른쪽에 표시되며 사이드바의 뷰 간을 전환하는 데 사용할 수 있습니다.",
 	"activityBarForeground": "작업 막대 전경 색(예: 아이콘에 사용됨)입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
 	"activityBarBorder": "사이드바와 구분하는 작업 막대 테두리색입니다. 작업 막대는 오른쪽이나 왼쪽 끝에 표시되며 사이드바의 보기 간을 전환할 수 있습니다.",
diff --git a/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json b/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
index dc0deb8eb7f..c019b85acbe 100644
--- a/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
+++ b/i18n/kor/src/vs/workbench/electron-browser/window.i18n.json
@@ -9,5 +9,6 @@
 	"cut": "잘라내기",
 	"copy": "복사",
 	"paste": "붙여넣기",
-	"selectAll": "모두 선택"
+	"selectAll": "모두 선택",
+	"runningAsRoot": "{0}을(를) 루트 사용자로 실행하지 않는 것이 좋습니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
index e3166a31b49..55b56ed3448 100644
--- a/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/debug/browser/debugActionsWidget.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"debugToolBarBackground": "디버그 도구 모음 배경색입니다."
+	"debugToolBarBackground": "디버그 도구 모음 배경색입니다.",
+	"debugToolBarBorder": "디버그 도구 모음 테두리색입니다."
 }
\ No newline at end of file
diff --git a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 109cbec7026..ec5f81cd482 100644
--- a/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "다시 표시 안 함",
+	"close": "닫기",
 	"workspaceRecommendation": "이 확장은 현재 작업 영역 사용자가 권장합니다.",
 	"fileBasedRecommendation": "최근에 연 파일을 기반으로 확장이 권장됩니다.",
 	"exeBasedRecommendation": "{0}이(가) 설치되어 있으므로 이 확장을 권장합니다.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "이 파일 형식에 대해 '{0}' 확장 팩이 권장됩니다.",
 	"showRecommendations": "권장 사항 표시",
 	"install": "설치",
-	"neverShowAgain": "다시 표시 안 함",
-	"close": "닫기",
 	"workspaceRecommended": "이 작업 영역에 확장 권장 사항이 있습니다.",
 	"installAll": "모두 설치",
 	"ignoreExtensionRecommendations": "확장 권장 사항을 모두 무시하시겠습니까?",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 68afc8f65f7..9595a565713 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "변경 내용을 취소하고 디스크의 콘텐츠로 되돌리기",
 	"copyPathOfActive": "활성 파일의 경로 복사",
 	"saveAllInGroup": "그룹의 모든 항목 저장",
+	"saveFiles": "파일 모두 저장",
 	"revert": "파일 되돌리기",
 	"compareActiveWithSaved": "활성 파일을 저장된 파일과 비교",
 	"closeEditor": "편집기 닫기",
diff --git a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index a5bbd5fb7c4..3ba45c45801 100644
--- a/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/kor/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "다른 이름으로 저장...",
 	"save": "저장",
 	"saveAll": "모두 저장",
-	"saveFiles": "파일 모두 저장",
 	"removeFolderFromWorkspace": "작업 영역에서 폴더 삭제",
 	"modifiedLabel": "{0}(디스크) ↔ {1}",
 	"openFileToReveal": "첫 번째 파일을 열어서 나타냅니다.",
diff --git a/i18n/ptb/extensions/git/out/commands.i18n.json b/i18n/ptb/extensions/git/out/commands.i18n.json
index 502c4844053..b56c7d4a6f4 100644
--- a/i18n/ptb/extensions/git/out/commands.i18n.json
+++ b/i18n/ptb/extensions/git/out/commands.i18n.json
@@ -42,6 +42,8 @@
 	"yes discard tracked": "Descartar 1 arquivo controlado",
 	"yes discard tracked multiple": "Descartar arquivos {0} controlados",
 	"unsaved files single": "O seguinte arquivo não foi salvo: [0}.\n\nGostaria de salvá-lo antes de executar o commit?",
+	"unsaved files": "Existem {0} arquivos não salvos.\n\nGostaria de salvá-los antes de executar o commit?",
+	"save and commit": "Salvar Tudo & Confirmar",
 	"commit": "Confirmar de qualquer maneira",
 	"no staged changes": "Não há nenhuma modificação escalonada para confirmar.\n\nGostaria de escalonar automaticamente todas as suas alterações e confirmá-las diretamente?",
 	"always": "Sempre",
@@ -67,10 +69,12 @@
 	"pick remote pull repo": "Selecione um remoto para efeutar o pull da ramificação",
 	"no remotes to push": "O seu repositório não possui remotos configurados para efetuar push.",
 	"nobranch": "Por favor, faça checkout em um ramo para fazer push em um remoto.",
+	"confirm publish branch": "O branch '{0}' não possui um branch superior. Você quer publicar este branch?",
 	"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.",
 	"provide stash message": "Opcionalmente forneça uma mensagem para esconder.",
diff --git a/i18n/ptb/extensions/git/package.i18n.json b/i18n/ptb/extensions/git/package.i18n.json
index d92673284f6..670378da7f5 100644
--- a/i18n/ptb/extensions/git/package.i18n.json
+++ b/i18n/ptb/extensions/git/package.i18n.json
@@ -60,7 +60,6 @@
 	"config.enableLongCommitWarning": "Se mensagens longas de confirmação devem ter aviso",
 	"config.confirmSync": "Confirmar antes de sincronizar repositórios git",
 	"config.countBadge": "Controla o contador de distintivos do git. 'todos' considera todas as alterações. 'rastreado' considera apenas as alterações controladas. 'desligado' desliga o contador.",
-	"config.checkoutType": "Controla quais tipos de ramos são listados quando executando `Checkout para... `. `todos` mostra todas as referências, `local` mostra apenas os ramos locais, `etiqueta` mostra apenas etiquetas e `remoto` mostra apenas os ramos remotos.",
 	"config.ignoreLegacyWarning": "Ignora o aviso de Git legado",
 	"config.ignoreMissingGitWarning": "Ignora o aviso quando Git não existir.",
 	"config.ignoreLimitWarning": "Ignora o aviso quando houver muitas alterações em um repositório",
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 5134c6e6945..27de662d885 100644
--- a/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/editor/common/view/editorColorRegistry.i18n.json
@@ -6,6 +6,7 @@
 {
 	"lineHighlight": "Cor de fundo para a posição do cursor  na seleção de linhas.",
 	"lineHighlightBorderBox": "Cor de fundo para a borda em volta da linha na posição do cursor",
+	"rangeHighlight": "Cor de fundo dos intervalos selecionados, assim como da abertura instantânea e localização de recursos. A cor não deve ser opaca para evitar esconder as decorações subjacentes",
 	"caret": "Cor do cursor no editor.",
 	"editorCursorBackground": "A cor de fundo do cursor do editor. Permite customizar a cor de um caractere sobreposto pelo bloco do cursor.",
 	"editorWhitespaces": "Cor dos caracteres em branco no editor",
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 e6fba46dfd7..5be9785fd64 100644
--- a/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
+++ b/i18n/ptb/src/vs/editor/contrib/gotoError/gotoError.i18n.json
@@ -5,6 +5,8 @@
 // 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.",
diff --git a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
index e056838d019..72fb01e6637 100644
--- a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json
@@ -30,6 +30,7 @@
 	"inspect-extensions": "Permite depuração e criação de perfis de extensões. Verifique as ferramentas de desenvolvimento para a conexão uri.",
 	"inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.",
 	"disableGPU": "Desabilita aceleração de hardware da GPU.",
+	"uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.",
 	"usage": "Uso",
 	"options": "opções",
 	"paths": "caminhos",
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 635a04864da..ad9e4de8759 100644
--- a/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
+++ b/i18n/ptb/src/vs/platform/theme/common/colorRegistry.i18n.json
@@ -64,7 +64,11 @@
 	"editorSelectionBackground": "Cor de seleção do editor.",
 	"editorSelectionForeground": "Cor do texto selecionado para alto contraste.",
 	"editorInactiveSelection": "Cor da seleção em um editor inativo. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"editorSelectionHighlight": "Cor para regiões com o mesmo conteúdo da seleção. A cor não deve ser opaca para não esconder decorações subjacentes.",
 	"editorFindMatch": "Cor da correspondência de pesquisa atual.",
+	"findMatchHighlight": "Cor dos outros termos que correspondem ao da pesquisa. A cor não deve ser opaca para não esconder as decorações subjacentes.",
+	"findRangeHighlight": "Cor do intervalo limitando a pesquisa. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"hoverHighlight": "Destaque abaixo da palavra para qual um flutuador é mostrado. A cor não deve ser opaca para não esconder decorações subjacentes.",
 	"hoverBackground": "Cor de fundo para o item flutuante do editor",
 	"hoverBorder": "Cor da borda para o item flutuante do editor.",
 	"activeLinkForeground": "Cor dos links ativos.",
@@ -72,6 +76,12 @@
 	"diffEditorRemoved": "Cor de fundo para texto que foi removido.",
 	"diffEditorInsertedOutline": "Cor de contorno para o texto que foi inserido.",
 	"diffEditorRemovedOutline": "Cor de contorno para o texto que foi removido.",
+	"mergeCurrentHeaderBackground": "Fundo do cabeçalho atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"mergeCurrentContentBackground": "Fundo do conteúdo atual em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"mergeIncomingHeaderBackground": "Fundo do cabeçalho entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"mergeIncomingContentBackground": "Fundo do conteúdo entrante em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"mergeCommonHeaderBackground": "Fundo comum do cabeçalho antepassado em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
+	"mergeCommonContentBackground": "Fundo comum do conteúdo antepassado em conflitos de merge inline. A cor não deve ser opaca para não esconder decorações subjacentes.",
 	"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.",
diff --git a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
index a2c9cbd217b..2d6a1561774 100644
--- a/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
+++ b/i18n/ptb/src/vs/workbench/api/node/extHostTreeViews.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado."
+	"treeView.notRegistered": "Nenhuma visualização de árvore com id '{0}' registrado.",
+	"treeView.duplicateElement": "Elemento com id {0} já está registrado"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index ee4fc530361..3bc4ff33bb9 100644
--- a/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Alternar Localização da Barra Lateral",
+	"toggleSidebarPosition": "Alternar a Posição da Barra Lateral",
 	"view": "Exibir"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
index fdb629550fd..34b9d5b4435 100644
--- a/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/actions/workspaceCommands.i18n.json
@@ -6,5 +6,6 @@
 {
 	"addFolderToWorkspace": "Adicionar pasta ao espaço de trabalho...",
 	"add": "&&Adicionar",
-	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho"
+	"addFolderToWorkspaceTitle": "Adicionar pasta ao espaço de trabalho",
+	"workspaceFolderPickerPlaceholder": "Selecione a pasta do espaço de trabalho"
 }
\ 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 c1dd3fcfe9b..229a03e2233 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
@@ -20,6 +20,7 @@
 	"closeAllUnmodified": "Fechar Não Modificados",
 	"closeAll": "Fechar todos",
 	"keepOpen": "Manter aberto",
+	"toggleInlineView": "Alternar para exibição embutida",
 	"showOpenedEditors": "Mostrar editores abertos",
 	"keepEditor": "Manter editor",
 	"closeEditorsInGroup": "Fechar todos editores no grupo",
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 fce09f85b3d..d43b455c264 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
@@ -48,5 +48,8 @@
 	"moveEditorLeft": "Mover o Editor para a Esquerda",
 	"moveEditorRight": "Mover o Editor para a Direita",
 	"moveEditorToPreviousGroup": "Mover o Editor para o Grupo Anterior",
-	"moveEditorToNextGroup": "Mover o Editor para o Próximo Grupo"
+	"moveEditorToNextGroup": "Mover o Editor para o Próximo Grupo",
+	"moveEditorToFirstGroup": "Mover o Editor para o Primeiro Grupo",
+	"moveEditorToSecondGroup": "Mover o Editor para o Segundo Grupo",
+	"moveEditorToThirdGroup": "Mover o Editor para o Terceiro Grupo"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index a2d4770e337..e40ee5163a0 100644
--- a/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/ptb/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"hideView": "Ocultar a Barra Lateral"
+	"hideView": "Ocultar"
 }
\ 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 fc80fefdfe6..e83d165cd84 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
@@ -30,6 +30,7 @@
 	"closeOnFocusLost": "Controla se Abertura Rápida deve fechar automaticamente caso perca o foco.",
 	"openDefaultSettings": "Controla se a abertura de configurações também abre um editor mostrando todas as configurações padrão.",
 	"sideBarLocation": "Controla a localização da barra lateral. Ele pode ser exibido à esquerda ou à direita da área de trabalho.",
+	"panelDefaultLocation": "Controla o local padrão do painel. Pode ser visualizado na parte inferior ou no lado direito da área de trabalho.",
 	"statusBarVisibility": "Controla a visibilidade da barra de status na parte inferior da área de trabalho.",
 	"activityBarVisibility": "Controla a visibilidade da barra de atividades na área de trabalho.",
 	"fontAliasing": "Controla o método de identificação de fonte no espaço de trabalho.\n- padrão: Suavização de fonte subpixel. Na maioria dos monitores não-retina isto mostrará o texto mais nítido\n- antialiased: Suaviza a fonte no nível do pixel, em oposição a subpixel. Pode fazer a fonte aparecer mais clara de um modo geral \n- nenhum: Desabilita a suavização de fonte. Texto será mostrado com bordas irregulares",
diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index be106023061..d532a7ba72e 100644
--- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Não mostrar novamente",
+	"close": "Fechar",
 	"workspaceRecommendation": "Esta extensão é recomendada pelos usuários da área de trabalho atual.",
 	"fileBasedRecommendation": "Esta extensão é recomendada baseada nos arquivos que você abriu recentemente.",
 	"exeBasedRecommendation": "Esta extensão é recomendada porque você tem {0} instalado.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.",
 	"showRecommendations": "Mostrar Recomendações",
 	"install": "Instalar",
-	"neverShowAgain": "Não mostrar novamente",
-	"close": "Fechar",
 	"workspaceRecommended": "Este espaço de trabalho possui recomendações de extensão.",
 	"installAll": "Instalar Tudo",
 	"ignoreExtensionRecommendations": "Você quer ignorar todas as recomendações de extensão?",
diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
index 254a1e7b5f1..25e6a323be4 100644
--- a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json
@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"workbenchConfigurationTitle": "Área de Trabalho"
+	"workbenchConfigurationTitle": "Área de Trabalho",
+	"feedbackVisibility": "Controla a visibilidade do feedback no Twitter (smiley) na barra de status na região inferior da área de trabalho."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
index 5d3c22c39a8..db165d19e5b 100644
--- a/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json
@@ -16,6 +16,7 @@
 	"request a missing feature": "Solicitar um recurso ausente",
 	"tell us why?": "Diga-nos porquê?",
 	"commentsHeader": "Comentários",
+	"showFeedback": "Mostrar Smiley de Feedback na Barra de Status",
 	"tweet": "Tweetar",
 	"character left": "caractere à esquerda",
 	"characters left": "caracteres à esquerda",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 1ebe014543e..a67013312a3 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Descartar as alterações e reverter para o conteúdo no disco",
 	"copyPathOfActive": "Copiar Caminho do Arquivo Ativo",
 	"saveAllInGroup": "Salvar Todos no Grupo",
+	"saveFiles": "Salvar todos os arquivos",
 	"revert": "Reverter Arquivo",
 	"compareActiveWithSaved": "Comparar o Arquivo Ativo com o Arquivo Salvo",
 	"closeEditor": "Fechar Editor",
@@ -23,6 +24,7 @@
 	"compareWithSaved": "Comparar com o salvo",
 	"compareWithSelected": "Comparar com o Selecionado",
 	"compareSource": "Selecione para comparar",
+	"compareSelected": "Comparar Selecionado",
 	"close": "Fechar",
 	"closeOthers": "Fechar Outros",
 	"closeUnmodified": "Fechar Não Modificados",
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 48ba3f85e8c..02499c21575 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
@@ -18,15 +18,18 @@
 	"deleteButtonLabelRecycleBin": "&&Mover para Lixeira",
 	"deleteButtonLabelTrash": "&&Mover para o Lixo",
 	"deleteButtonLabel": "&&Excluir",
+	"dirtyMessageFilesDelete": "Você está excluindo arquivos com alterações não salvas. Você quer continuar?",
 	"dirtyMessageFolderOneDelete": "Você está excluindo uma pasta com alterações não salvas em 1 arquivo. Você quer continuar?",
 	"dirtyMessageFolderDelete": "Você está excluindo uma pasta com alterações não salvas em {0} arquivos. Você quer continuar?",
 	"dirtyMessageFileDelete": "Você está excluindo um arquivo com alterações não salvas. Você quer continuar?",
 	"dirtyWarning": "Suas alterações serão perdidas se você não salvá-las.",
+	"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!",
@@ -34,6 +37,7 @@
 	"importFiles": "Importar Arquivos",
 	"confirmOverwrite": "Um arquivo ou pasta com o mesmo nome já existe na pasta de destino. Você quer substituí-lo?",
 	"replaceButtonLabel": "&&Substituir",
+	"fileDeleted": "Arquivo foi excluído ou movido durante o processo",
 	"fileIsAncestor": "Arquivo a ser copiado é um ancestral da pasta de destino.",
 	"duplicateFile": "Duplicar",
 	"globalCompareFile": "Compare o Arquivo Ativo Com...",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index 4d9e669b83d..7a2c7c9c70d 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Salvar como...",
 	"save": "Salvar",
 	"saveAll": "Salvar Todos",
-	"saveFiles": "Salvar todos os arquivos",
 	"removeFolderFromWorkspace": "Remover pasta da área de trabalho",
 	"genericRevertError": "Falha ao reverter '{0}': {1}",
 	"modifiedLabel": "{0} (em disco) ↔ {1}",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
index f6bbbed75c4..8488c0881d3 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json
@@ -36,6 +36,7 @@
 	"editorConfigurationTitle": "Editor",
 	"formatOnSave": "Formata um arquivo no salvamento. Um formatador deve estar disponível, o arquivo não deve ser salvo automaticamente e editor não deve ser desligado.",
 	"explorerConfigurationTitle": "Explorador de arquivos",
+	"openEditorsVisible": "Número de editores mostrados no painel Editores Abertos.",
 	"autoReveal": "Controla se o explorador deve automaticamente revelar e selecionar arquivos ao abri-los.",
 	"enableDragAndDrop": "Controla se o explorador deve permitir mover arquivos e pastas através de arrastar e soltar.",
 	"confirmDragAndDrop": "Controla se o explorer deve pedir a confirmação ao mover arquivos ou pastas através de arrastar e soltar.",
diff --git a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
index 02afd8f004f..e29cc00e9bf 100644
--- a/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.i18n.json
@@ -10,6 +10,7 @@
 	"dropFolder": "Você quer adicionar a pasta no espaço de trabalho?",
 	"addFolders": "&&Adicionar Pastas",
 	"addFolder": "&&Adicionar Pasta",
+	"confirmMultiMove": "Você tem certeza que deseja mover os seguintes {0} arquivos?",
 	"confirmMove": "Tem certeza que deseja mover '{0}'?",
 	"doNotAskAgain": "Não me pergunte novamente",
 	"moveButtonLabel": "&&Mover",
diff --git a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
index 30c8e9206e8..2bd2313c928 100644
--- a/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json
@@ -11,6 +11,7 @@
 	"rendererProcess": "Janela",
 	"extensionHost": "Host de Extensão",
 	"selectProcess": "Selecionar processo",
+	"openLogFile": "Abrir Arquivo de Log...",
 	"setLogLevel": "Definir Nível de Log",
 	"trace": "Rastreamento",
 	"debug": "Depurar",
diff --git a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
index f038135e0fb..e304c1044a9 100644
--- a/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/markers/common/messages.i18n.json
@@ -5,6 +5,8 @@
 // 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",
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
index 4027814e08d..75c87388f26 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/keybindingsEditor.i18n.json
@@ -17,6 +17,7 @@
 	"resetLabel": "Redefinir Keybinding",
 	"showConflictsLabel": "Mostrar Conflitos",
 	"copyLabel": "Copiar",
+	"copyCommandLabel": "Copiar Comando",
 	"error": "Erro '{0}' enquanto edita keybinding. Por favor, abra o arquivo 'keybindings.json' e verifique.",
 	"command": "Comando",
 	"keybinding": "KeyBinding",
diff --git a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
index 49fd2fe9bd8..0877b71005f 100644
--- a/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json
@@ -11,6 +11,8 @@
 	"oneSettingFound": "1 Configuração correspondente",
 	"settingsFound": "{0} Configurações correspondentes",
 	"totalSettingsMessage": "Total {0} Configurações",
+	"nlpResult": "Resultados da Linguagem Natural",
+	"filterResult": "Resultados Filtrados",
 	"defaultSettings": "Configurações Padrão",
 	"defaultFolderSettings": "Configuração Padrão da Pasta",
 	"defaultEditorReadonly": "Editar no editor do lado direito para substituir os padrões.",
diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
index 1d6d8fc3238..1676173518c 100644
--- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json
@@ -22,5 +22,6 @@
 	"useRipgrep": "Controla se utiliza ripgrep em buscas de texto e de arquivo",
 	"useIgnoreFiles": "Controla se utiliza arquivos .gitignore e .ignore por padrão ao fazer pesquisas de arquivos.",
 	"search.quickOpen.includeSymbols": "Configurar para incluir resultados de uma pesquisa símbolo global nos resultados do arquivo para Abertura Rápida.",
-	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca."
+	"search.followSymlinks": "Controla quando seguir symlinks ao realizar uma busca.",
+	"search.smartCase": "Faz pesquisas do tipo case-insensitive se o termo for totalmente minúsculo, caso contrário, faz pesquisas do tipo case-sensitive."
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
index 5d08c410ab9..be32250a3f7 100644
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/configureSnippets.i18n.json
@@ -8,6 +8,7 @@
 	"global.1": "({0})",
 	"new.global": "Novo Arquivo de Trechos de Código Global...",
 	"group.global": "Trechos de código existentes",
+	"new.global.sep": "Novos Trechos de Código",
 	"openSnippet.pickLanguage": "Selecionar Arquivo de Trechos de Código ou Criar Trechos de Código",
 	"openSnippet.label": "Configurar Trechos de Código do Usuário",
 	"preferences": "Preferências"
diff --git a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
index e4fdc20a129..142b52e21ef 100644
--- a/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/snippets/electron-browser/snippetsService.i18n.json
@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"invalid.path.0": "Esperada uma string em `contributes.{0}.path`. Valor informado: {1}",
+	"invalid.language.0": "Quando a linguagem for omitida, o valor de `contributes.{0}.path` deve ser um arquivo-`.code-snippets`. Valor definido: {1}",
 	"invalid.language": "Linguagem desconhecida em `contributes.{0}.language`. Valor fornecido: {1}",
 	"invalid.path.1": "É esperado que `contributes.{0}.path` ({1}) seja incluído na pasta da extensão ({2}). Isto pode tornar a extensão não portável.",
 	"vscode.extension.contributes.snippets": "Contribui aos trechos de código.",
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
index 7eeff308218..f45a86033e6 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json
@@ -25,10 +25,12 @@
 	"terminal.integrated.setLocaleVariables": "Controla se as variáveis locais são definidas na inicialização do terminal, este padrão é verdadeiro no OS X e falso em outras plataformas.",
 	"terminal.integrated.cwd": "Um caminho de início explícito onde o terminal será lançado, isso é usado como o diretório de trabalho atual (cwd) para o processo shell. Isto pode ser particularmente útil em configurações de espaço de trabalho se o diretório raiz não é um cwd conveniente.",
 	"terminal.integrated.confirmOnExit": "Confirmar na saída se ainda houverem sessões de terminal ativas.",
+	"terminal.integrated.enableBell": "Se o sino do terminal está habilitado ou não.",
 	"terminal.integrated.commandsToSkipShell": "Um conjunto de IDs de comando, cujas combinações de teclas não serão enviadas para o shell e sempre serão tratadas por código. Isto permite o uso de combinações de teclas que normalmente seriam consumidas pelo shell para agir da mesma forma quando o terminal não é focado, por exemplo ctrl+p para Execução Rápida.",
 	"terminal.integrated.env.osx": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Mac OS X",
 	"terminal.integrated.env.linux": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Linux",
 	"terminal.integrated.env.windows": "Objeto com variáveis de ambiente que serão adicionadas ao VS Code e utilizadas pelo terminal no Windows",
+	"terminal.integrated.showExitAlert": "Mostrar alerta 'O processo terminal foi encerrado com código de saída' quando o código de saída é diferente de zero.",
 	"terminalCategory": "Terminal",
 	"viewCategory": "Exibir"
 }
\ No newline at end of file
diff --git a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
index a500552f06f..53b433626d5 100644
--- a/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
+++ b/i18n/ptb/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json
@@ -7,6 +7,7 @@
 	"terminal.integrated.chooseWindowsShellInfo": "Você pode alterar o terminal shell padrão selecionando o botão Personalizar.",
 	"customize": "Personalizar",
 	"cancel": "Cancelar",
+	"never again": "OK, Não Mostrar Novamente",
 	"terminal.integrated.chooseWindowsShell": "Selecione o seu terminal shell preferido, você pode alterar isso mais tarde em suas configurações",
 	"terminalService.terminalCloseConfirmationSingular": "Há uma sessão ativa de terminal, você quer finalizá-la?",
 	"terminalService.terminalCloseConfirmationPlural": "Existem {0} sessões ativas de terminal, você quer finalizá-las?"
diff --git a/i18n/rus/extensions/git/package.i18n.json b/i18n/rus/extensions/git/package.i18n.json
index dcff3e1c9f0..bb4a19e4ed2 100644
--- a/i18n/rus/extensions/git/package.i18n.json
+++ b/i18n/rus/extensions/git/package.i18n.json
@@ -59,7 +59,6 @@
 	"config.enableLongCommitWarning": "Следует ли предупреждать о длинных сообщениях о фиксации",
 	"config.confirmSync": "Подтвердите синхронизацию репозиториев GIT.",
 	"config.countBadge": "\nУправляет счетчиком Git. При указании значения \"all\" подсчитываются все изменения, при указании значения \"tracked\" — только отслеживаемые изменения, при указании значения \"off\" счетчик отключается.",
-	"config.checkoutType": "Определяет типы ветвей, которые выводятся при выборе пункта меню \"Извлечь в...\". При указании значения \"all\" отображаются все ссылки, \"local\" — только локальные ветви, \"tags\" — только теги, а \"remote\" — только удаленные ветви.",
 	"config.ignoreLegacyWarning": "Игнорирует предупреждение об устаревшей версии Git",
 	"config.ignoreMissingGitWarning": "Игнорирует предупреждение об отсутствии Git",
 	"config.ignoreLimitWarning": "Игнорировать предупреждение, когда в репозитории слишком много изменений",
diff --git a/i18n/rus/src/vs/base/node/ps.i18n.json b/i18n/rus/src/vs/base/node/ps.i18n.json
index 8b6ad71cd4e..94c012b641d 100644
--- a/i18n/rus/src/vs/base/node/ps.i18n.json
+++ b/i18n/rus/src/vs/base/node/ps.i18n.json
@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
\ No newline at end of file
+{
+	"collecting": "Сбор информации о процессоре и памяти. Это может занять пару секунд."
+}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
index 04d052b0abb..acc13bcc696 100644
--- a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
+++ b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json
@@ -72,6 +72,7 @@
 	"cursorBlinking": "Управляет стилем анимации курсора. Допустимые значения: \"blink\", \"smooth\", \"phase\", \"expand\" и \"solid\"",
 	"mouseWheelZoom": "Изменение размера шрифта в редакторе при нажатой клавише CTRL и движении колесика мыши",
 	"cursorStyle": "Определяет стиль курсора. Допустимые значения: \"block\", \"block-outline\", \"line\", \"line-thin\", \"underline\" и \"underline-thin\"",
+	"lineCursorWidth": "Управляет шириной курсора, когда для параметра editor.cursorStyle установлено значение 'line'",
 	"fontLigatures": "Включает лигатуры шрифта.",
 	"hideCursorInOverviewRuler": "Управляет скрытием курсора в обзорной линейке.",
 	"renderWhitespace": "Определяет, должен ли редактор обрабатывать символы пробела; возможные значения: \"none\", \"boundary\" и \"all\". Параметр \"boundary\" не обрабатывает единичные пробелы между словами.",
diff --git a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
index ddfd930f08e..efe216539da 100644
--- a/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
+++ b/i18n/rus/src/vs/platform/environment/node/argv.i18n.json
@@ -33,5 +33,7 @@
 	"usage": "Использование",
 	"options": "параметры",
 	"paths": "пути",
+	"stdinWindows": "Чтобы прочитать вывод другой программы, добавьте '-' (например 'echo Hello World | {0} -')",
+	"stdinUnix": "Чтобы получить данные с stdin, добавьте '-' (например, 'ps aux | grep code | {0} -')\n",
 	"optionsUpperCase": "Параметры"
 }
\ 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 8201cea8194..54111e4751d 100644
--- a/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/rus/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,7 +9,9 @@
 	"installingOutdatedExtension": "Уже установлена более новая версия этого расширения. Вы хотите переопределить ее более старой версией?",
 	"override": "Переопределить",
 	"cancel": "Отмена",
+	"notFoundCompatible": "Невозможно установить '{0}'; нет версии, совместимой с VS Code '{1}'.",
 	"notFoundCompatibleDependency": "Не удается выполнить установку, так как не найдено зависимое расширение '{0}', совместимое с текущей версией VS Code '{1}'. ",
+	"exitCode": "Невозможно установить расширение. Пожалуйста, выйдите и зайдите в VS Code перед переустановкой.",
 	"uninstallDependeciesConfirmation": "Вы хотите удалить \"{0}\" отдельно или вместе с зависимостями?",
 	"uninstallOnly": "Только",
 	"uninstallAll": "Все",
diff --git a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index 3e03b98e62c..b88aead69da 100644
--- a/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Расположение боковой панели",
 	"view": "Просмотреть"
 }
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index 6dd99f557bc..8b6ad71cd4e 100644
--- a/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/rus/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "Скрыть из боковой панели"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index e55b39d762b..f674a1cb200 100644
--- a/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/rus/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Больше не показывать",
+	"close": "Закрыть",
 	"workspaceRecommendation": "Это расширение рекомендуется пользователями текущей рабочей области.",
 	"fileBasedRecommendation": "Рекомендуется использовать это расширение (на основе недавно открытых файлов).",
 	"exeBasedRecommendation": "Рекомендуется использовать это расширение, так как установлено {0}.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "Для этого типа файлов рекомендуется использовать пакет расширений '{0}'.",
 	"showRecommendations": "Показать рекомендации",
 	"install": "Установить",
-	"neverShowAgain": "Больше не показывать",
-	"close": "Закрыть",
 	"workspaceRecommended": "Эта рабочая область включает рекомендации по расширениям.",
 	"installAll": "Установить все",
 	"ignoreExtensionRecommendations": "Вы действительно хотите проигнорировать все рекомендации по расширениям?",
diff --git a/i18n/trk/extensions/git/package.i18n.json b/i18n/trk/extensions/git/package.i18n.json
index 7e10d7b3dae..193dcf3dff8 100644
--- a/i18n/trk/extensions/git/package.i18n.json
+++ b/i18n/trk/extensions/git/package.i18n.json
@@ -60,7 +60,6 @@
 	"config.enableLongCommitWarning": "Uzun commit mesajları hakkında uyarıda bulunulup bulunulmayacağı",
 	"config.confirmSync": "Git depolarını senkronize etmeden önce onaylayın",
 	"config.countBadge": "Git gösterge sayacını denetler. `all` tüm değişiklikleri sayar. `tracked` sadece izlenen değişikliklikleri sayar. `off` ise kapatır.",
-	"config.checkoutType": "`Geçiş Yap...` çalıştırılırken listelenecek dal türlerini denetler. `all` tüm başvuruları gösterir, `local` sadece yerel dalları gösterir, `tags` sadece etiketleri gösterir ve `remote` sadece uzak uçbirim dallarını gösterir.",
 	"config.ignoreLegacyWarning": "Eski Git uyarısını görmezden gelir",
 	"config.ignoreMissingGitWarning": "Git mevcut olmadığında uyarıyı yok sayar",
 	"config.ignoreLimitWarning": "Bir depoda çok fazla değişiklik var uyarısını görmezden gelir",
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 4014a5cf542..79f9fd64611 100644
--- a/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
+++ b/i18n/trk/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json
@@ -9,6 +9,7 @@
 	"installingOutdatedExtension": "Bu eklentinin daha yeni bir sürümü zaten yüklü. Bunu, daha eski bir sürümle geçersiz kılmak ister misiniz?",
 	"override": "Geçersiz Kıl",
 	"cancel": "İptal",
+	"errorInstallingDependencies": "Bağımlılıklar yüklenirken hata oluştu. {0}",
 	"notFoundCompatible": "'{0}' yüklenemiyor; VS Code '{1}' ile uyumlu mevcut bir sürümü yok.",
 	"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ı.",
 	"quitCode": "Eklenti yüklenemedi. Lütfen yeniden yüklemeden önce VS Code'u sonlandırın ve tekrar başlatın.",
diff --git a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
index b5c1cbc783e..1658e6a34d6 100644
--- a/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json
@@ -4,6 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggleLocation": "Kenar Çubuğu Konumunu Değiştir",
 	"view": "Görüntüle"
 }
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
index d61355ad2f9..8b6ad71cd4e 100644
--- a/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
+++ b/i18n/trk/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json
@@ -3,6 +3,4 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{
-	"hideView": "Kenar Çubuğunda Gizle"
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
index 2cb48be881f..53e00fca247 100644
--- a/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json
@@ -4,6 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"neverShowAgain": "Tekrar gösterme",
+	"close": "Kapat",
 	"workspaceRecommendation": "Bu eklenti geçerli çalışma alanı kullanıcıları tarafından tavsiye ediliyor.",
 	"fileBasedRecommendation": "Bu eklenti yakınlarda açtığınız dosyalara dayanarak tavsiye ediliyor.",
 	"exeBasedRecommendation": "Bu eklenti, sizde {0} kurulu olduğu için tavsiye ediliyor.",
@@ -11,8 +13,6 @@
 	"reallyRecommendedExtensionPack": "'{0}' eklenti paketi bu dosya türü için tavsiye edilir.",
 	"showRecommendations": "Tavsiyeleri Göster",
 	"install": "Yükle",
-	"neverShowAgain": "Tekrar Gösterme",
-	"close": "Kapat",
 	"workspaceRecommended": "Bu çalışma alanı bazı eklentileri tavsiye ediyor.",
 	"installAll": "Tümünü Yükle",
 	"ignoreExtensionRecommendations": "Tüm eklenti tavsiyelerini yok saymak istiyor musunuz?",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
index 4d413486366..101a33d0a50 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json
@@ -10,6 +10,7 @@
 	"revertLocalChanges": "Değişikliklerinizi göz ardı edin ve diskteki içeriğe geri dönün",
 	"copyPathOfActive": "Aktif Dosyanın Yolunu Kopyala",
 	"saveAllInGroup": "Gruptaki Tümünü Kadet",
+	"saveFiles": "Tüm Dosyaları Kaydet",
 	"revert": "Dosyayı Geri Döndür",
 	"compareActiveWithSaved": "Aktif Dosyayı Kaydedilenle Karşılaştır",
 	"closeEditor": "Düzenleyiciyi Kapat",
diff --git a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
index b1f43f0662a..c0c7d53c884 100644
--- a/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
+++ b/i18n/trk/src/vs/workbench/parts/files/electron-browser/fileCommands.i18n.json
@@ -10,7 +10,6 @@
 	"saveAs": "Farklı Kaydet...",
 	"save": "Kaydet",
 	"saveAll": "Tümünü Kaydet",
-	"saveFiles": "Tüm Dosyaları Kaydet",
 	"removeFolderFromWorkspace": "Çalışma Alanından Klasör Kaldır",
 	"genericRevertError": "'{0}' geri döndürülemedi: {1}",
 	"modifiedLabel": "{0} (diskte) ↔ {1}",

From 50064a2501768cd94b39598f83206f25c1d36892 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 22:35:27 +0100
Subject: [PATCH 438/710] enableWindowsBackgroundUpdates

---
 .../platform/update/electron-main/abstractUpdateService.ts   | 2 +-
 src/vs/platform/update/electron-main/updateService.win32.ts  | 4 +++-
 .../parts/update/electron-browser/update.contribution.ts     | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 742d09737d1..ade88f2e6f5 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -40,7 +40,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 
 	constructor(
 		@ILifecycleService private lifecycleService: ILifecycleService,
-		@IConfigurationService private configurationService: IConfigurationService,
+		@IConfigurationService protected configurationService: IConfigurationService,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@ILogService protected logService: ILogService
 	) {
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index 80562db75bd..b50b3ac33b6 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -118,9 +118,11 @@ export class Win32UpdateService extends AbstractUpdateService {
 								.then(() => updatePackagePath);
 						});
 					}).then(packagePath => {
+						const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
+
 						this.availableUpdate = { packagePath };
 
-						if (update.supportsFastUpdate) {
+						if (fastUpdatesEnabled && update.supportsFastUpdate) {
 							this.setState(State.Downloaded(update));
 						} else {
 							this.setState(State.Ready(update));
diff --git a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
index d93239ac3ca..b533e60a755 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.contribution.ts
@@ -57,6 +57,11 @@ configurationRegistry.registerConfiguration({
 			'enum': ['none', 'default'],
 			'default': 'default',
 			'description': nls.localize('updateChannel', "Configure whether you receive automatic updates from an update channel. Requires a restart after change.")
+		},
+		'update.enableWindowsBackgroundUpdates': {
+			'type': 'boolean',
+			'default': false,
+			'description': nls.localize('enableWindowsBackgroundUpdates', "Enables Windows background updates.")
 		}
 	}
 });

From 04d38863910098da9224eb3a6d5e9a3ca531192c Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Fri, 19 Jan 2018 22:47:12 +0100
Subject: [PATCH 439/710] win32: code should run after regular update

---
 build/win32/code.iss | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/win32/code.iss b/build/win32/code.iss
index 7e8326e4313..fc9b79a33c8 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -961,30 +961,30 @@ begin
 end;
 
 // Updates
-function IsUpdate(): Boolean;
+function IsBackgroundUpdate(): Boolean;
 begin
   Result := ExpandConstant('{param:update|false}') <> 'false';
 end;
 
 function IsNotUpdate(): Boolean;
 begin
-  Result := not IsUpdate();
+  Result := not IsBackgroundUpdate();
 end;
 
-// VS Code will create a flag file before the update starts (/update=C:\foo\bar)
-// - if the file exists at this point, the user quit Code before the update finished, so don't start Code after update
-// - otherwise, the user has accepted to apply the update and Code should start
 function ShouldRunAfterUpdate(): Boolean;
 begin
-  if IsUpdate() then
+  if IsBackgroundUpdate() then
+    // VS Code will create a flag file before the update starts (/update=C:\foo\bar)
+    // - if the file exists at this point, the user quit Code before the update finished, so don't start Code after update
+    // - otherwise, the user has accepted to apply the update and Code should start
     Result := not FileExists(ExpandConstant('{param:update}'))
   else
-    Result := False;
+    Result := True;
 end;
 
 function GetAppMutex(Value: string): string;
 begin
-  if IsUpdate() then
+  if IsBackgroundUpdate() then
     Result := ''
   else
     Result := '{#AppMutex}';
@@ -992,7 +992,7 @@ end;
 
 function GetDestDir(Value: string): string;
 begin
-  if IsUpdate() then
+  if IsBackgroundUpdate() then
     Result := ExpandConstant('{app}\_')
   else
     Result := ExpandConstant('{app}');
@@ -1002,7 +1002,7 @@ procedure CurStepChanged(CurStep: TSetupStep);
 var
   UpdateResultCode: Integer;
 begin
-  if IsUpdate() and (CurStep = ssPostInstall) then
+  if IsBackgroundUpdate() and (CurStep = ssPostInstall) then
   begin
     CreateMutex('{#AppMutex}-ready');
 

From 9e928dbedcf5e6a6c66508a5863624f3be366e00 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Fri, 19 Jan 2018 15:21:07 -0800
Subject: [PATCH 440/710] Pick up latest TS insiders

---
 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 8b5e2927d40..01f99336e66 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.7.0-insiders.20180117"
+    "typescript": "2.7.0-insiders.20180119"
   },
   "scripts": {
     "postinstall": "node ./postinstall"
diff --git a/extensions/yarn.lock b/extensions/yarn.lock
index bb38c8b58be..1fc13a8f83b 100644
--- a/extensions/yarn.lock
+++ b/extensions/yarn.lock
@@ -2,6 +2,6 @@
 # yarn lockfile v1
 
 
-typescript@2.7.0-insiders.20180117:
-  version "2.7.0-insiders.20180117"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.0-insiders.20180117.tgz#01761dd795e6ad1d6a11a1e898c9b14d068d0097"
+typescript@2.7.0-insiders.20180119:
+  version "2.7.0-insiders.20180119"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.0-insiders.20180119.tgz#556c59eaabb0758dd1a2f0b0602a355746d33277"

From 91198d94747caad4c0041351054b1f2b52135d51 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 15:20:57 -0800
Subject: [PATCH 441/710] Request settings for new extensions

---
 .../preferences/browser/preferencesEditor.ts  | 72 ++++++++++-------
 .../parts/preferences/common/preferences.ts   |  2 +-
 .../electron-browser/preferencesSearch.ts     | 78 +++++++++++--------
 3 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 3d60b7d794f..d6e0b6c55cb 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -111,7 +111,7 @@ export class PreferencesEditor extends BaseEditor {
 	private preferencesRenderers: PreferencesRenderersController;
 
 	private delayedFilterLogging: Delayer;
-	private remoteSearchThrottle: ThrottledDelayer;
+	private remoteSearchThrottle: ThrottledDelayer;
 	private _lastReportedFilter: string;
 
 	private lastFocusedWidget: SearchWidget | SideBySidePreferencesWidget = null;
@@ -243,18 +243,18 @@ export class PreferencesEditor extends BaseEditor {
 		TPromise.join([
 			this.preferencesRenderers.localFilterPreferences(query),
 			this.triggerThrottledSearch(query)
-		]).then(results => {
-			if (results) {
-				const [localResult, remoteResult] = results;
+		]).then(() => {
+			const result = this.preferencesRenderers.lastFilterResult;
+			if (result) {
 				this.delayedFilterLogging.trigger(() => this.reportFilteringUsed(
 					query,
-					remoteResult ? remoteResult.defaultSettingsGroupCounts : localResult.defaultSettingsGroupCounts,
-					remoteResult && remoteResult.metadata));
+					result.defaultSettingsGroupCounts,
+					result.metadata));
 			}
 		});
 	}
 
-	private triggerThrottledSearch(query: string): TPromise {
+	private triggerThrottledSearch(query: string): TPromise {
 		if (query) {
 			return this.remoteSearchThrottle.trigger(() => this.preferencesRenderers.remoteSearchPreferences(query));
 		} else {
@@ -366,11 +366,13 @@ class PreferencesRenderersController extends Disposable {
 	private _editablePreferencesRendererDisposables: IDisposable[] = [];
 
 	private _settingsNavigator: SettingsNavigator;
-	private _filtersInProgress: TPromise[];
+	private _remoteFiltersInProgress: TPromise[];
 
 	private _currentLocalSearchProvider: ISearchProvider;
 	private _currentRemoteSearchProvider: ISearchProvider;
+	private _currentNewExtensionsSearchProvider: ISearchProvider;
 	private _lastQuery: string;
+	private _lastFilterResult: IFilterOrSearchResult;
 
 	private _onDidFilterResultsCountChange: Emitter = this._register(new Emitter());
 	public onDidFilterResultsCountChange: Event = this._onDidFilterResultsCountChange.event;
@@ -382,6 +384,10 @@ class PreferencesRenderersController extends Disposable {
 		super();
 	}
 
+	get lastFilterResult(): IFilterOrSearchResult {
+		return this._lastFilterResult;
+	}
+
 	get defaultPreferencesRenderer(): IPreferencesRenderer {
 		return this._defaultPreferencesRenderer;
 	}
@@ -415,34 +421,48 @@ class PreferencesRenderersController extends Disposable {
 		}
 	}
 
-	async _onEditableContentDidChange(): TPromise {
+	private async _onEditableContentDidChange(): TPromise {
 		await this.localFilterPreferences(this._lastQuery, true);
 		await this.remoteSearchPreferences(this._lastQuery, true);
 	}
 
-	remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise {
+	remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise {
+		if (this._remoteFiltersInProgress) {
+			// Resolved/rejected promises have no .cancel()
+			this._remoteFiltersInProgress.forEach(p => p.cancel && p.cancel());
+		}
+
 		this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query);
-		return this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"));
+		this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true);
+
+		this._remoteFiltersInProgress = [
+			this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results")),
+			this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"))
+		];
+
+		return TPromise.join(this._remoteFiltersInProgress).then(() => {
+			this._remoteFiltersInProgress = null;
+		}, err => {
+			if (isPromiseCanceledError(err)) {
+				return null;
+			} else {
+				onUnexpectedError(err);
+			}
+		});
 	}
 
-	localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise {
+	localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise {
 		this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query);
 		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"));
 	}
 
-	filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string): TPromise {
+	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string): TPromise {
 		this._lastQuery = query;
-		if (this._filtersInProgress) {
-			// Resolved/rejected promises have no .cancel()
-			this._filtersInProgress.forEach(p => p.cancel && p.cancel());
-		}
 
-		this._filtersInProgress = [
+		return TPromise.join([
 			this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel),
-			this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel)];
-
-		return TPromise.join(this._filtersInProgress).then(results => {
-			this._filtersInProgress = null;
+			this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel)]
+		).then(results => {
 			const [defaultFilterResult, editableFilterResult] = results;
 
 			this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
@@ -451,13 +471,7 @@ class PreferencesRenderersController extends Disposable {
 				defaultSettingsGroupCounts: defaultFilterResult && this._countById(defaultFilterResult.filteredGroups)
 			};
 
-			return result;
-		}, err => {
-			if (isPromiseCanceledError(err)) {
-				return null;
-			} else {
-				onUnexpectedError(err);
-			}
+			this._lastFilterResult = result;
 		});
 	}
 
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index 9330e27ba91..d4ba6f83a05 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -177,7 +177,7 @@ export interface IPreferencesSearchService {
 	_serviceBrand: any;
 
 	getLocalSearchProvider(filter: string): ISearchProvider;
-	getRemoteSearchProvider(filter: string): ISearchProvider;
+	getRemoteSearchProvider(filter: string, newExtensionsOnly?: boolean): ISearchProvider;
 }
 
 export interface ISearchProvider {
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 763be7bcc05..3c56eac7ff6 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -67,8 +67,8 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 		}
 	}
 
-	getRemoteSearchProvider(filter: string): RemoteSearchProvider {
-		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this._endpoint, this._installedExtensions);
+	getRemoteSearchProvider(filter: string, newExtensionsOnly = false): RemoteSearchProvider {
+		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this._endpoint, this._installedExtensions, newExtensionsOnly);
 	}
 
 	getLocalSearchProvider(filter: string): LocalSearchProvider {
@@ -117,7 +117,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 	private _filter: string;
 	private _remoteSearchP: TPromise;
 
-	constructor(filter: string, endpoint: IEndpointDetails, private installedExtensions: TPromise,
+	constructor(filter: string, private endpoint: IEndpointDetails, private installedExtensions: TPromise, private newExtensionsOnly: boolean,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IRequestService private requestService: IRequestService,
 	) {
@@ -125,7 +125,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 
 		// @queries are always handled by local filter
 		this._remoteSearchP = filter && !strings.startsWith(filter, '@') ?
-			this.getSettingsFromBing(filter, endpoint) :
+			this.getSettingsFromBing(filter) :
 			TPromise.wrap(null);
 	}
 
@@ -148,15 +148,15 @@ export class RemoteSearchProvider implements ISearchProvider {
 		});
 	}
 
-	private getSettingsFromBing(filter: string, endpoint: IEndpointDetails): TPromise {
+	private getSettingsFromBing(filter: string): TPromise {
 		const start = Date.now();
-		return this.prepareUrl(filter, endpoint, this.environmentService.settingsSearchBuildId).then(url => {
+		return this.prepareUrl(filter).then(url => {
 			return this.requestService.request({
 				url,
 				headers: {
 					'User-Agent': 'request',
 					'Content-Type': 'application/json; charset=utf-8',
-					'api-key': endpoint.key
+					'api-key': this.endpoint.key
 				},
 				timeout: 5000
 			}).then(context => {
@@ -205,7 +205,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 		};
 	}
 
-	private prepareUrl(query: string, endpoint: IEndpointDetails, buildNumber: number): TPromise {
+	private prepareUrl(query: string): TPromise {
 		query = escapeSpecialChars(query);
 		const boost = 10;
 		const userQuery = `(${query})^${boost}`;
@@ -214,41 +214,55 @@ export class RemoteSearchProvider implements ISearchProvider {
 		query = query.replace(/\ +/g, '~ ') + '~';
 
 		const encodedQuery = encodeURIComponent(userQuery + ' || ' + query);
-		let url = `${endpoint.urlBase}?`;
+		let url = `${this.endpoint.urlBase}?`;
 
-		return this.installedExtensions.then(exts => {
-			if (endpoint.key) {
-				url += `${API_VERSION}`;
-				url += `&search=${encodedQuery}`;
+		const buildNumber = this.environmentService.settingsSearchBuildId;
+		if (this.endpoint.key) {
+			url += `${API_VERSION}&${QUERY_TYPE}`;
+			url += `&search=${encodedQuery}`;
 
-				const filters = exts.map(ext => {
-					const uuid = ext.identifier.uuid;
-					const versionString = ext.manifest.version
-						.split('.')
-						.map(versionPart => strings.pad(versionPart, 10))
-						.join('');
-
-					return `(packageid eq '${uuid}' and startbuildno le '${versionString}' and endbuildno ge '${versionString}')`;
-				});
-
-				if (buildNumber) {
-					filters.push(`(packageid eq 'core' and startbuildno le '${buildNumber}' and endbuildno ge '${buildNumber}')`);
-					url += `&$filter=${filters.join(' or ')}`;
-				}
+			if (this.newExtensionsOnly) {
+				return TPromise.wrap(url);
 			} else {
-				url += `query=${encodedQuery}`;
+				return this.getVersionAndExtensionFilters(buildNumber).then(filters => {
+					url += `&$filter=${filters.join(' or ')}`;
+					return url;
+				});
+			}
+		} else {
+			url += `query=${encodedQuery}`;
 
-				if (buildNumber) {
-					url += `&build=${buildNumber}`;
-				}
+			if (buildNumber) {
+				url += `&build=${buildNumber}`;
+			}
+		}
+
+		return TPromise.wrap(url);
+	}
+
+	private getVersionAndExtensionFilters(buildNumber?: number): TPromise {
+		return this.installedExtensions.then(exts => {
+			const filters = exts.map(ext => {
+				const uuid = ext.identifier.uuid;
+				const versionString = ext.manifest.version
+					.split('.')
+					.map(versionPart => strings.pad(versionPart, 10))
+					.join('');
+
+				return `(packageid eq '${uuid}' and startbuildno le '${versionString}' and endbuildno ge '${versionString}')`;
+			});
+
+			if (buildNumber) {
+				filters.push(`(packageid eq 'core' and startbuildno le '${buildNumber}' and endbuildno ge '${buildNumber}')`);
 			}
 
-			return url;
+			return filters;
 		});
 	}
 }
 
 const API_VERSION = 'api-version=2016-09-01-Preview';
+const QUERY_TYPE = 'querytype=full';
 
 function escapeSpecialChars(query: string): string {
 	return query.replace(/\./g, ' ')

From 0f907abc022460b9b9f114ea65ce181a4239d54f Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Fri, 19 Jan 2018 15:37:12 -0800
Subject: [PATCH 442/710] First attempt of search caching.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 485 ++----------------
 .../model/pieceTreeTextBuffer/rbTreeBase.ts   | 427 +++++++++++++++
 .../pieceTreeTextBuffer.test.ts               |   3 +-
 3 files changed, 474 insertions(+), 441 deletions(-)
 create mode 100644 src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 2d35c561c07..9c4b974dd11 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -8,49 +8,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export const enum NodeColor {
-	Black = 0,
-	Red = 1,
-}
-
-export function getNodeColor(node: TreeNode) {
-	return node.color;
-}
-
-function leftest(node: TreeNode): TreeNode {
-	while (node.left !== SENTINEL) {
-		node = node.left;
-	}
-	return node;
-}
-
-function righttest(node: TreeNode): TreeNode {
-	while (node.right !== SENTINEL) {
-		node = node.right;
-	}
-	return node;
-}
-
-function calculateSize(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.size_left + node.piece.length + calculateSize(node.right);
-}
-
-function calculateLF(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
-}
-
-function resetSentinel(): void {
-	SENTINEL.parent = SENTINEL;
-}
+import { leftest, righttest, updateTreeMetadata, rbDelete, fixInsert, NodeColor, SENTINEL, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
 
@@ -138,84 +96,6 @@ export function createLineStarts(r: number[], str: string): LineStarts {
 	return result;
 }
 
-export class TreeNode {
-	parent: TreeNode;
-	left: TreeNode;
-	right: TreeNode;
-	color: NodeColor;
-
-	// Piece
-	piece: Piece;
-	size_left: number; // size of the left subtree (not inorder)
-	lf_left: number; // line feeds cnt in the left subtree (not in order)
-
-	constructor(piece: Piece, color: NodeColor) {
-		this.piece = piece;
-		this.color = color;
-		this.size_left = 0;
-		this.lf_left = 0;
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-
-	public next(): TreeNode {
-		if (this.right !== SENTINEL) {
-			return leftest(this.right);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.left === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public prev(): TreeNode {
-		if (this.left !== SENTINEL) {
-			return righttest(this.left);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.right === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public detach(): void {
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-}
-
-export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
-SENTINEL.parent = SENTINEL;
-SENTINEL.left = SENTINEL;
-SENTINEL.right = SENTINEL;
-SENTINEL.color = NodeColor.Black;
-
 export interface NodePosition {
 	/**
 	 * Piece Index
@@ -309,6 +189,7 @@ export class PieceTreeBase {
 	protected _lineCnt: number;
 	protected _length: number;
 	private _lastChangeBufferPos: BufferCursor;
+	private _lastNodePosition: NodePosition;
 
 	constructor(chunks: StringBuffer[]) {
 		this.create(chunks);
@@ -319,6 +200,7 @@ export class PieceTreeBase {
 			new StringBuffer('', [0])
 		];
 		this._lastChangeBufferPos = { line: 0, column: 0 };
+		this._lastNodePosition = null;
 		this.root = SENTINEL;
 		this._lineCnt = 1;
 		this._length = 0;
@@ -380,7 +262,6 @@ export class PieceTreeBase {
 		this.create(chunks);
 	}
 
-
 	// #region Buffer API
 	public createSnapshot(BOM: string): ITextSnapshot {
 		return new PieceTreeSnapshot(this, BOM);
@@ -556,6 +437,7 @@ export class PieceTreeBase {
 				// changed buffer
 				this.appendToNode(node, value);
 				this.computeBufferMetadata();
+				this._lastNodePosition = { node, remainder, nodeStartOffset };
 				return;
 			}
 
@@ -638,7 +520,7 @@ export class PieceTreeBase {
 			if (startPosition.nodeStartOffset === offset) {
 				if (cnt === startNode.piece.length) { // delete node
 					let next = startNode.next();
-					this.rbDelete(startNode);
+					rbDelete(this, startNode);
 					this.validateCRLFWithPrevNode(next);
 					this.computeBufferMetadata();
 					return;
@@ -702,7 +584,7 @@ export class PieceTreeBase {
 			piece.length -= 1;
 
 			value += '\n';
-			this.updateTreeMetadata(node, -1, -1);
+			updateTreeMetadata(this, node, -1, -1);
 
 			if (node.piece.length === 0) {
 				nodesToDel.push(node);
@@ -806,7 +688,7 @@ export class PieceTreeBase {
 
 	deleteNodes(nodes: TreeNode[]): void {
 		for (let i = 0; i < nodes.length; i++) {
-			this.rbDelete(nodes[i]);
+			rbDelete(this, nodes[i]);
 		}
 	}
 
@@ -962,7 +844,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = newEndOffset - originalEndOffset;
 		piece.length += size_delta;
-		this.updateTreeMetadata(node, size_delta, lf_delta);
+		updateTreeMetadata(this, node, size_delta, lf_delta);
 	}
 
 	deleteNodeHead(node: TreeNode, pos: BufferCursor) {
@@ -976,7 +858,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = originalStartOffset - newStartOffset;
 		piece.length += size_delta;
-		this.updateTreeMetadata(node, size_delta, lf_delta);
+		updateTreeMetadata(this, node, size_delta, lf_delta);
 	}
 
 	shrinkNode(node: TreeNode, start: BufferCursor, end: BufferCursor) {
@@ -992,7 +874,7 @@ export class PieceTreeBase {
 		let newLength = this.offsetInBuffer(piece.bufferIndex, start) - this.offsetInBuffer(piece.bufferIndex, originalStartPos);
 		let newLFCnt = piece.lineFeedCnt;
 		piece.length = newLength;
-		this.updateTreeMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt);
+		updateTreeMetadata(this, node, newLength - oldLength, newLFCnt - oldLFCnt);
 
 		// new right piece, end, originalEndPos
 		let newPiece = new Piece(
@@ -1036,10 +918,36 @@ export class PieceTreeBase {
 		node.piece.lineFeedCnt = newLineFeedCnt;
 		let lf_delta = newLineFeedCnt - oldLineFeedCnt;
 		this._lastChangeBufferPos = endPos;
-		this.updateTreeMetadata(node, value.length, lf_delta);
+		updateTreeMetadata(this, node, value.length, lf_delta);
+	}
+
+	readNodePositionFromCache(offset: number): NodePosition {
+		if (!this._lastNodePosition) {
+			return null;
+		}
+
+		if (this._lastNodePosition.node.parent === null) {
+			this._lastNodePosition = null;
+			return null;
+		}
+
+		if (this._lastNodePosition.nodeStartOffset > offset || this._lastNodePosition.nodeStartOffset + this._lastNodePosition.node.piece.length < offset) {
+			return null;
+		}
+
+		return {
+			node: this._lastNodePosition.node,
+			remainder: offset - this._lastNodePosition.nodeStartOffset,
+			nodeStartOffset: this._lastNodePosition.nodeStartOffset
+		};
 	}
 
 	nodeAt(offset: number): NodePosition {
+		let cachedNodePosition = this.readNodePositionFromCache(offset);
+		if (cachedNodePosition) {
+			return cachedNodePosition;
+		}
+
 		let x = this.root;
 		let nodeStartOffset = 0;
 
@@ -1231,7 +1139,7 @@ export class PieceTreeBase {
 		prev.piece.length -= 1;
 		prev.piece.lineFeedCnt -= 1;
 
-		this.updateTreeMetadata(prev, - 1, -1);
+		updateTreeMetadata(this, prev, - 1, -1);
 		if (prev.piece.length === 0) {
 			nodesToDel.push(prev);
 		}
@@ -1243,7 +1151,7 @@ export class PieceTreeBase {
 		next.piece.lineFeedCnt = this.getLineFeedCnt(next.piece.bufferIndex, next.piece.start, next.piece.end); // @todo, we can optimize
 		// }
 
-		this.updateTreeMetadata(next, - 1, -1);
+		updateTreeMetadata(this, next, - 1, -1);
 		if (next.piece.length === 0) {
 			nodesToDel.push(next);
 		}
@@ -1254,7 +1162,7 @@ export class PieceTreeBase {
 		// delete empty nodes
 
 		for (let i = 0; i < nodesToDel.length; i++) {
-			this.rbDelete(nodesToDel[i]);
+			rbDelete(this, nodesToDel[i]);
 		}
 	}
 
@@ -1266,7 +1174,7 @@ export class PieceTreeBase {
 				value += '\n';
 
 				if (nextNode.piece.length === 1) {
-					this.rbDelete(nextNode);
+					rbDelete(this, nextNode);
 				} else {
 
 					let piece = nextNode.piece;
@@ -1274,7 +1182,7 @@ export class PieceTreeBase {
 					piece.start = newStart;
 					piece.length -= 1;
 					piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize
-					this.updateTreeMetadata(nextNode, -1, -1);
+					updateTreeMetadata(this, nextNode, -1, -1);
 				}
 				return true;
 			}
@@ -1287,7 +1195,7 @@ export class PieceTreeBase {
 
 	// #endregion
 
-	// #region Red Black Tree
+	// #region Tree operations
 	iterate(node: TreeNode, callback: (node: TreeNode) => boolean): boolean {
 		if (node === SENTINEL) {
 			return callback(SENTINEL);
@@ -1314,53 +1222,6 @@ export class PieceTreeBase {
 		return currentContent;
 	}
 
-	leftRotate(x: TreeNode) {
-		let y = x.right;
-
-		// fix size_left
-		y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
-		y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-		x.right = y.left;
-
-		if (y.left !== SENTINEL) {
-			y.left.parent = x;
-		}
-		y.parent = x.parent;
-		if (x.parent === SENTINEL) {
-			this.root = y;
-		} else if (x.parent.left === x) {
-			x.parent.left = y;
-		} else {
-			x.parent.right = y;
-		}
-		y.left = x;
-		x.parent = y;
-	}
-
-	rightRotate(y: TreeNode) {
-		let x = y.left;
-		y.left = x.right;
-		if (x.right !== SENTINEL) {
-			x.right.parent = y;
-		}
-		x.parent = y.parent;
-
-		// fix size_left
-		y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
-		y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-
-		if (y.parent === SENTINEL) {
-			this.root = x;
-		} else if (y === y.parent.right) {
-			y.parent.right = x;
-		} else {
-			y.parent.left = x;
-		}
-
-		x.right = y;
-		y.parent = x;
-	}
-
 	/**
 	 *      node              node
 	 *     /  \              /  \
@@ -1389,7 +1250,7 @@ export class PieceTreeBase {
 			z.parent = nextNode;
 		}
 
-		this.fixInsert(z);
+		fixInsert(this, z);
 		return z;
 	}
 
@@ -1421,266 +1282,10 @@ export class PieceTreeBase {
 			z.parent = prevNode;
 		}
 
-		this.fixInsert(z);
+		fixInsert(this, z);
 		return z;
 	}
 
-	rbDelete(z: TreeNode) {
-		let x: TreeNode;
-		let y: TreeNode;
-
-		if (z.left === SENTINEL) {
-			y = z;
-			x = y.right;
-		} else if (z.right === SENTINEL) {
-			y = z;
-			x = y.left;
-		} else {
-			y = leftest(z.right);
-			x = y.right;
-		}
-
-		if (y === this.root) {
-			this.root = x;
-
-			// if x is null, we are removing the only node
-			x.color = NodeColor.Black;
-			z.detach();
-			resetSentinel();
-			this.root.parent = SENTINEL;
-
-			return;
-		}
-
-		let yWasRed = (y.color === NodeColor.Red);
-
-		if (y === y.parent.left) {
-			y.parent.left = x;
-		} else {
-			y.parent.right = x;
-		}
-
-		if (y === z) {
-			x.parent = y.parent;
-			this.recomputeTreeMetadata(x);
-		} else {
-			if (y.parent === z) {
-				x.parent = y;
-			} else {
-				x.parent = y.parent;
-			}
-
-			// as we make changes to x's hierarchy, update size_left of subtree first
-			this.recomputeTreeMetadata(x);
-
-			y.left = z.left;
-			y.right = z.right;
-			y.parent = z.parent;
-			y.color = z.color;
-
-			if (z === this.root) {
-				this.root = y;
-			} else {
-				if (z === z.parent.left) {
-					z.parent.left = y;
-				} else {
-					z.parent.right = y;
-				}
-			}
-
-			if (y.left !== SENTINEL) {
-				y.left.parent = y;
-			}
-			if (y.right !== SENTINEL) {
-				y.right.parent = y;
-			}
-			// update metadata
-			// we replace z with y, so in this sub tree, the length change is z.item.length
-			y.size_left = z.size_left;
-			y.lf_left = z.lf_left;
-			this.recomputeTreeMetadata(y);
-		}
-
-		z.detach();
-
-		if (x.parent.left === x) {
-			let newSizeLeft = calculateSize(x);
-			let newLFLeft = calculateLF(x);
-			if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
-				let delta = newSizeLeft - x.parent.size_left;
-				let lf_delta = newLFLeft - x.parent.lf_left;
-				x.parent.size_left = newSizeLeft;
-				x.parent.lf_left = newLFLeft;
-				this.updateTreeMetadata(x.parent, delta, lf_delta);
-			}
-		}
-
-		this.recomputeTreeMetadata(x.parent);
-
-		if (yWasRed) {
-			resetSentinel();
-			return;
-		}
-
-		// RB-DELETE-FIXUP
-		let w: TreeNode;
-		while (x !== this.root && x.color === NodeColor.Black) {
-			if (x === x.parent.left) {
-				w = x.parent.right;
-
-				if (w.color === NodeColor.Red) {
-					w.color = NodeColor.Black;
-					x.parent.color = NodeColor.Red;
-					this.leftRotate(x.parent);
-					w = x.parent.right;
-				}
-
-				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-					w.color = NodeColor.Red;
-					x = x.parent;
-				} else {
-					if (w.right.color === NodeColor.Black) {
-						w.left.color = NodeColor.Black;
-						w.color = NodeColor.Red;
-						this.rightRotate(w);
-						w = x.parent.right;
-					}
-
-					w.color = x.parent.color;
-					x.parent.color = NodeColor.Black;
-					w.right.color = NodeColor.Black;
-					this.leftRotate(x.parent);
-					x = this.root;
-				}
-			} else {
-				w = x.parent.left;
-
-				if (w.color === NodeColor.Red) {
-					w.color = NodeColor.Black;
-					x.parent.color = NodeColor.Red;
-					this.rightRotate(x.parent);
-					w = x.parent.left;
-				}
-
-				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-					w.color = NodeColor.Red;
-					x = x.parent;
-
-				} else {
-					if (w.left.color === NodeColor.Black) {
-						w.right.color = NodeColor.Black;
-						w.color = NodeColor.Red;
-						this.leftRotate(w);
-						w = x.parent.left;
-					}
-
-					w.color = x.parent.color;
-					x.parent.color = NodeColor.Black;
-					w.left.color = NodeColor.Black;
-					this.rightRotate(x.parent);
-					x = this.root;
-				}
-			}
-		}
-		x.color = NodeColor.Black;
-		resetSentinel();
-	}
-
-	fixInsert(x: TreeNode) {
-		this.recomputeTreeMetadata(x);
-
-		while (x !== this.root && x.parent.color === NodeColor.Red) {
-			if (x.parent === x.parent.parent.left) {
-				const y = x.parent.parent.right;
-
-				if (y.color === NodeColor.Red) {
-					x.parent.color = NodeColor.Black;
-					y.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					x = x.parent.parent;
-				} else {
-					if (x === x.parent.right) {
-						x = x.parent;
-						this.leftRotate(x);
-					}
-
-					x.parent.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					this.rightRotate(x.parent.parent);
-				}
-			} else {
-				const y = x.parent.parent.left;
-
-				if (y.color === NodeColor.Red) {
-					x.parent.color = NodeColor.Black;
-					y.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					x = x.parent.parent;
-				} else {
-					if (x === x.parent.left) {
-						x = x.parent;
-						this.rightRotate(x);
-					}
-					x.parent.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					this.leftRotate(x.parent.parent);
-				}
-			}
-		}
-
-		this.root.color = NodeColor.Black;
-	}
-
-	updateTreeMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void {
-		// node length change or line feed count change
-		while (x !== this.root && x !== SENTINEL) {
-			if (x.parent.left === x) {
-				x.parent.size_left += delta;
-				x.parent.lf_left += lineFeedCntDelta;
-			}
-
-			x = x.parent;
-		}
-	}
-
-	recomputeTreeMetadata(x: TreeNode) {
-		let delta = 0;
-		let lf_delta = 0;
-		if (x === this.root) {
-			return;
-		}
-
-		if (delta === 0) {
-			// go upwards till the node whose left subtree is changed.
-			while (x !== this.root && x === x.parent.right) {
-				x = x.parent;
-			}
-
-			if (x === this.root) {
-				// well, it means we add a node to the end (inorder)
-				return;
-			}
-
-			// x is the node whose right subtree is changed.
-			x = x.parent;
-
-			delta = calculateSize(x.left) - x.size_left;
-			lf_delta = calculateLF(x.left) - x.lf_left;
-			x.size_left += delta;
-			x.lf_left += lf_delta;
-		}
-
-		// go upwards till root. O(logN)
-		while (x !== this.root && (delta !== 0 || lf_delta !== 0)) {
-			if (x.parent.left === x) {
-				x.parent.size_left += delta;
-				x.parent.lf_left += lf_delta;
-			}
-
-			x = x.parent;
-		}
-	}
-
 	getContentOfSubTree(node: TreeNode): string {
 		let str = '';
 
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
new file mode 100644
index 00000000000..84417b947cd
--- /dev/null
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
@@ -0,0 +1,427 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Piece, PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+
+export class TreeNode {
+	parent: TreeNode;
+	left: TreeNode;
+	right: TreeNode;
+	color: NodeColor;
+
+	// Piece
+	piece: Piece;
+	size_left: number; // size of the left subtree (not inorder)
+	lf_left: number; // line feeds cnt in the left subtree (not in order)
+
+	constructor(piece: Piece, color: NodeColor) {
+		this.piece = piece;
+		this.color = color;
+		this.size_left = 0;
+		this.lf_left = 0;
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+
+	public next(): TreeNode {
+		if (this.right !== SENTINEL) {
+			return leftest(this.right);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.left === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public prev(): TreeNode {
+		if (this.left !== SENTINEL) {
+			return righttest(this.left);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.right === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public detach(): void {
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+}
+
+export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
+SENTINEL.parent = SENTINEL;
+SENTINEL.left = SENTINEL;
+SENTINEL.right = SENTINEL;
+SENTINEL.color = NodeColor.Black;
+
+export const enum NodeColor {
+	Black = 0,
+	Red = 1,
+}
+
+export function leftest(node: TreeNode): TreeNode {
+	while (node.left !== SENTINEL) {
+		node = node.left;
+	}
+	return node;
+}
+
+export function righttest(node: TreeNode): TreeNode {
+	while (node.right !== SENTINEL) {
+		node = node.right;
+	}
+	return node;
+}
+
+export function calculateSize(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.size_left + node.piece.length + calculateSize(node.right);
+}
+
+export function calculateLF(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
+}
+
+export function resetSentinel(): void {
+	SENTINEL.parent = SENTINEL;
+}
+
+export function leftRotate(tree: PieceTreeBase, x: TreeNode) {
+	let y = x.right;
+
+	// fix size_left
+	y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
+	y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+	x.right = y.left;
+
+	if (y.left !== SENTINEL) {
+		y.left.parent = x;
+	}
+	y.parent = x.parent;
+	if (x.parent === SENTINEL) {
+		tree.root = y;
+	} else if (x.parent.left === x) {
+		x.parent.left = y;
+	} else {
+		x.parent.right = y;
+	}
+	y.left = x;
+	x.parent = y;
+}
+
+export function rightRotate(tree: PieceTreeBase, y: TreeNode) {
+	let x = y.left;
+	y.left = x.right;
+	if (x.right !== SENTINEL) {
+		x.right.parent = y;
+	}
+	x.parent = y.parent;
+
+	// fix size_left
+	y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
+	y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+
+	if (y.parent === SENTINEL) {
+		tree.root = x;
+	} else if (y === y.parent.right) {
+		y.parent.right = x;
+	} else {
+		y.parent.left = x;
+	}
+
+	x.right = y;
+	y.parent = x;
+}
+
+export function rbDelete(tree: PieceTreeBase, z: TreeNode) {
+	let x: TreeNode;
+	let y: TreeNode;
+
+	if (z.left === SENTINEL) {
+		y = z;
+		x = y.right;
+	} else if (z.right === SENTINEL) {
+		y = z;
+		x = y.left;
+	} else {
+		y = leftest(z.right);
+		x = y.right;
+	}
+
+	if (y === tree.root) {
+		tree.root = x;
+
+		// if x is null, we are removing the only node
+		x.color = NodeColor.Black;
+		z.detach();
+		resetSentinel();
+		tree.root.parent = SENTINEL;
+
+		return;
+	}
+
+	let yWasRed = (y.color === NodeColor.Red);
+
+	if (y === y.parent.left) {
+		y.parent.left = x;
+	} else {
+		y.parent.right = x;
+	}
+
+	if (y === z) {
+		x.parent = y.parent;
+		recomputeTreeMetadata(tree, x);
+	} else {
+		if (y.parent === z) {
+			x.parent = y;
+		} else {
+			x.parent = y.parent;
+		}
+
+		// as we make changes to x's hierarchy, update size_left of subtree first
+		recomputeTreeMetadata(tree, x);
+
+		y.left = z.left;
+		y.right = z.right;
+		y.parent = z.parent;
+		y.color = z.color;
+
+		if (z === tree.root) {
+			tree.root = y;
+		} else {
+			if (z === z.parent.left) {
+				z.parent.left = y;
+			} else {
+				z.parent.right = y;
+			}
+		}
+
+		if (y.left !== SENTINEL) {
+			y.left.parent = y;
+		}
+		if (y.right !== SENTINEL) {
+			y.right.parent = y;
+		}
+		// update metadata
+		// we replace z with y, so in this sub tree, the length change is z.item.length
+		y.size_left = z.size_left;
+		y.lf_left = z.lf_left;
+		recomputeTreeMetadata(tree, y);
+	}
+
+	z.detach();
+
+	if (x.parent.left === x) {
+		let newSizeLeft = calculateSize(x);
+		let newLFLeft = calculateLF(x);
+		if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
+			let delta = newSizeLeft - x.parent.size_left;
+			let lf_delta = newLFLeft - x.parent.lf_left;
+			x.parent.size_left = newSizeLeft;
+			x.parent.lf_left = newLFLeft;
+			updateTreeMetadata(tree, x.parent, delta, lf_delta);
+		}
+	}
+
+	recomputeTreeMetadata(tree, x.parent);
+
+	if (yWasRed) {
+		resetSentinel();
+		return;
+	}
+
+	// RB-DELETE-FIXUP
+	let w: TreeNode;
+	while (x !== tree.root && x.color === NodeColor.Black) {
+		if (x === x.parent.left) {
+			w = x.parent.right;
+
+			if (w.color === NodeColor.Red) {
+				w.color = NodeColor.Black;
+				x.parent.color = NodeColor.Red;
+				leftRotate(tree, x.parent);
+				w = x.parent.right;
+			}
+
+			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+				w.color = NodeColor.Red;
+				x = x.parent;
+			} else {
+				if (w.right.color === NodeColor.Black) {
+					w.left.color = NodeColor.Black;
+					w.color = NodeColor.Red;
+					rightRotate(tree, w);
+					w = x.parent.right;
+				}
+
+				w.color = x.parent.color;
+				x.parent.color = NodeColor.Black;
+				w.right.color = NodeColor.Black;
+				leftRotate(tree, x.parent);
+				x = tree.root;
+			}
+		} else {
+			w = x.parent.left;
+
+			if (w.color === NodeColor.Red) {
+				w.color = NodeColor.Black;
+				x.parent.color = NodeColor.Red;
+				rightRotate(tree, x.parent);
+				w = x.parent.left;
+			}
+
+			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+				w.color = NodeColor.Red;
+				x = x.parent;
+
+			} else {
+				if (w.left.color === NodeColor.Black) {
+					w.right.color = NodeColor.Black;
+					w.color = NodeColor.Red;
+					leftRotate(tree, w);
+					w = x.parent.left;
+				}
+
+				w.color = x.parent.color;
+				x.parent.color = NodeColor.Black;
+				w.left.color = NodeColor.Black;
+				rightRotate(tree, x.parent);
+				x = tree.root;
+			}
+		}
+	}
+	x.color = NodeColor.Black;
+	resetSentinel();
+}
+
+export function fixInsert(tree: PieceTreeBase, x: TreeNode) {
+	recomputeTreeMetadata(tree, x);
+
+	while (x !== tree.root && x.parent.color === NodeColor.Red) {
+		if (x.parent === x.parent.parent.left) {
+			const y = x.parent.parent.right;
+
+			if (y.color === NodeColor.Red) {
+				x.parent.color = NodeColor.Black;
+				y.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				x = x.parent.parent;
+			} else {
+				if (x === x.parent.right) {
+					x = x.parent;
+					leftRotate(tree, x);
+				}
+
+				x.parent.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				rightRotate(tree, x.parent.parent);
+			}
+		} else {
+			const y = x.parent.parent.left;
+
+			if (y.color === NodeColor.Red) {
+				x.parent.color = NodeColor.Black;
+				y.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				x = x.parent.parent;
+			} else {
+				if (x === x.parent.left) {
+					x = x.parent;
+					rightRotate(tree, x);
+				}
+				x.parent.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				leftRotate(tree, x.parent.parent);
+			}
+		}
+	}
+
+	tree.root.color = NodeColor.Black;
+}
+
+export function updateTreeMetadata(tree: PieceTreeBase, x: TreeNode, delta: number, lineFeedCntDelta: number): void {
+	// node length change or line feed count change
+	while (x !== tree.root && x !== SENTINEL) {
+		if (x.parent.left === x) {
+			x.parent.size_left += delta;
+			x.parent.lf_left += lineFeedCntDelta;
+		}
+
+		x = x.parent;
+	}
+}
+
+export function recomputeTreeMetadata(tree: PieceTreeBase, x: TreeNode) {
+	let delta = 0;
+	let lf_delta = 0;
+	if (x === tree.root) {
+		return;
+	}
+
+	if (delta === 0) {
+		// go upwards till the node whose left subtree is changed.
+		while (x !== tree.root && x === x.parent.right) {
+			x = x.parent;
+		}
+
+		if (x === tree.root) {
+			// well, it means we add a node to the end (inorder)
+			return;
+		}
+
+		// x is the node whose right subtree is changed.
+		x = x.parent;
+
+		delta = calculateSize(x.left) - x.size_left;
+		lf_delta = calculateLF(x.left) - x.lf_left;
+		x.size_left += delta;
+		x.lf_left += lf_delta;
+	}
+
+	// go upwards till root. O(logN)
+	while (x !== tree.root && (delta !== 0 || lf_delta !== 0)) {
+		if (x.parent.left === x) {
+			x.parent.size_left += delta;
+			x.parent.lf_left += lf_delta;
+		}
+
+		x = x.parent;
+	}
+}
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 edf6c9af1f9..83eaf75bde0 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -9,7 +9,8 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { PieceTreeBase, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
 import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n';

From 0724266efc5af0d13fe6b40a56920b39bf0e84d8 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 16:54:06 -0800
Subject: [PATCH 443/710] Show section for settings from new extensions, with
 decorations on each

---
 .../preferences/browser/media/preferences.css |  7 ++
 .../preferences/browser/preferencesEditor.ts  | 23 +++---
 .../browser/preferencesRenderers.ts           | 47 ++++++++++++
 .../parts/preferences/common/preferences.ts   | 11 ++-
 .../preferences/common/preferencesModels.ts   |  4 +-
 .../electron-browser/preferencesSearch.ts     | 71 +++++++++++++------
 6 files changed, 131 insertions(+), 32 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/media/preferences.css b/src/vs/workbench/parts/preferences/browser/media/preferences.css
index 04251e95105..e3832b44473 100644
--- a/src/vs/workbench/parts/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/parts/preferences/browser/media/preferences.css
@@ -276,6 +276,13 @@
 	cursor: pointer;
 }
 
+.monaco-editor .newExtensionInstall {
+	background: url('info.svg') center center no-repeat;
+	width: 16px;
+	height: 16px;
+	cursor: pointer;
+}
+
 .monaco-editor .edit-preferences-widget.hidden {
 	display: none;
 	visibility: hidden;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index d6e0b6c55cb..d8f1a411ebf 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -436,8 +436,8 @@ class PreferencesRenderersController extends Disposable {
 		this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true);
 
 		this._remoteFiltersInProgress = [
-			this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results")),
-			this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"))
+			this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1),
+			this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results"), 2)
 		];
 
 		return TPromise.join(this._remoteFiltersInProgress).then(() => {
@@ -453,16 +453,18 @@ class PreferencesRenderersController extends Disposable {
 
 	localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise {
 		this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query);
-		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"));
+		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0);
 	}
 
-	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string): TPromise {
+	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, newExtensionsOnly?: boolean): TPromise {
 		this._lastQuery = query;
 
-		return TPromise.join([
-			this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel),
-			this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel)]
-		).then(results => {
+		const filterPs = [this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)];
+		if (!newExtensionsOnly) {
+			filterPs.push(this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder));
+		}
+
+		return TPromise.join(filterPs).then(results => {
 			const [defaultFilterResult, editableFilterResult] = results;
 
 			this.consolidateAndUpdate(defaultFilterResult, editableFilterResult);
@@ -485,7 +487,7 @@ class PreferencesRenderersController extends Disposable {
 		this._focusPreference(setting, this._editablePreferencesRenderer);
 	}
 
-	private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string): TPromise {
+	private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise {
 		if (preferencesRenderer) {
 			const model = preferencesRenderer.preferencesModel;
 			const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null);
@@ -509,7 +511,8 @@ class PreferencesRenderersController extends Disposable {
 						model.updateResultGroup(groupId, {
 							id: groupId,
 							label: groupLabel,
-							result: searchResult
+							result: searchResult,
+							order: groupOrder
 						}) :
 						model.updateResultGroup(groupId, null);
 
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 49d6784e666..e41f688e6a9 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -6,6 +6,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as nls from 'vs/nls';
 import { Delayer } from 'vs/base/common/async';
+import * as arrays from 'vs/base/common/arrays';
 import * as strings from 'vs/base/common/strings';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IAction } from 'vs/base/common/actions';
@@ -255,6 +256,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 	private editSettingActionRenderer: EditSettingRenderer;
 	private feedbackWidgetRenderer: FeedbackWidgetRenderer;
 	private bracesHidingRenderer: BracesHidingRenderer;
+	private extensionCodelensRenderer: ExtensionCodelensRenderer;
 	private filterResult: IFilterResult;
 
 	private _onUpdatePreference: Emitter<{ key: string, value: any, source: IIndexedSetting }> = new Emitter<{ key: string, value: any, source: IIndexedSetting }>();
@@ -279,6 +281,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 		this.feedbackWidgetRenderer = this._register(instantiationService.createInstance(FeedbackWidgetRenderer, editor));
 		this.bracesHidingRenderer = this._register(instantiationService.createInstance(BracesHidingRenderer, editor, preferencesModel));
 		this.hiddenAreasRenderer = this._register(instantiationService.createInstance(HiddenAreasRenderer, editor, [this.settingsGroupTitleRenderer, this.filteredMatchesRenderer, this.bracesHidingRenderer]));
+		this.extensionCodelensRenderer = this._register(instantiationService.createInstance(ExtensionCodelensRenderer, editor));
 
 		this._register(this.editSettingActionRenderer.onUpdateSetting(e => this._onUpdatePreference.fire(e)));
 		this._register(this.settingsGroupTitleRenderer.onHiddenAreasChanged(() => this.hiddenAreasRenderer.render()));
@@ -314,6 +317,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 			this.settingHighlighter.clear(true);
 			this.bracesHidingRenderer.render(filterResult, this.preferencesModel.settingsGroups);
 			this.editSettingActionRenderer.render(filterResult.filteredGroups, this._associatedPreferencesModel);
+			this.extensionCodelensRenderer.render(filterResult);
 		} else {
 			this.settingHighlighter.clear(true);
 			this.filteredMatchesRenderer.render(null, this.preferencesModel.settingsGroups);
@@ -323,6 +327,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 			this.settingsGroupTitleRenderer.showGroup(0);
 			this.bracesHidingRenderer.render(null, this.preferencesModel.settingsGroups);
 			this.editSettingActionRenderer.render(this.preferencesModel.settingsGroups, this._associatedPreferencesModel);
+			this.extensionCodelensRenderer.render(null);
 		}
 
 		this.hiddenAreasRenderer.render();
@@ -836,6 +841,48 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 }
 
+export class ExtensionCodelensRenderer extends Disposable {
+	private decorationIds: string[] = [];
+
+	constructor(private editor: ICodeEditor) {
+		super();
+	}
+
+	public render(filterResult: IFilterResult): void {
+		this.editor.changeDecorations(changeAccessor => {
+			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
+		});
+
+		const newExtensionGroup = filterResult && arrays.first(filterResult.filteredGroups, g => g.id === 'newExtensionsResult');
+		if (newExtensionGroup) {
+			this.editor.changeDecorations(changeAccessor => {
+				const settings = newExtensionGroup.sections[0].settings;
+				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, settings.map(setting => this.createDecoration(setting)));
+			});
+		}
+	}
+
+	private createDecoration(setting: ISetting): IModelDeltaDecoration {
+		return {
+			range: new Range(setting.keyRange.startLineNumber, 1, setting.keyRange.endLineNumber, 1),
+			options: {
+				glyphMarginClassName: 'newExtensionInstall',
+				stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+			}
+		};
+	}
+
+	public dispose() {
+		if (this.decorationIds) {
+			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
+				return changeAccessor.deltaDecorations(this.decorationIds, []);
+			});
+		}
+
+		super.dispose();
+	}
+}
+
 export interface IIndexedSetting extends ISetting {
 	index: number;
 	groupId: string;
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index d4ba6f83a05..ff7620dee0f 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -65,6 +65,7 @@ export interface ISearchResultGroup {
 	id: string;
 	label: string;
 	result: ISearchResult;
+	order: number;
 }
 
 export interface IFilterResult {
@@ -82,7 +83,15 @@ export interface ISettingMatch {
 }
 
 export interface IScoredResults {
-	[key: string]: number;
+	[key: string]: IRemoteSetting;
+}
+
+export interface IRemoteSetting {
+	score: number;
+	key: string;
+	defaultValue: string;
+	description: string;
+	packageId: string;
 }
 
 export interface IFilterMetadata {
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index 18b63f4e9c0..e9e5d435af2 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -611,7 +611,9 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 
 	protected update(): IFilterResult {
 		// Grab current result groups, only render non-empty groups
-		const resultGroups = map.values(this._currentResultGroups);
+		const resultGroups = map
+			.values(this._currentResultGroups)
+			.sort((a, b) => a.order - b.order);
 		const nonEmptyResultGroups = resultGroups.filter(group => group.result.filterMatches.length);
 
 		const startLine = tail(this.settingsGroups).range.endLineNumber + 2;
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 3c56eac7ff6..e1ed15f5bd7 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 } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, ISearchResult, ISearchProvider, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting } from 'vs/workbench/parts/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';
@@ -131,19 +131,37 @@ export class RemoteSearchProvider implements ISearchProvider {
 
 	searchModel(preferencesModel: ISettingsEditorModel): TPromise {
 		return this._remoteSearchP.then(remoteResult => {
-			if (remoteResult) {
-				const highScoreKey = top(Object.keys(remoteResult.scoredResults), (a, b) => remoteResult.scoredResults[b] - remoteResult.scoredResults[a], 1)[0];
-				const highScore = highScoreKey ? remoteResult.scoredResults[highScoreKey] : 0;
-				const minScore = highScore / 5;
+			if (!remoteResult) {
+				return null;
+			}
 
+			const resultKeys = Object.keys(remoteResult.scoredResults);
+			const highScoreKey = top(resultKeys, (a, b) => remoteResult.scoredResults[b].score - remoteResult.scoredResults[a].score, 1)[0];
+			const highScore = highScoreKey ? remoteResult.scoredResults[highScoreKey].score : 0;
+			const minScore = highScore / 5;
+			if (this.newExtensionsOnly) {
+				const passingScoreKeys = resultKeys.filter(k => remoteResult.scoredResults[k].score >= minScore);
+				const filterMatches: ISettingMatch[] = passingScoreKeys.map(k => {
+					const remoteSetting = remoteResult.scoredResults[k];
+					const setting = remoteSettingToISetting(remoteSetting);
+					return {
+						setting,
+						score: remoteSetting.score,
+						matches: [] // TODO
+					};
+				});
+
+				return {
+					filterMatches,
+					metadata: remoteResult
+				};
+			} else {
 				const settingMatcher = this.getRemoteSettingMatcher(remoteResult.scoredResults, minScore, preferencesModel);
 				const filterMatches = preferencesModel.filterSettings(this._filter, group => null, settingMatcher);
 				return {
 					filterMatches,
 					metadata: remoteResult
 				};
-			} else {
-				return null;
 			}
 		});
 	}
@@ -168,18 +186,18 @@ export class RemoteSearchProvider implements ISearchProvider {
 			}).then((result: any) => {
 				const timestamp = Date.now();
 				const duration = timestamp - start;
-				const suggestions = (result.value || [])
-					.map(r => ({
-						name: r.setting || r.Setting,
-						score: r['@search.score']
+				const remoteSettings: IRemoteSetting[] = (result.value || [])
+					.map(r => ({
+						key: JSON.parse(r.setting || r.Setting),
+						defaultValue: r['value'],
+						score: r['@search.score'],
+						description: JSON.parse(r['details']),
+						packageId: r['packageid']
 					}));
 
 				const scoredResults = Object.create(null);
-				suggestions.forEach(s => {
-					const name = s.name
-						.replace(/^"/, '')
-						.replace(/"$/, '');
-					scoredResults[name] = s.score;
+				remoteSettings.forEach(s => {
+					scoredResults[s.key] = s;
 				});
 
 				return {
@@ -195,10 +213,10 @@ export class RemoteSearchProvider implements ISearchProvider {
 
 	private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher {
 		return (setting: ISetting) => {
-			const score = scoredResults[setting.key];
-			if (typeof score === 'number' && score >= minScore) {
+			const remoteSetting = scoredResults[setting.key];
+			if (remoteSetting && remoteSetting.score >= minScore) {
 				const settingMatches = new SettingMatches(this._filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
-				return { matches: settingMatches, score: scoredResults[setting.key] };
+				return { matches: settingMatches, score: remoteSetting.score };
 			}
 
 			return null;
@@ -271,6 +289,19 @@ function escapeSpecialChars(query: string): string {
 		.trim();
 }
 
+function remoteSettingToISetting(remoteSetting: IRemoteSetting): ISetting {
+	return {
+		description: remoteSetting.description.split('\n'),
+		descriptionRanges: null,
+		key: remoteSetting.key,
+		keyRange: null,
+		value: remoteSetting.defaultValue,
+		range: null,
+		valueRange: null,
+		overrides: []
+	};
+}
+
 class SettingMatches {
 
 	private readonly descriptionMatchingWords: Map = new Map();
@@ -345,7 +376,7 @@ class SettingMatches {
 			const valueMatches = or(matchesPrefix, matchesContiguousSubString)(searchString, setting.value);
 			valueRanges = valueMatches ? valueMatches.map(match => this.toValueRange(setting, match)) : this.getRangesForWords(words, this.valueMatchingWords, [this.keyMatchingWords, this.descriptionMatchingWords]);
 		} else {
-			valueRanges = this.valuesMatcher(searchString, setting);
+			valueRanges = this.valuesMatcher ? this.valuesMatcher(searchString, setting) : [];
 		}
 
 		return [...descriptionRanges, ...keyRanges, ...valueRanges];

From 404970532a9e9a128ed540f65bf58ba85c6ad50f Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 17:38:43 -0800
Subject: [PATCH 444/710] Add command to search for extension by ID

---
 .../parts/extensions/browser/extensionsActions.ts    | 11 +++++++++++
 .../preferences/browser/preferencesRenderers.ts      | 12 +++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
index 905b22e3f88..0b244b693db 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts
@@ -1692,6 +1692,17 @@ CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsForL
 		});
 });
 
+CommandsRegistry.registerCommand('workbench.extensions.action.showExtensionsWithId', function (accessor: ServicesAccessor, extensionId: string) {
+	const viewletService = accessor.get(IViewletService);
+
+	return viewletService.openViewlet(VIEWLET_ID, true)
+		.then(viewlet => viewlet as IExtensionsViewlet)
+		.then(viewlet => {
+			viewlet.search(`@id:${extensionId}`);
+			viewlet.focus();
+		});
+});
+
 export const extensionButtonProminentBackground = registerColor('extensionButton.prominentBackground', {
 	dark: '#327e36',
 	light: '#327e36',
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index e41f688e6a9..edbd73470a7 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -34,6 +34,7 @@ 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';
+import { ICommandService } from 'vs/platform/commands/common/commands';
 
 export interface IPreferencesRenderer extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel;
@@ -844,7 +845,8 @@ export class HighlightMatchesRenderer extends Disposable {
 export class ExtensionCodelensRenderer extends Disposable {
 	private decorationIds: string[] = [];
 
-	constructor(private editor: ICodeEditor) {
+	constructor(private editor: ICodeEditor,
+		@ICommandService private commandService: ICommandService) {
 		super();
 	}
 
@@ -860,6 +862,14 @@ export class ExtensionCodelensRenderer extends Disposable {
 				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, settings.map(setting => this.createDecoration(setting)));
 			});
 		}
+
+		this._register(this.editor.onMouseDown((e: IEditorMouseEvent) => {
+			if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN) {
+				return;
+			}
+
+			this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithId', 'ms-python.python');
+		}));
 	}
 
 	private createDecoration(setting: ISetting): IModelDeltaDecoration {

From d3e2fe7c552d7d007828ace8c735b4a1e971f137 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Fri, 19 Jan 2018 18:32:03 -0800
Subject: [PATCH 445/710] Explicitly hide TS version status when in ts/js file
 with unknown scheme

---
 extensions/typescript/src/utils/versionStatus.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/typescript/src/utils/versionStatus.ts b/extensions/typescript/src/utils/versionStatus.ts
index 3ed92289670..69871458646 100644
--- a/extensions/typescript/src/utils/versionStatus.ts
+++ b/extensions/typescript/src/utils/versionStatus.ts
@@ -40,8 +40,10 @@ export default class VersionStatus {
 		if (vscode.languages.match([languageModeIds.typescript, languageModeIds.typescriptreact], doc)) {
 			if (this.normalizePath(doc.uri)) {
 				this.versionBarEntry.show();
-				return;
+			} else {
+				this.versionBarEntry.hide();
 			}
+			return;
 		}
 
 		if (!vscode.window.activeTextEditor.viewColumn) {

From 3b1dad55cac7b664c553e9bcbea47a75f9a2f7c8 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Fri, 19 Jan 2018 18:38:35 -0800
Subject: [PATCH 446/710] Use absolute paths for webview core resources

Fixes #41887
---
 .../extensions/browser/extensionEditor.ts     | 10 +++------
 .../workbench/parts/html/browser/webview.ts   | 21 ++++++++++---------
 .../electron-browser/releaseNotesEditor.ts    |  8 +++----
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index 53b8c33bf14..94917051daf 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -53,7 +53,6 @@ import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRe
 import { Color } from 'vs/base/common/color';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import URI from 'vs/base/common/uri';
 
 /**  A context key that is set when an extension editor webview has focus. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey('extensionEditorWebviewFocus', undefined);
@@ -64,11 +63,8 @@ export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED = new
 /**  A context key that is set when the find widget find input in extension editor webview is not focused. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_NOT_FOCUSED: ContextKeyExpr = KEYBINDING_CONTEXT_EXTENSIONEDITOR_FIND_WIDGET_INPUT_FOCUSED.toNegated();
 
-function renderBody(
-	body: string,
-	environmentService: IEnvironmentService
-): string {
-	const styleSheetPath = require.toUrl('./media/markdown.css').replace(URI.file(environmentService.appRoot).toString(true), 'vscode-core-resource://');
+function renderBody(body: string): string {
+	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-core-resource://');
 	return `
 		
 			
@@ -415,7 +411,7 @@ export class ExtensionEditor extends BaseEditor {
 	private openMarkdown(content: TPromise, noContentCopy: string) {
 		return this.loadContents(() => content
 			.then(marked.parse)
-			.then(content => renderBody(content, this.environmentService))
+			.then(renderBody)
 			.then(removeEmbeddedSVGs)
 			.then(body => {
 				const allowedBadgeProviders = this.extensionsWorkbenchService.allowedBadgeProviders;
diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index 814050eaa77..90f7cd006cd 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -15,7 +15,7 @@ import { WebviewFindWidget } from './webviewFindWidget';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { normalize, join, nativeSep } from 'vs/base/common/paths';
+import { normalize, nativeSep } from 'vs/base/common/paths';
 import { startsWith } from 'vs/base/common/strings';
 
 export interface WebviewElementFindInPageOptions {
@@ -102,7 +102,7 @@ export default class Webview {
 
 				const contents = this._webview.getWebContents();
 				if (contents && !contents.isDestroyed()) {
-					registerFileProtocol(contents, 'vscode-core-resource', this._environmentService.appRoot + nativeSep);
+					registerFileProtocol(contents, 'vscode-core-resource', [this._environmentService.appRoot]);
 				}
 			}));
 		}
@@ -417,20 +417,21 @@ export default class Webview {
 function registerFileProtocol(
 	contents: Electron.WebContents,
 	protocol: string,
-	root: string
+	roots: string[]
 ) {
 	contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => {
 		const requestPath = URI.parse(request.url).path;
-		const normalizedPath = normalize(join(root, requestPath), true);
-		if (startsWith(normalizedPath, root)) {
-			callback({ path: normalizedPath });
-		} else {
-			callback({ error: 'Cannot load resource outside of protocol root' });
+		for (const root of roots) {
+			const normalizedPath = normalize(requestPath, true);
+			if (startsWith(normalizedPath, root + nativeSep)) {
+				callback({ path: normalizedPath });
+				return;
+			}
 		}
+		callback({ error: 'Cannot load resource outside of protocol root' });
 	}, (error) => {
 		if (error) {
 			console.error('Failed to register protocol ' + protocol);
 		}
 	});
-}
-
+}
\ No newline at end of file
diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
index 444c67aa91f..b78a3529a97 100644
--- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
+++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts
@@ -28,14 +28,12 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
 import { generateTokensCSSForColorMap } from 'vs/editor/common/modes/supports/tokenization';
-import URI from 'vs/base/common/uri';
 
 function renderBody(
 	body: string,
-	css: string,
-	environmentService: IEnvironmentService
+	css: string
 ): string {
-	const styleSheetPath = require.toUrl('./media/markdown.css').replace(URI.file(environmentService.appRoot).toString(true), 'vscode-core-resource://');
+	const styleSheetPath = require.toUrl('./media/markdown.css').replace('file://', 'vscode-core-resource://');
 	return `
 		
 			
@@ -105,7 +103,7 @@ export class ReleaseNotesEditor extends WebviewEditor {
 
 		const colorMap = TokenizationRegistry.getColorMap();
 		const css = generateTokensCSSForColorMap(colorMap);
-		const body = renderBody(marked(text, { renderer }), css, this.environmentService);
+		const body = renderBody(marked(text, { renderer }), css);
 		this._webview = new WebView(this.content, this.partService.getContainer(Parts.EDITOR_PART), this.environmentService, this._contextViewService, this.contextKey, this.findInputFocusContextKey, {}, false);
 		if (this.input && this.input instanceof ReleaseNotesInput) {
 			const state = this.loadViewState(this.input.version);

From 5be09bdb60913c4fd983e4ccf71c1581f6f5171a Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 21:33:00 -0800
Subject: [PATCH 447/710] Switch search output panel to logservice

---
 .../parts/search/browser/searchViewlet.ts       | 17 +----------------
 .../workbench/parts/search/common/constants.ts  |  1 -
 .../electron-browser/search.contribution.ts     |  5 -----
 .../services/search/node/ripgrepTextSearch.ts   |  7 ++++---
 .../services/search/node/searchService.ts       |  8 +++++++-
 5 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts
index 5eb985b8db2..a7e14a96539 100644
--- a/src/vs/workbench/parts/search/browser/searchViewlet.ts
+++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts
@@ -54,7 +54,6 @@ import * as Constants from 'vs/workbench/parts/search/common/constants';
 import { IThemeService, ITheme, ICssStyleCollector, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { editorFindMatchHighlight, diffInserted, diffRemoved, diffInsertedOutline, diffRemovedOutline, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
 import FileResultsNavigation from 'vs/workbench/parts/files/browser/fileResultsNavigation';
-import { IOutputService } from 'vs/workbench/parts/output/common/output';
 import { getOutOfWorkspaceEditorResources } from 'vs/workbench/parts/search/common/search';
 import { PreferencesEditor } from 'vs/workbench/parts/preferences/browser/preferencesEditor';
 import { SimpleFileResourceDragAndDrop } from 'vs/base/parts/tree/browser/treeDnd';
@@ -120,8 +119,7 @@ export class SearchViewlet extends Viewlet {
 		@IReplaceService private replaceService: IReplaceService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IPreferencesService private preferencesService: IPreferencesService,
-		@IThemeService protected themeService: IThemeService,
-		@IOutputService private outputService: IOutputService
+		@IThemeService protected themeService: IThemeService
 	) {
 		super(Constants.VIEWLET_ID, telemetryService, themeService);
 
@@ -1071,12 +1069,7 @@ export class SearchViewlet extends Viewlet {
 		this.showEmptyStage();
 
 		let isDone = false;
-		const outputChannel = this.outputService.getChannel(Constants.SEARCH_OUTPUT_CHANNEL_ID);
 		let onComplete = (completed?: ISearchComplete) => {
-			if (query.useRipgrep) {
-				outputChannel.append('\n');
-			}
-
 			isDone = true;
 
 			// Complete up to 100% as needed
@@ -1205,10 +1198,6 @@ export class SearchViewlet extends Viewlet {
 		};
 
 		let onError = (e: any) => {
-			if (query.useRipgrep) {
-				outputChannel.append('\n');
-			}
-
 			if (errors.isPromiseCanceledError(e)) {
 				onComplete(null);
 			} else {
@@ -1230,10 +1219,6 @@ export class SearchViewlet extends Viewlet {
 			if (p.worked) {
 				worked = p.worked;
 			}
-
-			if (p.message) {
-				outputChannel.append(p.message);
-			}
 		};
 
 		// Handle UI updates in an interval to show frequent progress and results
diff --git a/src/vs/workbench/parts/search/common/constants.ts b/src/vs/workbench/parts/search/common/constants.ts
index e15486d6ca5..d68fafac729 100644
--- a/src/vs/workbench/parts/search/common/constants.ts
+++ b/src/vs/workbench/parts/search/common/constants.ts
@@ -6,7 +6,6 @@
 import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 
 export const VIEWLET_ID = 'workbench.view.search';
-export const SEARCH_OUTPUT_CHANNEL_ID = 'search';
 
 export const FindInFilesActionId = 'workbench.action.findInFiles';
 export const FocusActiveEditorCommandId = 'search.action.focusActiveEditor';
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 cee75706fd2..8e6b0fe4bfe 100644
--- a/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
+++ b/src/vs/workbench/parts/search/electron-browser/search.contribution.ts
@@ -35,7 +35,6 @@ import { ToggleCaseSensitiveKeybinding, ToggleRegexKeybinding, ToggleWholeWordKe
 import { ISearchWorkbenchService, SearchWorkbenchService } from 'vs/workbench/parts/search/common/searchModel';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { SearchViewlet } from 'vs/workbench/parts/search/browser/searchViewlet';
-import { IOutputChannelRegistry, Extensions as OutputExt } from 'vs/workbench/parts/output/common/output';
 import { defaultQuickOpenContextKey } from 'vs/workbench/browser/parts/quickopen/quickopen';
 import { OpenSymbolHandler } from 'vs/workbench/parts/search/browser/openSymbolHandler';
 import { OpenAnythingHandler } from 'vs/workbench/parts/search/browser/openAnythingHandler';
@@ -371,10 +370,6 @@ Registry.as(QuickOpenExtensions.Quickopen).registerQuickOpen
 	)
 );
 
-// Search output channel
-const outputChannelRegistry = Registry.as(OutputExt.OutputChannels);
-outputChannelRegistry.registerChannel(Constants.SEARCH_OUTPUT_CHANNEL_ID, nls.localize('searchOutputChannelTitle', "Search"));
-
 // Configuration
 const configurationRegistry = Registry.as(ConfigurationExtensions.Configuration);
 configurationRegistry.registerConfiguration({
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
index 8742487da29..850e0f5be23 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -65,11 +65,12 @@ export class RipgrepEngine {
 				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
 				.join(' ');
 
-			const rgCmd = `rg ${escapedArgs}\n - cwd: ${cwd}\n`;
-			onMessage({ message: rgCmd });
+			let rgCmd = `rg ${escapedArgs}\n - cwd: ${cwd}`;
 			if (rgArgs.siblingClauses) {
-				onMessage({ message: ` - Sibling clauses: ${JSON.stringify(rgArgs.siblingClauses)}\n` });
+				rgCmd += `\n - Sibling clauses: ${JSON.stringify(rgArgs.siblingClauses)}`;
 			}
+
+			onMessage({ message: rgCmd });
 		});
 		this.rgProc = cp.spawn(rgPath, rgArgs.globArgs, { cwd });
 		process.once('exit', this.killRgProcFn);
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index 8284c0f6c74..bbfe0682918 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -22,6 +22,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Schemas } from 'vs/base/common/network';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class SearchService implements ISearchService {
 	public _serviceBrand: any;
@@ -35,7 +36,8 @@ export class SearchService implements ISearchService {
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@ITelemetryService private telemetryService: ITelemetryService,
-		@IConfigurationService private configurationService: IConfigurationService
+		@IConfigurationService private configurationService: IConfigurationService,
+		@ILogService private logService: ILogService
 	) {
 		this.diskSearch = new DiskSearch(!environmentService.isBuilt || environmentService.verbose, /*timeout=*/undefined, environmentService.debugSearch);
 		this.registerSearchResultProvider(this.diskSearch);
@@ -104,6 +106,10 @@ export class SearchService implements ISearchService {
 						// Progress
 						onProgress(progress);
 					}
+
+					if (progress.message) {
+						this.logService.info('SearchService#search', progress.message);
+					}
 				}
 			));
 

From be9c70e8eeab7e3069703882d34fdfcaf06fc67f Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Fri, 19 Jan 2018 22:37:52 -0800
Subject: [PATCH 448/710] Log ripgrep cmd from quickopen to logservice

---
 src/vs/platform/search/common/search.ts       |  5 +---
 .../services/search/node/fileSearch.ts        | 22 ++++++++++++----
 .../services/search/node/rawSearchService.ts  |  4 ++-
 .../services/search/node/ripgrepFileSearch.ts |  9 ++++---
 .../services/search/node/ripgrepTextSearch.ts | 12 ++++-----
 .../workbench/services/search/node/search.ts  |  4 +--
 .../services/search/node/textSearch.ts        | 26 ++++++++++---------
 7 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/vs/platform/search/common/search.ts b/src/vs/platform/search/common/search.ts
index 3090197c532..7fb3992feb1 100644
--- a/src/vs/platform/search/common/search.ts
+++ b/src/vs/platform/search/common/search.ts
@@ -112,13 +112,10 @@ export interface ILineMatch {
 export interface IProgress {
 	total?: number;
 	worked?: number;
-}
-
-export interface ISearchLog {
 	message?: string;
 }
 
-export interface ISearchProgressItem extends IFileMatch, IProgress, ISearchLog {
+export interface ISearchProgressItem extends IFileMatch, IProgress {
 	// Marker interface to indicate the possible values for progress calls from the engine
 }
 
diff --git a/src/vs/workbench/services/search/node/fileSearch.ts b/src/vs/workbench/services/search/node/fileSearch.ts
index 2e6d6ed3caa..6917c8da877 100644
--- a/src/vs/workbench/services/search/node/fileSearch.ts
+++ b/src/vs/workbench/services/search/node/fileSearch.ts
@@ -118,7 +118,7 @@ export class FileWalker {
 		this.isCanceled = true;
 	}
 
-	public walk(folderQueries: IFolderSearch[], extraFiles: string[], onResult: (result: IRawFileMatch) => void, done: (error: Error, isLimitHit: boolean) => void): void {
+	public walk(folderQueries: IFolderSearch[], extraFiles: string[], onResult: (result: IRawFileMatch) => void, onMessage: (message: IProgress) => void, done: (error: Error, isLimitHit: boolean) => void): void {
 		this.fileWalkStartTime = Date.now();
 
 		// Support that the file pattern is a full path to a file that exists
@@ -180,7 +180,7 @@ export class FileWalker {
 
 			// For each root folder
 			flow.parallel(folderQueries, (folderQuery: IFolderSearch, rootFolderDone: (err: Error, result: void) => void) => {
-				this.call(traverse, this, folderQuery, onResult, (err?: Error) => {
+				this.call(traverse, this, folderQuery, onResult, onMessage, (err?: Error) => {
 					if (err) {
 						const errorMessage = toErrorMessage(err);
 						console.error(errorMessage);
@@ -205,7 +205,7 @@ export class FileWalker {
 		}
 	}
 
-	private cmdTraversal(folderQuery: IFolderSearch, onResult: (result: IRawFileMatch) => void, cb: (err?: Error) => void): void {
+	private cmdTraversal(folderQuery: IFolderSearch, onResult: (result: IRawFileMatch) => void, onMessage: (message: IProgress) => void, cb: (err?: Error) => void): void {
 		const rootFolder = folderQuery.folder;
 		const isMac = platform.isMacintosh;
 		let cmd: childProcess.ChildProcess;
@@ -227,6 +227,18 @@ export class FileWalker {
 			const ripgrep = spawnRipgrepCmd(this.config, folderQuery, this.config.includePattern, this.folderExcludePatterns.get(folderQuery.folder).expression);
 			cmd = ripgrep.cmd;
 			noSiblingsClauses = !Object.keys(ripgrep.siblingClauses).length;
+
+			process.nextTick(() => {
+				const escapedArgs = ripgrep.rgArgs.args
+					.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
+					.join(' ');
+
+				let rgCmd = `rg ${escapedArgs}\n - cwd: ${ripgrep.cwd}`;
+				if (ripgrep.rgArgs.siblingClauses) {
+					rgCmd += `\n - Sibling clauses: ${JSON.stringify(ripgrep.rgArgs.siblingClauses)}`;
+				}
+				onMessage({ message: rgCmd });
+			});
 		} else {
 			cmd = this.spawnFindCmd(folderQuery);
 		}
@@ -504,7 +516,7 @@ export class FileWalker {
 		matchDirectory(rootEntries);
 	}
 
-	private nodeJSTraversal(folderQuery: IFolderSearch, onResult: (result: IRawFileMatch) => void, done: (err?: Error) => void): void {
+	private nodeJSTraversal(folderQuery: IFolderSearch, onResult: (result: IRawFileMatch) => void, onMessage: (message: IProgress) => void, done: (err?: Error) => void): void {
 		this.directoriesWalked++;
 		extfs.readdir(folderQuery.folder, (error: Error, files: string[]) => {
 			if (error || this.isCanceled || this.isLimitHit) {
@@ -730,7 +742,7 @@ export class Engine implements ISearchEngine {
 	}
 
 	public search(onResult: (result: IRawFileMatch) => void, onProgress: (progress: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
-		this.walker.walk(this.folderQueries, this.extraFiles, onResult, (err: Error, isLimitHit: boolean) => {
+		this.walker.walk(this.folderQueries, this.extraFiles, onResult, onProgress, (err: Error, isLimitHit: boolean) => {
 			done(err, {
 				limitHit: isLimitHit,
 				stats: this.walker.getStats()
diff --git a/src/vs/workbench/services/search/node/rawSearchService.ts b/src/vs/workbench/services/search/node/rawSearchService.ts
index b4956230b48..82cc34039d1 100644
--- a/src/vs/workbench/services/search/node/rawSearchService.ts
+++ b/src/vs/workbench/services/search/node/rawSearchService.ts
@@ -367,7 +367,9 @@ export class SearchService implements IRawSearchService {
 					}
 				}
 			}, (progress) => {
-				p(progress);
+				process.nextTick(() => {
+					p(progress);
+				});
 			}, (error, stats) => {
 				if (batch.length) {
 					p(batch);
diff --git a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
index 50fa1077c40..9b73f7739ec 100644
--- a/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepFileSearch.ts
@@ -15,9 +15,12 @@ import { foldersToIncludeGlobs, foldersToRgExcludeGlobs } from './ripgrepTextSea
 
 export function spawnRipgrepCmd(config: IRawSearch, folderQuery: IFolderSearch, includePattern: glob.IExpression, excludePattern: glob.IExpression) {
 	const rgArgs = getRgArgs(config, folderQuery, includePattern, excludePattern);
+	const cwd = folderQuery.folder;
 	return {
-		cmd: cp.spawn(rgPath, rgArgs.globArgs, { cwd: folderQuery.folder }),
-		siblingClauses: rgArgs.siblingClauses
+		cmd: cp.spawn(rgPath, rgArgs.args, { cwd }),
+		siblingClauses: rgArgs.siblingClauses,
+		rgArgs,
+		cwd
 	};
 }
 
@@ -57,7 +60,7 @@ function getRgArgs(config: IRawSearch, folderQuery: IFolderSearch, includePatter
 
 	args.push('.');
 
-	return { globArgs: args, siblingClauses };
+	return { args, siblingClauses };
 }
 
 function anchor(glob: string) {
diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
index 850e0f5be23..72ecb4b919d 100644
--- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
+++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts
@@ -18,10 +18,10 @@ import * as paths from 'vs/base/common/paths';
 import * as extfs from 'vs/base/node/extfs';
 import * as encoding from 'vs/base/node/encoding';
 import * as glob from 'vs/base/common/glob';
-import { ISearchLog } from 'vs/platform/search/common/search';
 import { TPromise } from 'vs/base/common/winjs.base';
 
 import { ISerializedFileMatch, ISerializedSearchComplete, IRawSearch, IFolderSearch, LineMatch, FileMatch } from './search';
+import { IProgress } from 'vs/platform/search/common/search';
 
 export class RipgrepEngine {
 	private isDone = false;
@@ -44,7 +44,7 @@ export class RipgrepEngine {
 	}
 
 	// TODO@Rob - make promise-based once the old search is gone, and I don't need them to have matching interfaces anymore
-	search(onResult: (match: ISerializedFileMatch) => void, onMessage: (message: ISearchLog) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
+	search(onResult: (match: ISerializedFileMatch) => void, onMessage: (message: IProgress) => void, done: (error: Error, complete: ISerializedSearchComplete) => void): void {
 		if (!this.config.folderQueries.length && !this.config.extraFiles.length) {
 			process.removeListener('exit', this.killRgProcFn);
 			done(null, {
@@ -61,7 +61,7 @@ export class RipgrepEngine {
 
 		const cwd = platform.isWindows ? 'c:/' : '/';
 		process.nextTick(() => { // Allow caller to register progress callback
-			const escapedArgs = rgArgs.globArgs
+			const escapedArgs = rgArgs.args
 				.map(arg => arg.match(/^-/) ? arg : `'${arg}'`)
 				.join(' ');
 
@@ -72,7 +72,7 @@ export class RipgrepEngine {
 
 			onMessage({ message: rgCmd });
 		});
-		this.rgProc = cp.spawn(rgPath, rgArgs.globArgs, { cwd });
+		this.rgProc = cp.spawn(rgPath, rgArgs.args, { cwd });
 		process.once('exit', this.killRgProcFn);
 
 		this.ripgrepParser = new RipgrepParser(this.config.maxResults, cwd, this.config.extraFiles);
@@ -422,7 +422,7 @@ export function fixDriveC(path: string): string {
 		path;
 }
 
-function getRgArgs(config: IRawSearch): IRgGlobResult {
+function getRgArgs(config: IRawSearch) {
 	const args = ['--hidden', '--heading', '--line-number', '--color', 'ansi', '--colors', 'path:none', '--colors', 'line:none', '--colors', 'match:fg:red', '--colors', 'match:style:nobold'];
 	if (config.contentPattern.isSmartCase) {
 		args.push('--smart-case');
@@ -500,7 +500,7 @@ function getRgArgs(config: IRawSearch): IRgGlobResult {
 	args.push(...config.folderQueries.map(q => q.folder));
 	args.push(...config.extraFiles);
 
-	return { globArgs: args, siblingClauses };
+	return { args, siblingClauses };
 }
 
 function getSiblings(file: string): TPromise {
diff --git a/src/vs/workbench/services/search/node/search.ts b/src/vs/workbench/services/search/node/search.ts
index 1c5c4947e7a..a1061c52d22 100644
--- a/src/vs/workbench/services/search/node/search.ts
+++ b/src/vs/workbench/services/search/node/search.ts
@@ -7,7 +7,7 @@
 
 import { PPromise, TPromise } from 'vs/base/common/winjs.base';
 import { IExpression } from 'vs/base/common/glob';
-import { IProgress, ILineMatch, IPatternInfo, ISearchStats, ISearchLog } from 'vs/platform/search/common/search';
+import { IProgress, ILineMatch, IPatternInfo, ISearchStats } from 'vs/platform/search/common/search';
 import { ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
 
 export interface IFolderSearch {
@@ -71,7 +71,7 @@ export interface ISerializedFileMatch {
 }
 
 // Type of the possible values for progress calls from the engine
-export type ISerializedSearchProgressItem = ISerializedFileMatch | ISerializedFileMatch[] | IProgress | ISearchLog;
+export type ISerializedSearchProgressItem = ISerializedFileMatch | ISerializedFileMatch[] | IProgress;
 export type IFileSearchProgressItem = IRawFileMatch | IRawFileMatch[] | IProgress;
 
 
diff --git a/src/vs/workbench/services/search/node/textSearch.ts b/src/vs/workbench/services/search/node/textSearch.ts
index b5a62eb9023..c2002bb88ed 100644
--- a/src/vs/workbench/services/search/node/textSearch.ts
+++ b/src/vs/workbench/services/search/node/textSearch.ts
@@ -147,20 +147,22 @@ export class Engine implements ISearchEngine {
 				nextBatch = [];
 				nextBatchBytes = 0;
 			}
-		}, (error, isLimitHit) => {
-			this.walkerIsDone = true;
-			this.walkerError = error;
+		},
+			onProgress,
+			(error, isLimitHit) => {
+				this.walkerIsDone = true;
+				this.walkerError = error;
 
-			// Send any remaining paths to a worker, or unwind if we're stopping
-			if (nextBatch.length) {
-				if (this.limitReached || this.isCanceled) {
-					unwind(nextBatchBytes);
+				// Send any remaining paths to a worker, or unwind if we're stopping
+				if (nextBatch.length) {
+					if (this.limitReached || this.isCanceled) {
+						unwind(nextBatchBytes);
+					} else {
+						run(nextBatch, nextBatchBytes);
+					}
 				} else {
-					run(nextBatch, nextBatchBytes);
+					unwind(0);
 				}
-			} else {
-				unwind(0);
-			}
-		});
+			});
 	}
 }

From 81d1942e4c9405816f262064e457b318ef8ca875 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sat, 20 Jan 2018 08:33:16 +0100
Subject: [PATCH 449/710] fix issue with useAltAsMultiSelectModifier

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

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 2fea10cc6ed..a812d54aaff 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -342,7 +342,7 @@ export class FileController extends DefaultController implements IDisposable {
 	) {
 		super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */, keyboardSupport: false /* handled via IListService */ });
 
-		this.useAltAsMultiSelectModifier = configurationService.getValue(multiSelectModifierSettingKey);
+		this.useAltAsMultiSelectModifier = configurationService.getValue(multiSelectModifierSettingKey) === 'alt';
 		this.toDispose = [];
 
 		this.registerListeners();
@@ -351,7 +351,7 @@ export class FileController extends DefaultController implements IDisposable {
 	private registerListeners(): void {
 		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
-				this.useAltAsMultiSelectModifier = this.configurationService.getValue(multiSelectModifierSettingKey);
+				this.useAltAsMultiSelectModifier = this.configurationService.getValue(multiSelectModifierSettingKey) === 'alt';
 			}
 		}));
 	}

From 79822577699571be93cdb4b579c19c357584edeb Mon Sep 17 00:00:00 2001
From: Alex 
Date: Sat, 20 Jan 2018 15:35:06 +0300
Subject: [PATCH 450/710] Revert - move striping logic back to javascript

---
 .../parts/preferences/browser/keybindingsEditor.ts          | 1 +
 .../parts/preferences/browser/media/keybindingsEditor.css   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
index 0b9c84a41c5..4171d03edc2 100644
--- a/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
@@ -660,6 +660,7 @@ class KeybindingItemRenderer implements IRenderer .keybindings-body > .keybindings-list-container .monaco-list-row:nth-child(even):not(.focused):not(.selected):not(:hover),
-.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(:focus) .monaco-list-row.focused:nth-child(even):not(.selected):not(:hover),
-.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(.focused) .monaco-list-row.focused:nth-child(even):not(.selected):not(:hover) {
+.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list-row.odd:not(.focused):not(.selected):not(:hover),
+.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(:focus) .monaco-list-row.focused.odd:not(.selected):not(:hover),
+.keybindings-editor > .keybindings-body > .keybindings-list-container .monaco-list:not(.focused) .monaco-list-row.focused.odd:not(.selected):not(:hover) {
 	background-color: rgba(130, 130, 130, 0.04);
 }
 

From b618e4a25ec45394f8911922a0f6eaf0b99e238c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sat, 20 Jan 2018 14:20:19 +0100
Subject: [PATCH 451/710] introduce writeFileStreamAndFlush

---
 src/vs/base/node/extfs.ts                 | 160 ++++++++++++----
 src/vs/base/node/pfs.ts                   |   2 +
 src/vs/base/test/node/extfs/extfs.test.ts | 220 +++++++++++++++++++++-
 3 files changed, 341 insertions(+), 41 deletions(-)

diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
index b3a4121079e..b36dd2e9b22 100644
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -14,6 +14,7 @@ import * as fs from 'fs';
 import * as paths from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { nfcall } from 'vs/base/common/async';
+import { Readable } from 'stream';
 
 const loop = flow.loop;
 
@@ -54,7 +55,7 @@ export function copy(source: string, target: string, callback: (error: Error) =>
 		}
 
 		if (!stat.isDirectory()) {
-			return pipeFs(source, target, stat.mode & 511, callback);
+			return doCopyFile(source, target, stat.mode & 511, callback);
 		}
 
 		if (copiedSources[source]) {
@@ -75,6 +76,38 @@ export function copy(source: string, target: string, callback: (error: Error) =>
 	});
 }
 
+function doCopyFile(source: string, target: string, mode: number, callback: (error: Error) => void): void {
+	const reader = fs.createReadStream(source);
+	const writer = fs.createWriteStream(target, { mode });
+
+	let finished = false;
+	const finish = (error?: Error) => {
+		if (!finished) {
+			finished = true;
+
+			// in error cases, pass to callback
+			if (error) {
+				callback(error);
+			}
+
+			// we need to explicitly chmod because of https://github.com/nodejs/node/issues/1104
+			else {
+				fs.chmod(target, mode, callback);
+			}
+		}
+	};
+
+	// handle errors properly
+	reader.once('error', error => finish(error));
+	writer.once('error', error => finish(error));
+
+	// we are done (underlying fd has been closed)
+	writer.once('close', () => finish());
+
+	// start piping
+	reader.pipe(writer);
+}
+
 export function mkdirp(path: string, mode?: number): TPromise {
 	const mkdir = () => nfcall(fs.mkdir, path, mode)
 		.then(null, (err: NodeJS.ErrnoException) => {
@@ -88,11 +121,12 @@ export function mkdirp(path: string, mode?: number): TPromise {
 			return TPromise.wrapError(err);
 		});
 
-	// is root?
+	// stop at root
 	if (path === paths.dirname(path)) {
 		return TPromise.as(true);
 	}
 
+	// recursively mkdir
 	return mkdir().then(null, (err: NodeJS.ErrnoException) => {
 		if (err.code === 'ENOENT') {
 			return mkdirp(paths.dirname(path), mode).then(mkdir);
@@ -102,40 +136,6 @@ export function mkdirp(path: string, mode?: number): TPromise {
 	});
 }
 
-function pipeFs(source: string, target: string, mode: number, callback: (error: Error) => void): void {
-	let callbackHandled = false;
-
-	const readStream = fs.createReadStream(source);
-	const writeStream = fs.createWriteStream(target, { mode: mode });
-
-	const onError = (error: Error) => {
-		if (!callbackHandled) {
-			callbackHandled = true;
-			callback(error);
-		}
-	};
-
-	readStream.on('error', onError);
-	writeStream.on('error', onError);
-
-	readStream.on('end', () => {
-		(writeStream).end(() => { // In this case the write stream is known to have an end signature with callback
-			if (!callbackHandled) {
-				callbackHandled = true;
-
-				fs.chmod(target, mode, callback); // we need to explicitly chmod because of https://github.com/nodejs/node/issues/1104
-			}
-		});
-	});
-
-	// In node 0.8 there is no easy way to find out when the pipe operation has finished. As such, we use the end property = false
-	// so that we are in charge of calling end() on the write stream and we will be notified when the write stream is really done.
-	// We can do this because file streams have an end() method that allows to pass in a callback.
-	// In node 0.10 there is an event 'finish' emitted from the write stream that can be used. See
-	// https://groups.google.com/forum/?fromgroups=#!topic/nodejs/YWQ1sRoXOdI
-	readStream.pipe(writeStream, { end: false });
-}
-
 // Deletes the given path by first moving it out of the workspace. This has two benefits. For one, the operation can return fast because
 // after the rename, the contents are out of the workspace although not yet deleted. The greater benefit however is that this operation
 // will fail in case any file is used by another process. fs.unlink() in node will not bail if a file unlinked is used by another process.
@@ -320,15 +320,95 @@ export function mv(source: string, target: string, callback: (error: Error) => v
 	});
 }
 
+let canFlush = true;
+export function writeFileAndFlush(path: string, data: string | NodeBuffer | Readable, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
+	options = ensureOptions(options);
+
+	if (data instanceof Readable) {
+		doWriteFileStreamAndFlush(path, data, options, callback);
+	} else {
+		doWriteFileAndFlush(path, data, options, callback);
+	}
+}
+
+function doWriteFileStreamAndFlush(path: string, reader: Readable, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
+
+	// finish only once
+	let finished = false;
+	const finish = (error?: Error) => {
+		if (!finished) {
+			finished = true;
+
+			// in error cases we need to manually close streams
+			// if the write stream was successfully opened
+			if (error) {
+				if (isOpen) {
+					writer.once('close', () => callback(error));
+					writer.close();
+				} else {
+					callback(error);
+				}
+			}
+
+			// otherwise just return without error
+			else {
+				callback();
+			}
+		}
+	};
+
+	// create writer to target
+	const writer = fs.createWriteStream(path, options);
+
+	// handle errors properly
+	reader.once('error', error => finish(error));
+	writer.once('error', error => finish(error));
+
+	// save the fd for later use
+	let fd: number;
+	let isOpen: boolean;
+	writer.once('open', descriptor => {
+		fd = descriptor;
+		isOpen = true;
+	});
+
+	// we are done (underlying fd has been closed)
+	writer.once('close', () => finish());
+
+	// handle end event because we are in charge
+	reader.once('end', () => {
+
+		// flush to disk
+		if (canFlush && isOpen) {
+			fs.fdatasync(fd, (syncError: Error) => {
+
+				// In some exotic setups it is well possible that node fails to sync
+				// In that case we disable flushing and warn to the console
+				if (syncError) {
+					console.warn('[node.js fs] fdatasync is now disabled for this session because it failed: ', syncError);
+					canFlush = false;
+				}
+
+				writer.end();
+			});
+		}
+
+		// do not flush
+		else {
+			writer.end();
+		}
+	});
+
+	// end: false means we are in charge of ending the streams properly
+	reader.pipe(writer, { end: false });
+}
+
 // Calls fs.writeFile() followed by a fs.sync() call to flush the changes to disk
 // We do this in cases where we want to make sure the data is really on disk and
 // not in some cache.
 //
 // See https://github.com/nodejs/node/blob/v5.10.0/lib/fs.js#L1194
-let canFlush = true;
-export function writeFileAndFlush(path: string, data: string | NodeBuffer, options: { mode?: number; flag?: string; }, callback: (error: Error) => void): void {
-	options = ensureOptions(options);
-
+function doWriteFileAndFlush(path: string, data: string | NodeBuffer, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
 	if (!canFlush) {
 		return fs.writeFile(path, data, options, callback);
 	}
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index b949384de1e..ba1ab12a7ca 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -13,6 +13,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import { once } from 'vs/base/common/event';
+import { Readable } from 'stream';
 
 export function readdir(path: string): TPromise {
 	return nfcall(extfs.readdir, path);
@@ -101,6 +102,7 @@ const writeFilePathQueue: { [path: string]: Queue } = Object.create(null);
 
 export function writeFile(path: string, data: string, options?: { mode?: number; flag?: string; }): TPromise;
 export function writeFile(path: string, data: NodeBuffer, options?: { mode?: number; flag?: string; }): TPromise;
+export function writeFile(path: string, data: Readable, options?: { mode?: number; flag?: string; }): TPromise;
 export function writeFile(path: string, data: any, options?: { mode?: number; flag?: string; }): TPromise {
 	let queueKey = toQueueKey(path);
 
diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index 06ecf0b8ba0..2e3e8b848ae 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -15,6 +15,7 @@ import uuid = require('vs/base/common/uuid');
 import strings = require('vs/base/common/strings');
 import extfs = require('vs/base/node/extfs');
 import { onError } from 'vs/base/test/common/utils';
+import { Readable } from 'stream';
 
 const ignore = () => { };
 
@@ -22,6 +23,37 @@ const mkdirp = (path: string, mode: number, callback: (error) => void) => {
 	extfs.mkdirp(path, mode).done(() => callback(null), error => callback(error));
 };
 
+const chunkSize = 64 * 1024;
+const readError = 'Error while reading';
+function toReadable(value: string, throwError?: boolean): Readable {
+	const totalChunks = Math.ceil(value.length / chunkSize);
+	const stringChunks: string[] = [];
+
+	for (let i = 0, j = 0; i < totalChunks; ++i, j += chunkSize) {
+		stringChunks[i] = value.substr(j, chunkSize);
+	}
+
+	let counter = 0;
+	return new Readable({
+		read: function () {
+			if (throwError) {
+				this.emit('error', new Error(readError));
+			}
+
+			let res: string;
+			let canPush = true;
+			while (canPush && (res = stringChunks[counter++])) {
+				canPush = this.push(res);
+			}
+
+			// EOS
+			if (!res) {
+				this.push(null);
+			}
+		}
+	});
+}
+
 suite('Extfs', () => {
 
 	test('mkdirp', function (done: () => void) {
@@ -174,7 +206,7 @@ suite('Extfs', () => {
 		}
 	});
 
-	test('writeFileAndFlush', function (done: () => void) {
+	test('writeFileAndFlush (string)', function (done: () => void) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
 		const newDir = path.join(parentDir, 'extfs', id);
@@ -209,6 +241,192 @@ suite('Extfs', () => {
 		});
 	});
 
+	test('writeFileAndFlush (stream)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			extfs.writeFileAndFlush(testFile, toReadable('Hello World'), null, error => {
+				if (error) {
+					return onError(error, done);
+				}
+
+				assert.equal(fs.readFileSync(testFile), 'Hello World');
+
+				const largeString = (new Array(100 * 1024)).join('Large String\n');
+
+				extfs.writeFileAndFlush(testFile, toReadable(largeString), null, error => {
+					if (error) {
+						return onError(error, done);
+					}
+
+					assert.equal(fs.readFileSync(testFile), largeString);
+
+					extfs.del(parentDir, os.tmpdir(), done, ignore);
+				});
+			});
+		});
+	});
+
+	test('writeFileAndFlush (file stream)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const sourceFile = require.toUrl('./fixtures/index.html');
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			extfs.writeFileAndFlush(testFile, fs.createReadStream(sourceFile), null, error => {
+				if (error) {
+					return onError(error, done);
+				}
+
+				assert.equal(fs.readFileSync(testFile).toString(), fs.readFileSync(sourceFile).toString());
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
+	test('writeFileAndFlush (string, error handling)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			fs.mkdirSync(testFile); // this will trigger an error because testFile is now a directory!
+
+			extfs.writeFileAndFlush(testFile, 'Hello World', null, error => {
+				if (!error) {
+					return onError(new Error('Expected error for writing to readonly file'), done);
+				}
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
+	test('writeFileAndFlush (stream, error handling EISDIR)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			fs.mkdirSync(testFile); // this will trigger an error because testFile is now a directory!
+
+			extfs.writeFileAndFlush(testFile, toReadable('Hello World'), null, error => {
+				if (!error || (error).code !== 'EISDIR') {
+					return onError(new Error('Expected EISDIR error for writing to folder but got: ' + (error ? (error).code : 'no error')), done);
+				}
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
+	test('writeFileAndFlush (stream, error handling READERROR)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			extfs.writeFileAndFlush(testFile, toReadable('Hello World', true /* throw error */), null, error => {
+				if (!error || error.message !== readError) {
+					return onError(new Error('Expected error for writing to folder'), done);
+				}
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
+	test('pasero writeFileAndFlush (stream, error handling EACCES)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			fs.writeFileSync(testFile, '');
+			fs.chmodSync(testFile, 33060); // make readonly
+
+			extfs.writeFileAndFlush(testFile, toReadable('Hello World'), null, error => {
+				if (!error || !((error).code !== 'EACCES' || (error).code !== 'EPERM')) {
+					return onError(new Error('Expected EACCES/EPERM error for writing to folder but got: ' + (error ? (error).code : 'no error')), done);
+				}
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
+	test('writeFileAndFlush (file stream, error handling)', function (done: () => void) {
+		const id = uuid.generateUuid();
+		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
+		const sourceFile = require.toUrl('./fixtures/index.html');
+		const newDir = path.join(parentDir, 'extfs', id);
+		const testFile = path.join(newDir, 'flushed.txt');
+
+		mkdirp(newDir, 493, error => {
+			if (error) {
+				return onError(error, done);
+			}
+
+			assert.ok(fs.existsSync(newDir));
+
+			fs.mkdirSync(testFile); // this will trigger an error because testFile is now a directory!
+
+			extfs.writeFileAndFlush(testFile, fs.createReadStream(sourceFile), null, error => {
+				if (!error) {
+					return onError(new Error('Expected error for writing to folder'), done);
+				}
+
+				extfs.del(parentDir, os.tmpdir(), done, ignore);
+			});
+		});
+	});
+
 	test('writeFileAndFlushSync', function (done: () => void) {
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);

From a43926a61e073d7a5b08ce7d297bd93cadb0fabc Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Sat, 20 Jan 2018 15:24:23 +0100
Subject: [PATCH 452/710] document update state machine

---
 src/vs/code/electron-main/menus.ts            |  2 +-
 src/vs/platform/update/common/update.ts       | 26 ++++++++++++++++---
 .../electron-main/abstractUpdateService.ts    |  6 ++---
 .../electron-main/updateService.linux.ts      |  6 ++---
 .../parts/update/electron-browser/update.ts   |  6 ++---
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts
index 5c1daf2bea3..7e389c63729 100644
--- a/src/vs/code/electron-main/menus.ts
+++ b/src/vs/code/electron-main/menus.ts
@@ -1057,7 +1057,7 @@ export class CodeMenu {
 			case StateType.CheckingForUpdates:
 				return [new MenuItem({ label: nls.localize('miCheckingForUpdates', "Checking For Updates..."), enabled: false })];
 
-			case StateType.Available:
+			case StateType.AvailableForDownload:
 				return [new MenuItem({
 					label: nls.localize('miDownloadUpdate', "Download Available Update"), click: () => {
 						this.updateService.downloadUpdate();
diff --git a/src/vs/platform/update/common/update.ts b/src/vs/platform/update/common/update.ts
index a80618c9ebb..8ce018cb411 100644
--- a/src/vs/platform/update/common/update.ts
+++ b/src/vs/platform/update/common/update.ts
@@ -19,11 +19,29 @@ export interface IUpdate {
 	hash?: string;
 }
 
+/**
+ * Updates are run as a state machine:
+ *
+ *      Uninitialized
+ *           ↓
+ *          Idle
+ *          ↓  ↑
+ *   Checking for Updates  →  Available for Download
+ *         ↓
+ *     Downloading  →   Ready
+ *         ↓               ↑
+ *     Downloaded   →  Updating
+ *
+ * Available: There is an update available for download (linux).
+ * Ready: Code will be updated as soon as it restarts (win32, darwin).
+ * Donwloaded: There is an update ready to be installed in the background (win32).
+ */
+
 export enum StateType {
 	Uninitialized = 'uninitialized',
 	Idle = 'idle',
-	Available = 'available',
 	CheckingForUpdates = 'checking for updates',
+	AvailableForDownload = 'available for download',
 	Downloading = 'downloading',
 	Downloaded = 'downloaded',
 	Updating = 'updating',
@@ -33,19 +51,19 @@ export enum StateType {
 export type Uninitialized = { type: StateType.Uninitialized };
 export type Idle = { type: StateType.Idle };
 export type CheckingForUpdates = { type: StateType.CheckingForUpdates, explicit: boolean };
-export type Available = { type: StateType.Available, update: IUpdate };
+export type AvailableForDownload = { type: StateType.AvailableForDownload, update: IUpdate };
 export type Downloading = { type: StateType.Downloading, update: IUpdate };
 export type Downloaded = { type: StateType.Downloaded, update: IUpdate };
 export type Updating = { type: StateType.Updating, update: IUpdate };
 export type Ready = { type: StateType.Ready, update: IUpdate };
 
-export type State = Uninitialized | Idle | CheckingForUpdates | Available | Downloading | Downloaded | Updating | Ready;
+export type State = Uninitialized | Idle | CheckingForUpdates | AvailableForDownload | Downloading | Downloaded | Updating | Ready;
 
 export const State = {
 	Uninitialized: { type: StateType.Uninitialized } as Uninitialized,
 	Idle: { type: StateType.Idle } as Idle,
 	CheckingForUpdates: (explicit: boolean) => ({ type: StateType.CheckingForUpdates, explicit } as CheckingForUpdates),
-	Available: (update: IUpdate) => ({ type: StateType.Available, update } as Available),
+	AvailableForDownload: (update: IUpdate) => ({ type: StateType.AvailableForDownload, update } as AvailableForDownload),
 	Downloading: (update: IUpdate) => ({ type: StateType.Downloading, update } as Downloading),
 	Downloaded: (update: IUpdate) => ({ type: StateType.Downloaded, update } as Downloaded),
 	Updating: (update: IUpdate) => ({ type: StateType.Updating, update } as Updating),
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index ade88f2e6f5..97055d435d1 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -11,7 +11,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import product from 'vs/platform/node/product';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IUpdateService, State, StateType, Available } from 'vs/platform/update/common/update';
+import { IUpdateService, State, StateType, AvailableForDownload } from 'vs/platform/update/common/update';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
 
@@ -97,14 +97,14 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	downloadUpdate(): TPromise {
-		if (this.state.type !== StateType.Available) {
+		if (this.state.type !== StateType.AvailableForDownload) {
 			return TPromise.as(null);
 		}
 
 		return this.doDownloadUpdate(this.state);
 	}
 
-	protected doDownloadUpdate(state: Available): TPromise {
+	protected doDownloadUpdate(state: AvailableForDownload): TPromise {
 		return TPromise.as(null);
 	}
 
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index a59e24fd722..53cb9a6ae9b 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -8,7 +8,7 @@
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILifecycleService } from 'vs/platform/lifecycle/electron-main/lifecycleMain';
 import { IRequestService } from 'vs/platform/request/node/request';
-import { State, IUpdate, Available } from 'vs/platform/update/common/update';
+import { State, IUpdate, AvailableForDownload } from 'vs/platform/update/common/update';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -57,7 +57,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 
 					this.setState(State.Idle);
 				} else {
-					this.setState(State.Available(update));
+					this.setState(State.AvailableForDownload(update));
 				}
 			})
 			.then(null, err => {
@@ -73,7 +73,7 @@ export class LinuxUpdateService extends AbstractUpdateService {
 			});
 	}
 
-	protected doDownloadUpdate(state: Available): TPromise {
+	protected doDownloadUpdate(state: AvailableForDownload): TPromise {
 		shell.openExternal(state.update.url);
 		this.setState(State.Idle);
 
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index e091ce43563..2c705a72974 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -338,7 +338,7 @@ export class UpdateContribution implements IGlobalActivity {
 				}
 				break;
 
-			case StateType.Available:
+			case StateType.AvailableForDownload:
 				this.onUpdateAvailable(state.update);
 				break;
 
@@ -357,7 +357,7 @@ export class UpdateContribution implements IGlobalActivity {
 
 		let badge: IBadge | undefined = undefined;
 
-		if (state.type === StateType.Available || state.type === StateType.Downloaded || state.type === StateType.Ready) {
+		if (state.type === StateType.AvailableForDownload || state.type === StateType.Downloaded || state.type === StateType.Ready) {
 			badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
 		} else if (state.type === StateType.CheckingForUpdates || state.type === StateType.Downloading || state.type === StateType.Updating) {
 			badge = new ProgressBadge(() => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
@@ -491,7 +491,7 @@ export class UpdateContribution implements IGlobalActivity {
 			case StateType.CheckingForUpdates:
 				return new Action('update.checking', nls.localize('checkingForUpdates', "Checking For Updates..."), undefined, false);
 
-			case StateType.Available:
+			case StateType.AvailableForDownload:
 				return new Action('update.downloadNow', nls.localize('download now', "Download Now"), null, true, () =>
 					this.updateService.downloadUpdate());
 

From c7da35f1de3d342d12143536a66f43769c9fc9f9 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sat, 20 Jan 2018 18:10:15 +0100
Subject: [PATCH 453/710] first cut stream support for updateContent

---
 src/typings/iconv-lite.d.ts                   |  6 +--
 src/vs/base/node/encoding.ts                  | 10 ++--
 src/vs/base/node/extfs.ts                     | 11 ++--
 src/vs/base/node/pfs.ts                       |  3 +-
 src/vs/base/test/node/extfs/extfs.test.ts     |  3 +-
 src/vs/platform/files/common/files.ts         | 15 +++++-
 .../common/editor/textEditorModel.ts          | 10 ++++
 .../files/electron-browser/fileService.ts     |  4 +-
 .../electron-browser/remoteFileService.ts     |  9 ++--
 .../services/files/node/fileService.ts        | 50 ++++++++++++++++---
 .../textfile/common/textFileEditorModel.ts    |  2 +-
 .../workbench/test/workbenchTestServices.ts   |  4 +-
 12 files changed, 94 insertions(+), 33 deletions(-)

diff --git a/src/typings/iconv-lite.d.ts b/src/typings/iconv-lite.d.ts
index 84c54e320cf..5ad19bb95b7 100644
--- a/src/typings/iconv-lite.d.ts
+++ b/src/typings/iconv-lite.d.ts
@@ -6,13 +6,13 @@
 /// 
 
 declare module 'iconv-lite' {
-	export function decode(buffer: NodeBuffer, encoding: string, options?: any): string;
+	export function decode(buffer: NodeBuffer, encoding: string): string;
 
-	export function encode(content: string, encoding: string, options?: any): NodeBuffer;
+	export function encode(content: string, encoding: string, options?: { addBOM?: boolean }): NodeBuffer;
 
 	export function encodingExists(encoding: string): boolean;
 
 	export function decodeStream(encoding: string): NodeJS.ReadWriteStream;
 
-	export function encodeStream(encoding: string): NodeJS.ReadWriteStream;
+	export function encodeStream(encoding: string, options?: { addBOM?: boolean }): NodeJS.ReadWriteStream;
 }
\ No newline at end of file
diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts
index 4177f3ffab5..1d134c65767 100644
--- a/src/vs/base/node/encoding.ts
+++ b/src/vs/base/node/encoding.ts
@@ -28,11 +28,11 @@ export function bomLength(encoding: string): number {
 	return 0;
 }
 
-export function decode(buffer: NodeBuffer, encoding: string, options?: any): string {
-	return iconv.decode(buffer, toNodeEncoding(encoding), options);
+export function decode(buffer: NodeBuffer, encoding: string): string {
+	return iconv.decode(buffer, toNodeEncoding(encoding));
 }
 
-export function encode(content: string, encoding: string, options?: any): NodeBuffer {
+export function encode(content: string, encoding: string, options?: { addBOM?: boolean }): NodeBuffer {
 	return iconv.encode(content, toNodeEncoding(encoding), options);
 }
 
@@ -44,6 +44,10 @@ export function decodeStream(encoding: string): NodeJS.ReadWriteStream {
 	return iconv.decodeStream(toNodeEncoding(encoding));
 }
 
+export function encodeStream(encoding: string, options?: { addBOM?: boolean }): NodeJS.ReadWriteStream {
+	return iconv.encodeStream(toNodeEncoding(encoding), options);
+}
+
 function toNodeEncoding(enc: string): string {
 	if (enc === UTF8_with_bom) {
 		return UTF8; // iconv does not distinguish UTF 8 with or without BOM, so we need to help it
diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
index b36dd2e9b22..9b540108284 100644
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -14,7 +14,6 @@ import * as fs from 'fs';
 import * as paths from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { nfcall } from 'vs/base/common/async';
-import { Readable } from 'stream';
 
 const loop = flow.loop;
 
@@ -321,17 +320,17 @@ export function mv(source: string, target: string, callback: (error: Error) => v
 }
 
 let canFlush = true;
-export function writeFileAndFlush(path: string, data: string | NodeBuffer | Readable, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
+export function writeFileAndFlush(path: string, data: string | NodeBuffer | NodeJS.ReadableStream, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
 	options = ensureOptions(options);
 
-	if (data instanceof Readable) {
-		doWriteFileStreamAndFlush(path, data, options, callback);
-	} else {
+	if (typeof data === 'string' || Buffer.isBuffer(data)) {
 		doWriteFileAndFlush(path, data, options, callback);
+	} else {
+		doWriteFileStreamAndFlush(path, data, options, callback);
 	}
 }
 
-function doWriteFileStreamAndFlush(path: string, reader: Readable, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
+function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream, options: { mode?: number; flag?: string; }, callback: (error?: Error) => void): void {
 
 	// finish only once
 	let finished = false;
diff --git a/src/vs/base/node/pfs.ts b/src/vs/base/node/pfs.ts
index ba1ab12a7ca..9ebc819fd02 100644
--- a/src/vs/base/node/pfs.ts
+++ b/src/vs/base/node/pfs.ts
@@ -13,7 +13,6 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as platform from 'vs/base/common/platform';
 import { once } from 'vs/base/common/event';
-import { Readable } from 'stream';
 
 export function readdir(path: string): TPromise {
 	return nfcall(extfs.readdir, path);
@@ -102,7 +101,7 @@ const writeFilePathQueue: { [path: string]: Queue } = Object.create(null);
 
 export function writeFile(path: string, data: string, options?: { mode?: number; flag?: string; }): TPromise;
 export function writeFile(path: string, data: NodeBuffer, options?: { mode?: number; flag?: string; }): TPromise;
-export function writeFile(path: string, data: Readable, options?: { mode?: number; flag?: string; }): TPromise;
+export function writeFile(path: string, data: NodeJS.ReadableStream, options?: { mode?: number; flag?: string; }): TPromise;
 export function writeFile(path: string, data: any, options?: { mode?: number; flag?: string; }): TPromise {
 	let queueKey = toQueueKey(path);
 
diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index 2e3e8b848ae..686934d9e01 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -50,7 +50,8 @@ function toReadable(value: string, throwError?: boolean): Readable {
 			if (!res) {
 				this.push(null);
 			}
-		}
+		},
+		encoding: 'utf8'
 	});
 }
 
diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index af89c431ab6..0fe4bf63718 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -83,7 +83,7 @@ export interface IFileService {
 	/**
 	 * Updates the content replacing its previous value.
 	 */
-	updateContent(resource: URI, value: string, options?: IUpdateContentOptions): TPromise;
+	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise;
 
 	/**
 	 * Moves the file to a new path identified by the resource.
@@ -468,6 +468,19 @@ export interface ITextSnapshot {
 	read(): string;
 }
 
+/**
+ * Helper method to convert a snapshot into its full string form.
+ */
+export function snapshotToString(snapshot: ITextSnapshot): string {
+	const chunks: string[] = [];
+	let chunk: string;
+	while (typeof (chunk = snapshot.read()) === 'string') {
+		chunks.push(chunk);
+	}
+
+	return chunks.join('');
+}
+
 /**
  * Streamable content and meta information of a file.
  */
diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 524ffbdf8d6..29550c7197f 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -13,6 +13,7 @@ import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { ITextSnapshot } from 'vs/platform/files/common/files';
 
 /**
  * The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.
@@ -142,6 +143,15 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		return null;
 	}
 
+	public createSnapshot(): ITextSnapshot {
+		const model = this.textEditorModel;
+		if (model) {
+			return model.createSnapshot(true /* Preserve BOM */);
+		}
+
+		return null;
+	}
+
 	public isResolved(): boolean {
 		return !!this.textEditorModelHandle;
 	}
diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/electron-browser/fileService.ts
index 5eeae64bf3a..e97cc0ffd1d 100644
--- a/src/vs/workbench/services/files/electron-browser/fileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/fileService.ts
@@ -11,7 +11,7 @@ import paths = require('vs/base/common/paths');
 import encoding = require('vs/base/node/encoding');
 import errors = require('vs/base/common/errors');
 import uri from 'vs/base/common/uri';
-import { FileOperation, FileOperationEvent, IFileService, IFilesConfiguration, IResolveFileOptions, IFileStat, IResolveFileResult, IContent, IStreamContent, IImportResult, IResolveContentOptions, IUpdateContentOptions, FileChangesEvent, ICreateFileOptions } from 'vs/platform/files/common/files';
+import { FileOperation, FileOperationEvent, IFileService, IFilesConfiguration, IResolveFileOptions, IFileStat, IResolveFileResult, IContent, IStreamContent, IImportResult, IResolveContentOptions, IUpdateContentOptions, FileChangesEvent, ICreateFileOptions, ITextSnapshot } from 'vs/platform/files/common/files';
 import { FileService as NodeFileService, IFileServiceOptions, IEncodingOverride } from 'vs/workbench/services/files/node/fileService';
 import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
@@ -181,7 +181,7 @@ export class FileService implements IFileService {
 		return this.raw.resolveStreamContent(resource, options);
 	}
 
-	public updateContent(resource: uri, value: string, options?: IUpdateContentOptions): TPromise {
+	public updateContent(resource: uri, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise {
 		return this.raw.updateContent(resource, value, options);
 	}
 
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
index 2bf1ba014e1..1fb80d99042 100644
--- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
+++ b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -6,7 +6,7 @@
 
 import URI from 'vs/base/common/uri';
 import { FileService } from 'vs/workbench/services/files/electron-browser/fileService';
-import { IContent, IStreamContent, IFileStat, IResolveContentOptions, IUpdateContentOptions, IResolveFileOptions, IResolveFileResult, FileOperationEvent, FileOperation, IFileSystemProvider, IStat, FileType, IImportResult, FileChangesEvent, ICreateFileOptions, FileOperationError, FileOperationResult } from 'vs/platform/files/common/files';
+import { IContent, IStreamContent, IFileStat, IResolveContentOptions, IUpdateContentOptions, IResolveFileOptions, IResolveFileResult, FileOperationEvent, FileOperation, IFileSystemProvider, IStat, FileType, IImportResult, FileChangesEvent, ICreateFileOptions, FileOperationError, FileOperationResult, ITextSnapshot, snapshotToString } from 'vs/platform/files/common/files';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { basename, join } from 'path';
 import { IDisposable } from 'vs/base/common/lifecycle';
@@ -351,7 +351,7 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	updateContent(resource: URI, value: string, options?: IUpdateContentOptions): TPromise {
+	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise {
 		if (resource.scheme === Schemas.file) {
 			return super.updateContent(resource, value, options);
 		} else {
@@ -361,9 +361,10 @@ export class RemoteFileService extends FileService {
 		}
 	}
 
-	private _doUpdateContent(provider: IFileSystemProvider, resource: URI, content: string, options: IUpdateContentOptions): TPromise {
+	private _doUpdateContent(provider: IFileSystemProvider, resource: URI, content: string | ITextSnapshot, options: IUpdateContentOptions): TPromise {
 		const encoding = this.getEncoding(resource, options.encoding);
-		return provider.write(resource, encode(content, encoding)).then(() => {
+		// TODO@Joh support streaming API for remote file system writes
+		return provider.write(resource, encode(typeof content === 'string' ? content : snapshotToString(content), encoding)).then(() => {
 			return this.resolveFile(resource);
 		});
 	}
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index b1475b44eb9..d55169d2af0 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -11,7 +11,7 @@ import os = require('os');
 import crypto = require('crypto');
 import assert = require('assert');
 
-import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData } from 'vs/platform/files/common/files';
+import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot, snapshotToString } from 'vs/platform/files/common/files';
 import { MAX_FILE_SIZE } from 'vs/platform/files/node/files';
 import { isEqualOrParent } from 'vs/base/common/paths';
 import { ResourceMap } from 'vs/base/common/map';
@@ -41,6 +41,7 @@ import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cance
 import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { assign } from 'vs/base/common/objects';
+import { Readable } from 'stream';
 
 export interface IEncodingOverride {
 	resource: uri;
@@ -505,15 +506,16 @@ export class FileService implements IFileService {
 		});
 	}
 
-	public updateContent(resource: uri, value: string, options: IUpdateContentOptions = Object.create(null)): TPromise {
+	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise {
 		if (this.options.elevationSupport && options.writeElevated) {
-			return this.doUpdateContentElevated(resource, value, options);
+			// We can currently only write strings elevated, so we need to convert snapshots properly
+			return this.doUpdateContentElevated(resource, typeof value === 'string' ? value : snapshotToString(value), options);
 		}
 
 		return this.doUpdateContent(resource, value, options);
 	}
 
-	private doUpdateContent(resource: uri, value: string, options: IUpdateContentOptions = Object.create(null)): TPromise {
+	private doUpdateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		// 1.) check file
@@ -579,18 +581,25 @@ export class FileService implements IFileService {
 		});
 	}
 
-	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): TPromise {
+	private doSetContentsAndResolve(resource: uri, absolutePath: string, value: string | ITextSnapshot, addBOM: boolean, encodingToWrite: string, options?: { mode?: number; flag?: string; }): TPromise {
 		let writeFilePromise: TPromise;
 
 		// Write fast if we do UTF 8 without BOM
 		if (!addBOM && encodingToWrite === encoding.UTF8) {
-			writeFilePromise = pfs.writeFile(absolutePath, value, options);
+			if (typeof value === 'string') {
+				writeFilePromise = pfs.writeFile(absolutePath, value, options);
+			} else {
+				writeFilePromise = pfs.writeFile(absolutePath, this.snapshotToReadableStream(value), options);
+			}
 		}
 
 		// Otherwise use encoding lib
 		else {
-			const encoded = encoding.encode(value, encodingToWrite, { addBOM });
-			writeFilePromise = pfs.writeFile(absolutePath, encoded, options);
+			if (typeof value === 'string') {
+				writeFilePromise = pfs.writeFile(absolutePath, encoding.encode(value, encodingToWrite, { addBOM }), options);
+			} else {
+				writeFilePromise = pfs.writeFile(absolutePath, this.snapshotToReadableStream(value).pipe(encoding.encodeStream(encodingToWrite, { addBOM })), options);
+			}
 		}
 
 		// set contents
@@ -601,6 +610,31 @@ export class FileService implements IFileService {
 		});
 	}
 
+	private snapshotToReadableStream(snapshot: ITextSnapshot): NodeJS.ReadableStream {
+		return new Readable({
+			read: function () {
+				try {
+					let chunk: string;
+					let canPush = true;
+
+					// Push all chunks as long as we can push and as long as
+					// the underlying snapshot returns strings to us
+					while (canPush && typeof (chunk = snapshot.read()) === 'string') {
+						canPush = this.push(chunk);
+					}
+
+					// Signal EOS by pushing NULL
+					if (typeof chunk !== 'string') {
+						this.push(null);
+					}
+				} catch (error) {
+					this.emit('error', error);
+				}
+			},
+			encoding: encoding.UTF8 // very important, so that strings are passed around and not buffers!
+		});
+	}
+
 	private doUpdateContentElevated(resource: uri, value: string, options: IUpdateContentOptions = Object.create(null)): TPromise {
 		const absolutePath = this.toAbsolutePath(resource);
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index fc18f6c5656..beb2ea20d74 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -702,7 +702,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			// Save to Disk
 			// mark the save operation as currently pending with the versionId (it might have changed from a save participant triggering)
 			diag(`doSave(${versionId}) - before updateContent()`, this.resource, new Date());
-			return this.saveSequentializer.setPending(newVersionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.getValue(), {
+			return this.saveSequentializer.setPending(newVersionId, this.fileService.updateContent(this.lastResolvedDiskStat.resource, this.createSnapshot(), {
 				overwriteReadonly: options.overwriteReadonly,
 				overwriteEncoding: options.overwriteEncoding,
 				mtime: this.lastResolvedDiskStat.mtime,
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index e45bc1a4b10..e6f1b33310f 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -33,7 +33,7 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IEditorGroupService, GroupArrangement, GroupOrientation, IEditorTabOptions, IMoveOptions } from 'vs/workbench/services/group/common/groupService';
 import { TextFileService } from 'vs/workbench/services/textfile/common/textFileService';
-import { FileOperationEvent, IFileService, IResolveContentOptions, FileOperationError, IFileStat, IResolveFileResult, IImportResult, FileChangesEvent, IResolveFileOptions, IContent, IUpdateContentOptions, IStreamContent, ICreateFileOptions } from 'vs/platform/files/common/files';
+import { FileOperationEvent, IFileService, IResolveContentOptions, FileOperationError, IFileStat, IResolveFileResult, IImportResult, FileChangesEvent, IResolveFileOptions, IContent, IUpdateContentOptions, IStreamContent, ICreateFileOptions, ITextSnapshot } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -755,7 +755,7 @@ export class TestFileService implements IFileService {
 		});
 	}
 
-	updateContent(resource: URI, value: string, options?: IUpdateContentOptions): TPromise {
+	updateContent(resource: URI, value: string | ITextSnapshot, options?: IUpdateContentOptions): TPromise {
 		return TPromise.timeout(1).then(() => {
 			return {
 				resource,

From 8e7ca11a139b8ab68ba583b2057002174f85c899 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Sat, 20 Jan 2018 11:01:53 -0800
Subject: [PATCH 454/710] xterm@3.1.0-beta5

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

diff --git a/package.json b/package.json
index 480e75ed2b1..3312dc66b2d 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.0",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.1.0-beta3",
+    "vscode-xterm": "3.1.0-beta5",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 025f0b25545..8c4b2723702 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.1.0-beta3:
-  version "3.1.0-beta3"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta3.tgz#03ac017cb828ea51873c65b6c06ed045efa981ec"
+vscode-xterm@3.1.0-beta5:
+  version "3.1.0-beta5"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta5.tgz#b63c48cacda9c2546f50de550fef973a24df284c"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"

From 27be5beb83e21d69e53a4f7a41217f258815b9fd Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Sat, 20 Jan 2018 11:12:51 -0800
Subject: [PATCH 455/710] Support macOptionIsMeta

Fixes #11314
---
 src/typings/vscode-xterm.d.ts                          |  9 +++++++--
 src/vs/workbench/parts/terminal/common/terminal.ts     |  1 +
 .../terminal/electron-browser/terminal.contribution.ts |  5 +++++
 .../terminal/electron-browser/terminalInstance.ts      | 10 +++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index 84d9593b9d4..5e76f2033ee 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -67,6 +67,11 @@ declare module 'vscode-xterm' {
 		 */
 		lineHeight?: number;
 
+		/**
+		 * Whether to treat option as the meta key.
+		 */
+		macOptionIsMeta?: boolean;
+
 		/**
 		 * The number of rows in the terminal.
 		 */
@@ -422,7 +427,7 @@ declare module 'vscode-xterm' {
 		 * Retrieves an option's value from the terminal.
 		 * @param key The option key.
 		 */
-		getOption(key: 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell'): boolean;
+		getOption(key: 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell'): boolean;
 		/**
 		 * Retrieves an option's value from the terminal.
 		 * @param key The option key.
@@ -467,7 +472,7 @@ declare module 'vscode-xterm' {
 		 * @param key The option key.
 		 * @param value The option value.
 		 */
-		setOption(key: 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell', value: boolean): void;
+		setOption(key: 'cancelEvents' | 'convertEol' | 'cursorBlink' | 'debug' | 'disableStdin' | 'enableBold' | 'macOptionIsMeta' | 'popOnBell' | 'screenKeys' | 'useFlowControl' | 'visualBell', value: boolean): void;
 		/**
 		 * Sets an option on the terminal.
 		 * @param key The option key.
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 529159f22f1..59e4747ed75 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -61,6 +61,7 @@ export interface ITerminalConfiguration {
 		windows: string[];
 	};
 	enableBold: boolean;
+	macOptionIsMeta: boolean;
 	rightClickCopyPaste: boolean;
 	cursorBlinking: boolean;
 	cursorStyle: string;
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 254865eeb6b..6c596e10385 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -115,6 +115,11 @@ configurationRegistry.registerConfiguration({
 			},
 			'default': []
 		},
+		'terminal.integrated.macOptionIsMeta': {
+			'description': nls.localize('terminal.integrated.macOptionIsMeta', "Treat the option key as the meta key in the terminal on macOS."),
+			'type': 'boolean',
+			'default': false
+		},
 		'terminal.integrated.rightClickCopyPaste': {
 			'description': nls.localize('terminal.integrated.rightClickCopyPaste', "When set, this will prevent the context menu from appearing when right clicking within the terminal, instead it will copy when there is a selection and paste when there is no selection."),
 			'type': 'boolean',
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 7b25da78866..46bdcaefbca 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -282,7 +282,8 @@ export class TerminalInstance implements ITerminalInstance {
 			lineHeight: font.lineHeight,
 			enableBold: this._configHelper.config.enableBold,
 			bellStyle: this._configHelper.config.enableBell ? 'sound' : 'none',
-			screenReaderMode: accessibilitySupport === 'on'
+			screenReaderMode: accessibilitySupport === 'on',
+			macOptionIsMeta: this._configHelper.config.macOptionIsMeta
 		});
 		if (this._shellLaunchConfig.initialText) {
 			this._xterm.writeln(this._shellLaunchConfig.initialText);
@@ -981,6 +982,7 @@ export class TerminalInstance implements ITerminalInstance {
 		this._setCommandsToSkipShell(this._configHelper.config.commandsToSkipShell);
 		this._setScrollback(this._configHelper.config.scrollback);
 		this._setEnableBell(this._configHelper.config.enableBell);
+		this._setMacOptionIsMeta(this._configHelper.config.macOptionIsMeta);
 	}
 
 	public updateAccessibilitySupport(): void {
@@ -1013,6 +1015,12 @@ export class TerminalInstance implements ITerminalInstance {
 		}
 	}
 
+	private _setMacOptionIsMeta(value: boolean): void {
+		if (this._xterm && this._xterm.getOption('macOptionIsMeta') !== value) {
+			this._xterm.setOption('macOptionIsMeta', value);
+		}
+	}
+
 	private _setEnableBell(isEnabled: boolean): void {
 		if (this._xterm) {
 			if (this._xterm.getOption('bellStyle') === 'sound') {

From 15e4f9f9ccc0892fb68924a8b2f3328d676641dd Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Sat, 20 Jan 2018 19:21:50 -0800
Subject: [PATCH 456/710] GDPR annotation fix and remove unused prop

---
 .../parts/preferences/browser/preferencesRenderers.ts          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index 49d6784e666..6d2195213c1 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -110,7 +110,6 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 
 		if (this.filterResult) {
 			data['query'] = this.filterResult.query;
-			data['fuzzy'] = !!this.filterResult.metadata;
 			data['duration'] = this.filterResult.metadata && this.filterResult.metadata.duration;
 			data['index'] = source.index;
 			data['groupId'] = source.groupId;
@@ -121,8 +120,8 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend
 			"defaultSettingsActions.copySetting" : {
 				"userConfigurationKeys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"query" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-				"fuzzy" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+				"groupId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 				"editableSide" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 			}

From 34ce394126df4fda096eb4d77015aa44ff4f9d3f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sun, 21 Jan 2018 10:43:53 +0100
Subject: [PATCH 457/710] fix fdatasync working properly

---
 src/vs/base/node/extfs.ts                     | 44 +++++++++++--------
 .../services/files/node/fileService.ts        |  8 ++--
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts
index 9b540108284..963a9a3905e 100644
--- a/src/vs/base/node/extfs.ts
+++ b/src/vs/base/node/extfs.ts
@@ -356,14 +356,13 @@ function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream,
 		}
 	};
 
-	// create writer to target
-	const writer = fs.createWriteStream(path, options);
+	// create writer to target. we set autoClose: false because we want to use the streams
+	// file descriptor to call fs.fdatasync to ensure the data is flushed to disk
+	const writer = fs.createWriteStream(path, { mode: options.mode, flags: options.flag, autoClose: false });
 
-	// handle errors properly
-	reader.once('error', error => finish(error));
-	writer.once('error', error => finish(error));
-
-	// save the fd for later use
+	// Event: 'open'
+	// Purpose: save the fd for later use
+	// Notes: will not be called when there is an error opening the file descriptor!
 	let fd: number;
 	let isOpen: boolean;
 	writer.once('open', descriptor => {
@@ -371,11 +370,16 @@ function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream,
 		isOpen = true;
 	});
 
-	// we are done (underlying fd has been closed)
-	writer.once('close', () => finish());
+	// Event: 'error'
+	// Purpose: to return the error to the outside and to close the write stream (does not happen automatically)
+	reader.once('error', error => finish(error));
+	writer.once('error', error => finish(error));
 
-	// handle end event because we are in charge
-	reader.once('end', () => {
+	// Event: 'finish'
+	// Purpose: use fs.fdatasync to flush the contents to disk
+	// Notes: event is called when the writer has finished writing to the underlying resource. we must call writer.close()
+	// because we have created the WriteStream with autoClose: false
+	writer.once('finish', () => {
 
 		// flush to disk
 		if (canFlush && isOpen) {
@@ -388,18 +392,20 @@ function doWriteFileStreamAndFlush(path: string, reader: NodeJS.ReadableStream,
 					canFlush = false;
 				}
 
-				writer.end();
+				writer.close();
 			});
-		}
-
-		// do not flush
-		else {
-			writer.end();
+		} else {
+			writer.close();
 		}
 	});
 
-	// end: false means we are in charge of ending the streams properly
-	reader.pipe(writer, { end: false });
+	// Event: 'close'
+	// Purpose: signal we are done to the outside
+	// Notes: event is called when the writer's filedescriptor is closed
+	writer.once('close', () => finish());
+
+	// start data piping
+	reader.pipe(writer);
 }
 
 // Calls fs.writeFile() followed by a fs.sync() call to flush the changes to disk
diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts
index d55169d2af0..f443fec34a4 100644
--- a/src/vs/workbench/services/files/node/fileService.ts
+++ b/src/vs/workbench/services/files/node/fileService.ts
@@ -10,8 +10,7 @@ import fs = require('fs');
 import os = require('os');
 import crypto = require('crypto');
 import assert = require('assert');
-
-import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot, snapshotToString } from 'vs/platform/files/common/files';
+import { isParent, FileOperation, FileOperationEvent, IContent, IFileService, IResolveFileOptions, IResolveFileResult, IResolveContentOptions, IFileStat, IStreamContent, FileOperationError, FileOperationResult, IUpdateContentOptions, FileChangeType, IImportResult, FileChangesEvent, ICreateFileOptions, IContentData, ITextSnapshot } from 'vs/platform/files/common/files';
 import { MAX_FILE_SIZE } from 'vs/platform/files/node/files';
 import { isEqualOrParent } from 'vs/base/common/paths';
 import { ResourceMap } from 'vs/base/common/map';
@@ -508,8 +507,7 @@ export class FileService implements IFileService {
 
 	public updateContent(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise {
 		if (this.options.elevationSupport && options.writeElevated) {
-			// We can currently only write strings elevated, so we need to convert snapshots properly
-			return this.doUpdateContentElevated(resource, typeof value === 'string' ? value : snapshotToString(value), options);
+			return this.doUpdateContentElevated(resource, value, options);
 		}
 
 		return this.doUpdateContent(resource, value, options);
@@ -635,7 +633,7 @@ export class FileService implements IFileService {
 		});
 	}
 
-	private doUpdateContentElevated(resource: uri, value: string, options: IUpdateContentOptions = Object.create(null)): TPromise {
+	private doUpdateContentElevated(resource: uri, value: string | ITextSnapshot, options: IUpdateContentOptions = Object.create(null)): TPromise {
 		const absolutePath = this.toAbsolutePath(resource);
 
 		// 1.) check file

From 1d56aabed51fc8324144e30289dab18b4ec5a8cd Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sun, 21 Jan 2018 10:51:57 +0100
Subject: [PATCH 458/710] add more text snapshot tests

---
 .../files/test/node/fileService.test.ts       | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

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 3a97a2a5cec..863f43f8721 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -22,6 +22,7 @@ import { onError } from 'vs/base/test/common/utils';
 import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
+import { TextModel } from 'vs/editor/common/model/textModel';
 
 suite('FileService', () => {
 	let service: FileService;
@@ -581,6 +582,54 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('updateContent (ITextSnapShot)', function (done: () => void) {
+		const resource = uri.file(path.join(testDir, 'small.txt'));
+
+		service.resolveContent(resource).done(c => {
+			assert.equal(c.value, 'Small File');
+
+			const model = TextModel.createFromString('Updates to the small file');
+
+			return service.updateContent(c.resource, model.createSnapshot()).then(c => {
+				assert.equal(fs.readFileSync(resource.fsPath), 'Updates to the small file');
+
+				model.dispose();
+
+				done();
+			});
+		}, error => onError(error, done));
+	});
+
+	test('updateContent (large file)', function (done: () => void) {
+		const resource = uri.file(path.join(testDir, 'lorem.txt'));
+
+		service.resolveContent(resource).done(c => {
+			const newValue = c.value + c.value;
+			c.value = newValue;
+
+			return service.updateContent(c.resource, c.value).then(c => {
+				assert.equal(fs.readFileSync(resource.fsPath), newValue);
+
+				done();
+			});
+		}, error => onError(error, done));
+	});
+
+	test('updateContent (large file, ITextSnapShot)', function (done: () => void) {
+		const resource = uri.file(path.join(testDir, 'lorem.txt'));
+
+		service.resolveContent(resource).done(c => {
+			const newValue = c.value + c.value;
+			const model = TextModel.createFromString(newValue);
+
+			return service.updateContent(c.resource, model.createSnapshot()).then(c => {
+				assert.equal(fs.readFileSync(resource.fsPath), newValue);
+
+				done();
+			});
+		}, error => onError(error, done));
+	});
+
 	test('updateContent - use encoding (UTF 16 BE)', function (done: () => void) {
 		const resource = uri.file(path.join(testDir, 'small.txt'));
 		const encoding = 'utf16be';
@@ -602,6 +651,31 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('updateContent - use encoding (UTF 16 BE, ITextSnapShot)', function (done: () => void) {
+		const resource = uri.file(path.join(testDir, 'small.txt'));
+		const encoding = 'utf16be';
+
+		service.resolveContent(resource).done(c => {
+			c.encoding = encoding;
+
+			const model = TextModel.createFromString(c.value);
+
+			return service.updateContent(c.resource, model.createSnapshot(), { encoding: encoding }).then(c => {
+				return encodingLib.detectEncodingByBOM(c.resource.fsPath).then((enc) => {
+					assert.equal(enc, encodingLib.UTF16be);
+
+					return service.resolveContent(resource).then(c => {
+						assert.equal(c.encoding, encoding);
+
+						model.dispose();
+
+						done();
+					});
+				});
+			});
+		}, error => onError(error, done));
+	});
+
 	test('updateContent - encoding preserved (UTF 16 LE)', function (done: () => void) {
 		const encoding = 'utf16le';
 		const resource = uri.file(path.join(testDir, 'some_utf16le.css'));
@@ -625,6 +699,31 @@ suite('FileService', () => {
 		}, error => onError(error, done));
 	});
 
+	test('updateContent - encoding preserved (UTF 16 LE, ITextSnapShot)', function (done: () => void) {
+		const encoding = 'utf16le';
+		const resource = uri.file(path.join(testDir, 'some_utf16le.css'));
+
+		service.resolveContent(resource).done(c => {
+			assert.equal(c.encoding, encoding);
+
+			const model = TextModel.createFromString('Some updates');
+
+			return service.updateContent(c.resource, model.createSnapshot(), { encoding: encoding }).then(c => {
+				return encodingLib.detectEncodingByBOM(c.resource.fsPath).then((enc) => {
+					assert.equal(enc, encodingLib.UTF16le);
+
+					return service.resolveContent(resource).then(c => {
+						assert.equal(c.encoding, encoding);
+
+						model.dispose();
+
+						done();
+					});
+				});
+			});
+		}, error => onError(error, done));
+	});
+
 	test('resolveContent - large file', function (done: () => void) {
 		const resource = uri.file(path.join(testDir, 'lorem.txt'));
 

From 7bbf60b0111f2dede4d7730d0f4f23c442245800 Mon Sep 17 00:00:00 2001
From: Anton Kosiakov 
Date: Sun, 21 Jan 2018 12:13:40 +0100
Subject: [PATCH 459/710] [monaco] bind ILogService to NullLogService by
 default

---
 src/vs/editor/standalone/browser/standaloneServices.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/editor/standalone/browser/standaloneServices.ts b/src/vs/editor/standalone/browser/standaloneServices.ts
index 8071e7863ea..552156aca88 100644
--- a/src/vs/editor/standalone/browser/standaloneServices.ts
+++ b/src/vs/editor/standalone/browser/standaloneServices.ts
@@ -40,6 +40,7 @@ import { ContextKeyService } from 'vs/platform/contextkey/browser/contextKeyServ
 import { IMenuService } from 'vs/platform/actions/common/actions';
 import { IStandaloneThemeService } from 'vs/editor/standalone/common/standaloneThemeService';
 import { StandaloneThemeServiceImpl } from 'vs/editor/standalone/browser/standaloneThemeServiceImpl';
+import { ILogService, NullLogService } from 'vs/platform/log/common/log';
 
 export interface IEditorContextViewService extends IContextViewService {
 	dispose(): void;
@@ -142,6 +143,8 @@ export module StaticServices {
 
 	export const storageService = define(IStorageService, () => NullStorageService);
 
+	export const logService = define(ILogService, () => new NullLogService());
+
 }
 
 export class DynamicStandaloneServices extends Disposable {

From 2866ee1ae846f456d1fe9d3728fa4b3f68a7cff0 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Sun, 21 Jan 2018 12:10:48 +0100
Subject: [PATCH 460/710] splitview.addView should set low prio to new view

---
 src/vs/base/browser/ui/splitview/splitview.css | 1 +
 src/vs/base/browser/ui/splitview/splitview.ts  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/browser/ui/splitview/splitview.css b/src/vs/base/browser/ui/splitview/splitview.css
index 41d3de5c826..045645a3f68 100644
--- a/src/vs/base/browser/ui/splitview/splitview.css
+++ b/src/vs/base/browser/ui/splitview/splitview.css
@@ -20,4 +20,5 @@
 
 .monaco-split-view2.horizontal > .split-view-view {
 	height: 100%;
+	display: inline-block;
 }
diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts
index 9c6657154b8..833a2180803 100644
--- a/src/vs/base/browser/ui/splitview/splitview.ts
+++ b/src/vs/base/browser/ui/splitview/splitview.ts
@@ -161,7 +161,7 @@ export class SplitView implements IDisposable {
 		}
 
 		view.render(container, this.orientation);
-		this.relayout();
+		this.relayout(index);
 		this.state = State.Idle;
 	}
 

From 673355d8f42c0b676442a454fcce940a4e270aff Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Sun, 21 Jan 2018 12:11:56 +0100
Subject: [PATCH 461/710] grid example

---
 src/vs/base/browser/ui/splitview/grid.ts | 149 +++++++++++++++++++++++
 test/grid.html                           |  59 +++++++++
 2 files changed, 208 insertions(+)
 create mode 100644 src/vs/base/browser/ui/splitview/grid.ts
 create mode 100644 test/grid.html

diff --git a/src/vs/base/browser/ui/splitview/grid.ts b/src/vs/base/browser/ui/splitview/grid.ts
new file mode 100644
index 00000000000..fd0c585ff11
--- /dev/null
+++ b/src/vs/base/browser/ui/splitview/grid.ts
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import Event, { anyEvent } from 'vs/base/common/event';
+import { Orientation } from 'vs/base/browser/ui/sash/sash';
+import { append, $ } from 'vs/base/browser/dom';
+import { SplitView, IView } from 'vs/base/browser/ui/splitview/splitview';
+export { Orientation } from 'vs/base/browser/ui/sash/sash';
+
+export class GridNode implements IView {
+
+	get minimumSize(): number {
+		let result = 0;
+
+		for (const child of this.children) {
+			for (const grandchild of child.children) {
+				result += grandchild.minimumSize;
+			}
+		}
+
+		return result === 0 ? 50 : result;
+	}
+
+	readonly maximumSize = Number.MAX_VALUE;
+
+	private _onDidChange: Event = Event.None;
+	get onDidChange(): Event {
+		return this._onDidChange;
+	}
+
+	protected orientation: Orientation | undefined;
+	protected size: number | undefined;
+	protected orthogonalSize: number | undefined;
+	private splitview: SplitView | undefined;
+	private children: GridNode[] = [];
+	private color: string | undefined;
+
+	constructor(private parent?: GridNode, orthogonalSize?: number, color?: string) {
+		this.orthogonalSize = orthogonalSize;
+		this.color = color || `hsl(${Math.round(Math.random() * 360)}, 72%, 72%)`;
+	}
+
+	render(container: HTMLElement): void {
+		container = append(container, $('.node'));
+		container.style.backgroundColor = this.color;
+
+		append(container, $('.action', { onclick: () => this.split(container, Orientation.HORIZONTAL) }, '⬌'));
+		append(container, $('.action', { onclick: () => this.split(container, Orientation.VERTICAL) }, '⬍'));
+	}
+
+	protected split(container: HTMLElement, orientation: Orientation): void {
+		if (this.parent && this.parent.orientation === orientation) {
+			const index = this.parent.children.indexOf(this);
+			this.parent.addChild(this.size / 2, this.orthogonalSize, index + 1);
+		} else {
+			this.branch(container, orientation);
+		}
+	}
+
+	protected branch(container: HTMLElement, orientation: Orientation): void {
+		this.orientation = orientation;
+		container.innerHTML = '';
+
+		this.splitview = new SplitView(container, { orientation });
+		this.layout(this.size);
+		this.orthogonalLayout(this.orthogonalSize);
+
+		this.addChild(this.orthogonalSize / 2, this.size, 0, this.color);
+		this.addChild(this.orthogonalSize / 2, this.size);
+	}
+
+	layout(size: number): void {
+		this.size = size;
+
+		for (const child of this.children) {
+			child.orthogonalLayout(size);
+		}
+	}
+
+	orthogonalLayout(size: number): void {
+		this.orthogonalSize = size;
+
+		if (this.splitview) {
+			this.splitview.layout(size);
+		}
+	}
+
+	private addChild(size: number, orthogonalSize: number, index?: number, color?: string): void {
+		const child = new GridNode(this, orthogonalSize, color);
+		this.splitview.addView(child, size, index);
+
+		if (typeof index === 'number') {
+			this.children.splice(index, 0, child);
+		} else {
+			this.children.push(child);
+		}
+
+		this._onDidChange = anyEvent(...this.children.map(c => c.onDidChange));
+	}
+}
+
+export class RootGridNode extends GridNode {
+
+	private width: number;
+	private height: number;
+
+	protected branch(container: HTMLElement, orientation: Orientation): void {
+		if (orientation === Orientation.VERTICAL) {
+			this.size = this.width;
+			this.orthogonalSize = this.height;
+		} else {
+			this.size = this.height;
+			this.orthogonalSize = this.width;
+		}
+
+		super.branch(container, orientation);
+	}
+
+	layoutBox(width: number, height: number): void {
+		if (this.orientation === Orientation.VERTICAL) {
+			this.layout(width);
+			this.orthogonalLayout(height);
+		} else if (this.orientation === Orientation.HORIZONTAL) {
+			this.layout(height);
+			this.orthogonalLayout(width);
+		} else {
+			this.width = width;
+			this.height = height;
+		}
+	}
+}
+
+export class Grid {
+
+	private root: RootGridNode;
+
+	constructor(container: HTMLElement) {
+		this.root = new RootGridNode();
+		this.root.render(container);
+	}
+
+	layout(width: number, height: number): void {
+		this.root.layoutBox(width, height);
+	}
+}
diff --git a/test/grid.html b/test/grid.html
new file mode 100644
index 00000000000..a455621fea8
--- /dev/null
+++ b/test/grid.html
@@ -0,0 +1,59 @@
+
+
+
+
+	
+	
+	Grid Example
+	
+	
+	
+	
+
+
+
+
+
+
+
\ No newline at end of file

From d44201fa07b1c89ac35875f90bdc13b9b68e3b3c Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sun, 21 Jan 2018 12:20:46 +0100
Subject: [PATCH 462/710] wire in ITextSnapshot for backup writing

---
 src/vs/platform/files/common/files.ts         | 26 ++++++++++
 .../parts/backup/common/backupModelTracker.ts |  4 +-
 .../files/electron-browser/fileActions.ts     |  2 +-
 .../electron-browser/views/explorerViewer.ts  |  2 +-
 .../services/backup/common/backup.ts          |  6 +--
 .../services/backup/node/backupFileService.ts | 22 +++++---
 .../test/node/backupFileService.test.ts       | 52 ++++++++++++++++++-
 .../files/test/node/fileService.test.ts       | 14 +++--
 .../textfile/common/textFileService.ts        |  4 +-
 .../services/textfile/common/textfiles.ts     |  4 +-
 .../workbench/test/workbenchTestServices.ts   |  2 +-
 11 files changed, 116 insertions(+), 22 deletions(-)

diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 0fe4bf63718..9f313e5a55a 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -481,6 +481,32 @@ export function snapshotToString(snapshot: ITextSnapshot): string {
 	return chunks.join('');
 }
 
+/**
+ * Helper that wraps around a ITextSnapshot and allows to have a
+ * preamble that the read() method will return first.
+ */
+export class BufferedTextSnapshot implements ITextSnapshot {
+	private preambleHandled: boolean;
+
+	constructor(private snapshot: ITextSnapshot, private preamble: string) {
+	}
+
+	public read(): string {
+		let value = this.snapshot.read();
+		if (!this.preambleHandled) {
+			this.preambleHandled = true;
+
+			if (typeof value === 'string') {
+				value = this.preamble + value;
+			} else {
+				value = this.preamble;
+			}
+		}
+
+		return value;
+	}
+}
+
 /**
  * Streamable content and meta information of a file.
  */
diff --git a/src/vs/workbench/parts/backup/common/backupModelTracker.ts b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
index 7078c5cd4b5..1c61b9715e2 100644
--- a/src/vs/workbench/parts/backup/common/backupModelTracker.ts
+++ b/src/vs/workbench/parts/backup/common/backupModelTracker.ts
@@ -72,14 +72,14 @@ export class BackupModelTracker implements IWorkbenchContribution {
 			// Do not backup when auto save after delay is configured
 			if (!this.configuredAutoSaveAfterDelay) {
 				const model = this.textFileService.models.get(event.resource);
-				this.backupFileService.backupResource(model.getResource(), model.getValue(), model.getVersionId()).done(null, errors.onUnexpectedError);
+				this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId()).done(null, errors.onUnexpectedError);
 			}
 		}
 	}
 
 	private onUntitledModelChanged(resource: Uri): void {
 		if (this.untitledEditorService.isDirty(resource)) {
-			this.untitledEditorService.loadOrCreate({ resource }).then(model => this.backupFileService.backupResource(resource, model.getValue(), model.getVersionId())).done(null, errors.onUnexpectedError);
+			this.untitledEditorService.loadOrCreate({ resource }).then(model => this.backupFileService.backupResource(resource, model.createSnapshot(), model.getVersionId())).done(null, errors.onUnexpectedError);
 		} else {
 			this.discardBackup(resource);
 		}
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
index e80a6804eb1..952968f7641 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts
@@ -318,7 +318,7 @@ class RenameFileAction extends BaseRenameAction {
 
 			const model = this.textFileService.models.get(d);
 
-			return this.backupFileService.backupResource(renamed, model.getValue(), model.getVersionId());
+			return this.backupFileService.backupResource(renamed, model.createSnapshot(), model.getVersionId());
 		}))
 
 			// 2. soft revert all dirty since we have backed up their contents
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 a812d54aaff..49550e507a1 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -968,7 +968,7 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 
 				const model = this.textFileService.models.get(d);
 
-				return this.backupFileService.backupResource(moved, model.getValue(), model.getVersionId());
+				return this.backupFileService.backupResource(moved, model.createSnapshot(), model.getVersionId());
 			}))
 
 				// 2. soft revert all dirty since we have backed up their contents
diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts
index 7a46ffa491e..0b4d35f5d0c 100644
--- a/src/vs/workbench/services/backup/common/backup.ts
+++ b/src/vs/workbench/services/backup/common/backup.ts
@@ -8,7 +8,7 @@
 import Uri from 'vs/base/common/uri';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { IResolveContentOptions, IUpdateContentOptions } from 'vs/platform/files/common/files';
+import { IResolveContentOptions, IUpdateContentOptions, ITextSnapshot } from 'vs/platform/files/common/files';
 import { ITextBufferFactory } from 'vs/editor/common/model';
 
 export const IBackupFileService = createDecorator('backupFileService');
@@ -52,10 +52,10 @@ export interface IBackupFileService {
 	 * Backs up a resource.
 	 *
 	 * @param resource The resource to back up.
-	 * @param content The content of the resource.
+	 * @param content The content of the resource as value or snapshot.
 	 * @param versionId The version id of the resource to backup.
 	 */
-	backupResource(resource: Uri, content: string, versionId?: number): TPromise;
+	backupResource(resource: Uri, content: string | ITextSnapshot, versionId?: number): TPromise;
 
 	/**
 	 * Gets a list of file backups for the current workspace.
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index ff3543726ce..3ef38e18dc5 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -11,7 +11,7 @@ import * as pfs from 'vs/base/node/pfs';
 import Uri from 'vs/base/common/uri';
 import { ResourceQueue } from 'vs/base/common/async';
 import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
-import { IFileService } from 'vs/platform/files/common/files';
+import { IFileService, ITextSnapshot, BufferedTextSnapshot, IFileStat } from 'vs/platform/files/common/files';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readToMatchingString } from 'vs/base/node/stream';
 import { Range } from 'vs/editor/common/core/range';
@@ -149,7 +149,7 @@ export class BackupFileService implements IBackupFileService {
 		});
 	}
 
-	public backupResource(resource: Uri, content: string, versionId?: number): TPromise {
+	public backupResource(resource: Uri, content: string | ITextSnapshot, versionId?: number): TPromise {
 		if (this.isShuttingDown) {
 			return TPromise.as(void 0);
 		}
@@ -164,11 +164,21 @@ export class BackupFileService implements IBackupFileService {
 				return void 0; // return early if backup version id matches requested one
 			}
 
-			// Add metadata to top of file
-			content = `${resource.toString()}${BackupFileService.META_MARKER}${content}`;
-
 			return this.ioOperationQueues.queueFor(backupResource).queue(() => {
-				return this.fileService.updateContent(backupResource, content, BACKUP_FILE_UPDATE_OPTIONS).then(() => model.add(backupResource, versionId));
+				const preamble = `${resource.toString()}${BackupFileService.META_MARKER}`;
+
+				// Update content with value
+				let updateContentPromise: TPromise;
+				if (typeof content === 'string') {
+					updateContentPromise = this.fileService.updateContent(backupResource, `${preamble}${content}`, BACKUP_FILE_UPDATE_OPTIONS);
+				}
+
+				// Update content with snapshot
+				else {
+					updateContentPromise = this.fileService.updateContent(backupResource, new BufferedTextSnapshot(content, preamble), BACKUP_FILE_UPDATE_OPTIONS);
+				}
+
+				return updateContentPromise.then(() => model.add(backupResource, versionId));
 			});
 		});
 	}
diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
index 84ae8794ec7..2720754abbb 100644
--- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
@@ -16,7 +16,7 @@ import pfs = require('vs/base/node/pfs');
 import Uri from 'vs/base/common/uri';
 import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService';
 import { FileService } from 'vs/workbench/services/files/node/fileService';
-import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
+import { createTextBufferFactory, TextModel } from 'vs/editor/common/model/textModel';
 import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices';
 import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
@@ -121,6 +121,56 @@ suite('BackupFileService', () => {
 				done();
 			});
 		});
+
+		test('text file (ITextSnapshot)', function (done: () => void) {
+			const model = TextModel.createFromString('test');
+
+			service.backupResource(fooFile, model.createSnapshot()).then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+				assert.equal(fs.existsSync(fooBackupPath), true);
+				assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\ntest`);
+				model.dispose();
+				done();
+			});
+		});
+
+		test('untitled file (ITextSnapshot)', function (done: () => void) {
+			const model = TextModel.createFromString('test');
+
+			service.backupResource(untitledFile, model.createSnapshot()).then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+				assert.equal(fs.existsSync(untitledBackupPath), true);
+				assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\ntest`);
+				model.dispose();
+				done();
+			});
+		});
+
+		test('text file (large file, ITextSnapshot)', function (done: () => void) {
+			const largeString = (new Array(100 * 1024)).join('Large String\n');
+			const model = TextModel.createFromString(largeString);
+
+			service.backupResource(fooFile, model.createSnapshot()).then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1);
+				assert.equal(fs.existsSync(fooBackupPath), true);
+				assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\n${largeString}`);
+				model.dispose();
+				done();
+			});
+		});
+
+		test('untitled file (large file, ITextSnapshot)', function (done: () => void) {
+			const largeString = (new Array(100 * 1024)).join('Large String\n');
+			const model = TextModel.createFromString(largeString);
+
+			service.backupResource(untitledFile, model.createSnapshot()).then(() => {
+				assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1);
+				assert.equal(fs.existsSync(untitledBackupPath), true);
+				assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\n${largeString}`);
+				model.dispose();
+				done();
+			});
+		});
 	});
 
 	suite('discardResourceBackup', () => {
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 863f43f8721..378b1b91a08 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -945,26 +945,32 @@ suite('FileService', () => {
 			fs.readFile(resource.fsPath, (error, data) => {
 				assert.equal(encodingLib.detectEncodingByBOMFromBuffer(data, 512), null);
 
+				const model = TextModel.createFromString('Hello Bom');
+
 				// Update content: UTF_8 => UTF_8_BOM
-				_service.updateContent(resource, 'Hello Bom', { encoding: encodingLib.UTF8_with_bom }).done(() => {
+				_service.updateContent(resource, model.createSnapshot(), { encoding: encodingLib.UTF8_with_bom }).done(() => {
 					fs.readFile(resource.fsPath, (error, data) => {
 						assert.equal(encodingLib.detectEncodingByBOMFromBuffer(data, 512), encodingLib.UTF8);
 
 						// Update content: PRESERVE BOM when using UTF-8
-						_service.updateContent(resource, 'Please stay Bom', { encoding: encodingLib.UTF8 }).done(() => {
+						model.setValue('Please stay Bom');
+						_service.updateContent(resource, model.createSnapshot(), { encoding: encodingLib.UTF8 }).done(() => {
 							fs.readFile(resource.fsPath, (error, data) => {
 								assert.equal(encodingLib.detectEncodingByBOMFromBuffer(data, 512), encodingLib.UTF8);
 
 								// Update content: REMOVE BOM
-								_service.updateContent(resource, 'Go away Bom', { encoding: encodingLib.UTF8, overwriteEncoding: true }).done(() => {
+								model.setValue('Go away Bom');
+								_service.updateContent(resource, model.createSnapshot(), { encoding: encodingLib.UTF8, overwriteEncoding: true }).done(() => {
 									fs.readFile(resource.fsPath, (error, data) => {
 										assert.equal(encodingLib.detectEncodingByBOMFromBuffer(data, 512), null);
 
 										// Update content: BOM comes not back
-										_service.updateContent(resource, 'Do not come back Bom', { encoding: encodingLib.UTF8 }).done(() => {
+										model.setValue('Do not come back Bom');
+										_service.updateContent(resource, model.createSnapshot(), { encoding: encodingLib.UTF8 }).done(() => {
 											fs.readFile(resource.fsPath, (error, data) => {
 												assert.equal(encodingLib.detectEncodingByBOMFromBuffer(data, 512), null);
 
+												model.dispose();
 												_service.dispose();
 												done();
 											});
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index 6e5bf84bf4a..a1ef38dd364 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -241,7 +241,7 @@ export abstract class TextFileService implements ITextFileService {
 	private doBackupAll(dirtyFileModels: ITextFileEditorModel[], untitledResources: URI[]): TPromise {
 
 		// Handle file resources first
-		return TPromise.join(dirtyFileModels.map(model => this.backupFileService.backupResource(model.getResource(), model.getValue(), model.getVersionId()))).then(results => {
+		return TPromise.join(dirtyFileModels.map(model => this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId()))).then(results => {
 
 			// Handle untitled resources
 			const untitledModelPromises = untitledResources
@@ -250,7 +250,7 @@ export abstract class TextFileService implements ITextFileService {
 
 			return TPromise.join(untitledModelPromises).then(untitledModels => {
 				const untitledBackupPromises = untitledModels.map(model => {
-					return this.backupFileService.backupResource(model.getResource(), model.getValue(), model.getVersionId());
+					return this.backupFileService.backupResource(model.getResource(), model.createSnapshot(), model.getVersionId());
 				});
 
 				return TPromise.join(untitledBackupPromises).then(() => void 0);
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 4be8ffb329e..6000c9734e5 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri';
 import Event from 'vs/base/common/event';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { IEncodingSupport, ConfirmResult } from 'vs/workbench/common/editor';
-import { IBaseStat, IResolveContentOptions } from 'vs/platform/files/common/files';
+import { IBaseStat, IResolveContentOptions, ITextSnapshot } from 'vs/platform/files/common/files';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { ITextEditorModel } from 'vs/editor/common/services/resolverService';
 import { ITextBufferFactory } from 'vs/editor/common/model';
@@ -202,6 +202,8 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	getValue(): string;
 
+	createSnapshot(): ITextSnapshot;
+
 	isDirty(): boolean;
 
 	isResolved(): boolean;
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index e6f1b33310f..50f9c781ff8 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -856,7 +856,7 @@ export class TestBackupFileService implements IBackupFileService {
 		return null;
 	}
 
-	public backupResource(resource: URI, content: string): TPromise {
+	public backupResource(resource: URI, content: string | ITextSnapshot): TPromise {
 		return TPromise.as(void 0);
 	}
 

From fbc94d2a8f61a7bd3a770d2a6d02ce7efe41d7b3 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sun, 21 Jan 2018 12:43:18 +0100
Subject: [PATCH 463/710] snapshot support for getFirstLineText

---
 .../workbench/common/editor/textEditorModel.ts   | 16 +++++++++++++---
 .../common/editor/untitledEditorModel.ts         |  9 ---------
 .../textfile/common/textFileEditorModel.ts       |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 29550c7197f..8df2f87b499 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -91,7 +91,9 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		return this;
 	}
 
-	protected getFirstLineText(value: string | ITextBufferFactory): string {
+	protected getFirstLineText(value: string | ITextBufferFactory | ITextSnapshot): string {
+
+		// string
 		if (typeof value === 'string') {
 			const firstLineText = value.substr(0, 100);
 
@@ -106,9 +108,17 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 			}
 
 			return firstLineText.substr(0, Math.min(crIndex, lfIndex));
-		} else {
-			return value.getFirstLineText(100);
 		}
+
+		// text buffer factory
+		const textBufferFactory = value as ITextBufferFactory;
+		if (typeof textBufferFactory.getFirstLineText === 'function') {
+			return textBufferFactory.getFirstLineText(100);
+		}
+
+		// text snapshot
+		const textSnapshot = value as ITextSnapshot;
+		return this.getFirstLineText(textSnapshot.read() || '');
 	}
 
 	/**
diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts
index 9a817653721..c7dcee066bd 100644
--- a/src/vs/workbench/common/editor/untitledEditorModel.ts
+++ b/src/vs/workbench/common/editor/untitledEditorModel.ts
@@ -10,7 +10,6 @@ import { IEncodingSupport } from 'vs/workbench/common/editor';
 import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
 import URI from 'vs/base/common/uri';
 import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
-import { EndOfLinePreference } from 'vs/editor/common/model';
 import { CONTENT_CHANGE_EVENT_BUFFER_DELAY } from 'vs/platform/files/common/files';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { IModelService } from 'vs/editor/common/services/modelService';
@@ -113,14 +112,6 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin
 		return this.versionId;
 	}
 
-	public getValue(): string {
-		if (this.textEditorModel) {
-			return this.textEditorModel.getValue(EndOfLinePreference.TextDefined, true /* Preserve BOM */);
-		}
-
-		return null;
-	}
-
 	public getModeId(): string {
 		if (this.textEditorModel) {
 			return this.textEditorModel.getLanguageIdentifier().language;
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
index beb2ea20d74..88197be4a82 100644
--- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
+++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -188,7 +188,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 			return;
 		}
 
-		const firstLineText = this.getFirstLineText(this.textEditorModel.getValue());
+		const firstLineText = this.getFirstLineText(this.textEditorModel.createSnapshot());
 		const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText);
 
 		this.modelService.setMode(this.textEditorModel, mode);

From 0628d026f004687134a54ce1fb55f593bcac1fd4 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Sun, 21 Jan 2018 13:26:15 +0100
Subject: [PATCH 464/710] move BackupSnapshot around

---
 src/vs/platform/files/common/files.ts         | 26 -------------------
 .../services/backup/node/backupFileService.ts | 26 +++++++++++++++++--
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts
index 9f313e5a55a..0fe4bf63718 100644
--- a/src/vs/platform/files/common/files.ts
+++ b/src/vs/platform/files/common/files.ts
@@ -481,32 +481,6 @@ export function snapshotToString(snapshot: ITextSnapshot): string {
 	return chunks.join('');
 }
 
-/**
- * Helper that wraps around a ITextSnapshot and allows to have a
- * preamble that the read() method will return first.
- */
-export class BufferedTextSnapshot implements ITextSnapshot {
-	private preambleHandled: boolean;
-
-	constructor(private snapshot: ITextSnapshot, private preamble: string) {
-	}
-
-	public read(): string {
-		let value = this.snapshot.read();
-		if (!this.preambleHandled) {
-			this.preambleHandled = true;
-
-			if (typeof value === 'string') {
-				value = this.preamble + value;
-			} else {
-				value = this.preamble;
-			}
-		}
-
-		return value;
-	}
-}
-
 /**
  * Streamable content and meta information of a file.
  */
diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts
index 3ef38e18dc5..18c4e2a7b50 100644
--- a/src/vs/workbench/services/backup/node/backupFileService.ts
+++ b/src/vs/workbench/services/backup/node/backupFileService.ts
@@ -11,7 +11,7 @@ import * as pfs from 'vs/base/node/pfs';
 import Uri from 'vs/base/common/uri';
 import { ResourceQueue } from 'vs/base/common/async';
 import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS } from 'vs/workbench/services/backup/common/backup';
-import { IFileService, ITextSnapshot, BufferedTextSnapshot, IFileStat } from 'vs/platform/files/common/files';
+import { IFileService, ITextSnapshot, IFileStat } from 'vs/platform/files/common/files';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readToMatchingString } from 'vs/base/node/stream';
 import { Range } from 'vs/editor/common/core/range';
@@ -28,6 +28,28 @@ export interface IBackupFilesModel {
 	clear(): void;
 }
 
+export class BackupSnapshot implements ITextSnapshot {
+	private preambleHandled: boolean;
+
+	constructor(private snapshot: ITextSnapshot, private preamble: string) {
+	}
+
+	public read(): string {
+		let value = this.snapshot.read();
+		if (!this.preambleHandled) {
+			this.preambleHandled = true;
+
+			if (typeof value === 'string') {
+				value = this.preamble + value;
+			} else {
+				value = this.preamble;
+			}
+		}
+
+		return value;
+	}
+}
+
 export class BackupFilesModel implements IBackupFilesModel {
 	private cache: { [resource: string]: number /* version ID */ } = Object.create(null);
 
@@ -175,7 +197,7 @@ export class BackupFileService implements IBackupFileService {
 
 				// Update content with snapshot
 				else {
-					updateContentPromise = this.fileService.updateContent(backupResource, new BufferedTextSnapshot(content, preamble), BACKUP_FILE_UPDATE_OPTIONS);
+					updateContentPromise = this.fileService.updateContent(backupResource, new BackupSnapshot(content, preamble), BACKUP_FILE_UPDATE_OPTIONS);
 				}
 
 				return updateContentPromise.then(() => model.add(backupResource, versionId));

From cda9c6ac5e8627bf7e8d0e0e3366c7608b6c0abc Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Sun, 21 Jan 2018 21:43:36 -0800
Subject: [PATCH 465/710] Remove unnecessary telemetry property

---
 src/vs/workbench/parts/preferences/browser/preferencesEditor.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 3d60b7d794f..941892045d0 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -298,7 +298,6 @@ export class PreferencesEditor extends BaseEditor {
 		if (filter && filter !== this._lastReportedFilter) {
 			let data = {
 				filter,
-				fuzzy: !!metadata,
 				duration: metadata ? metadata.duration : undefined,
 				context: metadata ? metadata.context : undefined,
 				counts
@@ -307,7 +306,6 @@ export class PreferencesEditor extends BaseEditor {
 			/* __GDPR__
 				"defaultSettings.filter" : {
 					"filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
-					"fuzzy" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"context" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
 					"counts" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }

From 4bcaeaed2b617f380d184c5d4936dc2082218c41 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Sun, 21 Jan 2018 21:45:18 -0800
Subject: [PATCH 466/710] Bump node-debug2

---
 build/gulpfile.vscode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a0b70de7f14..15b95986668 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -46,7 +46,7 @@ const nodeModules = ['electron', 'original-fs']
 
 const builtInExtensions = [
 	{ name: 'ms-vscode.node-debug', version: '1.20.3' },
-	{ name: 'ms-vscode.node-debug2', version: '1.20.0' }
+	{ name: 'ms-vscode.node-debug2', version: '1.20.1' }
 ];
 
 const excludedExtensions = [

From 9f4dc79a03910415d28145e1798b81b2450dadb0 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 09:09:02 +0100
Subject: [PATCH 467/710] linux: missing checking for updatse

---
 src/vs/platform/update/electron-main/updateService.linux.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 53cb9a6ae9b..cb36c658585 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -44,6 +44,8 @@ export class LinuxUpdateService extends AbstractUpdateService {
 			return;
 		}
 
+		this.setState(State.CheckingForUpdates(explicit));
+
 		this.requestService.request({ url: this.url })
 			.then(asJson)
 			.then(update => {

From 5c2c361712d3bbe41d4e0f6c1b1a974f2711b203 Mon Sep 17 00:00:00 2001
From: Erich Gamma 
Date: Mon, 22 Jan 2018 10:24:31 +0100
Subject: [PATCH 468/710] Show diagnostics as warnings (#41952)

---
 build/tslint.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/tslint.json b/build/tslint.json
index a85e98b95dc..15275279139 100644
--- a/build/tslint.json
+++ b/build/tslint.json
@@ -9,5 +9,6 @@
 			"always"
 		],
 		"triple-equals": true
-	}
+	},
+	"defaultSeverity": "warning"
 }
\ No newline at end of file

From 155b0662667fd090b73f4dbeab0a018dc60bf38c Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Mon, 22 Jan 2018 10:38:44 +0100
Subject: [PATCH 469/710] post merge fixes

---
 src/vs/workbench/api/node/extHost.protocol.ts                   | 2 +-
 .../test/electron-browser/api/mainThreadEditors.test.ts         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 347ab9e9328..4b2f6b6a404 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -52,7 +52,7 @@ import { IStat, FileChangeType } from 'vs/platform/files/common/files';
 import { ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
-import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model';
+import { ISingleEditOperation } from 'vs/editor/common/model';
 import { ILineMatch, IPatternInfo } from 'vs/platform/search/common/search';
 
 export interface IEnvironment {
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
index da8f3fb2498..03ad3ac7926 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts
@@ -156,7 +156,6 @@ suite('MainThreadEditors', () => {
 function createMockFileStat(target: URI): IFileStat {
 	return {
 		etag: '',
-		hasChildren: false,
 		isDirectory: false,
 		name: target.path,
 		mtime: 0,

From 45bb5bf3be92f24de8a457a79ed21d23c7c1c943 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 10:41:54 +0100
Subject: [PATCH 470/710] move inno_updater.exe to windows build directory

---
 build/gulpfile.vscode.js       | 2 ++
 build/gulpfile.vscode.win32.js | 2 +-
 build/win32/code.iss           | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index a0b70de7f14..90f10ed4240 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -349,6 +349,8 @@ function packageTask(platform, arch, opts) {
 
 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
 				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
+
+			result = es.merge(result, gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' }));
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
 				.pipe(replace('@@NAME@@', product.applicationName))
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 8630284bc1f..a24daa47e9a 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -77,7 +77,7 @@ gulp.task('vscode-win32-x64-setup', ['clean-vscode-win32-x64-setup'], buildWin32
 
 function archiveWin32Setup(arch) {
 	return cb => {
-		const args = ['a', '-tzip', zipPath(arch), '.', '-r'];
+		const args = ['a', '-tzip', zipPath(arch), '.', '-r', '-x!inno_updater.exe'];
 
 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
 			.on('error', cb)
diff --git a/build/win32/code.iss b/build/win32/code.iss
index fc9b79a33c8..1601f540fa2 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -67,8 +67,8 @@ Name: "addtopath"; Description: "{cm:AddToPath}"; GroupDescription: "{cm:Other}"
 Name: "runcode"; Description: "{cm:RunAfter,{#NameShort}}"; GroupDescription: "{cm:Other}"; Check: WizardSilent
 
 [Files]
-Source: "*"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#RepoDir}\build\win32\inno_updater.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "*"; Excludes: "inno_updater.exe"; DestDir: "{code:GetDestDir}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "inno_updater.exe"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\{#NameLong}"; Filename: "{app}\{#ExeBasename}.exe"; AppUserModelID: "{#AppUserId}"

From c18f63a1b7b5daf27a4be4ba09b1bbec1a4aa4b2 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann 
Date: Mon, 15 Jan 2018 11:00:24 +0100
Subject: [PATCH 471/710] [themes] add 'support.function' to functions (for
 #41612)

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

diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
index 37e0498d121..fd7ad73cded 100644
--- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
+++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts
@@ -30,7 +30,7 @@ const tokenGroupToScopesMap: { [setting: string]: string[] } = {
 	keywords: ['keyword', 'keyword.control', 'storage', 'storage.type'],
 	numbers: ['constant.numeric'],
 	types: ['entity.name.type', 'entity.name.class', 'support.type', 'support.class'],
-	functions: ['entity.name.function'],
+	functions: ['entity.name.function', 'support.function'],
 	variables: ['variable']
 };
 

From c1ec6c2ff50b2e0d5a4b24abe05ba16748852063 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann 
Date: Tue, 16 Jan 2018 10:57:27 +0100
Subject: [PATCH 472/710] add download limiter to build/i18n script

---
 build/lib/i18n.ts | 55 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts
index db67ffc3812..223b61ce911 100644
--- a/build/lib/i18n.ts
+++ b/build/lib/i18n.ts
@@ -17,6 +17,8 @@ import * as https from 'https';
 var util = require('gulp-util');
 var iconv = require('iconv-lite');
 
+const NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
+
 function log(message: any, ...rest: any[]): void {
 	util.log(util.colors.green('[i18n]'), message, ...rest);
 }
@@ -272,6 +274,49 @@ export class XLF {
 	};
 }
 
+export interface ITask {
+	(): T;
+}
+
+interface ILimitedTaskFactory {
+	factory: ITask>;
+	c: (value?: T | Thenable) => void;
+	e: (error?: any) => void;
+}
+
+export class Limiter {
+	private runningPromises: number;
+	private outstandingPromises: ILimitedTaskFactory[];
+
+	constructor(private maxDegreeOfParalellism: number) {
+		this.outstandingPromises = [];
+		this.runningPromises = 0;
+	}
+
+	queue(factory: ITask>): Promise {
+		return new Promise((c, e) => {
+			this.outstandingPromises.push({factory, c, e});
+			this.consume();
+		});
+	}
+
+	private consume(): void {
+		while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
+			const iLimitedTask = this.outstandingPromises.shift();
+			this.runningPromises++;
+
+			const promise = iLimitedTask.factory();
+			promise.then(iLimitedTask.c).catch(iLimitedTask.e);
+			promise.then(() => this.consumed()).catch(() => this.consumed());
+		}
+	}
+
+	private consumed(): void {
+		this.runningPromises--;
+		this.consume();
+	}
+}
+
 const iso639_3_to_2: Map = {
 	'chs': 'zh-cn',
 	'cht': 'zh-tw',
@@ -927,9 +972,10 @@ export function pullXlfFiles(projectName: string, apiHostname: string, username:
 		callback();
 	});
 }
+const limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS);
 
 function retrieveResource(language: string, resource: Resource, apiHostname, credentials): Promise {
-	return new Promise((resolve, reject) => {
+	return limiter.queue(() => new Promise((resolve, reject) => {
 		const slug = resource.name.replace(/\//g, '_');
 		const project = resource.project;
 		const iso639 = language.toLowerCase();
@@ -937,6 +983,7 @@ function retrieveResource(language: string, resource: Resource, apiHostname, cre
 			hostname: apiHostname,
 			path: `/api/2/project/${project}/resource/${slug}/translation/${iso639}?file&mode=onlyreviewed`,
 			auth: credentials,
+			port: 443,
 			method: 'GET'
 		};
 
@@ -945,16 +992,18 @@ function retrieveResource(language: string, resource: Resource, apiHostname, cre
 			res.on('data', (chunk: Buffer) => xlfBuffer.push(chunk));
 			res.on('end', () => {
 				if (res.statusCode === 200) {
+					console.log('success: ' + options.path);
 					resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${iso639_2_to_3[language]}/${slug}.xlf` }));
 				}
 				reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`);
 			});
 		});
 		request.on('error', (err) => {
-			reject(`Failed to query resource ${slug} with the following error: ${err}`);
+			reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`);
 		});
 		request.end();
-	});
+		console.log('started: ' + options.path);
+	}));
 }
 
 export function prepareJsonFiles(): ThroughStream {

From 19bab787f4e7e970cabc7340008d56eadc129f61 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 10:47:00 +0100
Subject: [PATCH 473/710] move inno_updater into app when building setup

---
 build/gulpfile.vscode.js       |  2 --
 build/gulpfile.vscode.win32.js | 16 +++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 90f10ed4240..a0b70de7f14 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -349,8 +349,6 @@ function packageTask(platform, arch, opts) {
 
 			result = es.merge(result, gulp.src('resources/win32/VisualElementsManifest.xml', { base: 'resources/win32' })
 				.pipe(rename(product.nameShort + '.VisualElementsManifest.xml')));
-
-			result = es.merge(result, gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' }));
 		} else if (platform === 'linux') {
 			result = es.merge(result, gulp.src('resources/linux/bin/code.sh', { base: '.' })
 				.pipe(replace('@@NAME@@', product.applicationName))
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index a24daa47e9a..b8d0be61116 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -9,10 +9,12 @@ const gulp = require('gulp');
 const path = require('path');
 const assert = require('assert');
 const cp = require('child_process');
+const es = require('event-stream');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
 const pkg = require('../package.json');
 const product = require('../product.json');
+const vfs = require('vinyl-fs');
 
 const repoPath = path.dirname(__dirname);
 const buildPath = arch => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -38,8 +40,8 @@ function packageInnoSetup(iss, options, cb) {
 		.on('exit', () => cb(null));
 }
 
-function buildWin32Setup(arch) {
-	return cb => {
+function _buildWin32Setup(arch) {
+	return es.through(null, function () {
 		const ia32AppId = product.win32AppId;
 		const x64AppId = product.win32x64AppId;
 
@@ -65,7 +67,15 @@ function buildWin32Setup(arch) {
 			OutputDir: setupDir(arch)
 		};
 
-		packageInnoSetup(issPath, { definitions }, cb);
+		packageInnoSetup(issPath, { definitions }, err => err ? this.emit('error', err) : this.emit('end'));
+	});
+}
+
+function buildWin32Setup(arch) {
+	return () => {
+		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
+			.pipe(vfs.dest(buildPath))
+			.pipe(_buildWin32Setup(arch));
 	};
 }
 

From 7b55cebb00783d170a0e3612033b2255ec467e31 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 11:10:04 +0100
Subject: [PATCH 474/710] show progress bar for update in progress

---
 .../parts/activitybar/activitybarPart.ts      |  6 ++---
 .../parts/compositebar/compositeBarActions.ts | 23 +++++++++++++++----
 .../parts/update/electron-browser/update.ts   |  4 +++-
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
index 627be4bee34..122d34883f6 100644
--- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts
@@ -93,10 +93,10 @@ export class ActivitybarPart extends Part {
 			return this.compositeBar.showActivity(viewletOrActionId, badge, clazz, priority);
 		}
 
-		return this.showGlobalActivity(viewletOrActionId, badge);
+		return this.showGlobalActivity(viewletOrActionId, badge, clazz);
 	}
 
-	private showGlobalActivity(globalActivityId: string, badge: IBadge): IDisposable {
+	private showGlobalActivity(globalActivityId: string, badge: IBadge, clazz?: string): IDisposable {
 		if (!badge) {
 			throw illegalArgument('badge');
 		}
@@ -106,7 +106,7 @@ export class ActivitybarPart extends Part {
 			throw illegalArgument('globalActivityId');
 		}
 
-		action.setBadge(badge);
+		action.setBadge(badge, clazz);
 
 		return toDisposable(() => action.setBadge(undefined));
 	}
diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
index 6c4f3102f84..61b5c8d5697 100644
--- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
+++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
@@ -12,7 +12,7 @@ import * as dom from 'vs/base/browser/dom';
 import { Builder, $ } from 'vs/base/browser/builder';
 import { BaseActionItem, IBaseActionItemOptions, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ICommandService } from 'vs/platform/commands/common/commands';
-import { dispose } from 'vs/base/common/lifecycle';
+import { dispose, IDisposable, empty, toDisposable } from 'vs/base/common/lifecycle';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import { TextBadge, NumberBadge, IBadge, IconBadge, ProgressBadge } from 'vs/workbench/services/activity/common/activity';
@@ -53,6 +53,7 @@ export interface ICompositeBar {
 
 export class ActivityAction extends Action {
 	private badge: IBadge;
+	private clazz: string | undefined;
 	private _onDidChangeBadge = new Emitter();
 
 	constructor(private _activity: IActivity) {
@@ -85,8 +86,13 @@ export class ActivityAction extends Action {
 		return this.badge;
 	}
 
-	public setBadge(badge: IBadge): void {
+	public getClass(): string | undefined {
+		return this.clazz;
+	}
+
+	public setBadge(badge: IBadge, clazz?: string): void {
 		this.badge = badge;
+		this.clazz = clazz;
 		this._onDidChangeBadge.fire(this);
 	}
 }
@@ -110,6 +116,7 @@ export class ActivityActionItem extends BaseActionItem {
 	protected options: IActivityActionItemOptions;
 
 	private $badgeContent: Builder;
+	private badgeDisposable: IDisposable = empty;
 	private mouseUpTimeout: number;
 
 	constructor(
@@ -199,7 +206,10 @@ export class ActivityActionItem extends BaseActionItem {
 		this.updateStyles();
 	}
 
-	protected updateBadge(badge: IBadge): void {
+	protected updateBadge(badge: IBadge, clazz?: string): void {
+		this.badgeDisposable.dispose();
+		this.badgeDisposable = empty;
+
 		this.$badgeContent.empty();
 		this.$badge.hide();
 
@@ -234,6 +244,11 @@ export class ActivityActionItem extends BaseActionItem {
 			else if (badge instanceof ProgressBadge) {
 				this.$badge.show();
 			}
+
+			if (clazz) {
+				this.$badge.addClass(clazz);
+				this.badgeDisposable = toDisposable(() => this.$badge.removeClass(clazz));
+			}
 		}
 
 		// Title
@@ -259,7 +274,7 @@ export class ActivityActionItem extends BaseActionItem {
 	private handleBadgeChangeEvenet(): void {
 		const action = this.getAction();
 		if (action instanceof ActivityAction) {
-			this.updateBadge(action.getBadge());
+			this.updateBadge(action.getBadge(), action.getClass());
 		}
 	}
 
diff --git a/src/vs/workbench/parts/update/electron-browser/update.ts b/src/vs/workbench/parts/update/electron-browser/update.ts
index 2c705a72974..380a3c068eb 100644
--- a/src/vs/workbench/parts/update/electron-browser/update.ts
+++ b/src/vs/workbench/parts/update/electron-browser/update.ts
@@ -356,17 +356,19 @@ export class UpdateContribution implements IGlobalActivity {
 		}
 
 		let badge: IBadge | undefined = undefined;
+		let clazz: string | undefined;
 
 		if (state.type === StateType.AvailableForDownload || state.type === StateType.Downloaded || state.type === StateType.Ready) {
 			badge = new NumberBadge(1, () => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
 		} else if (state.type === StateType.CheckingForUpdates || state.type === StateType.Downloading || state.type === StateType.Updating) {
 			badge = new ProgressBadge(() => nls.localize('updateIsReady', "New {0} update available.", product.nameShort));
+			clazz = 'progress-badge';
 		}
 
 		this.badgeDisposable.dispose();
 
 		if (badge) {
-			this.badgeDisposable = this.activityService.showActivity(this.id, badge);
+			this.badgeDisposable = this.activityService.showActivity(this.id, badge, clazz);
 		}
 
 		this.state = state;

From 2d45445592a502dbbcd2bc47ff05e8a055ac2c52 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Mon, 22 Jan 2018 11:14:04 +0100
Subject: [PATCH 475/710] Fix #41781

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

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 3c7d35378b0..df49559b538 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -234,7 +234,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 				const languageTag = languageName ? ` tag:"${languageName}"` : '';
 
 				// Construct a rich query
-				return `tag:"__ext_${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
+				return `tag:"__ext_.${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
 			});
 
 			if (names.length) {

From cdb7246a2df5daa3abe6d8b23ec00555da415e14 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 11:16:23 +0100
Subject: [PATCH 476/710] add log statements to update service

---
 .../update/electron-main/abstractUpdateService.ts   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index 97055d435d1..fcc47b9f7a6 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -34,6 +34,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	protected setState(state: State): void {
+		this.logService.info('update#setState', state.type);
 		this._state = state;
 		this._onStateChange.fire(state);
 	}
@@ -45,20 +46,24 @@ export abstract class AbstractUpdateService implements IUpdateService {
 		@ILogService protected logService: ILogService
 	) {
 		if (this.environmentService.disableUpdates) {
+			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
 
 		if (!product.updateUrl || !product.commit) {
+			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
 
 		const quality = this.getProductQuality();
 
 		if (!quality) {
+			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
 
 		if (!this.setUpdateFeedUrl(quality)) {
+			this.logService.info('update#ctor - updates are disabled');
 			return;
 		}
 
@@ -89,6 +94,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	checkForUpdates(explicit = false): TPromise {
+		this.logService.trace('update#checkForUpdates, state = ', this.state.type);
+
 		if (this.state.type !== StateType.Idle) {
 			return TPromise.as(null);
 		}
@@ -97,6 +104,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	downloadUpdate(): TPromise {
+		this.logService.trace('update#downloadUpdate, state = ', this.state.type);
+
 		if (this.state.type !== StateType.AvailableForDownload) {
 			return TPromise.as(null);
 		}
@@ -109,6 +118,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	applyUpdate(): TPromise {
+		this.logService.trace('update#applyUpdate, state = ', this.state.type);
+
 		if (this.state.type !== StateType.Ready) {
 			return TPromise.as(null);
 		}
@@ -121,6 +132,8 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	}
 
 	quitAndInstall(): TPromise {
+		this.logService.trace('update#quitAndInstall, state = ', this.state.type);
+
 		if (this.state.type !== StateType.Ready) {
 			return TPromise.as(null);
 		}

From 0be4f4ec9dc339f1cd79b5dacc41ea5d2e16bc74 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann 
Date: Mon, 22 Jan 2018 11:12:42 +0100
Subject: [PATCH 477/710] [i18n] push compiles js file

---
 build/lib/i18n.js | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/build/lib/i18n.js b/build/lib/i18n.js
index 1be9709523f..1358c7dfdda 100644
--- a/build/lib/i18n.js
+++ b/build/lib/i18n.js
@@ -14,6 +14,7 @@ var glob = require("glob");
 var https = require("https");
 var util = require('gulp-util');
 var iconv = require('iconv-lite');
+var NUMBER_OF_CONCURRENT_DOWNLOADS = 1;
 function log(message) {
     var rest = [];
     for (var _i = 1; _i < arguments.length; _i++) {
@@ -207,6 +208,36 @@ var XLF = /** @class */ (function () {
     return XLF;
 }());
 exports.XLF = XLF;
+var Limiter = /** @class */ (function () {
+    function Limiter(maxDegreeOfParalellism) {
+        this.maxDegreeOfParalellism = maxDegreeOfParalellism;
+        this.outstandingPromises = [];
+        this.runningPromises = 0;
+    }
+    Limiter.prototype.queue = function (factory) {
+        var _this = this;
+        return new Promise(function (c, e) {
+            _this.outstandingPromises.push({ factory: factory, c: c, e: e });
+            _this.consume();
+        });
+    };
+    Limiter.prototype.consume = function () {
+        var _this = this;
+        while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
+            var iLimitedTask = this.outstandingPromises.shift();
+            this.runningPromises++;
+            var promise = iLimitedTask.factory();
+            promise.then(iLimitedTask.c).catch(iLimitedTask.e);
+            promise.then(function () { return _this.consumed(); }).catch(function () { return _this.consumed(); });
+        }
+    };
+    Limiter.prototype.consumed = function () {
+        this.runningPromises--;
+        this.consume();
+    };
+    return Limiter;
+}());
+exports.Limiter = Limiter;
 var iso639_3_to_2 = {
     'chs': 'zh-cn',
     'cht': 'zh-tw',
@@ -826,8 +857,9 @@ function pullXlfFiles(projectName, apiHostname, username, password, languages, r
     });
 }
 exports.pullXlfFiles = pullXlfFiles;
+var limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS);
 function retrieveResource(language, resource, apiHostname, credentials) {
-    return new Promise(function (resolve, reject) {
+    return limiter.queue(function () { return new Promise(function (resolve, reject) {
         var slug = resource.name.replace(/\//g, '_');
         var project = resource.project;
         var iso639 = language.toLowerCase();
@@ -835,6 +867,7 @@ function retrieveResource(language, resource, apiHostname, credentials) {
             hostname: apiHostname,
             path: "/api/2/project/" + project + "/resource/" + slug + "/translation/" + iso639 + "?file&mode=onlyreviewed",
             auth: credentials,
+            port: 443,
             method: 'GET'
         };
         var request = https.request(options, function (res) {
@@ -842,16 +875,18 @@ function retrieveResource(language, resource, apiHostname, credentials) {
             res.on('data', function (chunk) { return xlfBuffer.push(chunk); });
             res.on('end', function () {
                 if (res.statusCode === 200) {
+                    console.log('success: ' + options.path);
                     resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + iso639_2_to_3[language] + "/" + slug + ".xlf" }));
                 }
                 reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + ".");
             });
         });
         request.on('error', function (err) {
-            reject("Failed to query resource " + slug + " with the following error: " + err);
+            reject("Failed to query resource " + slug + " with the following error: " + err + ". " + options.path);
         });
         request.end();
-    });
+        console.log('started: ' + options.path);
+    }); });
 }
 function prepareJsonFiles() {
     var parsePromises = [];

From 8500a2ec5338d8f29842a966d22450bc14a04e1d Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann 
Date: Mon, 22 Jan 2018 11:26:26 +0100
Subject: [PATCH 478/710] Keywords and Storage.types have the same color in
 Dark theme for Go. Fixes #41822

---
 extensions/go/test/colorize-fixtures/test.go  |   1 +
 .../go/test/colorize-results/test_go.json     | 121 ++++++++++++++++++
 .../theme-defaults/themes/dark_plus.json      |   5 +
 .../theme-defaults/themes/light_plus.json     |   5 +
 4 files changed, 132 insertions(+)

diff --git a/extensions/go/test/colorize-fixtures/test.go b/extensions/go/test/colorize-fixtures/test.go
index ef1d22a3bff..ade235742c6 100644
--- a/extensions/go/test/colorize-fixtures/test.go
+++ b/extensions/go/test/colorize-fixtures/test.go
@@ -8,6 +8,7 @@ import (
 func main() {
     dnsName := "test-vm-from-go"
     storageAccount := "mystorageaccount"
+    c := make(chan int)
 
     client, err := management.ClientFromPublishSettingsFile("path/to/downloaded.publishsettings", "")
     if err != nil {
diff --git a/extensions/go/test/colorize-results/test_go.json b/extensions/go/test/colorize-results/test_go.json
index 0a876071e60..6916ec49cd2 100644
--- a/extensions/go/test/colorize-results/test_go.json
+++ b/extensions/go/test/colorize-results/test_go.json
@@ -428,6 +428,127 @@
 			"hc_black": "default: #FFFFFF"
 		}
 	},
+	{
+		"c": "c",
+		"t": "source.go variable.other.assignment.go",
+		"r": {
+			"dark_plus": "variable: #9CDCFE",
+			"light_plus": "variable: #001080",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "variable: #9CDCFE"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": ":=",
+		"t": "source.go keyword.operator.assignment.go",
+		"r": {
+			"dark_plus": "keyword.operator: #D4D4D4",
+			"light_plus": "keyword.operator: #000000",
+			"dark_vs": "keyword.operator: #D4D4D4",
+			"light_vs": "keyword.operator: #000000",
+			"hc_black": "keyword.operator: #D4D4D4"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "make",
+		"t": "source.go support.function.builtin.go",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": "(",
+		"t": "source.go punctuation.definition.begin.bracket.round.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "chan",
+		"t": "source.go keyword.channel.go",
+		"r": {
+			"dark_plus": "keyword: #569CD6",
+			"light_plus": "keyword: #0000FF",
+			"dark_vs": "keyword: #569CD6",
+			"light_vs": "keyword: #0000FF",
+			"hc_black": "keyword: #569CD6"
+		}
+	},
+	{
+		"c": " ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "int",
+		"t": "source.go storage.type.numeric.go",
+		"r": {
+			"dark_plus": "storage.type.numeric.go: #4EC9B0",
+			"light_plus": "storage.type.numeric.go: #267F99",
+			"dark_vs": "storage.type: #569CD6",
+			"light_vs": "storage.type: #0000FF",
+			"hc_black": "storage.type: #569CD6"
+		}
+	},
+	{
+		"c": ")",
+		"t": "source.go punctuation.definition.end.bracket.round.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "    ",
+		"t": "source.go",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
 	{
 		"c": "client",
 		"t": "source.go variable.other.assignment.go",
diff --git a/extensions/theme-defaults/themes/dark_plus.json b/extensions/theme-defaults/themes/dark_plus.json
index fe868c9a375..9767fa79c74 100644
--- a/extensions/theme-defaults/themes/dark_plus.json
+++ b/extensions/theme-defaults/themes/dark_plus.json
@@ -22,6 +22,11 @@
 				"support.type",
 				"entity.name.type",
 				"entity.name.class",
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
 				"storage.type.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",
diff --git a/extensions/theme-defaults/themes/light_plus.json b/extensions/theme-defaults/themes/light_plus.json
index 0ab71013c2f..a4b6b642a9a 100644
--- a/extensions/theme-defaults/themes/light_plus.json
+++ b/extensions/theme-defaults/themes/light_plus.json
@@ -22,6 +22,11 @@
 				"support.type",
 				"entity.name.type",
 				"entity.name.class",
+				"storage.type.numeric.go",
+				"storage.type.byte.go",
+				"storage.type.boolean.go",
+				"storage.type.string.go",
+				"storage.type.uintptr.go",
 				"storage.type.cs",
 				"storage.type.generic.cs",
 				"storage.type.modifier.cs",

From 236b928218e11ce551e52607d7d8b731087e0893 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Mon, 22 Jan 2018 11:27:24 +0100
Subject: [PATCH 479/710] add a todo

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

diff --git a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
index 37e840a1666..af425b59ffb 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
@@ -22,6 +22,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 export function registerCommands(): void {
 
+	// TODO@Isidor remove in february
 	KeybindingsRegistry.registerCommandAndKeybindingRule({
 		id: 'debug.logToDebugConsole',
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),

From a76e372236251409135935909ff512b7f4d36ae9 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Mon, 22 Jan 2018 11:39:15 +0100
Subject: [PATCH 480/710] Remove duplicated code

---
 .../browser/viewParts/lines/viewLine.ts       | 53 +++++++------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 5f83e8df989..1b17027275a 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -278,8 +278,27 @@ export class ViewLine implements IVisibleLine {
 	}
 
 	public getVisibleRangesForRange(startColumn: number, endColumn: number, context: DomReadingContext): HorizontalRange[] {
+		startColumn = startColumn | 0; // @perf
+		endColumn = endColumn | 0; // @perf
+
 		startColumn = Math.min(this._renderedViewLine.input.lineContent.length + 1, Math.max(1, startColumn));
 		endColumn = Math.min(this._renderedViewLine.input.lineContent.length + 1, Math.max(1, endColumn));
+
+		const stopRenderingLineAfter = this._renderedViewLine.input.stopRenderingLineAfter | 0; // @perf
+
+		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter && endColumn > stopRenderingLineAfter) {
+			// This range is obviously not visible
+			return null;
+		}
+
+		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter) {
+			startColumn = stopRenderingLineAfter;
+		}
+
+		if (stopRenderingLineAfter !== -1 && endColumn > stopRenderingLineAfter) {
+			endColumn = stopRenderingLineAfter;
+		}
+
 		return this._renderedViewLine.getVisibleRangesForRange(startColumn, endColumn, context);
 	}
 
@@ -325,23 +344,6 @@ class FastRenderedViewLine implements IRenderedViewLine {
 	}
 
 	public getVisibleRangesForRange(startColumn: number, endColumn: number, context: DomReadingContext): HorizontalRange[] {
-		startColumn = startColumn | 0; // @perf
-		endColumn = endColumn | 0; // @perf
-		const stopRenderingLineAfter = this.input.stopRenderingLineAfter | 0; // @perf
-
-		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter && endColumn > stopRenderingLineAfter) {
-			// This range is obviously not visible
-			return null;
-		}
-
-		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter) {
-			startColumn = stopRenderingLineAfter;
-		}
-
-		if (stopRenderingLineAfter !== -1 && endColumn > stopRenderingLineAfter) {
-			endColumn = stopRenderingLineAfter;
-		}
-
 		const startPosition = this._getCharPosition(startColumn);
 		const endPosition = this._getCharPosition(endColumn);
 		return [new HorizontalRange(startPosition, endPosition - startPosition)];
@@ -432,23 +434,6 @@ class RenderedViewLine implements IRenderedViewLine {
 	 * Visible ranges for a model range
 	 */
 	public getVisibleRangesForRange(startColumn: number, endColumn: number, context: DomReadingContext): HorizontalRange[] {
-		startColumn = startColumn | 0; // @perf
-		endColumn = endColumn | 0; // @perf
-		const stopRenderingLineAfter = this.input.stopRenderingLineAfter | 0; // @perf
-
-		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter && endColumn > stopRenderingLineAfter) {
-			// This range is obviously not visible
-			return null;
-		}
-
-		if (stopRenderingLineAfter !== -1 && startColumn > stopRenderingLineAfter) {
-			startColumn = stopRenderingLineAfter;
-		}
-
-		if (stopRenderingLineAfter !== -1 && endColumn > stopRenderingLineAfter) {
-			endColumn = stopRenderingLineAfter;
-		}
-
 		if (this._pixelOffsetCache !== null) {
 			// the text is LTR
 			let startOffset = this._readPixelOffset(startColumn, context);

From a1b0cc77c9fc30b9ff764c118b851569f7c9ec31 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Mon, 22 Jan 2018 11:53:52 +0100
Subject: [PATCH 481/710] Fixes #33971: Stricter check for using
 FastRenderedViewLine

---
 src/vs/editor/browser/viewParts/lines/viewLine.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/editor/browser/viewParts/lines/viewLine.ts b/src/vs/editor/browser/viewParts/lines/viewLine.ts
index 1b17027275a..7a9761d20d8 100644
--- a/src/vs/editor/browser/viewParts/lines/viewLine.ts
+++ b/src/vs/editor/browser/viewParts/lines/viewLine.ts
@@ -228,9 +228,12 @@ export class ViewLine implements IVisibleLine {
 				isRegularASCII = strings.isBasicASCII(lineData.content);
 			}
 
-			if (isRegularASCII && lineData.content.length < 1000) {
+			if (isRegularASCII && 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...
+				// ---
+				// Another rounding error has been observed on Linux in VSCode, where  width
+				// rounding errors add up to an observable large number...
 				renderedViewLine = new FastRenderedViewLine(
 					this._renderedViewLine ? this._renderedViewLine.domNode : null,
 					renderLineInput,

From 11e05b6a3939a63980f8a0a5d495e6c4fb2c1172 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 12:07:47 +0100
Subject: [PATCH 482/710] fix bad build script

---
 build/gulpfile.vscode.win32.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index b8d0be61116..a7ecdf66f5a 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -74,7 +74,7 @@ function _buildWin32Setup(arch) {
 function buildWin32Setup(arch) {
 	return () => {
 		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
-			.pipe(vfs.dest(buildPath))
+			.pipe(vfs.dest(buildPath(arch)))
 			.pipe(_buildWin32Setup(arch));
 	};
 }

From d73725c38419bc19d25d75824e8a688de71d68a0 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Mon, 22 Jan 2018 12:23:50 +0100
Subject: [PATCH 483/710] Fixes #41925: ERR Illegal value 0 for `lineNumber`

---
 .../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 07a61e0f3b8..ad20179ae9b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -145,7 +145,7 @@ export class TrimFinalNewLinesParticipant implements ISaveParticipantParticipant
 		const lineCount = model.getLineCount();
 
 		// Do not insert new line if file does not end with new line
-		if (!lineCount) {
+		if (lineCount === 1) {
 			return;
 		}
 

From 12d45a9bcee51469c425141edf70a408eddb4807 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Mon, 22 Jan 2018 15:39:39 +0100
Subject: [PATCH 484/710] Revert "Fix #41781"

This reverts commit 2d45445592a502dbbcd2bc47ff05e8a055ac2c52.
---
 .../parts/extensions/electron-browser/extensionsViews.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index df49559b538..3c7d35378b0 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -234,7 +234,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 				const languageTag = languageName ? ` tag:"${languageName}"` : '';
 
 				// Construct a rich query
-				return `tag:"__ext_.${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
+				return `tag:"__ext_${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
 			});
 
 			if (names.length) {

From 060896c9019819c1f7ebe7fcf99041a8cc579ba5 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Mon, 22 Jan 2018 06:40:03 -0800
Subject: [PATCH 485/710] Announce terminal to screen reader

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

diff --git a/package.json b/package.json
index 3312dc66b2d..5720232afe8 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.0",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.1.0-beta5",
+    "vscode-xterm": "3.1.0-beta6",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 8c4b2723702..50fc2a3bae6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.1.0-beta5:
-  version "3.1.0-beta5"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta5.tgz#b63c48cacda9c2546f50de550fef973a24df284c"
+vscode-xterm@3.1.0-beta6:
+  version "3.1.0-beta6"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta6.tgz#0ff44249ac141e9f6dbcf0b7628d0b8d87e69abf"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"

From 4846088f22202df577c6b84b5c29745abefff730 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Mon, 22 Jan 2018 15:47:18 +0100
Subject: [PATCH 486/710] fix inno updater

---
 build/gulpfile.vscode.win32.js | 25 +++++++++++++------------
 build/tfs/win32/1_build.ps1    |  4 ++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index a7ecdf66f5a..15459f7dae8 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -9,7 +9,6 @@ const gulp = require('gulp');
 const path = require('path');
 const assert = require('assert');
 const cp = require('child_process');
-const es = require('event-stream');
 const _7z = require('7zip')['7z'];
 const util = require('./lib/util');
 const pkg = require('../package.json');
@@ -40,8 +39,8 @@ function packageInnoSetup(iss, options, cb) {
 		.on('exit', () => cb(null));
 }
 
-function _buildWin32Setup(arch) {
-	return es.through(null, function () {
+function buildWin32Setup(arch) {
+	return cb => {
 		const ia32AppId = product.win32AppId;
 		const x64AppId = product.win32x64AppId;
 
@@ -67,15 +66,7 @@ function _buildWin32Setup(arch) {
 			OutputDir: setupDir(arch)
 		};
 
-		packageInnoSetup(issPath, { definitions }, err => err ? this.emit('error', err) : this.emit('end'));
-	});
-}
-
-function buildWin32Setup(arch) {
-	return () => {
-		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
-			.pipe(vfs.dest(buildPath(arch)))
-			.pipe(_buildWin32Setup(arch));
+		packageInnoSetup(issPath, { definitions }, cb);
 	};
 }
 
@@ -100,3 +91,13 @@ gulp.task('vscode-win32-ia32-archive', ['clean-vscode-win32-ia32-archive'], arch
 
 gulp.task('clean-vscode-win32-x64-archive', util.rimraf(zipDir('x64')));
 gulp.task('vscode-win32-x64-archive', ['clean-vscode-win32-x64-archive'], archiveWin32Setup('x64'));
+
+function copyInnoUpdater(arch) {
+	return () => {
+		return gulp.src('build/win32/inno_updater.exe', { base: 'build/win32' })
+			.pipe(vfs.dest(buildPath(arch)));
+	};
+}
+
+gulp.task('vscode-win32-ia32-copy-inno-updater', copyInnoUpdater('ia32'));
+gulp.task('vscode-win32-x64-copy-inno-updater', copyInnoUpdater('x64'));
\ No newline at end of file
diff --git a/build/tfs/win32/1_build.ps1 b/build/tfs/win32/1_build.ps1
index bc6ade13de3..0fcb56c1b9e 100644
--- a/build/tfs/win32/1_build.ps1
+++ b/build/tfs/win32/1_build.ps1
@@ -45,6 +45,10 @@ step "Build minified" {
   exec { & npm run gulp -- "vscode-win32-$global:arch-min" }
 }
 
+step "Copy Inno updater" {
+  exec { & npm run gulp -- "vscode-win32-$global:arch-copy-inno-updater" }
+}
+
 # step "Create loader snapshot" {
 #   exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
 # }

From de220368be1cf08ece9d5a9bd8bb858f1e921994 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Mon, 22 Jan 2018 15:45:46 +0100
Subject: [PATCH 487/710] Fix #41781

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

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
index 3c7d35378b0..03694331729 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts
@@ -234,7 +234,7 @@ export class ExtensionsListView extends ViewsViewletPanel {
 				const languageTag = languageName ? ` tag:"${languageName}"` : '';
 
 				// Construct a rich query
-				return `tag:"__ext_${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
+				return `tag:"__ext_${ext}" tag:"__ext_.${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`;
 			});
 
 			if (names.length) {

From 54616a8ffebc5204de72648a0d4d12f2897f5c89 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Mon, 22 Jan 2018 15:57:49 +0100
Subject: [PATCH 488/710] fixes in bulk edit

---
 src/vs/editor/browser/services/bulkEdit.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/browser/services/bulkEdit.ts b/src/vs/editor/browser/services/bulkEdit.ts
index 2be87d824bf..cded7ca6be5 100644
--- a/src/vs/editor/browser/services/bulkEdit.ts
+++ b/src/vs/editor/browser/services/bulkEdit.ts
@@ -9,7 +9,7 @@ import { IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
 import URI from 'vs/base/common/uri';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { ITextModelService, ITextEditorModel } from 'vs/editor/common/services/resolverService';
-import { IFileService } from 'vs/platform/files/common/files';
+import { IFileService, FileChangeType } from 'vs/platform/files/common/files';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
@@ -17,7 +17,7 @@ import { IIdentifiedSingleEditOperation, ITextModel, EndOfLineSequence } from 'v
 import { IProgressRunner, emptyProgressRunner, IProgress } from 'vs/platform/progress/common/progress';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { optional } from 'vs/platform/instantiation/common/instantiation';
-import { ResourceTextEdit, ResourceFileEdit, isResourceFileEdit } from 'vs/editor/common/modes';
+import { ResourceTextEdit, ResourceFileEdit, isResourceFileEdit, isResourceTextEdit } from 'vs/editor/common/modes';
 import { getPathLabel } from 'vs/base/common/labels';
 
 
@@ -32,7 +32,9 @@ abstract class IRecording {
 			// watch only when there is a fileservice available
 			stop = fileService.onFileChanges(event => {
 				for (const change of event.changes) {
-					_changes.add(change.resource.toString());
+					if (change.type === FileChangeType.UPDATED) {
+						_changes.add(change.resource.toString());
+					}
 				}
 			});
 		}
@@ -304,7 +306,10 @@ export class BulkEdit {
 		const groups: Edit[][] = [];
 		let group: Edit[];
 		for (const edit of this._edits) {
-			if (!group || isResourceFileEdit(group[0]) === isResourceFileEdit(edit)) {
+			if (!group
+				|| (isResourceFileEdit(group[0]) && !isResourceFileEdit(edit))
+				|| (isResourceTextEdit(group[0]) && !isResourceTextEdit(edit))
+			) {
 				group = [];
 				groups.push(group);
 			}

From a99da1688f9451c013b63ea22d8c9578f81eaa86 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Mon, 22 Jan 2018 07:01:35 -0800
Subject: [PATCH 489/710] Add screen reader keywords to navigation mode command

---
 .../parts/terminal/electron-browser/terminal.contribution.ts   | 3 +--
 .../parts/terminal/electron-browser/terminalActions.ts         | 2 +-
 2 files changed, 2 insertions(+), 3 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 6c596e10385..98e2a2357b8 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -394,9 +394,8 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(DeleteWordRightT
 }, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Delete Word Right', category);
 actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(EnterNavigationModeTerminalAction, EnterNavigationModeTerminalAction.ID, EnterNavigationModeTerminalAction.LABEL, {
 	primary: KeyMod.CtrlCmd | KeyCode.KEY_N
-}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Navigation Mode', category);
+}, KEYBINDING_CONTEXT_TERMINAL_FOCUS), 'Terminal: Enter Screen Reader Navigation Mode', category);
 
 terminalCommands.setup();
 
 registerColors();
-
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
index 4e9752cafa3..3c1b515e62b 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
@@ -199,7 +199,7 @@ export class DeleteWordRightTerminalAction extends Action {
 export class EnterNavigationModeTerminalAction extends Action {
 
 	public static readonly ID = 'workbench.action.terminal.enterLineNavigationMode';
-	public static readonly LABEL = nls.localize('workbench.action.terminal.enterLineNavigationMode', "Enter Line Navigation Mode");
+	public static readonly LABEL = nls.localize('workbench.action.terminal.enterLineNavigationMode', "Enter Screen Reader Navigation Mode");
 
 	constructor(
 		id: string, label: string,

From 56b067cfdf8d24d93a3261da639bc44106d90fed Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Mon, 22 Jan 2018 16:10:00 +0100
Subject: [PATCH 490/710] adopt more snapshots

---
 src/vs/editor/common/model/textModel.ts               | 11 +++++++++++
 .../parts/files/electron-browser/saveErrorHandler.ts  |  5 +++--
 .../services/textfile/common/textFileService.ts       |  7 +++++--
 .../textfile/electron-browser/textFileService.ts      |  4 +++-
 src/vs/workbench/test/workbenchTestServices.ts        |  5 +++--
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 90e95ac7bb7..27c58c24d2e 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -82,6 +82,17 @@ export function createTextBufferFactoryFromStream(stream: IStringStream): TPromi
 	});
 }
 
+export function createTextBufferFactoryFromSnapshot(snapshot: ITextSnapshot): model.ITextBufferFactory {
+	let builder = createTextBufferBuilder();
+
+	let chunk: string;
+	while (typeof (chunk = snapshot.read()) === 'string') {
+		builder.acceptChunk(chunk);
+	}
+
+	return builder.finish();
+}
+
 export function createTextBuffer(value: string | model.ITextBufferFactory, defaultEOL: model.DefaultEndOfLine): model.ITextBuffer {
 	const factory = (typeof value === 'string' ? createTextBufferFactory(value) : value);
 	return factory.create(defaultEOL);
diff --git a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
index 379a2a53d81..3a0864e2ea7 100644
--- a/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
+++ b/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.ts
@@ -31,6 +31,7 @@ import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEdi
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { SAVE_FILE_COMMAND_ID, REVERT_FILE_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL } from 'vs/workbench/parts/files/electron-browser/fileCommands';
+import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 
 export const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 export const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
@@ -262,7 +263,7 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
 
 	resolverService.createModelReference(resource).then(reference => {
 		const model = reference.object as ITextFileEditorModel;
-		const localModelValue = model.getValue();
+		const localModelSnapshot = model.createSnapshot();
 
 		clearPendingResolveSaveConflictMessages(); // hide any previously shown message about how to use these actions
 
@@ -270,7 +271,7 @@ export const acceptLocalChangesCommand = (accessor: ServicesAccessor, resource:
 		return model.revert().then(() => {
 
 			// Restore user value (without loosing undo stack)
-			modelService.updateModel(model.textEditorModel, localModelValue);
+			modelService.updateModel(model.textEditorModel, createTextBufferFactoryFromSnapshot(localModelSnapshot));
 
 			// Trigger save
 			return model.save().then(() => {
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
index a1ef38dd364..42f1d466370 100644
--- a/src/vs/workbench/services/textfile/common/textFileService.ts
+++ b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -32,6 +32,8 @@ import { Schemas } from 'vs/base/common/network';
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { IRevertOptions } from 'vs/platform/editor/common/editor';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
+import { IModelService } from 'vs/editor/common/services/modelService';
 
 export interface IBackupResult {
 	didBackup: boolean;
@@ -73,7 +75,8 @@ export abstract class TextFileService implements ITextFileService {
 		private backupFileService: IBackupFileService,
 		private windowsService: IWindowsService,
 		private historyService: IHistoryService,
-		contextKeyService: IContextKeyService
+		contextKeyService: IContextKeyService,
+		private modelService: IModelService
 	) {
 		this.toUnbind = [];
 
@@ -615,7 +618,7 @@ export abstract class TextFileService implements ITextFileService {
 
 			// take over encoding and model value from source model
 			targetModel.updatePreferredEncoding(sourceModel.getEncoding());
-			targetModel.textEditorModel.setValue(sourceModel.getValue());
+			this.modelService.updateModel(targetModel.textEditorModel, createTextBufferFactoryFromSnapshot(sourceModel.createSnapshot()));
 
 			// save model
 			return targetModel.save(options);
diff --git a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
index ecf4229c83b..1dcfc4c6334 100644
--- a/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
+++ b/src/vs/workbench/services/textfile/electron-browser/textFileService.ts
@@ -30,6 +30,7 @@ import { IWindowsService, IWindowService } from 'vs/platform/windows/common/wind
 import { IHistoryService } from 'vs/workbench/services/history/common/history';
 import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IModelService } from 'vs/editor/common/services/modelService';
 
 export class TextFileService extends AbstractTextFileService {
 
@@ -41,6 +42,7 @@ export class TextFileService extends AbstractTextFileService {
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IModeService private modeService: IModeService,
+		@IModelService modelService: IModelService,
 		@IWindowService private windowService: IWindowService,
 		@IEnvironmentService environmentService: IEnvironmentService,
 		@IMessageService messageService: IMessageService,
@@ -49,7 +51,7 @@ export class TextFileService extends AbstractTextFileService {
 		@IHistoryService historyService: IHistoryService,
 		@IContextKeyService contextKeyService: IContextKeyService
 	) {
-		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, environmentService, backupFileService, windowsService, historyService, contextKeyService);
+		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, environmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
 	public resolveTextContent(resource: URI, options?: IResolveContentOptions): TPromise {
diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts
index 50f9c781ff8..e5db572cc91 100644
--- a/src/vs/workbench/test/workbenchTestServices.ts
+++ b/src/vs/workbench/test/workbenchTestServices.ts
@@ -180,9 +180,10 @@ export class TestTextFileService extends TextFileService {
 		@IBackupFileService backupFileService: IBackupFileService,
 		@IWindowsService windowsService: IWindowsService,
 		@IHistoryService historyService: IHistoryService,
-		@IContextKeyService contextKeyService: IContextKeyService
+		@IContextKeyService contextKeyService: IContextKeyService,
+		@IModelService modelService: IModelService
 	) {
-		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, TestEnvironmentService, backupFileService, windowsService, historyService, contextKeyService);
+		super(lifecycleService, contextService, configurationService, fileService, untitledEditorService, instantiationService, messageService, TestEnvironmentService, backupFileService, windowsService, historyService, contextKeyService, modelService);
 	}
 
 	public setPromptPath(path: string): void {

From 2835524c71808dc60e0318aba088f7e1524e3f4c Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Mon, 22 Jan 2018 17:28:54 +0100
Subject: [PATCH 491/710] less tuple type usage

---
 src/vs/workbench/api/node/extHostTypes.ts | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 59416044954..b62d6592c54 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -493,11 +493,11 @@ export class TextEdit {
 
 export class WorkspaceEdit implements vscode.WorkspaceEdit {
 
-	private _clock: number = 0;
+	private _seqPool: number = 0;
 
-	private _resourceEdits: [number/*time*/, URI, URI][] = [];
+	private _resourceEdits: { seq: number, from: URI, to: URI }[] = [];
 	private _textEdits: [URI, TextEdit[]][] = [];
-	private _textEditsIndex = new Map();
+	private _textEditsIndex = new Map();
 
 	createResource(uri: vscode.Uri): void {
 		this.renameResource(undefined, uri);
@@ -508,11 +508,11 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	}
 
 	renameResource(from: vscode.Uri, to: vscode.Uri): void {
-		this._resourceEdits.push([this._clock++, from, to]);
+		this._resourceEdits.push({ seq: this._seqPool++, from, to });
 	}
 
 	resourceEdits(): [vscode.Uri, vscode.Uri][] {
-		return this._resourceEdits.map(([, oldUri, newUri]) => (<[vscode.Uri, vscode.Uri]>[oldUri, newUri]));
+		return this._resourceEdits.map(({ from, to }) => (<[vscode.Uri, vscode.Uri]>[from, to]));
 	}
 
 	replace(uri: URI, range: Range, newText: string): void {
@@ -540,9 +540,9 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	set(uri: URI, edits: TextEdit[]): void {
 		if (!this._textEditsIndex.has(uri.toString())) {
 			let newLen = this._textEdits.push([uri, edits]);
-			this._textEditsIndex.set(uri.toString(), [newLen - 1, this._clock++]);
+			this._textEditsIndex.set(uri.toString(), { idx: newLen - 1, seq: this._seqPool++ });
 		} else {
-			const [idx] = this._textEditsIndex.get(uri.toString());
+			const { idx } = this._textEditsIndex.get(uri.toString());
 			this._textEdits[idx][1] = edits;
 		}
 	}
@@ -551,7 +551,7 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		if (!this._textEditsIndex.has(uri.toString())) {
 			return undefined;
 		}
-		const [idx] = this._textEditsIndex.get(uri.toString());
+		const { idx } = this._textEditsIndex.get(uri.toString());
 		return this._textEdits[idx][1];
 	}
 
@@ -561,17 +561,17 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	}
 
 	allEntries(): ([URI, TextEdit[]] | [URI, URI])[] {
-		// use the 'time' the we have assigned when inserting
+		// use the 'seq' the we have assigned when inserting
 		// the operation and use that order in the resulting
 		// array
 		const res: ([URI, TextEdit[]] | [URI, URI])[] = [];
 		this._textEditsIndex.forEach(value => {
-			const [index, time] = value;
-			res[time] = this._textEdits[index];
+			const { idx, seq } = value;
+			res[seq] = this._textEdits[idx];
 		});
 		this._resourceEdits.forEach(value => {
-			const [time, oldUri, newUri] = value;
-			res[time] = [oldUri, newUri];
+			const { seq, from, to } = value;
+			res[seq] = [from, to];
 		});
 		return res;
 	}

From 73d60bd4c8308f018c4bd761d38702a8f0e91c3a Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Mon, 22 Jan 2018 17:56:18 +0100
Subject: [PATCH 492/710] Fixes #41503: Add fast path for searching for \n

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

diff --git a/src/vs/editor/common/model/textModelSearch.ts b/src/vs/editor/common/model/textModelSearch.ts
index aa969b5334a..2f1526e618e 100644
--- a/src/vs/editor/common/model/textModelSearch.ts
+++ b/src/vs/editor/common/model/textModelSearch.ts
@@ -136,6 +136,23 @@ export class TextModelSearch {
 		}
 
 		if (searchData.regex.multiline) {
+			if (searchData.regex.source === '\\n') {
+				// Fast path for searching for EOL
+				let result: FindMatch[] = [], resultLen = 0;
+				for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber < lineCount; lineNumber++) {
+					const range = new Range(lineNumber, model.getLineMaxColumn(lineNumber), lineNumber + 1, 1);
+					if (captureMatches) {
+						result[resultLen++] = new FindMatch(range, null);
+					} else {
+						result[resultLen++] = new FindMatch(range, ['\n']);
+					}
+
+					if (resultLen >= limitResultCount) {
+						break;
+					}
+				}
+				return result;
+			}
 			return this._doFindMatchesMultiline(model, searchRange, new Searcher(searchData.wordSeparators, searchData.regex), captureMatches, limitResultCount);
 		}
 		return this._doFindMatchesLineByLine(model, searchRange, searchData, captureMatches, limitResultCount);

From b25c1947c6bcb43298914ee32d11e82e178978d5 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Mon, 22 Jan 2018 17:58:51 +0100
Subject: [PATCH 493/710] #41752 Update extension point

---
 .../configuration-editing/src/extension.ts    | 10 +--
 .../contrib/languagePackExtensions.ts         | 16 +++--
 .../common/extensionEnablementService.ts      |  2 +-
 .../common/extensionManagement.ts             |  9 +--
 .../common/extensionEnablementService.test.ts |  2 +-
 .../browser/localizationsExtensionPoint.ts    | 69 +++++++++++++++++++
 src/vs/workbench/workbench.main.ts            |  3 +
 7 files changed, 93 insertions(+), 18 deletions(-)
 create mode 100644 src/vs/workbench/api/browser/localizationsExtensionPoint.ts

diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts
index aacb21ff777..a081f0ad448 100644
--- a/extensions/configuration-editing/src/extension.ts
+++ b/extensions/configuration-editing/src/extension.ts
@@ -87,11 +87,11 @@ function registerLocaleCompletionsInLanguageDocument(): vscode.Disposable {
 function provideContributedLocalesProposals(range: vscode.Range): vscode.ProviderResult {
 	const contributedLocales: string[] = [];
 	for (const extension of vscode.extensions.all) {
-		if (extension.packageJSON && extension.packageJSON['contributes'] && extension.packageJSON['contributes']['locales'] && extension.packageJSON['contributes']['locales'].length) {
-			const locales: { locale: string }[] = extension.packageJSON['contributes']['locales'];
-			for (const locale of locales) {
-				if (contributedLocales.indexOf(locale.locale) === -1) {
-					contributedLocales.push(locale.locale);
+		if (extension.packageJSON && extension.packageJSON['contributes'] && extension.packageJSON['contributes']['localizations'] && extension.packageJSON['contributes']['localizations'].length) {
+			const localizations: { languageId: string }[] = extension.packageJSON['contributes']['localizations'];
+			for (const localization of localizations) {
+				if (contributedLocales.indexOf(localization.languageId) === -1) {
+					contributedLocales.push(localization.languageId);
 				}
 			}
 		}
diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
index 1add53f4777..64fd8395763 100644
--- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
@@ -16,7 +16,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 interface ILanguageSource {
 	extensionIdentifier: IExtensionIdentifier;
 	version: string;
-	path: string;
+	translations: string;
 }
 
 export class LanguagePackExtensions extends Disposable {
@@ -52,7 +52,7 @@ export class LanguagePackExtensions extends Disposable {
 	}
 
 	private onDidInstallExtension(extension: ILocalExtension): void {
-		if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length) {
+		if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length) {
 			this.logService.debug('Adding language packs from the extension', extension.identifier.id);
 			this.withLanguagePacks(languagePacks => {
 				this.removeLanguagePacksFromExtensions(languagePacks, { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid });
@@ -68,12 +68,14 @@ export class LanguagePackExtensions extends Disposable {
 
 	private addLanguagePacksFromExtensions(languagePacks: { [language: string]: ILanguageSource[] }, ...extensions: ILocalExtension[]): void {
 		for (const extension of extensions) {
-			if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length) {
+			if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length) {
 				const extensionIdentifier = { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid };
-				for (const localeContribution of extension.manifest.contributes.locales) {
-					const languageSources = languagePacks[localeContribution.locale] || [];
-					languageSources.splice(0, 0, { extensionIdentifier, path: join(extension.path, localeContribution.path), version: extension.manifest.version });
-					languagePacks[localeContribution.locale] = languageSources;
+				for (const localizationContribution of extension.manifest.contributes.localizations) {
+					if (localizationContribution.languagId && localizationContribution.translations) {
+						const languageSources = languagePacks[localizationContribution.languagId] || [];
+						languageSources.splice(0, 0, { extensionIdentifier, translations: join(extension.path, localizationContribution.translations), version: extension.manifest.version });
+						languagePacks[localizationContribution.languagId] = languageSources;
+					}
 				}
 			}
 		}
diff --git a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
index 990894ef862..8e4c9917668 100644
--- a/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
+++ b/src/vs/platform/extensionManagement/common/extensionEnablementService.ts
@@ -78,7 +78,7 @@ export class ExtensionEnablementService implements IExtensionEnablementService {
 	}
 
 	canChangeEnablement(extension: ILocalExtension): boolean {
-		return !this.environmentService.disableExtensions && !(extension.manifest && extension.manifest.contributes && extension.manifest.contributes.locales && extension.manifest.contributes.locales.length);
+		return !this.environmentService.disableExtensions && !(extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length);
 	}
 
 	setEnablement(arg: ILocalExtension | IExtensionIdentifier, newState: EnablementState): TPromise {
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 28f19aa05df..9789db5e966 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -85,9 +85,10 @@ export interface IColor {
 	defaults: { light: string, dark: string, highContrast: string };
 }
 
-export interface ILocale {
-	locale: string;
-	path: string;
+export interface ILocalization {
+	languagId: string;
+	languageName?: string;
+	translations: string;
 }
 
 export interface IExtensionContributions {
@@ -104,7 +105,7 @@ export interface IExtensionContributions {
 	iconThemes?: ITheme[];
 	views?: { [location: string]: IView[] };
 	colors?: IColor[];
-	locales?: ILocale[];
+	localizations?: ILocalization[];
 }
 
 export interface IExtensionManifest {
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index 4ccb6691229..efdb210e498 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
@@ -326,7 +326,7 @@ suite('ExtensionEnablementService Test', () => {
 	});
 
 	test('test canChangeEnablement return false for language packs', () => {
-		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { locales: [{ locale: 'gr', path: 'somepath' }] })), false);
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { localizations: [{ languagId: 'gr', translations: 'somepath' }] })), false);
 	});
 });
 
diff --git a/src/vs/workbench/api/browser/localizationsExtensionPoint.ts b/src/vs/workbench/api/browser/localizationsExtensionPoint.ts
new file mode 100644
index 00000000000..dcead032694
--- /dev/null
+++ b/src/vs/workbench/api/browser/localizationsExtensionPoint.ts
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { localize } from 'vs/nls';
+import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { ExtensionMessageCollector, ExtensionsRegistry } from 'vs/platform/extensions/common/extensionsRegistry';
+
+namespace schema {
+
+	// --localizations contribution point
+
+	export interface ILocalizationDescriptor {
+		languageId: string;
+		languageName: string;
+		translations: string;
+	}
+
+	export function validateLocalizationDescriptors(localizationDescriptors: ILocalizationDescriptor[], collector: ExtensionMessageCollector): boolean {
+		if (!Array.isArray(localizationDescriptors)) {
+			collector.error(localize('requirearray', "localizations must be an array"));
+			return false;
+		}
+
+		for (let descriptor of localizationDescriptors) {
+			if (typeof descriptor.languageId !== 'string') {
+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'languageId'));
+				return false;
+			}
+			if (typeof descriptor.languageName !== 'string') {
+				collector.error(localize('optstring', "property `{0}` can be omitted or must be of type `string`", 'languageName'));
+				return false;
+			}
+			if (descriptor.translations && typeof descriptor.translations !== 'string') {
+				collector.error(localize('requirestring', "property `{0}` is mandatory and must be of type `string`", 'translations'));
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	export const localizationsContribution: IJSONSchema = {
+		description: localize('vscode.extension.contributes.localizations', "Contributes localizations to the editor"),
+		type: 'array',
+		items: {
+			type: 'object',
+			properties: {
+				id: {
+					description: localize('vscode.extension.contributes.localizations.languageId', 'Id of the language into which the display strings are translated.'),
+					type: 'string'
+				},
+				name: {
+					description: localize('vscode.extension.contributes.localizations.languageName', 'Name of the language into which the display strings are translated.'),
+					type: 'string'
+				},
+				translations: {
+					description: localize('vscode.extension.contributes.localizations.translations', 'A relative path to the folder containing all translation files for the contributed language.'),
+					type: 'string'
+				}
+			}
+		}
+	};
+}
+
+ExtensionsRegistry.registerExtensionPoint('localizations', [], schema.localizationsContribution)
+	.setHandler((extensions) => extensions.forEach(extension => schema.validateLocalizationDescriptors(extension.value, extension.collector)));
\ No newline at end of file
diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts
index cc5fa97e31a..2966cea4559 100644
--- a/src/vs/workbench/workbench.main.ts
+++ b/src/vs/workbench/workbench.main.ts
@@ -21,6 +21,9 @@ import 'vs/platform/actions/electron-browser/menusExtensionPoint';
 // Views
 import 'vs/workbench/api/browser/viewsExtensionPoint';
 
+// Localizations
+import 'vs/workbench/api/browser/localizationsExtensionPoint';
+
 // Workbench
 import 'vs/workbench/browser/actions/toggleActivityBarVisibility';
 import 'vs/workbench/browser/actions/toggleStatusbarVisibility';

From d1c2e526f041d07e2746df02556b489c08312042 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Mon, 22 Jan 2018 18:02:14 +0100
Subject: [PATCH 494/710] #41752 Add default value for translations folder

---
 src/vs/workbench/api/browser/localizationsExtensionPoint.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/browser/localizationsExtensionPoint.ts b/src/vs/workbench/api/browser/localizationsExtensionPoint.ts
index dcead032694..cd92ed0e803 100644
--- a/src/vs/workbench/api/browser/localizationsExtensionPoint.ts
+++ b/src/vs/workbench/api/browser/localizationsExtensionPoint.ts
@@ -58,7 +58,8 @@ namespace schema {
 				},
 				translations: {
 					description: localize('vscode.extension.contributes.localizations.translations', 'A relative path to the folder containing all translation files for the contributed language.'),
-					type: 'string'
+					type: 'string',
+					default: 'translations'
 				}
 			}
 		}

From c6d150ebb49217241b7ba629c2fbc7f0c446fd97 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Mon, 22 Jan 2018 18:06:35 +0100
Subject: [PATCH 495/710] remove textEditorModel.getValue

---
 .../common/editor/textEditorModel.ts          | 14 +------------
 .../test/browser/fileEditorTracker.test.ts    |  6 +++---
 .../parts/search/browser/replaceService.ts    |  3 ++-
 .../editor/test/browser/editorService.test.ts |  3 ++-
 .../services/textfile/common/textfiles.ts     |  2 --
 .../textfile/test/textFileEditorModel.test.ts |  4 ++--
 .../test/textModelResolverService.test.ts     |  3 ++-
 .../common/editor/resourceEditorInput.test.ts |  3 ++-
 .../test/common/editor/untitledEditor.test.ts |  3 ++-
 .../api/mainThreadSaveParticipant.test.ts     | 21 ++++++++++---------
 10 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts
index 8df2f87b499..8c10065dfcc 100644
--- a/src/vs/workbench/common/editor/textEditorModel.ts
+++ b/src/vs/workbench/common/editor/textEditorModel.ts
@@ -5,7 +5,7 @@
 'use strict';
 
 import { TPromise } from 'vs/base/common/winjs.base';
-import { EndOfLinePreference, ITextModel, ITextBufferFactory } from 'vs/editor/common/model';
+import { ITextModel, ITextBufferFactory } from 'vs/editor/common/model';
 import { IMode } from 'vs/editor/common/modes';
 import { EditorModel } from 'vs/workbench/common/editor';
 import URI from 'vs/base/common/uri';
@@ -141,18 +141,6 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd
 		this.modelService.updateModel(this.textEditorModel, newValue);
 	}
 
-	/**
-	 * Returns the textual value of this editor model or null if it has not yet been created.
-	 */
-	public getValue(): string {
-		const model = this.textEditorModel;
-		if (model) {
-			return model.getValue(EndOfLinePreference.TextDefined, true /* Preserve BOM */);
-		}
-
-		return null;
-	}
-
 	public createSnapshot(): ITextSnapshot {
 		const model = this.textEditorModel;
 		if (model) {
diff --git a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
index 4b9590f037f..a76038659ec 100644
--- a/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
+++ b/src/vs/workbench/parts/files/test/browser/fileEditorTracker.test.ts
@@ -16,7 +16,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { EditorStacksModel } from 'vs/workbench/common/editor/editorStacksModel';
 import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
-import { FileOperation, FileOperationEvent, FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files';
+import { FileOperation, FileOperationEvent, FileChangesEvent, FileChangeType, IFileService, snapshotToString } from 'vs/platform/files/common/files';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { once } from 'vs/base/common/event';
 
@@ -191,14 +191,14 @@ suite('Files - FileEditorTracker', () => {
 
 		accessor.textFileService.models.loadOrCreate(resource).then((model: TextFileEditorModel) => {
 			model.textEditorModel.setValue('Super Good');
-			assert.equal(model.getValue(), 'Super Good');
+			assert.equal(snapshotToString(model.createSnapshot()), 'Super Good');
 
 			model.save().then(() => {
 
 				// change event (watcher)
 				accessor.fileService.fireFileChanges(new FileChangesEvent([{ resource, type: FileChangeType.UPDATED }]));
 
-				assert.equal(model.getValue(), 'Hello Html');
+				assert.equal(snapshotToString(model.createSnapshot()), 'Hello Html');
 
 				tracker.dispose();
 
diff --git a/src/vs/workbench/parts/search/browser/replaceService.ts b/src/vs/workbench/parts/search/browser/replaceService.ts
index c93549e85dd..fca4c6b1a36 100644
--- a/src/vs/workbench/parts/search/browser/replaceService.ts
+++ b/src/vs/workbench/parts/search/browser/replaceService.ts
@@ -24,6 +24,7 @@ import { ScrollType } from 'vs/editor/common/editorCommon';
 import { ITextModel } from 'vs/editor/common/model';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IFileService } from 'vs/platform/files/common/files';
+import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 
 const REPLACE_PREVIEW = 'replacePreview';
 
@@ -70,7 +71,7 @@ class ReplacePreviewModel extends Disposable {
 			ref = this._register(ref);
 			const sourceModel = ref.object.textEditorModel;
 			const sourceModelModeId = sourceModel.getLanguageIdentifier().language;
-			const replacePreviewModel = this.modelService.createModel(sourceModel.getValue(), this.modeService.getOrCreateMode(sourceModelModeId), replacePreviewUri);
+			const replacePreviewModel = this.modelService.createModel(createTextBufferFactoryFromSnapshot(sourceModel.createSnapshot()), this.modeService.getOrCreateMode(sourceModelModeId), replacePreviewUri);
 			this._register(fileMatch.onChange(modelChange => this.update(sourceModel, replacePreviewModel, fileMatch, modelChange)));
 			this._register(this.searchWorkbenchService.searchModel.onReplaceTermChanged(() => this.update(sourceModel, replacePreviewModel, fileMatch)));
 			this._register(fileMatch.onDispose(() => replacePreviewModel.dispose())); // TODO@Sandeep we should not dispose a model directly but rather the reference (depends on https://github.com/Microsoft/vscode/issues/17073)
diff --git a/src/vs/workbench/services/editor/test/browser/editorService.test.ts b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
index 196825b2f11..e5fd893ab73 100644
--- a/src/vs/workbench/services/editor/test/browser/editorService.test.ts
+++ b/src/vs/workbench/services/editor/test/browser/editorService.test.ts
@@ -19,6 +19,7 @@ import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorIn
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { ICloseEditorsFilter } from 'vs/workbench/browser/parts/editor/editorPart';
+import { snapshotToString } from 'vs/platform/files/common/files';
 
 let activeEditor: BaseEditor = {
 	getSelection: function () {
@@ -163,7 +164,7 @@ suite('WorkbenchEditorService', () => {
 
 			const untitledInput = openedEditorInput as UntitledEditorInput;
 			untitledInput.resolve().then(model => {
-				assert.equal(model.getValue(), 'Hello Untitled');
+				assert.equal(snapshotToString(model.createSnapshot()), 'Hello Untitled');
 			});
 		});
 
diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts
index 6000c9734e5..eacc46d1970 100644
--- a/src/vs/workbench/services/textfile/common/textfiles.ts
+++ b/src/vs/workbench/services/textfile/common/textfiles.ts
@@ -200,8 +200,6 @@ export interface ITextFileEditorModel extends ITextEditorModel, IEncodingSupport
 
 	revert(soft?: boolean): TPromise;
 
-	getValue(): string;
-
 	createSnapshot(): ITextSnapshot;
 
 	isDirty(): boolean;
diff --git a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
index 5e36065442d..d747bb23b3f 100644
--- a/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
+++ b/src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
@@ -14,7 +14,7 @@ import { ITextFileService, ModelState, StateChange } from 'vs/workbench/services
 import { workbenchInstantiationService, TestTextFileService, createFileInput, TestFileService } from 'vs/workbench/test/workbenchTestServices';
 import { onError, toResource } from 'vs/base/test/common/utils';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
-import { FileOperationResult, FileOperationError, IFileService } from 'vs/platform/files/common/files';
+import { FileOperationResult, FileOperationError, IFileService, snapshotToString } from 'vs/platform/files/common/files';
 import { IModelService } from 'vs/editor/common/services/modelService';
 
 class ServiceAccessor {
@@ -284,7 +284,7 @@ suite('Files - TextFileEditorModel', () => {
 
 		model.onDidStateChange(e => {
 			if (e === StateChange.SAVED) {
-				assert.equal(model.getValue(), 'bar');
+				assert.equal(snapshotToString(model.createSnapshot()), 'bar');
 				assert.ok(!model.isDirty());
 				eventCounter++;
 			}
diff --git a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
index f5bde377342..3c904f154a4 100644
--- a/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
+++ b/src/vs/workbench/services/textmodelResolver/test/textModelResolverService.test.ts
@@ -22,6 +22,7 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
 import { once } from 'vs/base/common/event';
+import { snapshotToString } from 'vs/platform/files/common/files';
 
 class ServiceAccessor {
 	constructor(
@@ -73,7 +74,7 @@ suite('Workbench - TextModelResolverService', () => {
 
 		input.resolve().then(model => {
 			assert.ok(model);
-			assert.equal((model as ResourceEditorModel).getValue(), 'Hello Test');
+			assert.equal(snapshotToString((model as ResourceEditorModel).createSnapshot()), 'Hello Test');
 
 			let disposed = false;
 			once(model.onDispose)(() => {
diff --git a/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts b/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
index 85c63eb3e1b..bed57cb0b05 100644
--- a/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
+++ b/src/vs/workbench/test/common/editor/resourceEditorInput.test.ts
@@ -13,6 +13,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IModeService } from 'vs/editor/common/services/modeService';
+import { snapshotToString } from 'vs/platform/files/common/files';
 
 class ServiceAccessor {
 	constructor(
@@ -39,7 +40,7 @@ suite('Workbench - ResourceEditorInput', () => {
 
 		return input.resolve().then((model: ResourceEditorModel) => {
 			assert.ok(model);
-			assert.equal(model.getValue(), 'function test() {}');
+			assert.equal(snapshotToString(model.createSnapshot()), 'function test() {}');
 		});
 	});
 });
\ No newline at end of file
diff --git a/src/vs/workbench/test/common/editor/untitledEditor.test.ts b/src/vs/workbench/test/common/editor/untitledEditor.test.ts
index b7b8a04dd4a..8edf3bb24aa 100644
--- a/src/vs/workbench/test/common/editor/untitledEditor.test.ts
+++ b/src/vs/workbench/test/common/editor/untitledEditor.test.ts
@@ -17,6 +17,7 @@ import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorMo
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
+import { snapshotToString } from 'vs/platform/files/common/files';
 
 export class TestUntitledEditorService extends UntitledEditorService {
 
@@ -142,7 +143,7 @@ suite('Workbench - Untitled Editor', () => {
 			assert.ok(!model1.isDirty());
 
 			return service.loadOrCreate({ initialValue: 'Hello World' }).then(model2 => {
-				assert.equal(model2.getValue(), 'Hello World');
+				assert.equal(snapshotToString(model2.createSnapshot()), 'Hello World');
 
 				const input = service.createOrGet();
 
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 d6f3681d331..d83503b679e 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadSaveParticipant.test.ts
@@ -17,6 +17,7 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel';
 import { ITextFileService, SaveReason } from 'vs/workbench/services/textfile/common/textfiles';
 import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
+import { snapshotToString } from 'vs/platform/files/common/files';
 
 class ServiceAccessor {
 	constructor( @ITextFileService public textFileService: TestTextFileService, @IModelService public modelService: IModelService) {
@@ -51,25 +52,25 @@ suite('MainThreadSaveParticipant', function () {
 			let lineContent = '';
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), lineContent);
+			assert.equal(snapshotToString(model.createSnapshot()), lineContent);
 
 			// No new line if last line already empty
 			lineContent = `Hello New Line${model.textEditorModel.getEOL()}`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), lineContent);
+			assert.equal(snapshotToString(model.createSnapshot()), lineContent);
 
 			// New empty line added (single line)
 			lineContent = 'Hello New Line';
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), `${lineContent}${model.textEditorModel.getEOL()}`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${lineContent}${model.textEditorModel.getEOL()}`);
 
 			// New empty line added (multi line)
 			lineContent = `Hello New Line${model.textEditorModel.getEOL()}Hello New Line${model.textEditorModel.getEOL()}Hello New Line`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), `${lineContent}${model.textEditorModel.getEOL()}`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${lineContent}${model.textEditorModel.getEOL()}`);
 
 			done();
 		});
@@ -91,25 +92,25 @@ suite('MainThreadSaveParticipant', function () {
 			let lineContent = `${textContent}`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), lineContent);
+			assert.equal(snapshotToString(model.createSnapshot()), lineContent);
 
 			// No new line removal if last line is single new line
 			lineContent = `${textContent}${eol}`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), lineContent);
+			assert.equal(snapshotToString(model.createSnapshot()), lineContent);
 
 			// Remove new line (single line with two new lines)
 			lineContent = `${textContent}${eol}${eol}`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), `${textContent}${eol}`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}`);
 
 			// Remove new lines (multiple lines with multiple new lines)
 			lineContent = `${textContent}${eol}${textContent}${eol}${eol}${eol}`;
 			model.textEditorModel.setValue(lineContent);
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
-			assert.equal(model.getValue(), `${textContent}${eol}${textContent}${eol}`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}${eol}${textContent}${eol}`);
 
 			done();
 		});
@@ -134,11 +135,11 @@ suite('MainThreadSaveParticipant', function () {
 			model.textEditorModel.pushEditOperations([new Selection(1, 14, 1, 14)], textEdits, () => { return [new Selection(1, 15, 1, 15)]; });
 			// undo
 			model.textEditorModel.undo();
-			assert.equal(model.getValue(), `${textContent}`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}`);
 			// trim final new lines should not mess the undo stack
 			participant.participate(model, { reason: SaveReason.EXPLICIT });
 			model.textEditorModel.redo();
-			assert.equal(model.getValue(), `${textContent}.`);
+			assert.equal(snapshotToString(model.createSnapshot()), `${textContent}.`);
 			done();
 		});
 	});

From e7e73637a98012a20c318764c8cb98f2bf4b53d8 Mon Sep 17 00:00:00 2001
From: Zhongliang Wang 
Date: Tue, 23 Jan 2018 01:41:44 +0800
Subject: [PATCH 496/710] Add workbench.fontAliasing.auto option (#41895)

* Add workbench.fontAliasing.auto option

* Remove monaco-font-aliasing-default class

* Remove monaco-font-aliasing-auto class for non-retina displays to behave as `default`
---
 .../electron-browser/main.contribution.ts     |  7 ++++---
 .../electron-browser/media/workbench.css      | 14 +++++++++++++
 .../workbench/electron-browser/workbench.ts   | 21 +++++++++++++------
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
index 6bcbf87b95d..d72fb4e04e6 100644
--- a/src/vs/workbench/electron-browser/main.contribution.ts
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -256,14 +256,15 @@ configurationRegistry.registerConfiguration({
 		},
 		'workbench.fontAliasing': {
 			'type': 'string',
-			'enum': ['default', 'antialiased', 'none'],
+			'enum': ['default', 'antialiased', 'none', 'auto'],
 			'default': 'default',
 			'description':
-				nls.localize('fontAliasing', "Controls font aliasing method in the workbench.\n- default: Sub-pixel font smoothing. On most non-retina displays this will give the sharpest text\n- antialiased: Smooth the font on the level of the pixel, as opposed to the subpixel. Can make the font appear lighter overall\n- none: Disables font smoothing. Text will show with jagged sharp edges"),
+				nls.localize('fontAliasing', "Controls font aliasing method in the workbench.\n- default: Sub-pixel font smoothing. On most non-retina displays this will give the sharpest text\n- antialiased: Smooth the font on the level of the pixel, as opposed to the subpixel. Can make the font appear lighter overall\n- none: Disables font smoothing. Text will show with jagged sharp edges\n- auto: Applies `default` or `antialiased` automatically based on the DPI of displays."),
 			'enumDescriptions': [
 				nls.localize('workbench.fontAliasing.default', "Sub-pixel font smoothing. On most non-retina displays this will give the sharpest text."),
 				nls.localize('workbench.fontAliasing.antialiased', "Smooth the font on the level of the pixel, as opposed to the subpixel. Can make the font appear lighter overall."),
-				nls.localize('workbench.fontAliasing.none', "Disables font smoothing. Text will show with jagged sharp edges.")
+				nls.localize('workbench.fontAliasing.none', "Disables font smoothing. Text will show with jagged sharp edges."),
+				nls.localize('workbench.fontAliasing.auto', "Applies `default` or `antialiased` automatically based on the DPI of displays.")
 			],
 			'included': isMacintosh
 		},
diff --git a/src/vs/workbench/electron-browser/media/workbench.css b/src/vs/workbench/electron-browser/media/workbench.css
index e3b64be9207..2b45ff41a7b 100644
--- a/src/vs/workbench/electron-browser/media/workbench.css
+++ b/src/vs/workbench/electron-browser/media/workbench.css
@@ -26,4 +26,18 @@
 
 .monaco-workbench.windows .monaco-action-bar .select-box {
 	margin-top: 7px; /* Center the select box */
+}
+
+.monaco-font-aliasing-antialiased {
+	-webkit-font-smoothing: antialiased;
+}
+
+.monaco-font-aliasing-none {
+	-webkit-font-smoothing: none;
+}
+
+@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
+	.monaco-font-aliasing-auto {
+		-webkit-font-smoothing: antialiased;
+	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts
index e13edb24a93..551bcc802f5 100644
--- a/src/vs/workbench/electron-browser/workbench.ts
+++ b/src/vs/workbench/electron-browser/workbench.ts
@@ -124,6 +124,8 @@ export interface IWorkbenchStartedInfo {
 	restoredEditors: string[];
 }
 
+type FontAliasingOption = 'default' | 'antialiased' | 'none' | 'auto';
+
 const Identifiers = {
 	WORKBENCH_CONTAINER: 'workbench.main.container',
 	TITLEBAR_PART: 'workbench.parts.titlebar',
@@ -202,7 +204,7 @@ export class Workbench implements IPartService {
 	private inZenMode: IContextKey;
 	private sideBarVisibleContext: IContextKey;
 	private hasFilesToCreateOpenOrDiff: boolean;
-	private fontAliasing: string;
+	private fontAliasing: FontAliasingOption;
 	private zenMode: {
 		active: boolean;
 		transitionedToFullScreen: boolean;
@@ -643,7 +645,7 @@ export class Workbench implements IPartService {
 		this.activityBarHidden = !activityBarVisible;
 
 		// Font aliasing
-		this.fontAliasing = this.configurationService.getValue(Workbench.fontAliasingConfigurationKey);
+		this.fontAliasing = this.configurationService.getValue(Workbench.fontAliasingConfigurationKey);
 
 		// Zen mode
 		this.zenMode = {
@@ -937,10 +939,17 @@ export class Workbench implements IPartService {
 		});
 	}
 
-	private setFontAliasing(aliasing: string) {
+	private setFontAliasing(aliasing: FontAliasingOption) {
 		this.fontAliasing = aliasing;
-
-		document.body.style['-webkit-font-smoothing'] = (aliasing === 'default' ? '' : aliasing);
+		const fontAliasingClassNames = [
+			'monaco-font-aliasing-antialiased',
+			'monaco-font-aliasing-none',
+			'monaco-font-aliasing-auto'
+		];
+		document.body.classList.remove(...fontAliasingClassNames);
+		if (aliasing !== 'default') {
+			document.body.classList.add(`monaco-font-aliasing-${aliasing}`);
+		}
 	}
 
 	public dispose(reason = ShutdownReason.QUIT): void {
@@ -1088,7 +1097,7 @@ export class Workbench implements IPartService {
 
 		this.setPanelPositionFromStorageOrConfig();
 
-		const fontAliasing = this.configurationService.getValue(Workbench.fontAliasingConfigurationKey);
+		const fontAliasing = this.configurationService.getValue(Workbench.fontAliasingConfigurationKey);
 		if (fontAliasing !== this.fontAliasing) {
 			this.setFontAliasing(fontAliasing);
 		}

From 1bcfe5b5c70ea4bb8e7b8f648b41b84544ced185 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Mon, 22 Jan 2018 19:00:47 +0100
Subject: [PATCH 497/710] fix #41989

---
 src/vs/code/electron-main/windows.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 073f7dc441f..8ecf8499910 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -1326,7 +1326,17 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		// Handle untitled workspaces with prompt as needed
-		e.veto(this.workspacesManager.promptToSaveUntitledWorkspace(this.getWindowById(e.window.id), workspace));
+		e.veto(this.workspacesManager.promptToSaveUntitledWorkspace(this.getWindowById(e.window.id), workspace).then(veto => {
+			if (veto) {
+				return veto;
+			}
+
+			// Bug in electron: somehow we need this timeout so that the window closes properly. That
+			// might be related to the fact that the untitled workspace prompt shows up async and this
+			// code can execute before the dialog is fully closed which then blocks the window from closing.
+			// Issue: https://github.com/Microsoft/vscode/issues/41989
+			return TPromise.timeout(0).then(() => veto);
+		}));
 	}
 
 	public focusLastActive(cli: ParsedArgs, context: OpenContext): CodeWindow {

From ad3f4f2784a198c8f4b350a2f79c306a95fc9fc7 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 10:03:19 -0800
Subject: [PATCH 498/710] turn on piece tree for insider.

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

diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts
index 27c58c24d2e..5a05edb5ccc 100644
--- a/src/vs/editor/common/model/textModel.ts
+++ b/src/vs/editor/common/model/textModel.ts
@@ -38,7 +38,7 @@ import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeText
 import { ChunksTextBufferBuilder } from 'vs/editor/common/model/chunksTextBuffer/chunksTextBufferBuilder';
 
 // Here is the master switch for the text buffer implementation:
-const USE_PIECE_TREE_IMPLEMENTATION = false;
+const USE_PIECE_TREE_IMPLEMENTATION = true;
 const USE_CHUNKS_TEXT_BUFFER = false;
 
 function createTextBufferBuilder() {

From 48a6f7176a89b036f04e3fd44b0824113d40573c Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Mon, 22 Jan 2018 10:07:27 -0800
Subject: [PATCH 499/710] Keep notification consistent with recommendations
 #38543

---
 .../electron-browser/extensionTipsService.ts  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
index 619aace599d..e630ffa559a 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts
@@ -404,25 +404,17 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 						return;
 					}
 
-					// Suggest the search only once as this is not a strong recommendation
-					fileExtensionSuggestionIgnoreList.push(fileExtension);
-					this.storageService.store(
-						'extensionsAssistant/fileExtensionsSuggestionIgnore',
-						JSON.stringify(fileExtensionSuggestionIgnoreList),
-						StorageScope.GLOBAL
-					);
-
-
 					const message = localize('showLanguageExtensions', "The Marketplace has extensions that can help with '.{0}' files", fileExtension);
 
 					const searchMarketplaceAction = this.instantiationService.createInstance(ShowLanguageExtensionsAction, fileExtension);
 
 					const options = [
 						localize('searchMarketplace', "Search Marketplace"),
+						choiceNever,
 						choiceClose
 					];
 
-					this.choiceService.choose(Severity.Info, message, options, 1).done(choice => {
+					this.choiceService.choose(Severity.Info, message, options, 2).done(choice => {
 						switch (choice) {
 							case 0:
 								/* __GDPR__
@@ -435,6 +427,20 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
 								searchMarketplaceAction.run();
 								break;
 							case 1:
+								fileExtensionSuggestionIgnoreList.push(fileExtension);
+								this.storageService.store(
+									'extensionsAssistant/fileExtensionsSuggestionIgnore',
+									JSON.stringify(fileExtensionSuggestionIgnoreList),
+									StorageScope.GLOBAL
+								);
+								/* __GDPR__
+									"fileExtensionSuggestion:popup" : {
+										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
+										"extensionId": { "classification": "PublicNonPersonalData", "purpose": "FeatureInsight" }
+									}
+								*/
+								this.telemetryService.publicLog('fileExtensionSuggestion:popup', { userReaction: 'neverShowAgain', fileExtension: fileExtension });
+							case 2:
 								/* __GDPR__
 									"fileExtensionSuggestion:popup" : {
 										"userReaction" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },

From 81d6f2b1d3f350d3fae0750052b9cc100f166283 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Mon, 22 Jan 2018 19:20:29 +0100
Subject: [PATCH 500/710] remove duplicate method

---
 .../workbench/browser/parts/editor/noTabsTitleControl.ts  | 8 +-------
 src/vs/workbench/browser/parts/editor/tabsTitleControl.ts | 6 ------
 src/vs/workbench/browser/parts/editor/titleControl.ts     | 2 ++
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
index 34cae60469c..8d0c4ef497f 100644
--- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts
@@ -7,7 +7,7 @@
 
 import 'vs/css!./media/notabstitle';
 import errors = require('vs/base/common/errors');
-import { IEditorGroup, toResource } from 'vs/workbench/common/editor';
+import { toResource } from 'vs/workbench/common/editor';
 import DOM = require('vs/base/browser/dom');
 import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
 import { ResourceLabel } from 'vs/workbench/browser/labels';
@@ -19,12 +19,6 @@ export class NoTabsTitleControl extends TitleControl {
 	private titleContainer: HTMLElement;
 	private editorLabel: ResourceLabel;
 
-	public setContext(group: IEditorGroup): void {
-		super.setContext(group);
-
-		this.editorActionsToolbar.context = { group };
-	}
-
 	public create(parent: HTMLElement): void {
 		super.create(parent);
 
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
index 6ac7609d531..892dc38d274 100644
--- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -118,12 +118,6 @@ export class TabsTitleControl extends TitleControl {
 		return this.instantiationService.createChild(new ServiceCollection([IWorkbenchEditorService, delegatingEditorService]));
 	}
 
-	public setContext(group: IEditorGroup): void {
-		super.setContext(group);
-
-		this.editorActionsToolbar.context = { group };
-	}
-
 	public create(parent: HTMLElement): void {
 		super.create(parent);
 
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index 4c2fbffde2a..c7054d7fb5b 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -170,6 +170,8 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 
 	public setContext(group: IEditorGroup): void {
 		this.context = group;
+
+		this.editorActionsToolbar.context = { group };
 	}
 
 	public hasContext(): boolean {

From 31bd69224394a264b923c94b3b51877187c19ffa Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Mon, 22 Jan 2018 19:46:27 +0100
Subject: [PATCH 501/710] fix #41918

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

diff --git a/src/vs/workbench/browser/actions.ts b/src/vs/workbench/browser/actions.ts
index 12ac79bfc78..e15e84abf60 100644
--- a/src/vs/workbench/browser/actions.ts
+++ b/src/vs/workbench/browser/actions.ts
@@ -169,7 +169,7 @@ export function prepareActions(actions: IAction[]): IAction[] {
 	for (let l = 0; l < actions.length; l++) {
 		const a = actions[l];
 		if (types.isUndefinedOrNull(a.order)) {
-			a.order = lastOrder++;
+			a.order = ++lastOrder;
 			orderOffset++;
 		} else {
 			a.order += orderOffset;

From ec183b09774f7c64a43b0b0f94bbe38efbab44ae Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 10:46:44 -0800
Subject: [PATCH 502/710] Fix webview protocols for windows drive letter casing

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

diff --git a/src/vs/workbench/parts/html/browser/webview.ts b/src/vs/workbench/parts/html/browser/webview.ts
index 90f7cd006cd..4010801932e 100644
--- a/src/vs/workbench/parts/html/browser/webview.ts
+++ b/src/vs/workbench/parts/html/browser/webview.ts
@@ -420,7 +420,7 @@ function registerFileProtocol(
 	roots: string[]
 ) {
 	contents.session.protocol.registerFileProtocol(protocol, (request, callback: any) => {
-		const requestPath = URI.parse(request.url).path;
+		const requestPath = URI.parse(request.url).fsPath;
 		for (const root of roots) {
 			const normalizedPath = normalize(requestPath, true);
 			if (startsWith(normalizedPath, root + nativeSep)) {

From eccf728e6444ceed2ed50e833f6977ca5c2a8c6f Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 11:45:22 -0800
Subject: [PATCH 503/710] CodeActionScope (#41782)

* Add CodeActionScope

* Replace matches with contains, try using in ts extension

* Move filtering to getCodeActions

* Basic test

* Docs

* Fix tests

* Hooking up requested scope

* Add basic test for requestedScope

* Added auto apply logic

* Gate refactor provider to only compute refactorings when requested

* Making suggested renames

* Clean up code action trigger impl to use single Trrigger info object

* Rename codeActionScope file and internal CodeActionScope class

* Add quick fix base type

* Make keybinding API more similar to insertSnippet

Take args as an object instead of as an array of values

* Clean up docs

* scope -> kind

* Fixing examples to match Refactor kind
---
 .../src/features/refactorProvider.ts          | 19 ++++-
 src/vs/editor/common/modes.ts                 | 10 ++-
 .../contrib/quickFix/codeActionTrigger.ts     | 32 +++++++
 src/vs/editor/contrib/quickFix/quickFix.ts    |  9 +-
 .../contrib/quickFix/quickFixCommands.ts      | 85 +++++++++++++++++--
 .../editor/contrib/quickFix/quickFixModel.ts  | 29 ++++---
 .../contrib/quickFix/test/quickFix.test.ts    | 51 ++++++++++-
 .../quickFix/test/quickFixModel.test.ts       |  6 +-
 .../standalone/browser/standaloneLanguages.ts |  9 +-
 src/vs/monaco.d.ts                            |  5 ++
 src/vs/vscode.d.ts                            | 74 ++++++++++++++++
 .../mainThreadLanguageFeatures.ts             |  4 +-
 src/vs/workbench/api/node/extHost.api.impl.ts |  1 +
 src/vs/workbench/api/node/extHost.protocol.ts |  3 +-
 .../workbench/api/node/extHostApiCommands.ts  |  3 +
 .../api/node/extHostLanguageFeatures.ts       | 15 ++--
 src/vs/workbench/api/node/extHostTypes.ts     | 28 ++++++
 .../api/extHostLanguageFeatures.test.ts       | 30 ++++++-
 18 files changed, 372 insertions(+), 41 deletions(-)
 create mode 100644 src/vs/editor/contrib/quickFix/codeActionTrigger.ts

diff --git a/extensions/typescript/src/features/refactorProvider.ts b/extensions/typescript/src/features/refactorProvider.ts
index 14dca20a4b5..45e47597017 100644
--- a/extensions/typescript/src/features/refactorProvider.ts
+++ b/extensions/typescript/src/features/refactorProvider.ts
@@ -108,13 +108,17 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 	public async provideCodeActions(
 		document: vscode.TextDocument,
 		_range: vscode.Range,
-		_context: vscode.CodeActionContext,
+		context: vscode.CodeActionContext,
 		token: vscode.CancellationToken
 	): Promise {
 		if (!this.client.apiVersion.has240Features()) {
 			return [];
 		}
 
+		if (context.only && !vscode.CodeActionKind.Refactor.contains(context.only)) {
+			return [];
+		}
+
 		if (!vscode.window.activeTextEditor) {
 			return [];
 		}
@@ -146,7 +150,8 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 							title: info.description,
 							command: SelectRefactorCommand.ID,
 							arguments: [document, file, info, range]
-						}
+						},
+						kind: vscode.CodeActionKind.Refactor
 					});
 				} else {
 					for (const action of info.actions) {
@@ -156,7 +161,8 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 								title: action.description,
 								command: ApplyRefactoringCommand.ID,
 								arguments: [document, file, info.name, action.name, range]
-							}
+							},
+							kind: TypeScriptRefactorProvider.getKind(action)
 						});
 					}
 				}
@@ -166,4 +172,11 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 			return [];
 		}
 	}
+
+	private static getKind(refactor: Proto.RefactorActionInfo) {
+		if (refactor.name.startsWith('function_')) {
+			return vscode.CodeActionKind.RefactorExtract.append('function');
+		}
+		return vscode.CodeActionKind.Refactor;
+	}
 }
\ No newline at end of file
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
index c3c19319c48..6b573d085a9 100644
--- a/src/vs/editor/common/modes.ts
+++ b/src/vs/editor/common/modes.ts
@@ -343,6 +343,14 @@ export interface CodeAction {
 	command?: Command;
 	edit?: WorkspaceEdit;
 	diagnostics?: IMarkerData[];
+	kind?: string;
+}
+
+/**
+ * @internal
+ */
+export interface CodeActionContext {
+	only?: string;
 }
 
 /**
@@ -354,7 +362,7 @@ export interface CodeActionProvider {
 	/**
 	 * Provide commands for the given document and range.
 	 */
-	provideCodeActions(model: model.ITextModel, range: Range, token: CancellationToken): CodeAction[] | Thenable;
+	provideCodeActions(model: model.ITextModel, range: Range, context: CodeActionContext, token: CancellationToken): CodeAction[] | Thenable;
 }
 
 /**
diff --git a/src/vs/editor/contrib/quickFix/codeActionTrigger.ts b/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
new file mode 100644
index 00000000000..0cd81d55df8
--- /dev/null
+++ b/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
@@ -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.
+ *--------------------------------------------------------------------------------------------*/
+
+import { startsWith } from 'vs/base/common/strings';
+
+export class CodeActionKind {
+	private static readonly sep = '.';
+
+	public static readonly Empty = new CodeActionKind('');
+
+	constructor(
+		public readonly value: string
+	) { }
+
+	public contains(other: string): boolean {
+		return this.value === other || startsWith(other, this.value + CodeActionKind.sep);
+	}
+}
+
+export enum CodeActionAutoApply {
+	IfSingle = 1,
+	First = 2,
+	Never = 3
+}
+
+export interface CodeActionTrigger {
+	type: 'auto' | 'manual';
+	kind?: CodeActionKind;
+	autoApply?: CodeActionAutoApply;
+}
\ No newline at end of file
diff --git a/src/vs/editor/contrib/quickFix/quickFix.ts b/src/vs/editor/contrib/quickFix/quickFix.ts
index 8e619e15c03..10bbbe4d5e8 100644
--- a/src/vs/editor/contrib/quickFix/quickFix.ts
+++ b/src/vs/editor/contrib/quickFix/quickFix.ts
@@ -14,16 +14,19 @@ import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/error
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { CodeActionKind } from './codeActionTrigger';
 
-export function getCodeActions(model: ITextModel, range: Range): TPromise {
+export function getCodeActions(model: ITextModel, range: Range, scope?: CodeActionKind): TPromise {
 
 	const allResults: CodeAction[] = [];
 	const promises = CodeActionProviderRegistry.all(model).map(support => {
-		return asWinJsPromise(token => support.provideCodeActions(model, range, token)).then(result => {
+		return asWinJsPromise(token => support.provideCodeActions(model, range, { only: scope ? scope.value : undefined }, token)).then(result => {
 			if (Array.isArray(result)) {
 				for (const quickFix of result) {
 					if (quickFix) {
-						allResults.push(quickFix);
+						if (!scope || (quickFix.kind && scope.contains(quickFix.kind))) {
+							allResults.push(quickFix);
+						}
 					}
 				}
 			}
diff --git a/src/vs/editor/contrib/quickFix/quickFixCommands.ts b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
index 2d067db0bf0..9850c794400 100644
--- a/src/vs/editor/contrib/quickFix/quickFixCommands.ts
+++ b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
@@ -15,11 +15,12 @@ import { optional } from 'vs/platform/instantiation/common/instantiation';
 import { IMarkerService } from 'vs/platform/markers/common/markers';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction } from 'vs/editor/browser/editorExtensions';
+import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { QuickFixContextMenu } from './quickFixWidget';
 import { LightBulbWidget } from './lightBulbWidget';
 import { QuickFixModel, QuickFixComputeEvent } from './quickFixModel';
+import { CodeActionKind, CodeActionAutoApply } from './codeActionTrigger';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { CodeAction } from 'vs/editor/common/modes';
 import { createBulkEdit } from 'vs/editor/browser/services/bulkEdit';
@@ -57,7 +58,7 @@ export class QuickFixController implements IEditorContribution {
 		this._updateLightBulbTitle();
 
 		this._disposables.push(
-			this._quickFixContextMenu.onDidExecuteCodeAction(_ => this._model.trigger('auto')),
+			this._quickFixContextMenu.onDidExecuteCodeAction(_ => this._model.trigger({ type: 'auto' })),
 			this._lightBulbWidget.onClick(this._handleLightBulbSelect, this),
 			this._model.onDidChangeFixes(e => this._onQuickFixEvent(e)),
 			this._keybindingService.onDidUpdateKeybindings(this._updateLightBulbTitle, this)
@@ -70,9 +71,21 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	private _onQuickFixEvent(e: QuickFixComputeEvent): void {
-		if (e && e.type === 'manual') {
-			this._quickFixContextMenu.show(e.fixes, e.position);
+		if (e && e.trigger.kind) {
+			// Triggered for specific scope
+			// Apply if we only have one action or requested autoApply, otherwise show menu
+			e.fixes.then(fixes => {
+				if (e.trigger.autoApply === CodeActionAutoApply.First || (e.trigger.autoApply === CodeActionAutoApply.IfSingle && fixes.length === 1)) {
+					this._onApplyCodeAction(fixes[0]);
+				} else {
+					this._quickFixContextMenu.show(e.fixes, e.position);
+				}
+			});
+			return;
+		}
 
+		if (e && e.trigger.type === 'manual') {
+			this._quickFixContextMenu.show(e.fixes, e.position);
 		} else if (e && e.fixes) {
 			// auto magically triggered
 			// * update an existing list of code actions
@@ -96,7 +109,11 @@ export class QuickFixController implements IEditorContribution {
 	}
 
 	public triggerFromEditorSelection(): void {
-		this._model.trigger('manual');
+		this._model.trigger({ type: 'manual' });
+	}
+
+	public triggerCodeActionFromEditorSelection(kind?: CodeActionKind, autoApply?: CodeActionAutoApply): void {
+		this._model.trigger({ type: 'manual', kind, autoApply });
 	}
 
 	private _updateLightBulbTitle(): void {
@@ -148,5 +165,63 @@ export class QuickFixAction extends EditorAction {
 	}
 }
 
+
+class CodeActionCommandArgs {
+	public static fromUser(arg: any): CodeActionCommandArgs {
+		if (!arg || typeof arg !== 'object') {
+			return new CodeActionCommandArgs(CodeActionKind.Empty, CodeActionAutoApply.IfSingle);
+		}
+		return new CodeActionCommandArgs(
+			CodeActionCommandArgs.getKindFromUser(arg),
+			CodeActionCommandArgs.getApplyFromUser(arg));
+	}
+
+	private static getApplyFromUser(arg: any) {
+		switch (typeof arg.apply === 'string' ? arg.apply.toLowerCase() : '') {
+			case 'first':
+				return CodeActionAutoApply.First;
+
+			case 'never':
+				return CodeActionAutoApply.Never;
+
+			case 'ifsingle':
+			default:
+				return CodeActionAutoApply.IfSingle;
+		}
+	}
+
+	private static getKindFromUser(arg: any) {
+		return typeof arg.kind === 'string'
+			? new CodeActionKind(arg.kind)
+			: CodeActionKind.Empty;
+	}
+
+	private constructor(
+		public readonly kind: CodeActionKind,
+		public readonly apply: CodeActionAutoApply
+	) { }
+}
+
+export class CodeActionCommand extends EditorCommand {
+
+	static readonly Id = 'editor.action.codeAction';
+
+	constructor() {
+		super({
+			id: CodeActionCommand.Id,
+			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)
+		});
+	}
+
+	public runEditorCommand(accessor: ServicesAccessor, editor: ICodeEditor, userArg: any) {
+		const controller = QuickFixController.get(editor);
+		if (controller) {
+			const args = CodeActionCommandArgs.fromUser(userArg);
+			controller.triggerCodeActionFromEditorSelection(args.kind, args.apply);
+		}
+	}
+}
+
 registerEditorContribution(QuickFixController);
 registerEditorAction(QuickFixAction);
+registerEditorCommand(new CodeActionCommand());
diff --git a/src/vs/editor/contrib/quickFix/quickFixModel.ts b/src/vs/editor/contrib/quickFix/quickFixModel.ts
index e2ff0dcd2a1..3e4366c4d63 100644
--- a/src/vs/editor/contrib/quickFix/quickFixModel.ts
+++ b/src/vs/editor/contrib/quickFix/quickFixModel.ts
@@ -13,6 +13,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { CodeActionProviderRegistry, CodeAction } from 'vs/editor/common/modes';
 import { getCodeActions } from './quickFix';
+import { CodeActionTrigger } from './codeActionTrigger';
 import { Position } from 'vs/editor/common/core/position';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
@@ -36,26 +37,26 @@ export class QuickFixOracle {
 		this._disposables = dispose(this._disposables);
 	}
 
-	trigger(type: 'manual' | 'auto'): void {
+	trigger(trigger: CodeActionTrigger): void {
 		let rangeOrSelection = this._getRangeOfMarker() || this._getRangeOfSelectionUnlessWhitespaceEnclosed();
-		if (!rangeOrSelection && type === 'manual') {
+		if (!rangeOrSelection && trigger.type === 'manual') {
 			rangeOrSelection = this._editor.getSelection();
 		}
-		this._createEventAndSignalChange(type, rangeOrSelection);
+		this._createEventAndSignalChange(trigger, rangeOrSelection);
 	}
 
 	private _onMarkerChanges(resources: URI[]): void {
 		const { uri } = this._editor.getModel();
 		for (const resource of resources) {
 			if (resource.toString() === uri.toString()) {
-				this.trigger('auto');
+				this.trigger({ type: 'auto' });
 				return;
 			}
 		}
 	}
 
 	private _onCursorChange(): void {
-		this.trigger('auto');
+		this.trigger({ type: 'auto' });
 	}
 
 	private _getRangeOfMarker(): Range {
@@ -98,24 +99,24 @@ export class QuickFixOracle {
 		return selection;
 	}
 
-	private _createEventAndSignalChange(type: 'auto' | 'manual', rangeOrSelection: Range | Selection): void {
+	private _createEventAndSignalChange(trigger: CodeActionTrigger, rangeOrSelection: Range | Selection): void {
 		if (!rangeOrSelection) {
 			// cancel
 			this._signalChange({
-				type,
+				trigger,
 				range: undefined,
 				position: undefined,
-				fixes: undefined
+				fixes: undefined,
 			});
 		} else {
 			// actual
 			const model = this._editor.getModel();
 			const range = model.validateRange(rangeOrSelection);
 			const position = rangeOrSelection instanceof Selection ? rangeOrSelection.getPosition() : rangeOrSelection.getStartPosition();
-			const fixes = getCodeActions(model, range);
+			const fixes = getCodeActions(model, range, trigger && trigger.kind);
 
 			this._signalChange({
-				type,
+				trigger,
 				range,
 				position,
 				fixes
@@ -125,7 +126,7 @@ export class QuickFixOracle {
 }
 
 export interface QuickFixComputeEvent {
-	type: 'auto' | 'manual';
+	trigger: CodeActionTrigger;
 	range: Range;
 	position: Position;
 	fixes: TPromise;
@@ -172,13 +173,13 @@ export class QuickFixModel {
 			&& !this._editor.getConfiguration().readOnly) {
 
 			this._quickFixOracle = new QuickFixOracle(this._editor, this._markerService, p => this._onDidChangeFixes.fire(p));
-			this._quickFixOracle.trigger('auto');
+			this._quickFixOracle.trigger({ type: 'auto' });
 		}
 	}
 
-	trigger(type: 'auto' | 'manual'): void {
+	trigger(trigger: CodeActionTrigger): void {
 		if (this._quickFixOracle) {
-			this._quickFixOracle.trigger(type);
+			this._quickFixOracle.trigger(trigger);
 		}
 	}
 }
diff --git a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts b/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
index 8e1fdc79473..ba52da9dde7 100644
--- a/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
+++ b/src/vs/editor/contrib/quickFix/test/quickFix.test.ts
@@ -8,10 +8,11 @@ import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import Severity from 'vs/base/common/severity';
 import { TextModel } from 'vs/editor/common/model/textModel';
-import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, IResourceEdit } from 'vs/editor/common/modes';
+import { CodeActionProviderRegistry, LanguageIdentifier, CodeActionProvider, Command, WorkspaceEdit, IResourceEdit, CodeAction, CodeActionContext } from 'vs/editor/common/modes';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { Range } from 'vs/editor/common/core/range';
 import { getCodeActions } from 'vs/editor/contrib/quickFix/quickFix';
+import { CodeActionKind } from 'vs/editor/contrib/quickFix/codeActionTrigger';
 
 suite('QuickFix', () => {
 
@@ -120,4 +121,52 @@ suite('QuickFix', () => {
 		assert.equal(actions.length, 6);
 		assert.deepEqual(actions, expected);
 	});
+
+	test('getCodeActions should filter by scope', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(): CodeAction[] {
+				return [
+					{ title: 'a', kind: 'a' },
+					{ title: 'b', kind: 'b' },
+					{ title: 'a.b', kind: 'a.b' }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a'));
+			assert.equal(actions.length, 2);
+			assert.strictEqual(actions[0].title, 'a');
+			assert.strictEqual(actions[1].title, 'a.b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a.b'));
+			assert.equal(actions.length, 1);
+			assert.strictEqual(actions[0].title, 'a.b');
+		}
+
+		{
+			const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a.b.c'));
+			assert.equal(actions.length, 0);
+		}
+	});
+
+	test('getCodeActions should forward requested scope to providers', async function () {
+		const provider = new class implements CodeActionProvider {
+			provideCodeActions(_model: any, _range: Range, context: CodeActionContext, _token: any): CodeAction[] {
+				return [
+					{ title: context.only, kind: context.only }
+				];
+			}
+		};
+
+		disposables.push(CodeActionProviderRegistry.register('fooLang', provider));
+
+		const actions = await getCodeActions(model, new Range(1, 1, 2, 1), new CodeActionKind('a'));
+		assert.equal(actions.length, 1);
+		assert.strictEqual(actions[0].title, 'a');
+	});
 });
diff --git a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts b/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts
index c2806d7d31e..a6c3b4663a7 100644
--- a/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts
+++ b/src/vs/editor/contrib/quickFix/test/quickFixModel.test.ts
@@ -47,7 +47,7 @@ suite('QuickFix', () => {
 	test('Orcale -> marker added', done => {
 
 		const oracle = new QuickFixOracle(editor, markerService, e => {
-			assert.equal(e.type, 'auto');
+			assert.equal(e.trigger.type, 'auto');
 			assert.ok(e.fixes);
 
 			e.fixes.then(fixes => {
@@ -83,7 +83,7 @@ suite('QuickFix', () => {
 		return new Promise((resolve, reject) => {
 
 			const oracle = new QuickFixOracle(editor, markerService, e => {
-				assert.equal(e.type, 'auto');
+				assert.equal(e.trigger.type, 'auto');
 				assert.ok(e.fixes);
 				e.fixes.then(fixes => {
 					oracle.dispose();
@@ -160,7 +160,7 @@ suite('QuickFix', () => {
 		await new Promise(resolve => {
 
 			let oracle = new QuickFixOracle(editor, markerService, e => {
-				assert.equal(e.type, 'auto');
+				assert.equal(e.trigger.type, 'auto');
 				assert.deepEqual(e.range, { startLineNumber: 3, startColumn: 1, endLineNumber: 3, endColumn: 4 });
 				assert.deepEqual(e.position, { lineNumber: 3, column: 1 });
 
diff --git a/src/vs/editor/standalone/browser/standaloneLanguages.ts b/src/vs/editor/standalone/browser/standaloneLanguages.ts
index 5c5b72caa39..1e4f3f4fc29 100644
--- a/src/vs/editor/standalone/browser/standaloneLanguages.ts
+++ b/src/vs/editor/standalone/browser/standaloneLanguages.ts
@@ -329,11 +329,11 @@ export function registerCodeLensProvider(languageId: string, provider: modes.Cod
  */
 export function registerCodeActionProvider(languageId: string, provider: CodeActionProvider): IDisposable {
 	return modes.CodeActionProviderRegistry.register(languageId, {
-		provideCodeActions: (model: model.ITextModel, range: Range, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Thenable<(modes.Command | modes.CodeAction)[]> => {
+		provideCodeActions: (model: model.ITextModel, range: Range, context: modes.CodeActionContext, token: CancellationToken): (modes.Command | modes.CodeAction)[] | Thenable<(modes.Command | modes.CodeAction)[]> => {
 			let markers = StaticServices.markerService.get().read({ resource: model.uri }).filter(m => {
 				return Range.areIntersectingOrTouching(m, range);
 			});
-			return provider.provideCodeActions(model, range, { markers }, token);
+			return provider.provideCodeActions(model, range, { markers, only: context.only }, token);
 		}
 	});
 }
@@ -401,6 +401,11 @@ export interface CodeActionContext {
 	 * @readonly
 	 */
 	readonly markers: IMarkerData[];
+
+	/**
+	 * Requested kind of actions to return.
+	 */
+	readonly only?: string;
 }
 
 /**
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
index b419e7e58ba..dd87b203a17 100644
--- a/src/vs/monaco.d.ts
+++ b/src/vs/monaco.d.ts
@@ -4043,6 +4043,10 @@ declare module monaco.languages {
 		 * @readonly
 		 */
 		readonly markers: editor.IMarkerData[];
+		/**
+		 * Requested kind of actions to return.
+		 */
+		readonly only?: string;
 	}
 
 	/**
@@ -4495,6 +4499,7 @@ declare module monaco.languages {
 		command?: Command;
 		edit?: WorkspaceEdit;
 		diagnostics?: editor.IMarkerData[];
+		kind?: string;
 	}
 
 	/**
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index 4f851542eff..b0582117933 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1812,6 +1812,66 @@ declare module 'vscode' {
 	 */
 	export type ProviderResult = T | undefined | null | Thenable;
 
+	/**
+	 * Kind of a code action.
+	 *
+	 * Kinds are a hierarchical list of identifiers separated by `.`, e.g. `"refactor.extract.function"`.
+	 */
+	export class CodeActionKind {
+		/**
+		 * Empty kind.
+		 */
+		static readonly Empty: CodeActionKind;
+
+		/**
+		 * Base kind for quickfix actions.
+		 */
+		static readonly QuickFix: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring actions.
+		 */
+		static readonly Refactor: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring extraction actions.
+		 */
+		static readonly RefactorExtract: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring inline actions.
+		 */
+		static readonly RefactorInline: CodeActionKind;
+
+		/**
+		 * Base kind for refactoring rewite actions.
+		 */
+		static readonly RefactorRewrite: CodeActionKind;
+
+		private constructor(value: string);
+
+		/**
+		 * String value of the kind, e.g. `"refactor.extract.function"`.
+		 */
+		readonly value?: string;
+
+		/**
+		 * Create a new kind by appending a more specific selector to the current kind.
+		 *
+		 * Does not modify the current kind.
+		 */
+		append(parts: string): CodeActionKind;
+
+		/**
+		 * Does this kind contain `other`?
+		 *
+		 * The kind `"refactor"` for example contains `"refactor.extract"` and ``"refactor.extract.function"`, but not `"unicorn.refactor.extract"` or `"refactory.extract"`
+		 *
+		 * @param other Kind to check.
+		 */
+		contains(other: CodeActionKind): boolean;
+	}
+
 	/**
 	 * Contains additional diagnostic information about the context in which
 	 * a [code action](#CodeActionProvider.provideCodeActions) is run.
@@ -1821,6 +1881,13 @@ declare module 'vscode' {
 		 * An array of diagnostics.
 		 */
 		readonly diagnostics: Diagnostic[];
+
+		/**
+		 * Requested kind of actions to return.
+		 *
+		 * Actions not of this kind are filtered out before being shown by the lightbulb.
+		 */
+		readonly only?: CodeActionKind;
 	}
 
 	/**
@@ -1853,6 +1920,13 @@ declare module 'vscode' {
 		 */
 		command?: Command;
 
+		/**
+		 * Kind of the code action.
+		 *
+		 * Used to filter code actions.
+		 */
+		readonly kind?: CodeActionKind;
+
 		/**
 		 * Creates a new code action.
 		 *
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
index d60034d69a2..1b6408a0ec8 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
@@ -206,8 +206,8 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
 
 	$registerQuickFixSupport(handle: number, selector: vscode.DocumentSelector): void {
 		this._registrations[handle] = modes.CodeActionProviderRegistry.register(toLanguageSelector(selector), {
-			provideCodeActions: (model: ITextModel, range: EditorRange, token: CancellationToken): Thenable => {
-				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideCodeActions(handle, model.uri, range))).then(MainThreadLanguageFeatures._reviveCodeActionDto);
+			provideCodeActions: (model: ITextModel, range: EditorRange, context: modes.CodeActionContext, token: CancellationToken): Thenable => {
+				return this._heapService.trackRecursive(wireCancellationToken(token, this._proxy.$provideCodeActions(handle, model.uri, range, context))).then(MainThreadLanguageFeatures._reviveCodeActionDto);
 			}
 		});
 	}
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index 4d6eb312357..cc7aafe634b 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -556,6 +556,7 @@ export function createApiFactory(
 			Breakpoint: extHostTypes.Breakpoint,
 			CancellationTokenSource: CancellationTokenSource,
 			CodeAction: extHostTypes.CodeAction,
+			CodeActionKind: extHostTypes.CodeActionKind,
 			CodeLens: extHostTypes.CodeLens,
 			Color: extHostTypes.Color,
 			ColorPresentation: extHostTypes.ColorPresentation,
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index ea9d6e8b960..d4dcd03d363 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -639,6 +639,7 @@ export interface CodeActionDto {
 	edit?: WorkspaceEditDto;
 	diagnostics?: IMarkerData[];
 	command?: modes.Command;
+	scope?: string;
 }
 
 export interface ExtHostLanguageFeaturesShape {
@@ -651,7 +652,7 @@ export interface ExtHostLanguageFeaturesShape {
 	$provideHover(handle: number, resource: UriComponents, position: IPosition): TPromise;
 	$provideDocumentHighlights(handle: number, resource: UriComponents, position: IPosition): TPromise;
 	$provideReferences(handle: number, resource: UriComponents, position: IPosition, context: modes.ReferenceContext): TPromise;
-	$provideCodeActions(handle: number, resource: UriComponents, range: IRange): TPromise;
+	$provideCodeActions(handle: number, resource: UriComponents, range: IRange, context: modes.CodeActionContext): TPromise;
 	$provideDocumentFormattingEdits(handle: number, resource: UriComponents, options: modes.FormattingOptions): TPromise;
 	$provideDocumentRangeFormattingEdits(handle: number, resource: UriComponents, range: IRange, options: modes.FormattingOptions): TPromise;
 	$provideOnTypeFormattingEdits(handle: number, resource: UriComponents, position: IPosition, ch: string, options: modes.FormattingOptions): TPromise;
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index bf16fdb2c52..9790068a020 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -419,6 +419,9 @@ export class ExtHostApiCommands {
 						codeAction.title,
 						typeConverters.WorkspaceEdit.to(codeAction.edit)
 					);
+					if (codeAction.kind) {
+						ret.scope = new types.CodeActionKind(codeAction.kind);
+					}
 					return ret;
 				}
 			});
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
index 37ac8015683..9ebfc217656 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 } from 'vs/workbench/api/node/extHostTypes';
+import { Range, Disposable, CompletionList, SnippetString, Color, 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';
@@ -273,7 +273,7 @@ class CodeActionAdapter {
 		this._provider = provider;
 	}
 
-	provideCodeActions(resource: URI, range: IRange): TPromise {
+	provideCodeActions(resource: URI, range: IRange, context: modes.CodeActionContext): TPromise {
 
 		const doc = this._documents.getDocumentData(resource).document;
 		const ran = TypeConverters.toRange(range);
@@ -289,8 +289,12 @@ class CodeActionAdapter {
 			}
 		});
 
+		const codeActionContext: vscode.CodeActionContext = {
+			diagnostics: allDiagnostics,
+			only: context.only ? new CodeActionKind(context.only) : undefined
+		};
 		return asWinJsPromise(token =>
-			this._provider.provideCodeActions(doc, ran, { diagnostics: allDiagnostics }, token)
+			this._provider.provideCodeActions(doc, ran, codeActionContext, token)
 		).then(commandsOrActions => {
 			if (isFalsyOrEmpty(commandsOrActions)) {
 				return undefined;
@@ -314,6 +318,7 @@ class CodeActionAdapter {
 						command: candidate.command && this._commands.toInternal(candidate.command),
 						diagnostics: candidate.diagnostics && candidate.diagnostics.map(DiagnosticCollection.toMarkerData),
 						edit: candidate.edit && TypeConverters.WorkspaceEdit.from(candidate.edit),
+						kind: candidate.kind && candidate.kind.value
 					});
 				}
 			}
@@ -943,8 +948,8 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
 		return this._createDisposable(handle);
 	}
 
-	$provideCodeActions(handle: number, resource: UriComponents, range: IRange): TPromise {
-		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range));
+	$provideCodeActions(handle: number, resource: UriComponents, range: IRange, context: modes.CodeActionContext): TPromise {
+		return this._withAdapter(handle, CodeActionAdapter, adapter => adapter.provideCodeActions(URI.revive(resource), range, context));
 	}
 
 	// --- formatting
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 76c30af3a0f..f09585c5473 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -12,6 +12,7 @@ import * as vscode from 'vscode';
 import { isMarkdownString } from 'vs/base/common/htmlContent';
 import { IRelativePattern } from 'vs/base/common/glob';
 import { relative } from 'path';
+import { startsWith } from 'vs/base/common/strings';
 
 export class Disposable {
 
@@ -818,12 +819,39 @@ export class CodeAction {
 
 	dianostics?: Diagnostic[];
 
+	scope?: CodeActionKind;
+
 	constructor(title: string, edit?: WorkspaceEdit) {
 		this.title = title;
 		this.edit = edit;
 	}
 }
 
+
+export class CodeActionKind {
+	private static readonly sep = '.';
+
+	public static readonly Empty = new CodeActionKind('');
+	public static readonly QuickFix = new CodeActionKind('quickfix');
+	public static readonly Refactor = new CodeActionKind('refactor');
+	public static readonly RefactorExtract = CodeActionKind.Refactor.append('extract');
+	public static readonly RefactorInline = CodeActionKind.Refactor.append('inline');
+	public static readonly RefactorRewrite = CodeActionKind.Refactor.append('rewrite');
+
+	constructor(
+		public readonly value: string
+	) { }
+
+	public append(parts: string): CodeActionKind {
+		return new CodeActionKind(this.value ? this.value + CodeActionKind.sep + parts : parts);
+	}
+
+	public contains(other: CodeActionKind): boolean {
+		return this.value === other.value || startsWith(other.value, this.value + CodeActionKind.sep);
+	}
+}
+
+
 export class CodeLens {
 
 	range: Range;
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 256ebb6879f..e86703048ec 100644
--- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts
@@ -641,7 +641,7 @@ suite('ExtHostLanguageFeatures', function () {
 
 	// --- quick fix
 
-	test('Quick Fix, data conversion', function () {
+	test('Quick Fix, command data conversion', function () {
 
 		disposables.push(extHost.registerCodeActionProvider(defaultSelector, {
 			provideCodeActions(): vscode.Command[] {
@@ -665,6 +665,34 @@ suite('ExtHostLanguageFeatures', function () {
 		});
 	});
 
+	test('Quick Fix, code action data conversion', function () {
+
+		disposables.push(extHost.registerCodeActionProvider(defaultSelector, {
+			provideCodeActions(): vscode.CodeAction[] {
+				return [
+					{
+						title: 'Testing1',
+						command: { title: 'Testing1Command', command: 'test1' },
+						kind: types.CodeActionKind.Empty.append('test.scope')
+					}
+				];
+			}
+		}));
+
+		return rpcProtocol.sync().then(() => {
+			return getCodeActions(model, model.getFullModelRange()).then(value => {
+				assert.equal(value.length, 1);
+
+				const [first] = value;
+				assert.equal(first.title, 'Testing1');
+				assert.equal(first.command.title, 'Testing1Command');
+				assert.equal(first.command.id, 'test1');
+				assert.equal(first.kind, 'test.scope');
+			});
+		});
+	});
+
+
 	test('Cannot read property \'id\' of undefined, #29469', function () {
 
 		disposables.push(extHost.registerCodeActionProvider(defaultSelector, {

From 3cb83387be101414346eb40c820eeb26d09e0b70 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 11:48:35 -0800
Subject: [PATCH 504/710] Use CodeActionKind.append

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

diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index f09585c5473..954042a7958 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -832,8 +832,8 @@ export class CodeActionKind {
 	private static readonly sep = '.';
 
 	public static readonly Empty = new CodeActionKind('');
-	public static readonly QuickFix = new CodeActionKind('quickfix');
-	public static readonly Refactor = new CodeActionKind('refactor');
+	public static readonly QuickFix = CodeActionKind.Empty.append('quickfix');
+	public static readonly Refactor = CodeActionKind.Empty.append('refactor');
 	public static readonly RefactorExtract = CodeActionKind.Refactor.append('extract');
 	public static readonly RefactorInline = CodeActionKind.Refactor.append('inline');
 	public static readonly RefactorRewrite = CodeActionKind.Refactor.append('rewrite');

From 6316a4d0c810e24818b0810c8290b82ac5ddacfe Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 11:59:17 -0800
Subject: [PATCH 505/710] Take kind instead of edit in CodeAction ctor

Changes the `CodeAction` constructor to take a kind instead of an edit. This makes the API more consistent IMO, as now both `edit` and `command` are set the same way
---
 .../src/features/quickFixProvider.ts          |  9 +++---
 .../src/features/refactorProvider.ts          | 28 ++++++++-----------
 src/vs/vscode.d.ts                            |  8 +++---
 .../workbench/api/node/extHostApiCommands.ts  |  6 ++--
 src/vs/workbench/api/node/extHostTypes.ts     |  6 ++--
 5 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/extensions/typescript/src/features/quickFixProvider.ts b/extensions/typescript/src/features/quickFixProvider.ts
index 4c4a86d1d97..d83c23d64da 100644
--- a/extensions/typescript/src/features/quickFixProvider.ts
+++ b/extensions/typescript/src/features/quickFixProvider.ts
@@ -131,10 +131,8 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 		diagnostic: vscode.Diagnostic,
 		tsAction: Proto.CodeFixAction
 	): vscode.CodeAction {
-		const codeAction = new vscode.CodeAction(
-			tsAction.description,
-			getEditForCodeAction(this.client, tsAction));
-
+		const codeAction = new vscode.CodeAction(tsAction.description, vscode.CodeActionKind.QuickFix);
+		codeAction.edit = getEditForCodeAction(this.client, tsAction);
 		codeAction.diagnostics = [diagnostic];
 		if (tsAction.commands) {
 			codeAction.command = {
@@ -172,7 +170,8 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
 
 			const codeAction = new vscode.CodeAction(
 				localize('fixAllInFileLabel', '{0} (Fix all in file)', tsAction.description),
-				createWorkspaceEditFromFileCodeEdits(this.client, combinedCodeFixesResponse.body.changes));
+				vscode.CodeActionKind.QuickFix);
+			codeAction.edit = createWorkspaceEditFromFileCodeEdits(this.client, combinedCodeFixesResponse.body.changes);
 			codeAction.diagnostics = [diagnostic];
 			if (tsAction.commands) {
 				codeAction.command = {
diff --git a/extensions/typescript/src/features/refactorProvider.ts b/extensions/typescript/src/features/refactorProvider.ts
index 45e47597017..088d8879059 100644
--- a/extensions/typescript/src/features/refactorProvider.ts
+++ b/extensions/typescript/src/features/refactorProvider.ts
@@ -144,26 +144,22 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv
 			const actions: vscode.CodeAction[] = [];
 			for (const info of response.body) {
 				if (info.inlineable === false) {
-					actions.push({
+					const codeAction = new vscode.CodeAction(info.description, vscode.CodeActionKind.Refactor);
+					codeAction.command = {
 						title: info.description,
-						command: {
-							title: info.description,
-							command: SelectRefactorCommand.ID,
-							arguments: [document, file, info, range]
-						},
-						kind: vscode.CodeActionKind.Refactor
-					});
+						command: SelectRefactorCommand.ID,
+						arguments: [document, file, info, range]
+					};
+					actions.push(codeAction);
 				} else {
 					for (const action of info.actions) {
-						actions.push({
+						const codeAction = new vscode.CodeAction(action.description, TypeScriptRefactorProvider.getKind(action));
+						codeAction.command = {
 							title: action.description,
-							command: {
-								title: action.description,
-								command: ApplyRefactoringCommand.ID,
-								arguments: [document, file, info.name, action.name, range]
-							},
-							kind: TypeScriptRefactorProvider.getKind(action)
-						});
+							command: ApplyRefactoringCommand.ID,
+							arguments: [document, file, info.name, action.name, range]
+						};
+						actions.push(codeAction);
 					}
 				}
 			}
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
index b0582117933..184c8b3f110 100644
--- a/src/vs/vscode.d.ts
+++ b/src/vs/vscode.d.ts
@@ -1897,7 +1897,7 @@ declare module 'vscode' {
 	export class CodeAction {
 
 		/**
-		 * A short, human-readanle, title for this code action.
+		 * A short, human-readable, title for this code action.
 		 */
 		title: string;
 
@@ -1925,7 +1925,7 @@ declare module 'vscode' {
 		 *
 		 * Used to filter code actions.
 		 */
-		readonly kind?: CodeActionKind;
+		kind?: CodeActionKind;
 
 		/**
 		 * Creates a new code action.
@@ -1934,9 +1934,9 @@ declare module 'vscode' {
 		 * or a [command](#CodeAction.command).
 		 *
 		 * @param title The title of the code action.
-		 * @param edits The edit of the code action.
+		 * @param kind The kind of the code action.
 		 */
-		constructor(title: string, edit?: WorkspaceEdit);
+		constructor(title: string, kind?: CodeActionKind);
 	}
 
 	/**
diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts
index 9790068a020..f95fca70c42 100644
--- a/src/vs/workbench/api/node/extHostApiCommands.ts
+++ b/src/vs/workbench/api/node/extHostApiCommands.ts
@@ -417,10 +417,10 @@ export class ExtHostApiCommands {
 				} else {
 					const ret = new types.CodeAction(
 						codeAction.title,
-						typeConverters.WorkspaceEdit.to(codeAction.edit)
+						codeAction.kind ? new types.CodeActionKind(codeAction.kind) : undefined
 					);
-					if (codeAction.kind) {
-						ret.scope = new types.CodeActionKind(codeAction.kind);
+					if (codeAction.edit) {
+						ret.edit = typeConverters.WorkspaceEdit.to(codeAction.edit);
 					}
 					return ret;
 				}
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index 954042a7958..761ffee7608 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -819,11 +819,11 @@ export class CodeAction {
 
 	dianostics?: Diagnostic[];
 
-	scope?: CodeActionKind;
+	kind?: CodeActionKind;
 
-	constructor(title: string, edit?: WorkspaceEdit) {
+	constructor(title: string, kind?: CodeActionKind) {
 		this.title = title;
-		this.edit = edit;
+		this.kind = kind;
 	}
 }
 

From 80991ce8a05bc57d2fd1b1c0451860fb1c47579d Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Mon, 22 Jan 2018 11:56:02 -0800
Subject: [PATCH 506/710] Fix terminal links sometimes not working before
 scroll

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

diff --git a/package.json b/package.json
index 5720232afe8..965756d054b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.0",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.1.0-beta6",
+    "vscode-xterm": "3.1.0-beta7",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 50fc2a3bae6..91fc8617773 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.1.0-beta6:
-  version "3.1.0-beta6"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta6.tgz#0ff44249ac141e9f6dbcf0b7628d0b8d87e69abf"
+vscode-xterm@3.1.0-beta7:
+  version "3.1.0-beta7"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta7.tgz#10b0162baf8ddbf8454ba3ccb723c8808f8803af"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"

From d7b6e7d7f684e07e7f24aa47b359bdfcb0cb6bc5 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 22 Jan 2018 11:53:35 -0800
Subject: [PATCH 507/710] No resizing of inputs in issue reporter, fixes #41992

---
 src/vs/code/electron-browser/issue/issueReporterMain.ts    | 2 +-
 src/vs/code/electron-browser/issue/media/issueReporter.css | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index f37957e1518..898e52222bf 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -95,7 +95,7 @@ export class IssueReporter extends Disposable {
 		if (styles.inputBorder) {
 			content.push(`input, textarea, select { border: 1px solid ${styles.inputBorder}; }`);
 		} else {
-			content.push(`input, textarea, select { border: none; }`);
+			content.push(`input, textarea, select { border: 1px solid transparent; }`);
 		}
 
 		if (styles.inputForeground) {
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index cb43afc9bc1..e4ca54e35b5 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -165,9 +165,14 @@ button:disabled {
 }
 
 select, input, textarea {
+	border: 1px solid transparent;
 	margin-top: 10px;
 }
 
+summary {
+	border: 1px solid transparent;
+}
+
 .validation-error {
 	font-size: 12px;
 	font-weight: bold;

From 09c9d52e3f137b7de9b3fdf20c636ea074e9584a Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 12:51:04 -0800
Subject: [PATCH 508/710] snapshot for empty file

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 9c4b974dd11..6af4001ded7 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -164,14 +164,27 @@ class PieceTreeSnapshot implements ITextSnapshot {
 		this._nodes = [];
 		this._tree = tree;
 		this._BOM = BOM;
-		tree.iterate(tree.root, node => {
-			this._nodes.push(node);
-			return true;
-		});
 		this._index = 0;
+		if (tree.root !== SENTINEL) {
+			tree.iterate(tree.root, node => {
+				if (node !== SENTINEL) {
+					this._nodes.push(node);
+				}
+				return true;
+			});
+		}
 	}
 
 	read(): string {
+		if (this._nodes.length === 0) {
+			if (this._index === 0) {
+				this._index++;
+				return this._BOM;
+			} else {
+				return null;
+			}
+		}
+
 		if (this._index > this._nodes.length - 1) {
 			return null;
 		}

From 220f4b56cced5237690f85269a2740c07ffcc540 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 13:04:35 -0800
Subject: [PATCH 509/710] fix integration test save for untitle file

---
 .../editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 6af4001ded7..e9e428b9106 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -290,6 +290,9 @@ export class PieceTreeBase {
 
 		let offset = 0;
 		let ret = this.iterate(this.root, node => {
+			if (node === SENTINEL) {
+				return true;
+			}
 			let str = this.getNodeContent(node);
 			let len = str.length;
 			let startPosition = other.nodeAt(offset);

From fc691f719c46bd6ea923a82ccf3b5fbcface3f7e Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 22 Jan 2018 13:33:44 -0800
Subject: [PATCH 510/710] Update issue reporter wording, fixes #41994

---
 .../code/electron-browser/issue/issueReporter.html   | 12 ++++++------
 .../code/electron-browser/issue/issueReporterMain.ts |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporter.html b/src/vs/code/electron-browser/issue/issueReporter.html
index 553c3d51de5..ad3010252ec 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -9,7 +9,7 @@
 		
    
 
 			
    
-				
+				
 				
 				
    
 				
    
@@ -42,7 +42,7 @@
 					
    
 						My System Info
 							
-								
+								
 							
 						
 						
    
@@ -54,7 +54,7 @@
 					
    
 						Currently Running Processes
 							
-								
+								
 							
 						
 						
    
@@ -66,7 +66,7 @@
 					
    
 						My Workspace Stats
 							
-								
+								
 							
 						
 						
    @@ -86,7 +86,7 @@
 					
    
 						
 								We support GitHub-flavored Markdown.
-								After submitting, you will still be able to edit your issue on GitHub.
+								You will still be able to edit your issue when we preview it on GitHub.
 							
 						
 						
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 898e52222bf..c5300541bde 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -246,9 +246,9 @@ export class IssueReporter extends Disposable {
 			hide(processBlock);
 			hide(workspaceBlock);
 
-			descriptionTitle.innerHTML = 'Steps to reproduce *';
+			descriptionTitle.innerHTML = 'Steps to Reproduce *';
 			show(descriptionSubtitle);
-			descriptionSubtitle.innerHTML = 'How did you encounter this problem? Clear steps to reproduce the problem help our investigation. What did you expect to happen and what actually happened?';
+			descriptionSubtitle.innerHTML = 'How did you encounter this problem? Please provide clear steps to reproduce the problem during our investigation. What did you expect to happen and what actually did happen?';
 		}
 		// 2 - Perf Issue
 		else if (issueType === 1) {
@@ -256,7 +256,7 @@ export class IssueReporter extends Disposable {
 			show(processBlock);
 			show(workspaceBlock);
 
-			descriptionTitle.innerHTML = 'Steps to reproduce *';
+			descriptionTitle.innerHTML = 'Steps to Reproduce *';
 			show(descriptionSubtitle);
 			descriptionSubtitle.innerHTML = 'When did this performance issue happen? For example, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.';
 		}

From 62fd6577aaa351eba77528da91a683a54698a85c Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 14:08:00 -0800
Subject: [PATCH 511/710] Use POST request for settings search

---
 .../electron-browser/preferencesSearch.ts     | 70 ++++++++++++-------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index e1ed15f5bd7..5f138ef5e40 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -19,6 +19,7 @@ import { IRequestService } from 'vs/platform/request/node/request';
 import { asJson } from 'vs/base/node/request';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export interface IEndpointDetails {
 	urlBase: string;
@@ -120,6 +121,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 	constructor(filter: string, private endpoint: IEndpointDetails, private installedExtensions: TPromise, private newExtensionsOnly: boolean,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IRequestService private requestService: IRequestService,
+		@ILogService private logService: ILogService
 	) {
 		this._filter = filter;
 
@@ -168,9 +170,14 @@ export class RemoteSearchProvider implements ISearchProvider {
 
 	private getSettingsFromBing(filter: string): TPromise {
 		const start = Date.now();
-		return this.prepareUrl(filter).then(url => {
+		return this.prepareRequest(filter).then(details => {
+			this.logService.debug(`Searching settings via ${details.url}`);
+			this.logService.debug(`Body: ${details.body}`);
+
 			return this.requestService.request({
-				url,
+				type: 'POST',
+				url: details.url,
+				data: details.body,
 				headers: {
 					'User-Agent': 'request',
 					'Content-Type': 'application/json; charset=utf-8',
@@ -179,7 +186,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 				timeout: 5000
 			}).then(context => {
 				if (context.res.statusCode >= 300) {
-					throw new Error(`${url} returned status code: ${context.res.statusCode}`);
+					throw new Error(`${details} returned status code: ${context.res.statusCode}`);
 				}
 
 				return asJson(context);
@@ -201,7 +208,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 				});
 
 				return {
-					remoteUrl: url,
+					remoteUrl: details.url, // telemetry for filter text?
 					duration,
 					timestamp,
 					scoredResults,
@@ -223,7 +230,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 		};
 	}
 
-	private prepareUrl(query: string): TPromise {
+	private async prepareRequest(query: string): TPromise<{ url: string, body?: string }> {
 		query = escapeSpecialChars(query);
 		const boost = 10;
 		const userQuery = `(${query})^${boost}`;
@@ -237,16 +244,24 @@ export class RemoteSearchProvider implements ISearchProvider {
 		const buildNumber = this.environmentService.settingsSearchBuildId;
 		if (this.endpoint.key) {
 			url += `${API_VERSION}&${QUERY_TYPE}`;
-			url += `&search=${encodedQuery}`;
+		}
 
-			if (this.newExtensionsOnly) {
-				return TPromise.wrap(url);
-			} else {
-				return this.getVersionAndExtensionFilters(buildNumber).then(filters => {
-					url += `&$filter=${filters.join(' or ')}`;
-					return url;
-				});
-			}
+		const usePost = true;
+		if (usePost) {
+			const filters = this.newExtensionsOnly ?
+				[`diminish eq 'latest'`] :
+				await this.getVersionFilters(buildNumber);
+
+			const filterStr = encodeURIComponent(filters.join(' or '));
+			const body = JSON.stringify({
+				query: encodedQuery,
+				filters: filterStr
+			});
+
+			return {
+				url,
+				body
+			};
 		} else {
 			url += `query=${encodedQuery}`;
 
@@ -255,20 +270,15 @@ export class RemoteSearchProvider implements ISearchProvider {
 			}
 		}
 
-		return TPromise.wrap(url);
+		return TPromise.wrap({ url });
 	}
 
-	private getVersionAndExtensionFilters(buildNumber?: number): TPromise {
+	private getVersionFilters(buildNumber?: number): TPromise {
 		return this.installedExtensions.then(exts => {
-			const filters = exts.map(ext => {
-				const uuid = ext.identifier.uuid;
-				const versionString = ext.manifest.version
-					.split('.')
-					.map(versionPart => strings.pad(versionPart, 10))
-					.join('');
-
-				return `(packageid eq '${uuid}' and startbuildno le '${versionString}' and endbuildno ge '${versionString}')`;
-			});
+			// Only search extensions that contribute settings
+			const filters = exts
+				.filter(ext => ext.manifest.contributes && ext.manifest.contributes.configuration)
+				.map(ext => this.getExtensionFilter(ext));
 
 			if (buildNumber) {
 				filters.push(`(packageid eq 'core' and startbuildno le '${buildNumber}' and endbuildno ge '${buildNumber}')`);
@@ -277,6 +287,16 @@ export class RemoteSearchProvider implements ISearchProvider {
 			return filters;
 		});
 	}
+
+	private getExtensionFilter(ext: ILocalExtension): string {
+		const uuid = ext.identifier.uuid;
+		const versionString = ext.manifest.version
+			.split('.')
+			.map(versionPart => strings.pad(versionPart, 10))
+			.join('');
+
+		return `(packageid eq '${uuid}' and startbuildno le '${versionString}' and endbuildno ge '${versionString}')`;
+	}
 }
 
 const API_VERSION = 'api-version=2016-09-01-Preview';

From eefac3921e41a9c10d951a71b69e33ee661eb67b Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 14:26:45 -0800
Subject: [PATCH 512/710] Also filter settings search by extension package id

---
 .../parts/preferences/common/preferences.ts   |  3 +-
 .../preferences/common/preferencesModels.ts   |  2 +-
 .../electron-browser/preferencesSearch.ts     | 34 ++++++++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index ff7620dee0f..52694d377cd 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -89,6 +89,7 @@ export interface IScoredResults {
 export interface IRemoteSetting {
 	score: number;
 	key: string;
+	id: string;
 	defaultValue: string;
 	description: string;
 	packageId: string;
@@ -111,7 +112,7 @@ export interface IPreferencesEditorModel {
 }
 
 export type IGroupFilter = (group: ISettingsGroup) => boolean;
-export type ISettingMatcher = (setting: ISetting) => { matches: IRange[], score: number };
+export type ISettingMatcher = (setting: ISetting, group: ISettingsGroup) => { matches: IRange[], score: number };
 
 export interface ISettingsEditorModel extends IPreferencesEditorModel {
 	readonly onDidChangeGroups: Event;
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index e9e5d435af2..959b05501d2 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -57,7 +57,7 @@ export abstract class AbstractSettingsModel extends EditorModel {
 			const groupMatched = groupFilter(group);
 			for (const section of group.sections) {
 				for (const setting of section.settings) {
-					const settingMatchResult = settingMatcher(setting);
+					const settingMatchResult = settingMatcher(setting, group);
 
 					if (groupMatched || settingMatchResult) {
 						filterMatches.push({
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 5f138ef5e40..d91e3a967bf 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -20,6 +20,7 @@ import { asJson } from 'vs/base/node/request';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILogService } from 'vs/platform/log/common/log';
+import { IStringDictionary } from 'vs/base/common/collections';
 
 export interface IEndpointDetails {
 	urlBase: string;
@@ -125,8 +126,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 	) {
 		this._filter = filter;
 
-		// @queries are always handled by local filter
-		this._remoteSearchP = filter && !strings.startsWith(filter, '@') ?
+		this._remoteSearchP = filter ?
 			this.getSettingsFromBing(filter) :
 			TPromise.wrap(null);
 	}
@@ -194,17 +194,23 @@ export class RemoteSearchProvider implements ISearchProvider {
 				const timestamp = Date.now();
 				const duration = timestamp - start;
 				const remoteSettings: IRemoteSetting[] = (result.value || [])
-					.map(r => ({
-						key: JSON.parse(r.setting || r.Setting),
-						defaultValue: r['value'],
-						score: r['@search.score'],
-						description: JSON.parse(r['details']),
-						packageId: r['packageid']
-					}));
+					.map(r => {
+						const key = JSON.parse(r.setting || r.Setting);
+						const packageId = r['packageid'];
+						const id = getSettingKey(packageId, key);
+						return {
+							key,
+							id,
+							defaultValue: r['value'],
+							score: r['@search.score'],
+							description: JSON.parse(r['details']),
+							packageId
+						};
+					});
 
 				const scoredResults = Object.create(null);
 				remoteSettings.forEach(s => {
-					scoredResults[s.key] = s;
+					scoredResults[s.id] = s;
 				});
 
 				return {
@@ -219,8 +225,8 @@ export class RemoteSearchProvider implements ISearchProvider {
 	}
 
 	private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher {
-		return (setting: ISetting) => {
-			const remoteSetting = scoredResults[setting.key];
+		return (setting: ISetting, group: ISettingsGroup) => {
+			const remoteSetting = scoredResults[getSettingKey(group.id, setting.key)];
 			if (remoteSetting && remoteSetting.score >= minScore) {
 				const settingMatches = new SettingMatches(this._filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
 				return { matches: settingMatches, score: remoteSetting.score };
@@ -299,6 +305,10 @@ export class RemoteSearchProvider implements ISearchProvider {
 	}
 }
 
+function getSettingKey(packageId: string, name: string): string {
+	return packageId + '_' + name;
+}
+
 const API_VERSION = 'api-version=2016-09-01-Preview';
 const QUERY_TYPE = 'querytype=full';
 

From 9081507e8930829ebc39cdc57589198ce5f9a08e Mon Sep 17 00:00:00 2001
From: Brian Schlenker 
Date: Mon, 22 Jan 2018 16:11:34 -0800
Subject: [PATCH 513/710] Add ability to zoom in/out on all images (#38538)

* Add ability to zoom in on small images

* Update image viewer to allow pinch or click to zoom

Images are now always centered in the window. They initially start at
their native size, unless they would be larger than the window, in which
case they are contained within the window. Clicking increases the
zoom, and alt+click decreases it. Pinch to zoom and ctrl+scroll are also
supported.

* Update resourceViewer to improve image viewing experience

ResourceViewer now holds a cache of image scales so they stay the same
while flipping between editor tabs. Right clicking now returns the image
to its original scale. Pixelation only triggers for images 64x64 or
smaller, and only after the first zoom. Editor risizing is handled
thorugh the layout call to the binary editor, passed down to the
resource viewer.
---
 .../ui/resourceviewer/resourceViewer.ts       | 131 ++++++++++++++++--
 .../ui/resourceviewer/resourceviewer.css      |  19 ++-
 .../browser/parts/editor/binaryEditor.ts      |  10 +-
 3 files changed, 139 insertions(+), 21 deletions(-)

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index 9f1e41502d2..a1e5c3fcb89 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -10,11 +10,12 @@ import nls = require('vs/nls');
 import mimes = require('vs/base/common/mime');
 import URI from 'vs/base/common/uri';
 import paths = require('vs/base/common/paths');
-import { Builder, $ } from 'vs/base/browser/builder';
+import { Builder, $, Dimension } from 'vs/base/browser/builder';
 import DOM = require('vs/base/browser/dom');
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { LRUCache } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
+import { clamp } from 'vs/base/common/numbers';
 
 interface MapExtToMediaMimes {
 	[index: string]: string;
@@ -78,6 +79,10 @@ export interface IResourceDescriptor {
 	mime: string;
 }
 
+enum ScaleDirection {
+	IN, OUT,
+}
+
 // Chrome is caching images very aggressively and so we use the ETag information to find out if
 // we need to bypass the cache or not. We could always bypass the cache everytime we show the image
 // however that has very bad impact on memory consumption because each time the image gets shown,
@@ -104,6 +109,13 @@ function imageSrc(descriptor: IResourceDescriptor): string {
 	return cached.src;
 }
 
+// store the scale of an image so it can be restored when changing editor tabs
+const IMAGE_SCALE_CACHE = new LRUCache(100);
+
+export interface ResourceViewerContext {
+	layout(dimension: Dimension);
+}
+
 /**
  * Helper to actually render the given resource into the provided container. Will adjust scrollbar (if provided) automatically based on loading
  * progress of the binary resource.
@@ -117,13 +129,19 @@ export class ResourceViewer {
 
 	private static readonly MAX_IMAGE_SIZE = ResourceViewer.MB; // showing images inline is memory intense, so we have a limit
 
+	private static SCALE_PINCH_FACTOR = 0.1;
+	private static SCALE_FACTOR = 1.5;
+	private static MAX_SCALE = 20;
+	private static MIN_SCALE = 0.1;
+	private static PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
+
 	public static show(
 		descriptor: IResourceDescriptor,
 		container: Builder,
 		scrollbar: DomScrollableElement,
 		openExternal: (uri: URI) => void,
 		metadataClb?: (meta: string) => void
-	): void {
+	): ResourceViewerContext {
 
 		// Ensure CSS class
 		$(container).setClass('monaco-resource-viewer');
@@ -144,28 +162,115 @@ export class ResourceViewer {
 		// Show Image inline unless they are large
 		if (mime.indexOf('image/') >= 0) {
 			if (ResourceViewer.inlineImage(descriptor)) {
+				const context = {
+					layout(dimension: Dimension) { }
+				};
 				$(container)
 					.empty()
-					.addClass('image')
+					.addClass('image', 'zoom-in')
 					.img({ src: imageSrc(descriptor) })
+					.addClass('untouched')
 					.on(DOM.EventType.LOAD, (e, img) => {
 						const imgElement = img.getHTMLElement();
-						if (imgElement.naturalWidth > imgElement.width || imgElement.naturalHeight > imgElement.height) {
-							$(container).addClass('oversized');
+						const cacheKey = descriptor.resource.toString();
+						let scaleDirection = ScaleDirection.IN;
+						let scale = IMAGE_SCALE_CACHE.get(cacheKey) || null;
+						if (scale) {
+							img.removeClass('untouched');
+							updateScale(scale);
+						}
 
-							img.on(DOM.EventType.CLICK, (e, img) => {
-								$(container).toggleClass('full-size');
+						function setImageWidth(width) {
+							img.style('width', `${width}px`);
+							img.style('height', 'auto');
+						}
 
-								scrollbar.scanDomNode();
+						function updateScale(newScale) {
+							scale = clamp(newScale, ResourceViewer.MIN_SCALE, ResourceViewer.MAX_SCALE);
+							setImageWidth(Math.floor(imgElement.naturalWidth * scale));
+							IMAGE_SCALE_CACHE.set(cacheKey, scale);
+
+							scrollbar.scanDomNode();
+
+							updateMetadata();
+						}
+
+						function updateMetadata() {
+							if (metadataClb) {
+								const scale = Math.round((imgElement.width / imgElement.naturalWidth) * 10000) / 100;
+								metadataClb(nls.localize('imgMeta', '{0}% {1}x{2} {3}',
+									scale,
+									imgElement.naturalWidth,
+									imgElement.naturalHeight,
+									ResourceViewer.formatSize(descriptor.size)));
+							}
+						}
+
+						context.layout = updateMetadata;
+
+						function firstZoom() {
+							const { clientWidth, naturalWidth } = imgElement;
+							setImageWidth(clientWidth);
+							img.removeClass('untouched');
+							if (imgElement.naturalWidth < ResourceViewer.PIXELATION_THRESHOLD
+								|| imgElement.naturalHeight < ResourceViewer.PIXELATION_THRESHOLD) {
+								img.addClass('pixelated');
+							}
+							scale = clientWidth / naturalWidth;
+						}
+
+						$(container)
+							.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => {
+								if (e.altKey) {
+									scaleDirection = ScaleDirection.OUT;
+									c.removeClass('zoom-in').addClass('zoom-out');
+								}
+							})
+							.on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => {
+								if (!e.altKey) {
+									scaleDirection = ScaleDirection.IN;
+									c.removeClass('zoom-out').addClass('zoom-in');
+								}
 							});
-						}
 
-						if (metadataClb) {
-							metadataClb(nls.localize('imgMeta', "{0}x{1} {2}", imgElement.naturalWidth, imgElement.naturalHeight, ResourceViewer.formatSize(descriptor.size)));
-						}
+						$(container).on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
+							if (scale === null) {
+								firstZoom();
+							}
+
+							// right click
+							if (e.button === 2) {
+								updateScale(1);
+							} else {
+								const scaleFactor = scaleDirection === ScaleDirection.IN
+									? ResourceViewer.SCALE_FACTOR
+									: 1 / ResourceViewer.SCALE_FACTOR;
+
+								updateScale(scale * scaleFactor);
+							}
+						});
+
+						$(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => {
+							// pinching is reported as scroll wheel + ctrl
+							if (!e.ctrlKey) {
+								return;
+							}
+
+							if (scale === null) {
+								firstZoom();
+							}
+
+							// scrolling up, pinching out should increase the scale
+							const delta = -e.deltaY;
+							updateScale(scale + delta * ResourceViewer.SCALE_PINCH_FACTOR);
+						});
+
+						updateMetadata();
 
 						scrollbar.scanDomNode();
 					});
+
+				return context;
 			} else {
 				const imageContainer = $(container)
 					.empty()
@@ -199,6 +304,8 @@ export class ResourceViewer {
 
 			scrollbar.scanDomNode();
 		}
+
+		return null;
 	}
 
 	private static inlineImage(descriptor: IResourceDescriptor): boolean {
diff --git a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
index c4badd1d2c5..98110688e66 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
+++ b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
@@ -16,6 +16,7 @@
 	padding: 10px 10px 0 10px;
 	background-position: 0 0, 8px 8px;
 	background-size: 16px 16px;
+	display: grid;
 }
 
 .monaco-resource-viewer.image.full-size {
@@ -34,18 +35,24 @@
 		linear-gradient(45deg, rgb(20, 20, 20) 25%, transparent 25%, transparent 75%, rgb(20, 20, 20) 75%, rgb(20, 20, 20));
 }
 
-.monaco-resource-viewer img {
+.monaco-resource-viewer img.untouched {
 	max-width: 100%;
-	max-height: calc(100% - 10px); /* somehow this prevents scrollbars from showing up */
+	object-fit: contain;
 }
 
-.monaco-resource-viewer.oversized img {
+.monaco-resource-viewer img.pixelated {
+	image-rendering: pixelated;
+}
+
+.monaco-resource-viewer img {
+	margin: auto; /* centers the image */
+}
+
+.monaco-resource-viewer.zoom-in {
 	cursor: zoom-in;
 }
 
-.monaco-resource-viewer.full-size img {
-	max-width: initial;
-	max-height: initial;
+.monaco-resource-viewer.zoom-out {
 	cursor: zoom-out;
 }
 
diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
index 282705c8e74..8d4b64f9f4b 100644
--- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts
+++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts
@@ -10,7 +10,7 @@ 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 { ResourceViewer } from 'vs/base/browser/ui/resourceviewer/resourceViewer';
+import { ResourceViewer, ResourceViewerContext } from 'vs/base/browser/ui/resourceviewer/resourceViewer';
 import { EditorModel, EditorInput, EditorOptions } from 'vs/workbench/common/editor';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
@@ -29,6 +29,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 	private binaryContainer: Builder;
 	private scrollbar: DomScrollableElement;
+	private resourceViewerContext: ResourceViewerContext;
 
 	constructor(
 		id: string,
@@ -87,7 +88,7 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 				// Render Input
 				const model = resolvedModel;
-				ResourceViewer.show(
+				this.resourceViewerContext = ResourceViewer.show(
 					{ name: model.getName(), resource: model.getResource(), size: model.getSize(), etag: model.getETag(), mime: model.getMime() },
 					this.binaryContainer,
 					this.scrollbar,
@@ -132,6 +133,9 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 		// Pass on to Binary Container
 		this.binaryContainer.size(dimension.width, dimension.height);
 		this.scrollbar.scanDomNode();
+		if (this.resourceViewerContext) {
+			this.resourceViewerContext.layout(dimension);
+		}
 	}
 
 	public focus(): void {
@@ -146,4 +150,4 @@ export abstract class BaseBinaryResourceEditor extends BaseEditor {
 
 		super.dispose();
 	}
-}
\ No newline at end of file
+}

From 3fc5ab42da1d81167a3a467608914693f0e53399 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 14:43:09 -0800
Subject: [PATCH 514/710] Use flatten

---
 .../goToDeclaration/goToDeclaration.ts        | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts
index b3ecb2c6d4b..f79912d8323 100644
--- a/src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts
+++ b/src/vs/editor/contrib/goToDeclaration/goToDeclaration.ts
@@ -14,20 +14,7 @@ import { DefinitionProviderRegistry, ImplementationProviderRegistry, TypeDefinit
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { asWinJsPromise } from 'vs/base/common/async';
 import { Position } from 'vs/editor/common/core/position';
-
-function outputResults(promises: TPromise[]) {
-	return TPromise.join(promises).then(allReferences => {
-		let result: Location[] = [];
-		for (let references of allReferences) {
-			if (Array.isArray(references)) {
-				result.push(...references);
-			} else if (references) {
-				result.push(references);
-			}
-		}
-		return result;
-	});
-}
+import { flatten } from 'vs/base/common/arrays';
 
 function getDefinitions(
 	model: ITextModel,
@@ -38,7 +25,7 @@ function getDefinitions(
 	const provider = registry.ordered(model);
 
 	// get results
-	const promises = provider.map((provider, idx) => {
+	const promises = provider.map((provider, idx): TPromise => {
 		return asWinJsPromise((token) => {
 			return provide(provider, model, position, token);
 		}).then(undefined, err => {
@@ -46,7 +33,9 @@ function getDefinitions(
 			return null;
 		});
 	});
-	return outputResults(promises);
+	return TPromise.join(promises)
+		.then(flatten)
+		.then(references => references.filter(x => !!x));
 }
 
 

From 5d397568b566fe11e78ba59cb28b16f191041cd9 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 16:18:32 -0800
Subject: [PATCH 515/710] Add refactor editor action

Adds a new refactor editor action. This action shows a lightbulb context menu with only code actions of kind `refactor.*`
---
 .../contrib/quickFix/codeActionTrigger.ts     |  1 +
 .../contrib/quickFix/quickFixCommands.ts      | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/vs/editor/contrib/quickFix/codeActionTrigger.ts b/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
index 0cd81d55df8..a210e484446 100644
--- a/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
+++ b/src/vs/editor/contrib/quickFix/codeActionTrigger.ts
@@ -9,6 +9,7 @@ export class CodeActionKind {
 	private static readonly sep = '.';
 
 	public static readonly Empty = new CodeActionKind('');
+	public static readonly Refactor = new CodeActionKind('refactor');
 
 	constructor(
 		public readonly value: string
diff --git a/src/vs/editor/contrib/quickFix/quickFixCommands.ts b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
index 9850c794400..15f8c5ee8d8 100644
--- a/src/vs/editor/contrib/quickFix/quickFixCommands.ts
+++ b/src/vs/editor/contrib/quickFix/quickFixCommands.ts
@@ -222,6 +222,30 @@ export class CodeActionCommand extends EditorCommand {
 	}
 }
 
+
+export class RefactorAction extends EditorAction {
+
+	static readonly Id = 'editor.action.refactor';
+
+	constructor() {
+		super({
+			id: RefactorAction.Id,
+			label: nls.localize('refactor.label', "Refactor"),
+			alias: 'Refactor',
+			precondition: ContextKeyExpr.and(EditorContextKeys.writable, EditorContextKeys.hasCodeActionsProvider)
+		});
+	}
+
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
+		const controller = QuickFixController.get(editor);
+		if (controller) {
+			controller.triggerCodeActionFromEditorSelection(CodeActionKind.Refactor, CodeActionAutoApply.Never);
+		}
+	}
+}
+
+
 registerEditorContribution(QuickFixController);
 registerEditorAction(QuickFixAction);
+registerEditorAction(RefactorAction);
 registerEditorCommand(new CodeActionCommand());

From c09f39ff8094bb5079cc3b2765f4b76c5c63dfba Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Mon, 22 Jan 2018 16:20:52 -0800
Subject: [PATCH 516/710] Issue Reporter: Preview on 'Shift Enter', fixes
 #41996

---
 .../electron-browser/issue/issueReporterMain.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index c5300541bde..0b8148580cc 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import 'vs/css!./media/issueReporter';
-import { shell, ipcRenderer, webFrame } from 'electron';
+import { shell, ipcRenderer, webFrame, remote } from 'electron';
 import { $ } from 'vs/base/browser/dom';
 import * as browser from 'vs/base/browser/browser';
 import product from 'vs/platform/node/product';
@@ -228,6 +228,15 @@ export class IssueReporter extends Disposable {
 		});
 
 		document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue());
+
+		document.onkeydown = (e: KeyboardEvent) => {
+			if (e.shiftKey && e.keyCode === 13) {
+				// Close the window if the issue was successfully created
+				if (this.createIssue()) {
+					remote.getCurrentWindow().close();
+				}
+			}
+		};
 	}
 
 	private renderBlocks(): void {
@@ -294,7 +303,7 @@ export class IssueReporter extends Disposable {
 		return isValid;
 	}
 
-	private createIssue(): void {
+	private createIssue(): boolean {
 		if (!this.validateInputs()) {
 			// If inputs are invalid, set focus to the first one and add listeners on them
 			// to detect further changes
@@ -307,7 +316,8 @@ export class IssueReporter extends Disposable {
 			document.getElementById('description').addEventListener('input', (event) => {
 				this.validateInput('description');
 			});
-			return;
+
+			return false;
 		}
 
 		if (this.telemetryService) {
@@ -323,6 +333,7 @@ export class IssueReporter extends Disposable {
 		const baseUrl = `https://github.com/microsoft/vscode/issues/new?title=${issueTitle}&body=`;
 		const issueBody = this.issueReporterModel.serialize();
 		shell.openExternal(baseUrl + encodeURIComponent(issueBody));
+		return true;
 	}
 
 	/**

From 20cc7d1957a8b6c445a6ee8bc87ed649a24c0ebe Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 17:10:23 -0800
Subject: [PATCH 517/710] Show codelenses for new extension search results

---
 .../preferences/browser/preferencesEditor.ts  | 25 +++---
 .../browser/preferencesRenderers.ts           | 89 +++++++++----------
 .../parts/preferences/common/preferences.ts   |  7 ++
 .../preferences/common/preferencesModels.ts   | 44 ++++-----
 .../electron-browser/preferencesSearch.ts     | 20 ++++-
 5 files changed, 102 insertions(+), 83 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index d8f1a411ebf..158b44e088b 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -366,7 +366,7 @@ class PreferencesRenderersController extends Disposable {
 	private _editablePreferencesRendererDisposables: IDisposable[] = [];
 
 	private _settingsNavigator: SettingsNavigator;
-	private _remoteFiltersInProgress: TPromise[];
+	private _remoteFilterInProgress: TPromise;
 
 	private _currentLocalSearchProvider: ISearchProvider;
 	private _currentRemoteSearchProvider: ISearchProvider;
@@ -427,21 +427,19 @@ class PreferencesRenderersController extends Disposable {
 	}
 
 	remoteSearchPreferences(query: string, updateCurrentResults?: boolean): TPromise {
-		if (this._remoteFiltersInProgress) {
+		if (this._remoteFilterInProgress && this._remoteFilterInProgress.cancel) {
 			// Resolved/rejected promises have no .cancel()
-			this._remoteFiltersInProgress.forEach(p => p.cancel && p.cancel());
+			this._remoteFilterInProgress.cancel();
 		}
 
 		this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query);
 		this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true);
 
-		this._remoteFiltersInProgress = [
-			this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1),
-			this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results"), 2)
-		];
+		this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1)
+			.then(result => this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results"), 2));
 
-		return TPromise.join(this._remoteFiltersInProgress).then(() => {
-			this._remoteFiltersInProgress = null;
+		return this._remoteFilterInProgress.then(() => {
+			this._remoteFilterInProgress = null;
 		}, err => {
 			if (isPromiseCanceledError(err)) {
 				return null;
@@ -456,13 +454,12 @@ class PreferencesRenderersController extends Disposable {
 		return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0);
 	}
 
-	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, newExtensionsOnly?: boolean): TPromise {
+	private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise {
 		this._lastQuery = query;
 
-		const filterPs = [this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)];
-		if (!newExtensionsOnly) {
-			filterPs.push(this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder));
-		}
+		const filterPs = [
+			this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder),
+			this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)];
 
 		return TPromise.join(filterPs).then(results => {
 			const [defaultFilterResult, editableFilterResult] = results;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index edbd73470a7..c36f7249579 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -17,7 +17,7 @@ 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, IScoredResults, IWorkbenchSettingsConfiguration } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IScoredResults, IWorkbenchSettingsConfiguration, IRemoteSetting, IExtensionSetting } from 'vs/workbench/parts/preferences/common/preferences';
 import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { IContextMenuService, ContextSubMenu } from 'vs/platform/contextview/browser/contextView';
@@ -34,7 +34,8 @@ 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';
-import { ICommandService } from 'vs/platform/commands/common/commands';
+import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes';
+import { CancellationToken } from 'vs/base/common/cancellation';
 
 export interface IPreferencesRenderer extends IDisposable {
 	readonly preferencesModel: IPreferencesEditorModel;
@@ -310,6 +311,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR
 
 	public filterPreferences(filterResult: IFilterResult): void {
 		this.filterResult = filterResult;
+
 		if (filterResult) {
 			this.filteredMatchesRenderer.render(filterResult, this.preferencesModel.settingsGroups);
 			this.settingsGroupTitleRenderer.render(filterResult.filteredGroups);
@@ -622,20 +624,23 @@ export class FeedbackWidgetRenderer extends Disposable {
 
 		const result = this._currentResult;
 		const actualResults = result.metadata.scoredResults;
-		const actualResultNames = Object.keys(actualResults);
+		const actualResultIds = Object.keys(actualResults);
 
 		const feedbackQuery: any = {};
 		feedbackQuery['comment'] = FeedbackWidgetRenderer.DEFAULT_COMMENT_TEXT;
 		feedbackQuery['queryString'] = result.query;
 		feedbackQuery['resultScores'] = {};
-		actualResultNames.forEach(settingKey => {
-			feedbackQuery['resultScores'][settingKey] = 10;
+		actualResultIds.forEach(settingId => {
+			const outputKey = actualResults[settingId].key;
+			feedbackQuery['resultScores'][outputKey] = 10;
 		});
 		feedbackQuery['alts'] = [];
 
 		const contents = FeedbackWidgetRenderer.INSTRUCTION_TEXT + '\n' +
 			JSON.stringify(feedbackQuery, undefined, '    ') + '\n\n' +
-			actualResultNames.map(name => `// ${name}: ${result.metadata.scoredResults[name]}`).join('\n');
+			actualResultIds.map(name => {
+				return `// ${actualResults[name].key}: ${actualResults[name].score}`;
+			}).join('\n');
 
 		this.editorService.openEditor({ contents, language: 'jsonc' }, /*sideBySide=*/true).then(feedbackEditor => {
 			const sendFeedbackWidget = this._register(this.instantiationService.createInstance(FloatingClickWidget, feedbackEditor.getControl(), 'Send feedback', null));
@@ -842,54 +847,48 @@ export class HighlightMatchesRenderer extends Disposable {
 	}
 }
 
-export class ExtensionCodelensRenderer extends Disposable {
-	private decorationIds: string[] = [];
+export class ExtensionCodelensRenderer extends Disposable implements CodeLensProvider {
+	private filterResult: IFilterResult;
 
-	constructor(private editor: ICodeEditor,
-		@ICommandService private commandService: ICommandService) {
+	constructor() {
 		super();
+		this._register(CodeLensProviderRegistry.register({ pattern: '**/settings.json' }, this));
 	}
 
 	public render(filterResult: IFilterResult): void {
-		this.editor.changeDecorations(changeAccessor => {
-			this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, []);
-		});
-
-		const newExtensionGroup = filterResult && arrays.first(filterResult.filteredGroups, g => g.id === 'newExtensionsResult');
-		if (newExtensionGroup) {
-			this.editor.changeDecorations(changeAccessor => {
-				const settings = newExtensionGroup.sections[0].settings;
-				this.decorationIds = changeAccessor.deltaDecorations(this.decorationIds, settings.map(setting => this.createDecoration(setting)));
-			});
-		}
-
-		this._register(this.editor.onMouseDown((e: IEditorMouseEvent) => {
-			if (e.target.type !== MouseTargetType.GUTTER_GLYPH_MARGIN) {
-				return;
-			}
-
-			this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithId', 'ms-python.python');
-		}));
+		this.filterResult = filterResult;
 	}
 
-	private createDecoration(setting: ISetting): IModelDeltaDecoration {
-		return {
-			range: new Range(setting.keyRange.startLineNumber, 1, setting.keyRange.endLineNumber, 1),
-			options: {
-				glyphMarginClassName: 'newExtensionInstall',
-				stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
-			}
-		};
-	}
-
-	public dispose() {
-		if (this.decorationIds) {
-			this.decorationIds = this.editor.changeDecorations(changeAccessor => {
-				return changeAccessor.deltaDecorations(this.decorationIds, []);
-			});
+	public provideCodeLenses(model: ITextModel, token: CancellationToken): ICodeLensSymbol[] {
+		if (!this.filterResult || !this.filterResult.filteredGroups) {
+			return [];
 		}
 
-		super.dispose();
+		const newExtensionGroup = arrays.first(this.filterResult.filteredGroups, g => g.id === 'newExtensionsResult');
+		if (!newExtensionGroup) {
+			return [];
+		}
+
+		return newExtensionGroup.sections[0].settings
+			.filter((s: IExtensionSetting) => {
+				// Skip any non IExtensionSettings that somehow got in here
+				return s.extensionName && s.extensionPublisher;
+			})
+			.map((s: IExtensionSetting) => {
+				const extId = s.extensionPublisher + '.' + s.extensionName;
+				return {
+					command: {
+						title: nls.localize('newExtensionLabel', "View \"{0}\"", extId),
+						id: 'workbench.extensions.action.showExtensionsWithId',
+						arguments: [extId.toLowerCase()]
+					},
+					range: new Range(s.keyRange.startLineNumber, 1, s.keyRange.startLineNumber, 1)
+				};
+			});
+	}
+
+	public resolveCodeLens(model: ITextModel, codeLens: ICodeLensSymbol, token: CancellationToken): ICodeLensSymbol {
+		return codeLens;
 	}
 }
 
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index 52694d377cd..fc0212457ab 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -56,6 +56,11 @@ export interface ISetting {
 	overrideOf?: ISetting;
 }
 
+export interface IExtensionSetting extends ISetting {
+	extensionName: string;
+	extensionPublisher: string;
+}
+
 export interface ISearchResult {
 	filterMatches: ISettingMatch[];
 	metadata?: IFilterMetadata;
@@ -93,6 +98,8 @@ export interface IRemoteSetting {
 	defaultValue: string;
 	description: string;
 	packageId: string;
+	extensionName?: string;
+	extensionPublisher?: string;
 }
 
 export interface IFilterMetadata {
diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index 959b05501d2..044268407ba 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -41,12 +41,14 @@ export abstract class AbstractSettingsModel extends EditorModel {
 	 * Remove duplicates between result groups, preferring results in earlier groups
 	 */
 	private removeDuplicateResults(): void {
-		// Depends on order of map keys
 		const settingKeys = new Set();
-		this._currentResultGroups.forEach((group, id) => {
-			group.result.filterMatches = group.result.filterMatches.filter(s => !settingKeys.has(s.setting.key));
-			group.result.filterMatches.forEach(s => settingKeys.add(s.setting.key));
-		});
+		map.keys(this._currentResultGroups)
+			.sort((a, b) => this._currentResultGroups.get(a).order - this._currentResultGroups.get(b).order)
+			.forEach(groupId => {
+				const group = this._currentResultGroups.get(groupId);
+				group.result.filterMatches = group.result.filterMatches.filter(s => !settingKeys.has(s.setting.key));
+				group.result.filterMatches.forEach(s => settingKeys.add(s.setting.key));
+			});
 	}
 
 	public filterSettings(filter: string, groupFilter: IGroupFilter, settingMatcher: ISettingMatcher): ISettingMatch[] {
@@ -61,7 +63,7 @@ export abstract class AbstractSettingsModel extends EditorModel {
 
 					if (groupMatched || settingMatchResult) {
 						filterMatches.push({
-							setting,
+							setting: this.copySetting(setting),
 							matches: settingMatchResult && settingMatchResult.matches,
 							score: settingMatchResult ? settingMatchResult.score : 0
 						});
@@ -86,6 +88,21 @@ export abstract class AbstractSettingsModel extends EditorModel {
 		return null;
 	}
 
+	private copySetting(setting: ISetting): ISetting {
+		return {
+			description: setting.description,
+			descriptionRanges: setting.descriptionRanges,
+			key: setting.key,
+			keyRange: setting.keyRange,
+			value: setting.value,
+			range: setting.range,
+			valueRange: setting.valueRange,
+			overrides: [],
+			overrideOf: setting.overrideOf
+		};
+	}
+
+
 	protected get filterGroups(): ISettingsGroup[] {
 		return this.settingsGroups;
 	}
@@ -720,19 +737,6 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 		return null;
 	}
 
-	private copySettings(settings: ISetting[]): ISetting[] {
-		return settings.map(setting => {
-			return {
-				description: setting.description,
-				key: setting.key,
-				value: setting.value,
-				range: null,
-				valueRange: null,
-				overrides: []
-			};
-		});
-	}
-
 	private getGroup(resultGroup: ISearchResultGroup): ISettingsGroup {
 		return {
 			id: resultGroup.id,
@@ -741,7 +745,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 			titleRange: null,
 			sections: [
 				{
-					settings: this.copySettings(resultGroup.result.filterMatches.map(m => m.setting))
+					settings: resultGroup.result.filterMatches.map(m => m.setting)
 				}
 			]
 		};
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index d91e3a967bf..1c4fe18c3a3 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 } from 'vs/workbench/parts/preferences/common/preferences';
+import { ISettingsEditorModel, ISetting, ISettingsGroup, IWorkbenchSettingsConfiguration, IFilterMetadata, IPreferencesSearchService, ISearchResult, ISearchProvider, IGroupFilter, ISettingMatcher, IScoredResults, ISettingMatch, IRemoteSetting, IExtensionSetting } from 'vs/workbench/parts/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';
@@ -198,13 +198,23 @@ export class RemoteSearchProvider implements ISearchProvider {
 						const key = JSON.parse(r.setting || r.Setting);
 						const packageId = r['packageid'];
 						const id = getSettingKey(packageId, key);
+
+						const packageName = r['packagename'];
+						let extensionName: string;
+						let extensionPublisher: string;
+						if (packageName.indexOf('##') >= 0) {
+							[extensionPublisher, extensionName] = packageName.split('##');
+						}
+
 						return {
 							key,
 							id,
 							defaultValue: r['value'],
 							score: r['@search.score'],
 							description: JSON.parse(r['details']),
-							packageId
+							packageId,
+							extensionName,
+							extensionPublisher
 						};
 					});
 
@@ -319,7 +329,7 @@ function escapeSpecialChars(query: string): string {
 		.trim();
 }
 
-function remoteSettingToISetting(remoteSetting: IRemoteSetting): ISetting {
+function remoteSettingToISetting(remoteSetting: IRemoteSetting): IExtensionSetting {
 	return {
 		description: remoteSetting.description.split('\n'),
 		descriptionRanges: null,
@@ -328,7 +338,9 @@ function remoteSettingToISetting(remoteSetting: IRemoteSetting): ISetting {
 		value: remoteSetting.defaultValue,
 		range: null,
 		valueRange: null,
-		overrides: []
+		overrides: [],
+		extensionName: remoteSetting.extensionName,
+		extensionPublisher: remoteSetting.extensionPublisher
 	};
 }
 

From 89cdbe2ad8d484b31e5d1db1056428b2408ed54d Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 16:27:18 -0800
Subject: [PATCH 518/710] Mark static constants readonly

---
 .../base/browser/ui/resourceviewer/resourceViewer.ts   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index a1e5c3fcb89..1a05cc207c6 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -129,11 +129,11 @@ export class ResourceViewer {
 
 	private static readonly MAX_IMAGE_SIZE = ResourceViewer.MB; // showing images inline is memory intense, so we have a limit
 
-	private static SCALE_PINCH_FACTOR = 0.1;
-	private static SCALE_FACTOR = 1.5;
-	private static MAX_SCALE = 20;
-	private static MIN_SCALE = 0.1;
-	private static PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
+	private static readonly SCALE_PINCH_FACTOR = 0.1;
+	private static readonly SCALE_FACTOR = 1.5;
+	private static readonly MAX_SCALE = 20;
+	private static readonly MIN_SCALE = 0.1;
+	private static readonly PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
 
 	public static show(
 		descriptor: IResourceDescriptor,

From 1b21617a802d079877f7534d202ef7917a5576af Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 16:31:16 -0800
Subject: [PATCH 519/710] Make sure we preserve pixelated property on zoomed
 images

---
 .../base/browser/ui/resourceviewer/resourceViewer.ts   | 10 ++++++----
 .../base/browser/ui/resourceviewer/resourceviewer.css  |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index 1a05cc207c6..e1901ab0748 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -180,6 +180,12 @@ export class ResourceViewer {
 							updateScale(scale);
 						}
 
+						if (imgElement.naturalWidth < ResourceViewer.PIXELATION_THRESHOLD
+							|| imgElement.naturalHeight < ResourceViewer.PIXELATION_THRESHOLD
+						) {
+							img.addClass('pixelated');
+						}
+
 						function setImageWidth(width) {
 							img.style('width', `${width}px`);
 							img.style('height', 'auto');
@@ -212,10 +218,6 @@ export class ResourceViewer {
 							const { clientWidth, naturalWidth } = imgElement;
 							setImageWidth(clientWidth);
 							img.removeClass('untouched');
-							if (imgElement.naturalWidth < ResourceViewer.PIXELATION_THRESHOLD
-								|| imgElement.naturalHeight < ResourceViewer.PIXELATION_THRESHOLD) {
-								img.addClass('pixelated');
-							}
 							scale = clientWidth / naturalWidth;
 						}
 
diff --git a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
index 98110688e66..054159a1281 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
+++ b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
@@ -35,13 +35,14 @@
 		linear-gradient(45deg, rgb(20, 20, 20) 25%, transparent 25%, transparent 75%, rgb(20, 20, 20) 75%, rgb(20, 20, 20));
 }
 
+.monaco-resource-viewer img.pixelated {
+	image-rendering: pixelated;
+}
+
 .monaco-resource-viewer img.untouched {
 	max-width: 100%;
 	object-fit: contain;
-}
-
-.monaco-resource-viewer img.pixelated {
-	image-rendering: pixelated;
+	image-rendering: auto;
 }
 
 .monaco-resource-viewer img {

From eac87dab44e8f7a0cb841bc6ce514bf0ccdaf310 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 16:41:21 -0800
Subject: [PATCH 520/710] Extract largeImageView

Extract genericBinaryFileView

Extract inlineImageView

Add explicit return nulls for largeImageView and binaryFile View

Extract getMime

Use or return type in getMime

Extract size logic to own class

Move IMAGE_SCALE_CACHE into class

Extract LargeImageView to own class

Extract GenericBinaryFileView to class

Move InlineImageView to own class

Extract image view to own class

Format param list

Move imgSource into InlineImageView

Make metadataClb non-optional since it is always pasesd in

Extract isImageResource

Give inlineImage a more descriptive name
---
 .../ui/resourceviewer/resourceViewer.ts       | 450 +++++++++---------
 1 file changed, 237 insertions(+), 213 deletions(-)

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index e1901ab0748..86ac9fbeee4 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -83,35 +83,33 @@ enum ScaleDirection {
 	IN, OUT,
 }
 
-// Chrome is caching images very aggressively and so we use the ETag information to find out if
-// we need to bypass the cache or not. We could always bypass the cache everytime we show the image
-// however that has very bad impact on memory consumption because each time the image gets shown,
-// memory grows (see also https://github.com/electron/electron/issues/6275)
-const IMAGE_RESOURCE_ETAG_CACHE = new LRUCache(100);
-function imageSrc(descriptor: IResourceDescriptor): string {
-	if (descriptor.resource.scheme === Schemas.data) {
-		return descriptor.resource.toString(true /* skip encoding */);
+class BinarySize {
+	public static readonly KB = 1024;
+	public static readonly MB = BinarySize.KB * BinarySize.KB;
+	public static readonly GB = BinarySize.MB * BinarySize.KB;
+	public static readonly TB = BinarySize.GB * BinarySize.KB;
+
+	public static formatSize(size: number): string {
+		if (size < BinarySize.KB) {
+			return nls.localize('sizeB', "{0}B", size);
+		}
+
+		if (size < BinarySize.MB) {
+			return nls.localize('sizeKB', "{0}KB", (size / BinarySize.KB).toFixed(2));
+		}
+
+		if (size < BinarySize.GB) {
+			return nls.localize('sizeMB', "{0}MB", (size / BinarySize.MB).toFixed(2));
+		}
+
+		if (size < BinarySize.TB) {
+			return nls.localize('sizeGB', "{0}GB", (size / BinarySize.GB).toFixed(2));
+		}
+
+		return nls.localize('sizeTB', "{0}TB", (size / BinarySize.TB).toFixed(2));
 	}
-
-	const src = descriptor.resource.toString();
-
-	let cached = IMAGE_RESOURCE_ETAG_CACHE.get(src);
-	if (!cached) {
-		cached = { etag: descriptor.etag, src };
-		IMAGE_RESOURCE_ETAG_CACHE.set(src, cached);
-	}
-
-	if (cached.etag !== descriptor.etag) {
-		cached.etag = descriptor.etag;
-		cached.src = `${src}?${Date.now()}`; // bypass cache with this trick
-	}
-
-	return cached.src;
 }
 
-// store the scale of an image so it can be restored when changing editor tabs
-const IMAGE_SCALE_CACHE = new LRUCache(100);
-
 export interface ResourceViewerContext {
 	layout(dimension: Dimension);
 }
@@ -121,32 +119,30 @@ export interface ResourceViewerContext {
  * progress of the binary resource.
  */
 export class ResourceViewer {
-
-	private static readonly KB = 1024;
-	private static readonly MB = ResourceViewer.KB * ResourceViewer.KB;
-	private static readonly GB = ResourceViewer.MB * ResourceViewer.KB;
-	private static readonly TB = ResourceViewer.GB * ResourceViewer.KB;
-
-	private static readonly MAX_IMAGE_SIZE = ResourceViewer.MB; // showing images inline is memory intense, so we have a limit
-
-	private static readonly SCALE_PINCH_FACTOR = 0.1;
-	private static readonly SCALE_FACTOR = 1.5;
-	private static readonly MAX_SCALE = 20;
-	private static readonly MIN_SCALE = 0.1;
-	private static readonly PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
-
 	public static show(
 		descriptor: IResourceDescriptor,
 		container: Builder,
 		scrollbar: DomScrollableElement,
 		openExternal: (uri: URI) => void,
-		metadataClb?: (meta: string) => void
+		metadataClb: (meta: string) => void
 	): ResourceViewerContext {
-
 		// Ensure CSS class
 		$(container).setClass('monaco-resource-viewer');
 
-		// Lookup media mime if any
+		if (ResourceViewer.isImageResource(descriptor)) {
+			return ImageView.create(container, descriptor, scrollbar, openExternal, metadataClb);
+		}
+
+		GenericBinaryFileView.create(container, metadataClb, descriptor, scrollbar);
+		return null;
+	}
+
+	private static isImageResource(descriptor: IResourceDescriptor) {
+		const mime = ResourceViewer.getMime(descriptor);
+		return mime.indexOf('image/') >= 0;
+	}
+
+	private static getMime(descriptor: IResourceDescriptor): string {
 		let mime = descriptor.mime;
 		if (!mime && descriptor.resource.scheme === Schemas.file) {
 			const ext = paths.extname(descriptor.resource.toString());
@@ -154,163 +150,29 @@ export class ResourceViewer {
 				mime = mapExtToMediaMimes[ext.toLowerCase()];
 			}
 		}
+		return mime || mimes.MIME_BINARY;
+	}
+}
 
-		if (!mime) {
-			mime = mimes.MIME_BINARY;
-		}
-
-		// Show Image inline unless they are large
-		if (mime.indexOf('image/') >= 0) {
-			if (ResourceViewer.inlineImage(descriptor)) {
-				const context = {
-					layout(dimension: Dimension) { }
-				};
-				$(container)
-					.empty()
-					.addClass('image', 'zoom-in')
-					.img({ src: imageSrc(descriptor) })
-					.addClass('untouched')
-					.on(DOM.EventType.LOAD, (e, img) => {
-						const imgElement = img.getHTMLElement();
-						const cacheKey = descriptor.resource.toString();
-						let scaleDirection = ScaleDirection.IN;
-						let scale = IMAGE_SCALE_CACHE.get(cacheKey) || null;
-						if (scale) {
-							img.removeClass('untouched');
-							updateScale(scale);
-						}
-
-						if (imgElement.naturalWidth < ResourceViewer.PIXELATION_THRESHOLD
-							|| imgElement.naturalHeight < ResourceViewer.PIXELATION_THRESHOLD
-						) {
-							img.addClass('pixelated');
-						}
-
-						function setImageWidth(width) {
-							img.style('width', `${width}px`);
-							img.style('height', 'auto');
-						}
-
-						function updateScale(newScale) {
-							scale = clamp(newScale, ResourceViewer.MIN_SCALE, ResourceViewer.MAX_SCALE);
-							setImageWidth(Math.floor(imgElement.naturalWidth * scale));
-							IMAGE_SCALE_CACHE.set(cacheKey, scale);
-
-							scrollbar.scanDomNode();
-
-							updateMetadata();
-						}
-
-						function updateMetadata() {
-							if (metadataClb) {
-								const scale = Math.round((imgElement.width / imgElement.naturalWidth) * 10000) / 100;
-								metadataClb(nls.localize('imgMeta', '{0}% {1}x{2} {3}',
-									scale,
-									imgElement.naturalWidth,
-									imgElement.naturalHeight,
-									ResourceViewer.formatSize(descriptor.size)));
-							}
-						}
-
-						context.layout = updateMetadata;
-
-						function firstZoom() {
-							const { clientWidth, naturalWidth } = imgElement;
-							setImageWidth(clientWidth);
-							img.removeClass('untouched');
-							scale = clientWidth / naturalWidth;
-						}
-
-						$(container)
-							.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => {
-								if (e.altKey) {
-									scaleDirection = ScaleDirection.OUT;
-									c.removeClass('zoom-in').addClass('zoom-out');
-								}
-							})
-							.on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => {
-								if (!e.altKey) {
-									scaleDirection = ScaleDirection.IN;
-									c.removeClass('zoom-out').addClass('zoom-in');
-								}
-							});
-
-						$(container).on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
-							if (scale === null) {
-								firstZoom();
-							}
-
-							// right click
-							if (e.button === 2) {
-								updateScale(1);
-							} else {
-								const scaleFactor = scaleDirection === ScaleDirection.IN
-									? ResourceViewer.SCALE_FACTOR
-									: 1 / ResourceViewer.SCALE_FACTOR;
-
-								updateScale(scale * scaleFactor);
-							}
-						});
-
-						$(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => {
-							// pinching is reported as scroll wheel + ctrl
-							if (!e.ctrlKey) {
-								return;
-							}
-
-							if (scale === null) {
-								firstZoom();
-							}
-
-							// scrolling up, pinching out should increase the scale
-							const delta = -e.deltaY;
-							updateScale(scale + delta * ResourceViewer.SCALE_PINCH_FACTOR);
-						});
-
-						updateMetadata();
-
-						scrollbar.scanDomNode();
-					});
-
-				return context;
-			} else {
-				const imageContainer = $(container)
-					.empty()
-					.p({
-						text: nls.localize('largeImageError', "The image is too large to display in the editor. ")
-					});
-
-				if (descriptor.resource.scheme !== Schemas.data) {
-					imageContainer.append($('a', {
-						role: 'button',
-						class: 'open-external',
-						text: nls.localize('resourceOpenExternalButton', "Open image using external program?")
-					}).on(DOM.EventType.CLICK, (e) => {
-						openExternal(descriptor.resource);
-					}));
-				}
-			}
-		}
-
-		// Handle generic Binary Files
-		else {
-			$(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.")
-				});
-
-			if (metadataClb) {
-				metadataClb(ResourceViewer.formatSize(descriptor.size));
-			}
-
-			scrollbar.scanDomNode();
+class ImageView {
+	private static readonly MAX_IMAGE_SIZE = BinarySize.MB; // showing images inline is memory intense, so we have a limit
+
+	public static create(
+		container: Builder,
+		descriptor: IResourceDescriptor,
+		scrollbar: DomScrollableElement,
+		openExternal: (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);
 		return null;
 	}
 
-	private static inlineImage(descriptor: IResourceDescriptor): boolean {
+	private static shouldShowImageInline(descriptor: IResourceDescriptor): boolean {
 		let skipInlineImage: boolean;
 
 		// Data URI
@@ -319,34 +181,196 @@ export class ResourceViewer {
 			const base64MarkerIndex = descriptor.resource.path.indexOf(BASE64_MARKER);
 			const hasData = base64MarkerIndex >= 0 && descriptor.resource.path.substring(base64MarkerIndex + BASE64_MARKER.length).length > 0;
 
-			skipInlineImage = !hasData || descriptor.size > ResourceViewer.MAX_IMAGE_SIZE || descriptor.resource.path.length > ResourceViewer.MAX_IMAGE_SIZE;
+			skipInlineImage = !hasData || descriptor.size > ImageView.MAX_IMAGE_SIZE || descriptor.resource.path.length > ImageView.MAX_IMAGE_SIZE;
 		}
 
 		// File URI
 		else {
-			skipInlineImage = typeof descriptor.size !== 'number' || descriptor.size > ResourceViewer.MAX_IMAGE_SIZE;
+			skipInlineImage = typeof descriptor.size !== 'number' || descriptor.size > ImageView.MAX_IMAGE_SIZE;
 		}
 
 		return !skipInlineImage;
 	}
+}
 
-	private static formatSize(size: number): string {
-		if (size < ResourceViewer.KB) {
-			return nls.localize('sizeB', "{0}B", size);
+class LargeImageView {
+	public static create(
+		container: Builder,
+		descriptor: IResourceDescriptor,
+		openExternal: (uri: URI) => void
+	) {
+		const imageContainer = $(container)
+			.empty()
+			.p({
+				text: nls.localize('largeImageError', "The image is too large to display in the editor. ")
+			});
+
+		if (descriptor.resource.scheme !== Schemas.data) {
+			imageContainer.append($('a', {
+				role: 'button',
+				class: 'open-external',
+				text: nls.localize('resourceOpenExternalButton', "Open image using external program?")
+			}).on(DOM.EventType.CLICK, (e) => {
+				openExternal(descriptor.resource);
+			}));
 		}
-
-		if (size < ResourceViewer.MB) {
-			return nls.localize('sizeKB', "{0}KB", (size / ResourceViewer.KB).toFixed(2));
-		}
-
-		if (size < ResourceViewer.GB) {
-			return nls.localize('sizeMB', "{0}MB", (size / ResourceViewer.MB).toFixed(2));
-		}
-
-		if (size < ResourceViewer.TB) {
-			return nls.localize('sizeGB', "{0}GB", (size / ResourceViewer.GB).toFixed(2));
-		}
-
-		return nls.localize('sizeTB', "{0}TB", (size / ResourceViewer.TB).toFixed(2));
+	}
+}
+
+class GenericBinaryFileView {
+	public static create(
+		container: Builder,
+		metadataClb: (meta: string) => void,
+		descriptor: IResourceDescriptor,
+		scrollbar: DomScrollableElement
+	) {
+		$(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.")
+			});
+		if (metadataClb) {
+			metadataClb(BinarySize.formatSize(descriptor.size));
+		}
+		scrollbar.scanDomNode();
+	}
+}
+
+class InlineImageView {
+	private static readonly SCALE_PINCH_FACTOR = 0.1;
+	private static readonly SCALE_FACTOR = 1.5;
+	private static readonly MAX_SCALE = 20;
+	private static readonly MIN_SCALE = 0.1;
+	private static readonly PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
+
+	/**
+	 * Chrome is caching images very aggressively and so we use the ETag information to find out if
+	 * we need to bypass the cache or not. We could always bypass the cache everytime we show the image
+	 * however that has very bad impact on memory consumption because each time the image gets shown,
+	 * memory grows (see also https://github.com/electron/electron/issues/6275)
+	 */
+	private static IMAGE_RESOURCE_ETAG_CACHE = new LRUCache(100);
+
+	/**
+	 * Store the scale of an image so it can be restored when changing editor tabs
+	 */
+	private static readonly IMAGE_SCALE_CACHE = new LRUCache(100);
+
+	public static create(
+		container: Builder,
+		descriptor: IResourceDescriptor,
+		scrollbar: DomScrollableElement,
+		metadataClb: (meta: string) => void
+	) {
+		const context = {
+			layout(dimension: Dimension) { }
+		};
+		$(container)
+			.empty()
+			.addClass('image', 'zoom-in')
+			.img({ src: InlineImageView.imageSrc(descriptor) })
+			.addClass('untouched')
+			.on(DOM.EventType.LOAD, (e, img) => {
+				const imgElement = img.getHTMLElement();
+				const cacheKey = descriptor.resource.toString();
+				let scaleDirection = ScaleDirection.IN;
+				let scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || null;
+				if (scale) {
+					img.removeClass('untouched');
+					updateScale(scale);
+				}
+				if (imgElement.naturalWidth < InlineImageView.PIXELATION_THRESHOLD
+					|| imgElement.naturalHeight < InlineImageView.PIXELATION_THRESHOLD) {
+					img.addClass('pixelated');
+				}
+				function setImageWidth(width) {
+					img.style('width', `${width}px`);
+					img.style('height', 'auto');
+				}
+				function updateScale(newScale) {
+					scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE);
+					setImageWidth(Math.floor(imgElement.naturalWidth * scale));
+					InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale);
+					scrollbar.scanDomNode();
+					updateMetadata();
+				}
+				function updateMetadata() {
+					if (metadataClb) {
+						const scale = Math.round((imgElement.width / imgElement.naturalWidth) * 10000) / 100;
+						metadataClb(nls.localize('imgMeta', '{0}% {1}x{2} {3}', scale, imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size)));
+					}
+				}
+				context.layout = updateMetadata;
+				function firstZoom() {
+					const { clientWidth, naturalWidth } = imgElement;
+					setImageWidth(clientWidth);
+					img.removeClass('untouched');
+					scale = clientWidth / naturalWidth;
+				}
+				$(container)
+					.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => {
+						if (e.altKey) {
+							scaleDirection = ScaleDirection.OUT;
+							c.removeClass('zoom-in').addClass('zoom-out');
+						}
+					})
+					.on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => {
+						if (!e.altKey) {
+							scaleDirection = ScaleDirection.IN;
+							c.removeClass('zoom-out').addClass('zoom-in');
+						}
+					});
+				$(container).on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
+					if (scale === null) {
+						firstZoom();
+					}
+					// right click
+					if (e.button === 2) {
+						updateScale(1);
+					}
+					else {
+						const scaleFactor = scaleDirection === ScaleDirection.IN
+							? InlineImageView.SCALE_FACTOR
+							: 1 / InlineImageView.SCALE_FACTOR;
+						updateScale(scale * scaleFactor);
+					}
+				});
+				$(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => {
+					// pinching is reported as scroll wheel + ctrl
+					if (!e.ctrlKey) {
+						return;
+					}
+					if (scale === null) {
+						firstZoom();
+					}
+					// scrolling up, pinching out should increase the scale
+					const delta = -e.deltaY;
+					updateScale(scale + delta * InlineImageView.SCALE_PINCH_FACTOR);
+				});
+				updateMetadata();
+				scrollbar.scanDomNode();
+			});
+		return context;
+	}
+
+	private static imageSrc(descriptor: IResourceDescriptor): string {
+		if (descriptor.resource.scheme === Schemas.data) {
+			return descriptor.resource.toString(true /* skip encoding */);
+		}
+
+		const src = descriptor.resource.toString();
+
+		let cached = InlineImageView.IMAGE_RESOURCE_ETAG_CACHE.get(src);
+		if (!cached) {
+			cached = { etag: descriptor.etag, src };
+			InlineImageView.IMAGE_RESOURCE_ETAG_CACHE.set(src, cached);
+		}
+
+		if (cached.etag !== descriptor.etag) {
+			cached.etag = descriptor.etag;
+			cached.src = `${src}?${Date.now()}`; // bypass cache with this trick
+		}
+
+		return cached.src;
 	}
 }

From f73e7bddfa40cacb09e390423eb4cb42687d2cd0 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 17:24:49 -0800
Subject: [PATCH 521/710] Dont load loguploader using import expression

---
 src/vs/code/electron-main/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index ea7bf733406..8ba25df359b 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -45,6 +45,7 @@ import { mnemonicButtonLabel } from 'vs/base/common/labels';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { printDiagnostics } from 'vs/code/electron-main/diagnostics';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
+import { uploadLogs } from 'vs/code/electron-main/logUploader';
 
 function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService {
 	const services = new ServiceCollection();
@@ -198,8 +199,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise {
 
 					// Log uploader
 					if (environmentService.args['upload-logs']) {
-						return import('vs/code/electron-main/logUploader')
-							.then(logUploader => logUploader.uploadLogs(channel, requestService))
+						return uploadLogs(channel, requestService)
 							.then(() => TPromise.wrapError(new ExpectedError()));
 					}
 

From 3877f2a950d2e0b096795b2bbf09af64edb387bb Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 17:46:04 -0800
Subject: [PATCH 522/710] Fix parsing of result message in uploadlogs

---
 src/vs/code/electron-main/logUploader.ts | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index f4a034627d3..795321e8600 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -94,12 +94,22 @@ async function postLogs(
 		throw e;
 	}
 
-	try {
-		return JSON.parse(result.stream.toString());
-	} catch (e) {
-		console.log(localize('parseError', 'Error parsing response'));
-		throw e;
-	}
+	return new TPromise((res, reject) => {
+		const parts: Buffer[] = [];
+		result.stream.on('data', data => {
+			parts.push(data);
+		});
+
+		result.stream.on('end', () => {
+			try {
+				const result = Buffer.concat(parts).toString('utf-8');
+				res(JSON.parse(result));
+			} catch (e) {
+				console.log(localize('parseError', 'Error parsing response'));
+				reject(e);
+			}
+		});
+	});
 }
 
 function zipLogs(

From 97904cdd61fbaef3321dd9c1b89328c7afdce201 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Mon, 22 Jan 2018 17:47:21 -0800
Subject: [PATCH 523/710] Dont hide details when frozen Fixes #39742

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

diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
index 6624f1ca547..05c83cead70 100644
--- a/src/vs/editor/contrib/suggest/suggestWidget.ts
+++ b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -667,7 +667,7 @@ export class SuggestWidget implements IContentWidget, IDelegate
 				this.show();
 				break;
 			case State.Frozen:
-				hide(this.messageElement, this.details.element);
+				hide(this.messageElement);
 				show(this.listElement);
 				this.show();
 				break;

From 65064fd524f4e94605126adba9c15506eb1829b5 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 18:30:59 -0800
Subject: [PATCH 524/710] Make sure log body is properly encoded

---
 src/vs/code/electron-main/logUploader.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index 795321e8600..bbcc8a6a76a 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -83,10 +83,9 @@ async function postLogs(
 		result = await requestService.request({
 			url: endpoint.url,
 			type: 'POST',
-			data: fs.createReadStream(outZip),
+			data: new Buffer(fs.readFileSync(outZip)).toString('base64'),
 			headers: {
-				'Content-Type': 'application/zip',
-				'Content-Length': fs.statSync(outZip).size
+				'Content-Type': 'application/zip'
 			}
 		});
 	} catch (e) {

From 00f0f2c8962bfad8201d225cdb46646fb5f104f0 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 18:36:37 -0800
Subject: [PATCH 525/710] Use special prefix to tell TS that a resource is
 in-memory only (#42001)

* Use special prefix to tell TS that a resource is in memory

* Move scheme checking logic into getWorkspaceRootForResource
---
 .../src/features/bufferSyncSupport.ts         |  6 +--
 .../typescript/src/typescriptServiceClient.ts | 37 +++++++++++++------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts
index 63f0bdfbc86..f3b005cdb4b 100644
--- a/extensions/typescript/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript/src/features/bufferSyncSupport.ts
@@ -10,6 +10,7 @@ import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import { Delayer } from '../utils/async';
 import * as languageModeIds from '../utils/languageModeIds';
+import * as fileSchemes from '../utils/fileSchemes';
 
 interface IDiagnosticRequestor {
 	requestDiagnostic(filepath: string): void;
@@ -48,10 +49,7 @@ class SyncedBuffer {
 		}
 
 		if (this.client.apiVersion.has230Features()) {
-			const root = this.client.getWorkspaceRootForResource(this.document.uri);
-			if (root) {
-				args.projectRootPath = root;
-			}
+			args.projectRootPath = this.client.getWorkspaceRootForResource(this.document.uri);
 		}
 
 		if (this.client.apiVersion.has240Features()) {
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index 2901d184ba1..a36818b3905 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -578,12 +578,12 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	}
 
 	public normalizePath(resource: Uri): string | null {
-		if (resource.scheme === fileSchemes.walkThroughSnippet) {
-			return resource.toString();
-		}
-
-		if (resource.scheme === fileSchemes.untitled && this._apiVersion.has213Features()) {
-			return resource.toString();
+		if (this._apiVersion.has213Features()) {
+			if (resource.scheme === fileSchemes.walkThroughSnippet || resource.scheme === fileSchemes.untitled) {
+				const dirName = path.dirname(resource.path);
+				const fileName = this.inMemoryResourcePrefix + path.basename(resource.path);
+				return resource.with({ path: path.join(dirName, fileName) }).toString(true);
+			}
 		}
 
 		if (resource.scheme !== fileSchemes.file) {
@@ -599,11 +599,24 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/');
 	}
 
+	private get inMemoryResourcePrefix(): string {
+		return this._apiVersion.has270Features() ? '^' : '';
+	}
+
 	public asUrl(filepath: string): Uri {
-		if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON)
-			|| (filepath.startsWith(fileSchemes.untitled + ':') && this._apiVersion.has213Features())
-		) {
-			return Uri.parse(filepath);
+		if (this._apiVersion.has213Features()) {
+			if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON) || (filepath.startsWith(fileSchemes.untitled + ':'))
+			) {
+				let resource = Uri.parse(filepath);
+				if (this.inMemoryResourcePrefix) {
+					const dirName = path.dirname(resource.path);
+					const fileName = path.basename(resource.path);
+					if (fileName.startsWith(this.inMemoryResourcePrefix)) {
+						resource = resource.with({ path: path.join(dirName, fileName.slice(this.inMemoryResourcePrefix.length)) });
+					}
+				}
+				return resource;
+			}
 		}
 		return Uri.file(filepath);
 	}
@@ -620,8 +633,10 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 					return root.uri.fsPath;
 				}
 			}
+			return roots[0].uri.fsPath;
 		}
-		return roots[0].uri.fsPath;
+
+		return undefined;
 	}
 
 	public execute(command: string, args: any, expectsResultOrToken?: boolean | CancellationToken): Promise {

From 75b3282ec2215c7af5eda9855c94e42d42e666ac Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 17:30:00 -0800
Subject: [PATCH 526/710] Test cases for pieceTree.equal

---
 .../pieceTreeTextBuffer.test.ts                    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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 83eaf75bde0..fad324b8051 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1517,4 +1517,18 @@ suite('buffer api', () => {
 		assert(!a.equal(c));
 		assert(!a.equal(d));
 	});
+
+	test('equal 2, empty buffer', () => {
+		let a = createTextBuffer(['']);
+		let b = createTextBuffer(['']);
+
+		assert(a.equal(b));
+	});
+
+	test('equal 3, empty buffer', () => {
+		let a = createTextBuffer(['a']);
+		let b = createTextBuffer(['']);
+
+		assert(!a.equal(b));
+	});
 });
\ No newline at end of file

From fa455a7249393df1d8cc1071f23ae91599102336 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 18:54:36 -0800
Subject: [PATCH 527/710] Revert "First attempt of search caching."

This reverts commit 0f907abc022460b9b9f114ea65ce181a4239d54f.
---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 485 ++++++++++++++++--
 .../model/pieceTreeTextBuffer/rbTreeBase.ts   | 427 ---------------
 .../pieceTreeTextBuffer.test.ts               |   3 +-
 3 files changed, 441 insertions(+), 474 deletions(-)
 delete mode 100644 src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index e9e428b9106..9598964eff9 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -8,7 +8,49 @@ import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextSnapshot } from 'vs/platform/files/common/files';
-import { leftest, righttest, updateTreeMetadata, rbDelete, fixInsert, NodeColor, SENTINEL, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
+
+export const enum NodeColor {
+	Black = 0,
+	Red = 1,
+}
+
+export function getNodeColor(node: TreeNode) {
+	return node.color;
+}
+
+function leftest(node: TreeNode): TreeNode {
+	while (node.left !== SENTINEL) {
+		node = node.left;
+	}
+	return node;
+}
+
+function righttest(node: TreeNode): TreeNode {
+	while (node.right !== SENTINEL) {
+		node = node.right;
+	}
+	return node;
+}
+
+function calculateSize(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.size_left + node.piece.length + calculateSize(node.right);
+}
+
+function calculateLF(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
+}
+
+function resetSentinel(): void {
+	SENTINEL.parent = SENTINEL;
+}
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
 
@@ -96,6 +138,84 @@ export function createLineStarts(r: number[], str: string): LineStarts {
 	return result;
 }
 
+export class TreeNode {
+	parent: TreeNode;
+	left: TreeNode;
+	right: TreeNode;
+	color: NodeColor;
+
+	// Piece
+	piece: Piece;
+	size_left: number; // size of the left subtree (not inorder)
+	lf_left: number; // line feeds cnt in the left subtree (not in order)
+
+	constructor(piece: Piece, color: NodeColor) {
+		this.piece = piece;
+		this.color = color;
+		this.size_left = 0;
+		this.lf_left = 0;
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+
+	public next(): TreeNode {
+		if (this.right !== SENTINEL) {
+			return leftest(this.right);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.left === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public prev(): TreeNode {
+		if (this.left !== SENTINEL) {
+			return righttest(this.left);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.right === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public detach(): void {
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+}
+
+export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
+SENTINEL.parent = SENTINEL;
+SENTINEL.left = SENTINEL;
+SENTINEL.right = SENTINEL;
+SENTINEL.color = NodeColor.Black;
+
 export interface NodePosition {
 	/**
 	 * Piece Index
@@ -202,7 +322,6 @@ export class PieceTreeBase {
 	protected _lineCnt: number;
 	protected _length: number;
 	private _lastChangeBufferPos: BufferCursor;
-	private _lastNodePosition: NodePosition;
 
 	constructor(chunks: StringBuffer[]) {
 		this.create(chunks);
@@ -213,7 +332,6 @@ export class PieceTreeBase {
 			new StringBuffer('', [0])
 		];
 		this._lastChangeBufferPos = { line: 0, column: 0 };
-		this._lastNodePosition = null;
 		this.root = SENTINEL;
 		this._lineCnt = 1;
 		this._length = 0;
@@ -275,6 +393,7 @@ export class PieceTreeBase {
 		this.create(chunks);
 	}
 
+
 	// #region Buffer API
 	public createSnapshot(BOM: string): ITextSnapshot {
 		return new PieceTreeSnapshot(this, BOM);
@@ -453,7 +572,6 @@ export class PieceTreeBase {
 				// changed buffer
 				this.appendToNode(node, value);
 				this.computeBufferMetadata();
-				this._lastNodePosition = { node, remainder, nodeStartOffset };
 				return;
 			}
 
@@ -536,7 +654,7 @@ export class PieceTreeBase {
 			if (startPosition.nodeStartOffset === offset) {
 				if (cnt === startNode.piece.length) { // delete node
 					let next = startNode.next();
-					rbDelete(this, startNode);
+					this.rbDelete(startNode);
 					this.validateCRLFWithPrevNode(next);
 					this.computeBufferMetadata();
 					return;
@@ -600,7 +718,7 @@ export class PieceTreeBase {
 			piece.length -= 1;
 
 			value += '\n';
-			updateTreeMetadata(this, node, -1, -1);
+			this.updateTreeMetadata(node, -1, -1);
 
 			if (node.piece.length === 0) {
 				nodesToDel.push(node);
@@ -704,7 +822,7 @@ export class PieceTreeBase {
 
 	deleteNodes(nodes: TreeNode[]): void {
 		for (let i = 0; i < nodes.length; i++) {
-			rbDelete(this, nodes[i]);
+			this.rbDelete(nodes[i]);
 		}
 	}
 
@@ -860,7 +978,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = newEndOffset - originalEndOffset;
 		piece.length += size_delta;
-		updateTreeMetadata(this, node, size_delta, lf_delta);
+		this.updateTreeMetadata(node, size_delta, lf_delta);
 	}
 
 	deleteNodeHead(node: TreeNode, pos: BufferCursor) {
@@ -874,7 +992,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = originalStartOffset - newStartOffset;
 		piece.length += size_delta;
-		updateTreeMetadata(this, node, size_delta, lf_delta);
+		this.updateTreeMetadata(node, size_delta, lf_delta);
 	}
 
 	shrinkNode(node: TreeNode, start: BufferCursor, end: BufferCursor) {
@@ -890,7 +1008,7 @@ export class PieceTreeBase {
 		let newLength = this.offsetInBuffer(piece.bufferIndex, start) - this.offsetInBuffer(piece.bufferIndex, originalStartPos);
 		let newLFCnt = piece.lineFeedCnt;
 		piece.length = newLength;
-		updateTreeMetadata(this, node, newLength - oldLength, newLFCnt - oldLFCnt);
+		this.updateTreeMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt);
 
 		// new right piece, end, originalEndPos
 		let newPiece = new Piece(
@@ -934,36 +1052,10 @@ export class PieceTreeBase {
 		node.piece.lineFeedCnt = newLineFeedCnt;
 		let lf_delta = newLineFeedCnt - oldLineFeedCnt;
 		this._lastChangeBufferPos = endPos;
-		updateTreeMetadata(this, node, value.length, lf_delta);
-	}
-
-	readNodePositionFromCache(offset: number): NodePosition {
-		if (!this._lastNodePosition) {
-			return null;
-		}
-
-		if (this._lastNodePosition.node.parent === null) {
-			this._lastNodePosition = null;
-			return null;
-		}
-
-		if (this._lastNodePosition.nodeStartOffset > offset || this._lastNodePosition.nodeStartOffset + this._lastNodePosition.node.piece.length < offset) {
-			return null;
-		}
-
-		return {
-			node: this._lastNodePosition.node,
-			remainder: offset - this._lastNodePosition.nodeStartOffset,
-			nodeStartOffset: this._lastNodePosition.nodeStartOffset
-		};
+		this.updateTreeMetadata(node, value.length, lf_delta);
 	}
 
 	nodeAt(offset: number): NodePosition {
-		let cachedNodePosition = this.readNodePositionFromCache(offset);
-		if (cachedNodePosition) {
-			return cachedNodePosition;
-		}
-
 		let x = this.root;
 		let nodeStartOffset = 0;
 
@@ -1155,7 +1247,7 @@ export class PieceTreeBase {
 		prev.piece.length -= 1;
 		prev.piece.lineFeedCnt -= 1;
 
-		updateTreeMetadata(this, prev, - 1, -1);
+		this.updateTreeMetadata(prev, - 1, -1);
 		if (prev.piece.length === 0) {
 			nodesToDel.push(prev);
 		}
@@ -1167,7 +1259,7 @@ export class PieceTreeBase {
 		next.piece.lineFeedCnt = this.getLineFeedCnt(next.piece.bufferIndex, next.piece.start, next.piece.end); // @todo, we can optimize
 		// }
 
-		updateTreeMetadata(this, next, - 1, -1);
+		this.updateTreeMetadata(next, - 1, -1);
 		if (next.piece.length === 0) {
 			nodesToDel.push(next);
 		}
@@ -1178,7 +1270,7 @@ export class PieceTreeBase {
 		// delete empty nodes
 
 		for (let i = 0; i < nodesToDel.length; i++) {
-			rbDelete(this, nodesToDel[i]);
+			this.rbDelete(nodesToDel[i]);
 		}
 	}
 
@@ -1190,7 +1282,7 @@ export class PieceTreeBase {
 				value += '\n';
 
 				if (nextNode.piece.length === 1) {
-					rbDelete(this, nextNode);
+					this.rbDelete(nextNode);
 				} else {
 
 					let piece = nextNode.piece;
@@ -1198,7 +1290,7 @@ export class PieceTreeBase {
 					piece.start = newStart;
 					piece.length -= 1;
 					piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize
-					updateTreeMetadata(this, nextNode, -1, -1);
+					this.updateTreeMetadata(nextNode, -1, -1);
 				}
 				return true;
 			}
@@ -1211,7 +1303,7 @@ export class PieceTreeBase {
 
 	// #endregion
 
-	// #region Tree operations
+	// #region Red Black Tree
 	iterate(node: TreeNode, callback: (node: TreeNode) => boolean): boolean {
 		if (node === SENTINEL) {
 			return callback(SENTINEL);
@@ -1238,6 +1330,53 @@ export class PieceTreeBase {
 		return currentContent;
 	}
 
+	leftRotate(x: TreeNode) {
+		let y = x.right;
+
+		// fix size_left
+		y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
+		y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+		x.right = y.left;
+
+		if (y.left !== SENTINEL) {
+			y.left.parent = x;
+		}
+		y.parent = x.parent;
+		if (x.parent === SENTINEL) {
+			this.root = y;
+		} else if (x.parent.left === x) {
+			x.parent.left = y;
+		} else {
+			x.parent.right = y;
+		}
+		y.left = x;
+		x.parent = y;
+	}
+
+	rightRotate(y: TreeNode) {
+		let x = y.left;
+		y.left = x.right;
+		if (x.right !== SENTINEL) {
+			x.right.parent = y;
+		}
+		x.parent = y.parent;
+
+		// fix size_left
+		y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
+		y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+
+		if (y.parent === SENTINEL) {
+			this.root = x;
+		} else if (y === y.parent.right) {
+			y.parent.right = x;
+		} else {
+			y.parent.left = x;
+		}
+
+		x.right = y;
+		y.parent = x;
+	}
+
 	/**
 	 *      node              node
 	 *     /  \              /  \
@@ -1266,7 +1405,7 @@ export class PieceTreeBase {
 			z.parent = nextNode;
 		}
 
-		fixInsert(this, z);
+		this.fixInsert(z);
 		return z;
 	}
 
@@ -1298,10 +1437,266 @@ export class PieceTreeBase {
 			z.parent = prevNode;
 		}
 
-		fixInsert(this, z);
+		this.fixInsert(z);
 		return z;
 	}
 
+	rbDelete(z: TreeNode) {
+		let x: TreeNode;
+		let y: TreeNode;
+
+		if (z.left === SENTINEL) {
+			y = z;
+			x = y.right;
+		} else if (z.right === SENTINEL) {
+			y = z;
+			x = y.left;
+		} else {
+			y = leftest(z.right);
+			x = y.right;
+		}
+
+		if (y === this.root) {
+			this.root = x;
+
+			// if x is null, we are removing the only node
+			x.color = NodeColor.Black;
+			z.detach();
+			resetSentinel();
+			this.root.parent = SENTINEL;
+
+			return;
+		}
+
+		let yWasRed = (y.color === NodeColor.Red);
+
+		if (y === y.parent.left) {
+			y.parent.left = x;
+		} else {
+			y.parent.right = x;
+		}
+
+		if (y === z) {
+			x.parent = y.parent;
+			this.recomputeTreeMetadata(x);
+		} else {
+			if (y.parent === z) {
+				x.parent = y;
+			} else {
+				x.parent = y.parent;
+			}
+
+			// as we make changes to x's hierarchy, update size_left of subtree first
+			this.recomputeTreeMetadata(x);
+
+			y.left = z.left;
+			y.right = z.right;
+			y.parent = z.parent;
+			y.color = z.color;
+
+			if (z === this.root) {
+				this.root = y;
+			} else {
+				if (z === z.parent.left) {
+					z.parent.left = y;
+				} else {
+					z.parent.right = y;
+				}
+			}
+
+			if (y.left !== SENTINEL) {
+				y.left.parent = y;
+			}
+			if (y.right !== SENTINEL) {
+				y.right.parent = y;
+			}
+			// update metadata
+			// we replace z with y, so in this sub tree, the length change is z.item.length
+			y.size_left = z.size_left;
+			y.lf_left = z.lf_left;
+			this.recomputeTreeMetadata(y);
+		}
+
+		z.detach();
+
+		if (x.parent.left === x) {
+			let newSizeLeft = calculateSize(x);
+			let newLFLeft = calculateLF(x);
+			if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
+				let delta = newSizeLeft - x.parent.size_left;
+				let lf_delta = newLFLeft - x.parent.lf_left;
+				x.parent.size_left = newSizeLeft;
+				x.parent.lf_left = newLFLeft;
+				this.updateTreeMetadata(x.parent, delta, lf_delta);
+			}
+		}
+
+		this.recomputeTreeMetadata(x.parent);
+
+		if (yWasRed) {
+			resetSentinel();
+			return;
+		}
+
+		// RB-DELETE-FIXUP
+		let w: TreeNode;
+		while (x !== this.root && x.color === NodeColor.Black) {
+			if (x === x.parent.left) {
+				w = x.parent.right;
+
+				if (w.color === NodeColor.Red) {
+					w.color = NodeColor.Black;
+					x.parent.color = NodeColor.Red;
+					this.leftRotate(x.parent);
+					w = x.parent.right;
+				}
+
+				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+					w.color = NodeColor.Red;
+					x = x.parent;
+				} else {
+					if (w.right.color === NodeColor.Black) {
+						w.left.color = NodeColor.Black;
+						w.color = NodeColor.Red;
+						this.rightRotate(w);
+						w = x.parent.right;
+					}
+
+					w.color = x.parent.color;
+					x.parent.color = NodeColor.Black;
+					w.right.color = NodeColor.Black;
+					this.leftRotate(x.parent);
+					x = this.root;
+				}
+			} else {
+				w = x.parent.left;
+
+				if (w.color === NodeColor.Red) {
+					w.color = NodeColor.Black;
+					x.parent.color = NodeColor.Red;
+					this.rightRotate(x.parent);
+					w = x.parent.left;
+				}
+
+				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+					w.color = NodeColor.Red;
+					x = x.parent;
+
+				} else {
+					if (w.left.color === NodeColor.Black) {
+						w.right.color = NodeColor.Black;
+						w.color = NodeColor.Red;
+						this.leftRotate(w);
+						w = x.parent.left;
+					}
+
+					w.color = x.parent.color;
+					x.parent.color = NodeColor.Black;
+					w.left.color = NodeColor.Black;
+					this.rightRotate(x.parent);
+					x = this.root;
+				}
+			}
+		}
+		x.color = NodeColor.Black;
+		resetSentinel();
+	}
+
+	fixInsert(x: TreeNode) {
+		this.recomputeTreeMetadata(x);
+
+		while (x !== this.root && x.parent.color === NodeColor.Red) {
+			if (x.parent === x.parent.parent.left) {
+				const y = x.parent.parent.right;
+
+				if (y.color === NodeColor.Red) {
+					x.parent.color = NodeColor.Black;
+					y.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
+					x = x.parent.parent;
+				} else {
+					if (x === x.parent.right) {
+						x = x.parent;
+						this.leftRotate(x);
+					}
+
+					x.parent.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
+					this.rightRotate(x.parent.parent);
+				}
+			} else {
+				const y = x.parent.parent.left;
+
+				if (y.color === NodeColor.Red) {
+					x.parent.color = NodeColor.Black;
+					y.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
+					x = x.parent.parent;
+				} else {
+					if (x === x.parent.left) {
+						x = x.parent;
+						this.rightRotate(x);
+					}
+					x.parent.color = NodeColor.Black;
+					x.parent.parent.color = NodeColor.Red;
+					this.leftRotate(x.parent.parent);
+				}
+			}
+		}
+
+		this.root.color = NodeColor.Black;
+	}
+
+	updateTreeMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void {
+		// node length change or line feed count change
+		while (x !== this.root && x !== SENTINEL) {
+			if (x.parent.left === x) {
+				x.parent.size_left += delta;
+				x.parent.lf_left += lineFeedCntDelta;
+			}
+
+			x = x.parent;
+		}
+	}
+
+	recomputeTreeMetadata(x: TreeNode) {
+		let delta = 0;
+		let lf_delta = 0;
+		if (x === this.root) {
+			return;
+		}
+
+		if (delta === 0) {
+			// go upwards till the node whose left subtree is changed.
+			while (x !== this.root && x === x.parent.right) {
+				x = x.parent;
+			}
+
+			if (x === this.root) {
+				// well, it means we add a node to the end (inorder)
+				return;
+			}
+
+			// x is the node whose right subtree is changed.
+			x = x.parent;
+
+			delta = calculateSize(x.left) - x.size_left;
+			lf_delta = calculateLF(x.left) - x.lf_left;
+			x.size_left += delta;
+			x.lf_left += lf_delta;
+		}
+
+		// go upwards till root. O(logN)
+		while (x !== this.root && (delta !== 0 || lf_delta !== 0)) {
+			if (x.parent.left === x) {
+				x.parent.size_left += delta;
+				x.parent.lf_left += lf_delta;
+			}
+
+			x = x.parent;
+		}
+	}
+
 	getContentOfSubTree(node: TreeNode): string {
 		let str = '';
 
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
deleted file mode 100644
index 84417b947cd..00000000000
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
+++ /dev/null
@@ -1,427 +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 { Piece, PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-
-export class TreeNode {
-	parent: TreeNode;
-	left: TreeNode;
-	right: TreeNode;
-	color: NodeColor;
-
-	// Piece
-	piece: Piece;
-	size_left: number; // size of the left subtree (not inorder)
-	lf_left: number; // line feeds cnt in the left subtree (not in order)
-
-	constructor(piece: Piece, color: NodeColor) {
-		this.piece = piece;
-		this.color = color;
-		this.size_left = 0;
-		this.lf_left = 0;
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-
-	public next(): TreeNode {
-		if (this.right !== SENTINEL) {
-			return leftest(this.right);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.left === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public prev(): TreeNode {
-		if (this.left !== SENTINEL) {
-			return righttest(this.left);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.right === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public detach(): void {
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-}
-
-export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
-SENTINEL.parent = SENTINEL;
-SENTINEL.left = SENTINEL;
-SENTINEL.right = SENTINEL;
-SENTINEL.color = NodeColor.Black;
-
-export const enum NodeColor {
-	Black = 0,
-	Red = 1,
-}
-
-export function leftest(node: TreeNode): TreeNode {
-	while (node.left !== SENTINEL) {
-		node = node.left;
-	}
-	return node;
-}
-
-export function righttest(node: TreeNode): TreeNode {
-	while (node.right !== SENTINEL) {
-		node = node.right;
-	}
-	return node;
-}
-
-export function calculateSize(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.size_left + node.piece.length + calculateSize(node.right);
-}
-
-export function calculateLF(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
-}
-
-export function resetSentinel(): void {
-	SENTINEL.parent = SENTINEL;
-}
-
-export function leftRotate(tree: PieceTreeBase, x: TreeNode) {
-	let y = x.right;
-
-	// fix size_left
-	y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
-	y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-	x.right = y.left;
-
-	if (y.left !== SENTINEL) {
-		y.left.parent = x;
-	}
-	y.parent = x.parent;
-	if (x.parent === SENTINEL) {
-		tree.root = y;
-	} else if (x.parent.left === x) {
-		x.parent.left = y;
-	} else {
-		x.parent.right = y;
-	}
-	y.left = x;
-	x.parent = y;
-}
-
-export function rightRotate(tree: PieceTreeBase, y: TreeNode) {
-	let x = y.left;
-	y.left = x.right;
-	if (x.right !== SENTINEL) {
-		x.right.parent = y;
-	}
-	x.parent = y.parent;
-
-	// fix size_left
-	y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
-	y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-
-	if (y.parent === SENTINEL) {
-		tree.root = x;
-	} else if (y === y.parent.right) {
-		y.parent.right = x;
-	} else {
-		y.parent.left = x;
-	}
-
-	x.right = y;
-	y.parent = x;
-}
-
-export function rbDelete(tree: PieceTreeBase, z: TreeNode) {
-	let x: TreeNode;
-	let y: TreeNode;
-
-	if (z.left === SENTINEL) {
-		y = z;
-		x = y.right;
-	} else if (z.right === SENTINEL) {
-		y = z;
-		x = y.left;
-	} else {
-		y = leftest(z.right);
-		x = y.right;
-	}
-
-	if (y === tree.root) {
-		tree.root = x;
-
-		// if x is null, we are removing the only node
-		x.color = NodeColor.Black;
-		z.detach();
-		resetSentinel();
-		tree.root.parent = SENTINEL;
-
-		return;
-	}
-
-	let yWasRed = (y.color === NodeColor.Red);
-
-	if (y === y.parent.left) {
-		y.parent.left = x;
-	} else {
-		y.parent.right = x;
-	}
-
-	if (y === z) {
-		x.parent = y.parent;
-		recomputeTreeMetadata(tree, x);
-	} else {
-		if (y.parent === z) {
-			x.parent = y;
-		} else {
-			x.parent = y.parent;
-		}
-
-		// as we make changes to x's hierarchy, update size_left of subtree first
-		recomputeTreeMetadata(tree, x);
-
-		y.left = z.left;
-		y.right = z.right;
-		y.parent = z.parent;
-		y.color = z.color;
-
-		if (z === tree.root) {
-			tree.root = y;
-		} else {
-			if (z === z.parent.left) {
-				z.parent.left = y;
-			} else {
-				z.parent.right = y;
-			}
-		}
-
-		if (y.left !== SENTINEL) {
-			y.left.parent = y;
-		}
-		if (y.right !== SENTINEL) {
-			y.right.parent = y;
-		}
-		// update metadata
-		// we replace z with y, so in this sub tree, the length change is z.item.length
-		y.size_left = z.size_left;
-		y.lf_left = z.lf_left;
-		recomputeTreeMetadata(tree, y);
-	}
-
-	z.detach();
-
-	if (x.parent.left === x) {
-		let newSizeLeft = calculateSize(x);
-		let newLFLeft = calculateLF(x);
-		if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
-			let delta = newSizeLeft - x.parent.size_left;
-			let lf_delta = newLFLeft - x.parent.lf_left;
-			x.parent.size_left = newSizeLeft;
-			x.parent.lf_left = newLFLeft;
-			updateTreeMetadata(tree, x.parent, delta, lf_delta);
-		}
-	}
-
-	recomputeTreeMetadata(tree, x.parent);
-
-	if (yWasRed) {
-		resetSentinel();
-		return;
-	}
-
-	// RB-DELETE-FIXUP
-	let w: TreeNode;
-	while (x !== tree.root && x.color === NodeColor.Black) {
-		if (x === x.parent.left) {
-			w = x.parent.right;
-
-			if (w.color === NodeColor.Red) {
-				w.color = NodeColor.Black;
-				x.parent.color = NodeColor.Red;
-				leftRotate(tree, x.parent);
-				w = x.parent.right;
-			}
-
-			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-				w.color = NodeColor.Red;
-				x = x.parent;
-			} else {
-				if (w.right.color === NodeColor.Black) {
-					w.left.color = NodeColor.Black;
-					w.color = NodeColor.Red;
-					rightRotate(tree, w);
-					w = x.parent.right;
-				}
-
-				w.color = x.parent.color;
-				x.parent.color = NodeColor.Black;
-				w.right.color = NodeColor.Black;
-				leftRotate(tree, x.parent);
-				x = tree.root;
-			}
-		} else {
-			w = x.parent.left;
-
-			if (w.color === NodeColor.Red) {
-				w.color = NodeColor.Black;
-				x.parent.color = NodeColor.Red;
-				rightRotate(tree, x.parent);
-				w = x.parent.left;
-			}
-
-			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-				w.color = NodeColor.Red;
-				x = x.parent;
-
-			} else {
-				if (w.left.color === NodeColor.Black) {
-					w.right.color = NodeColor.Black;
-					w.color = NodeColor.Red;
-					leftRotate(tree, w);
-					w = x.parent.left;
-				}
-
-				w.color = x.parent.color;
-				x.parent.color = NodeColor.Black;
-				w.left.color = NodeColor.Black;
-				rightRotate(tree, x.parent);
-				x = tree.root;
-			}
-		}
-	}
-	x.color = NodeColor.Black;
-	resetSentinel();
-}
-
-export function fixInsert(tree: PieceTreeBase, x: TreeNode) {
-	recomputeTreeMetadata(tree, x);
-
-	while (x !== tree.root && x.parent.color === NodeColor.Red) {
-		if (x.parent === x.parent.parent.left) {
-			const y = x.parent.parent.right;
-
-			if (y.color === NodeColor.Red) {
-				x.parent.color = NodeColor.Black;
-				y.color = NodeColor.Black;
-				x.parent.parent.color = NodeColor.Red;
-				x = x.parent.parent;
-			} else {
-				if (x === x.parent.right) {
-					x = x.parent;
-					leftRotate(tree, x);
-				}
-
-				x.parent.color = NodeColor.Black;
-				x.parent.parent.color = NodeColor.Red;
-				rightRotate(tree, x.parent.parent);
-			}
-		} else {
-			const y = x.parent.parent.left;
-
-			if (y.color === NodeColor.Red) {
-				x.parent.color = NodeColor.Black;
-				y.color = NodeColor.Black;
-				x.parent.parent.color = NodeColor.Red;
-				x = x.parent.parent;
-			} else {
-				if (x === x.parent.left) {
-					x = x.parent;
-					rightRotate(tree, x);
-				}
-				x.parent.color = NodeColor.Black;
-				x.parent.parent.color = NodeColor.Red;
-				leftRotate(tree, x.parent.parent);
-			}
-		}
-	}
-
-	tree.root.color = NodeColor.Black;
-}
-
-export function updateTreeMetadata(tree: PieceTreeBase, x: TreeNode, delta: number, lineFeedCntDelta: number): void {
-	// node length change or line feed count change
-	while (x !== tree.root && x !== SENTINEL) {
-		if (x.parent.left === x) {
-			x.parent.size_left += delta;
-			x.parent.lf_left += lineFeedCntDelta;
-		}
-
-		x = x.parent;
-	}
-}
-
-export function recomputeTreeMetadata(tree: PieceTreeBase, x: TreeNode) {
-	let delta = 0;
-	let lf_delta = 0;
-	if (x === tree.root) {
-		return;
-	}
-
-	if (delta === 0) {
-		// go upwards till the node whose left subtree is changed.
-		while (x !== tree.root && x === x.parent.right) {
-			x = x.parent;
-		}
-
-		if (x === tree.root) {
-			// well, it means we add a node to the end (inorder)
-			return;
-		}
-
-		// x is the node whose right subtree is changed.
-		x = x.parent;
-
-		delta = calculateSize(x.left) - x.size_left;
-		lf_delta = calculateLF(x.left) - x.lf_left;
-		x.size_left += delta;
-		x.lf_left += lf_delta;
-	}
-
-	// go upwards till root. O(logN)
-	while (x !== tree.root && (delta !== 0 || lf_delta !== 0)) {
-		if (x.parent.left === x) {
-			x.parent.size_left += delta;
-			x.parent.lf_left += lf_delta;
-		}
-
-		x = x.parent;
-	}
-}
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 fad324b8051..72d6b394b15 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -9,8 +9,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
-import { SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
+import { PieceTreeBase, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
 import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n';

From 0533a8e6a0f13d7d1cfd105b04096c24797375d7 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 20:42:49 -0800
Subject: [PATCH 528/710] Settings search - add setting to switch to new POST
 request format. And fix setting matcher for core settings from remote

---
 .../browser/preferencesRenderers.ts           |  2 +-
 .../parts/preferences/common/preferences.ts   |  1 +
 .../electron-browser/preferencesSearch.ts     | 71 ++++++++++++-------
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index c36f7249579..b92e3a6285a 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -17,7 +17,7 @@ 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, IScoredResults, IWorkbenchSettingsConfiguration, IRemoteSetting, IExtensionSetting } from 'vs/workbench/parts/preferences/common/preferences';
+import { IPreferencesService, ISettingsGroup, ISetting, IPreferencesEditorModel, IFilterResult, ISettingsEditorModel, IScoredResults, IWorkbenchSettingsConfiguration, IExtensionSetting } from 'vs/workbench/parts/preferences/common/preferences';
 import { SettingsEditorModel, DefaultSettingsEditorModel, WorkspaceConfigurationEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels';
 import { ICodeEditor, IEditorMouseEvent, MouseTargetType } from 'vs/editor/browser/editorBrowser';
 import { IContextMenuService, ContextSubMenu } from 'vs/platform/contextview/browser/contextView';
diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts
index fc0212457ab..5157b9cefb8 100644
--- a/src/vs/workbench/parts/preferences/common/preferences.ts
+++ b/src/vs/workbench/parts/preferences/common/preferences.ts
@@ -24,6 +24,7 @@ export interface IWorkbenchSettingsConfiguration {
 			naturalLanguageSearchEndpoint: string;
 			naturalLanguageSearchKey: string;
 			naturalLanguageSearchAutoIngestFeedback: boolean;
+			useNaturalLanguageSearchPost: boolean;
 			enableNaturalLanguageSearch: boolean;
 			enableNaturalLanguageSearchFeedback: boolean;
 		}
diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 1c4fe18c3a3..b347d735afd 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -20,7 +20,6 @@ import { asJson } from 'vs/base/node/request';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IExtensionManagementService, LocalExtensionType, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ILogService } from 'vs/platform/log/common/log';
-import { IStringDictionary } from 'vs/base/common/collections';
 
 export interface IEndpointDetails {
 	urlBase: string;
@@ -69,8 +68,17 @@ export class PreferencesSearchService extends Disposable implements IPreferences
 		}
 	}
 
-	getRemoteSearchProvider(filter: string, newExtensionsOnly = false): RemoteSearchProvider {
-		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, filter, this._endpoint, this._installedExtensions, newExtensionsOnly);
+	getRemoteSearchProvider(filter: string, newExtensionsOnly = false): ISearchProvider {
+		const workbenchSettings = this.configurationService.getValue().workbench.settings;
+
+		const opts: IRemoteSearchProviderOptions = {
+			filter,
+			newExtensionsOnly,
+			endpoint: this._endpoint,
+			usePost: workbenchSettings.useNaturalLanguageSearchPost
+		};
+
+		return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, opts, this._installedExtensions);
 	}
 
 	getLocalSearchProvider(filter: string): LocalSearchProvider {
@@ -115,20 +123,25 @@ export class LocalSearchProvider implements ISearchProvider {
 	}
 }
 
-export class RemoteSearchProvider implements ISearchProvider {
-	private _filter: string;
+interface IRemoteSearchProviderOptions {
+	filter: string;
+	endpoint: IEndpointDetails;
+	newExtensionsOnly: boolean;
+	usePost: boolean;
+}
+
+class RemoteSearchProvider implements ISearchProvider {
 	private _remoteSearchP: TPromise;
 
-	constructor(filter: string, private endpoint: IEndpointDetails, private installedExtensions: TPromise, private newExtensionsOnly: boolean,
+	constructor(private options: IRemoteSearchProviderOptions, private installedExtensions: TPromise,
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IRequestService private requestService: IRequestService,
 		@ILogService private logService: ILogService
 	) {
-		this._filter = filter;
-
-		this._remoteSearchP = filter ?
-			this.getSettingsFromBing(filter) :
-			TPromise.wrap(null);
+		this._remoteSearchP = (this.options.newExtensionsOnly && !this.options.usePost) ? TPromise.wrap(null) :
+			this.options.filter ?
+				this.getSettingsFromBing(this.options.filter) :
+				TPromise.wrap(null);
 	}
 
 	searchModel(preferencesModel: ISettingsEditorModel): TPromise {
@@ -141,7 +154,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 			const highScoreKey = top(resultKeys, (a, b) => remoteResult.scoredResults[b].score - remoteResult.scoredResults[a].score, 1)[0];
 			const highScore = highScoreKey ? remoteResult.scoredResults[highScoreKey].score : 0;
 			const minScore = highScore / 5;
-			if (this.newExtensionsOnly) {
+			if (this.options.newExtensionsOnly) {
 				const passingScoreKeys = resultKeys.filter(k => remoteResult.scoredResults[k].score >= minScore);
 				const filterMatches: ISettingMatch[] = passingScoreKeys.map(k => {
 					const remoteSetting = remoteResult.scoredResults[k];
@@ -159,7 +172,7 @@ export class RemoteSearchProvider implements ISearchProvider {
 				};
 			} else {
 				const settingMatcher = this.getRemoteSettingMatcher(remoteResult.scoredResults, minScore, preferencesModel);
-				const filterMatches = preferencesModel.filterSettings(this._filter, group => null, settingMatcher);
+				const filterMatches = preferencesModel.filterSettings(this.options.filter, group => null, settingMatcher);
 				return {
 					filterMatches,
 					metadata: remoteResult
@@ -172,16 +185,19 @@ export class RemoteSearchProvider implements ISearchProvider {
 		const start = Date.now();
 		return this.prepareRequest(filter).then(details => {
 			this.logService.debug(`Searching settings via ${details.url}`);
-			this.logService.debug(`Body: ${details.body}`);
+			if (details.body) {
+				this.logService.debug(`Body: ${details.body}`);
+			}
 
+			const requestType = details.body ? 'post' : 'get';
 			return this.requestService.request({
-				type: 'POST',
+				type: requestType,
 				url: details.url,
 				data: details.body,
 				headers: {
 					'User-Agent': 'request',
 					'Content-Type': 'application/json; charset=utf-8',
-					'api-key': this.endpoint.key
+					'api-key': this.options.endpoint.key
 				},
 				timeout: 5000
 			}).then(context => {
@@ -197,12 +213,12 @@ export class RemoteSearchProvider implements ISearchProvider {
 					.map(r => {
 						const key = JSON.parse(r.setting || r.Setting);
 						const packageId = r['packageid'];
-						const id = getSettingKey(packageId, key);
+						const id = getSettingKey(key, packageId);
 
 						const packageName = r['packagename'];
 						let extensionName: string;
 						let extensionPublisher: string;
-						if (packageName.indexOf('##') >= 0) {
+						if (packageName && packageName.indexOf('##') >= 0) {
 							[extensionPublisher, extensionName] = packageName.split('##');
 						}
 
@@ -236,9 +252,9 @@ export class RemoteSearchProvider implements ISearchProvider {
 
 	private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher {
 		return (setting: ISetting, group: ISettingsGroup) => {
-			const remoteSetting = scoredResults[getSettingKey(group.id, setting.key)];
+			const remoteSetting = scoredResults[getSettingKey(setting.key, group.id)] || scoredResults[getSettingKey(setting.key)];
 			if (remoteSetting && remoteSetting.score >= minScore) {
-				const settingMatches = new SettingMatches(this._filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
+				const settingMatches = new SettingMatches(this.options.filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
 				return { matches: settingMatches, score: remoteSetting.score };
 			}
 
@@ -255,16 +271,15 @@ export class RemoteSearchProvider implements ISearchProvider {
 		query = query.replace(/\ +/g, '~ ') + '~';
 
 		const encodedQuery = encodeURIComponent(userQuery + ' || ' + query);
-		let url = `${this.endpoint.urlBase}?`;
+		let url = `${this.options.endpoint.urlBase}?`;
 
 		const buildNumber = this.environmentService.settingsSearchBuildId;
-		if (this.endpoint.key) {
+		if (this.options.endpoint.key) {
 			url += `${API_VERSION}&${QUERY_TYPE}`;
 		}
 
-		const usePost = true;
-		if (usePost) {
-			const filters = this.newExtensionsOnly ?
+		if (this.options.usePost) {
+			const filters = this.options.newExtensionsOnly ?
 				[`diminish eq 'latest'`] :
 				await this.getVersionFilters(buildNumber);
 
@@ -315,8 +330,10 @@ export class RemoteSearchProvider implements ISearchProvider {
 	}
 }
 
-function getSettingKey(packageId: string, name: string): string {
-	return packageId + '_' + name;
+function getSettingKey(name: string, packageId?: string): string {
+	return packageId ?
+		packageId + '_' + name :
+		name;
 }
 
 const API_VERSION = 'api-version=2016-09-01-Preview';

From 758bfd87db9ddd706b9526f0ce4a298c73f6d074 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 20:48:26 -0800
Subject: [PATCH 529/710] Fix issue with settings search match highlights
 disappearing

---
 .../preferences/common/preferencesModels.ts   | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
index 044268407ba..95c7d255962 100644
--- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts
+++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts
@@ -72,7 +72,22 @@ export abstract class AbstractSettingsModel extends EditorModel {
 			}
 		}
 
-		return filterMatches.sort((a, b) => b.score - a.score);
+		return filterMatches
+			.sort((a, b) => b.score - a.score)
+			.map(filteredMatch => {
+				// Fix match ranges to offset from setting start line
+				return {
+					setting: filteredMatch.setting,
+					score: filteredMatch.score,
+					matches: filteredMatch.matches && filteredMatch.matches.map(match => {
+						return new Range(
+							match.startLineNumber - filteredMatch.setting.range.startLineNumber,
+							match.startColumn,
+							match.endLineNumber - filteredMatch.setting.range.startLineNumber,
+							match.endColumn);
+					})
+				};
+			});
 	}
 
 	public getPreference(key: string): ISetting {
@@ -91,12 +106,9 @@ export abstract class AbstractSettingsModel extends EditorModel {
 	private copySetting(setting: ISetting): ISetting {
 		return {
 			description: setting.description,
-			descriptionRanges: setting.descriptionRanges,
 			key: setting.key,
-			keyRange: setting.keyRange,
 			value: setting.value,
 			range: setting.range,
-			valueRange: setting.valueRange,
 			overrides: [],
 			overrideOf: setting.overrideOf
 		};
@@ -684,21 +696,6 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements
 	}
 
 	private writeSettingsGroupToBuilder(builder: SettingsContentBuilder, settingsGroup: ISettingsGroup, filterMatches: ISettingMatch[]): IRange[] {
-		// Fix match ranges to offset from setting start line
-		filterMatches = filterMatches.map(filteredMatch => {
-			return {
-				setting: filteredMatch.setting,
-				score: filteredMatch.score,
-				matches: filteredMatch.matches && filteredMatch.matches.map(match => {
-					return new Range(
-						match.startLineNumber - filteredMatch.setting.range.startLineNumber,
-						match.startColumn,
-						match.endLineNumber - filteredMatch.setting.range.startLineNumber,
-						match.endColumn);
-				})
-			};
-		});
-
 		builder.pushGroup(settingsGroup);
 		builder.pushLine(',');
 

From d34a8edccce71d1f9fafaf6148c192501500f5da Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 20:50:39 -0800
Subject: [PATCH 530/710] safe guard of search cache in buffer.

---
 .../pieceTreeTextBuffer.test.ts               | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

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 72d6b394b15..a04ab200bd6 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -1530,4 +1530,62 @@ suite('buffer api', () => {
 
 		assert(!a.equal(b));
 	});
+});
+
+suite('search offset cache', () => {
+	test('render white space exception', () => {
+		let pieceTable = createTextBuffer(['class Name{\n\t\n\t\t\tget() {\n\n\t\t\t}\n\t\t}']);
+		let str = 'class Name{\n\t\n\t\t\tget() {\n\n\t\t\t}\n\t\t}';
+
+		pieceTable.insert(12, 's');
+		str = str.substring(0, 12) + 's' + str.substring(12);
+
+		pieceTable.insert(13, 'e');
+		str = str.substring(0, 13) + 'e' + str.substring(13);
+
+		pieceTable.insert(14, 't');
+		str = str.substring(0, 14) + 't' + str.substring(14);
+
+		pieceTable.insert(15, '()');
+		str = str.substring(0, 15) + '()' + str.substring(15);
+
+		pieceTable.delete(16, 1);
+		str = str.substring(0, 16) + str.substring(16 + 1);
+
+		pieceTable.insert(17, '()');
+		str = str.substring(0, 17) + '()' + str.substring(17);
+
+		pieceTable.delete(18, 1);
+		str = str.substring(0, 18) + str.substring(18 + 1);
+
+		pieceTable.insert(18, '}');
+		str = str.substring(0, 18) + '}' + str.substring(18);
+
+		pieceTable.insert(12, '\n');
+		str = str.substring(0, 12) + '\n' + str.substring(12);
+
+		pieceTable.delete(12, 1);
+		str = str.substring(0, 12) + str.substring(12 + 1);
+
+		pieceTable.delete(18, 1);
+		str = str.substring(0, 18) + str.substring(18 + 1);
+
+		pieceTable.insert(18, '}');
+		str = str.substring(0, 18) + '}' + str.substring(18);
+
+		pieceTable.delete(17, 2);
+		str = str.substring(0, 17) + str.substring(17 + 2);
+
+		pieceTable.delete(16, 1);
+		str = str.substring(0, 16) + str.substring(16 + 1);
+
+		pieceTable.insert(16, ')');
+		str = str.substring(0, 16) + ')' + str.substring(16);
+
+		pieceTable.delete(15, 2);
+		str = str.substring(0, 15) + str.substring(15 + 2);
+
+		var content = pieceTable.getLinesRawContent();
+		assert(content === str);
+	});
 });
\ No newline at end of file

From 95dfbe441038ed4cae61aae56c07c1a1f75b1b27 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Mon, 22 Jan 2018 20:55:16 -0800
Subject: [PATCH 531/710] Move rbtree logic out of piecetreebase.

---
 .../pieceTreeTextBuffer/pieceTreeBase.ts      | 456 +-----------------
 .../model/pieceTreeTextBuffer/rbTreeBase.ts   | 427 ++++++++++++++++
 .../pieceTreeTextBuffer.test.ts               |   3 +-
 3 files changed, 445 insertions(+), 441 deletions(-)
 create mode 100644 src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts

diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
index 9598964eff9..3c98e8b6b31 100644
--- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts
@@ -8,49 +8,7 @@ import { Position } from 'vs/editor/common/core/position';
 import { CharCode } from 'vs/base/common/charCode';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextSnapshot } from 'vs/platform/files/common/files';
-
-export const enum NodeColor {
-	Black = 0,
-	Red = 1,
-}
-
-export function getNodeColor(node: TreeNode) {
-	return node.color;
-}
-
-function leftest(node: TreeNode): TreeNode {
-	while (node.left !== SENTINEL) {
-		node = node.left;
-	}
-	return node;
-}
-
-function righttest(node: TreeNode): TreeNode {
-	while (node.right !== SENTINEL) {
-		node = node.right;
-	}
-	return node;
-}
-
-function calculateSize(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.size_left + node.piece.length + calculateSize(node.right);
-}
-
-function calculateLF(node: TreeNode): number {
-	if (node === SENTINEL) {
-		return 0;
-	}
-
-	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
-}
-
-function resetSentinel(): void {
-	SENTINEL.parent = SENTINEL;
-}
+import { leftest, righttest, updateTreeMetadata, rbDelete, fixInsert, NodeColor, SENTINEL, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
 
 // const lfRegex = new RegExp(/\r\n|\r|\n/g);
 
@@ -138,84 +96,6 @@ export function createLineStarts(r: number[], str: string): LineStarts {
 	return result;
 }
 
-export class TreeNode {
-	parent: TreeNode;
-	left: TreeNode;
-	right: TreeNode;
-	color: NodeColor;
-
-	// Piece
-	piece: Piece;
-	size_left: number; // size of the left subtree (not inorder)
-	lf_left: number; // line feeds cnt in the left subtree (not in order)
-
-	constructor(piece: Piece, color: NodeColor) {
-		this.piece = piece;
-		this.color = color;
-		this.size_left = 0;
-		this.lf_left = 0;
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-
-	public next(): TreeNode {
-		if (this.right !== SENTINEL) {
-			return leftest(this.right);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.left === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public prev(): TreeNode {
-		if (this.left !== SENTINEL) {
-			return righttest(this.left);
-		}
-
-		let node: TreeNode = this;
-
-		while (node.parent !== SENTINEL) {
-			if (node.parent.right === node) {
-				break;
-			}
-
-			node = node.parent;
-		}
-
-		if (node.parent === SENTINEL) {
-			return SENTINEL;
-		} else {
-			return node.parent;
-		}
-	}
-
-	public detach(): void {
-		this.parent = null;
-		this.left = null;
-		this.right = null;
-	}
-}
-
-export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
-SENTINEL.parent = SENTINEL;
-SENTINEL.left = SENTINEL;
-SENTINEL.right = SENTINEL;
-SENTINEL.color = NodeColor.Black;
-
 export interface NodePosition {
 	/**
 	 * Piece Index
@@ -393,7 +273,6 @@ export class PieceTreeBase {
 		this.create(chunks);
 	}
 
-
 	// #region Buffer API
 	public createSnapshot(BOM: string): ITextSnapshot {
 		return new PieceTreeSnapshot(this, BOM);
@@ -654,7 +533,7 @@ export class PieceTreeBase {
 			if (startPosition.nodeStartOffset === offset) {
 				if (cnt === startNode.piece.length) { // delete node
 					let next = startNode.next();
-					this.rbDelete(startNode);
+					rbDelete(this, startNode);
 					this.validateCRLFWithPrevNode(next);
 					this.computeBufferMetadata();
 					return;
@@ -718,7 +597,7 @@ export class PieceTreeBase {
 			piece.length -= 1;
 
 			value += '\n';
-			this.updateTreeMetadata(node, -1, -1);
+			updateTreeMetadata(this, node, -1, -1);
 
 			if (node.piece.length === 0) {
 				nodesToDel.push(node);
@@ -822,7 +701,7 @@ export class PieceTreeBase {
 
 	deleteNodes(nodes: TreeNode[]): void {
 		for (let i = 0; i < nodes.length; i++) {
-			this.rbDelete(nodes[i]);
+			rbDelete(this, nodes[i]);
 		}
 	}
 
@@ -978,7 +857,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = newEndOffset - originalEndOffset;
 		piece.length += size_delta;
-		this.updateTreeMetadata(node, size_delta, lf_delta);
+		updateTreeMetadata(this, node, size_delta, lf_delta);
 	}
 
 	deleteNodeHead(node: TreeNode, pos: BufferCursor) {
@@ -992,7 +871,7 @@ export class PieceTreeBase {
 		let lf_delta = piece.lineFeedCnt - originalLFCnt;
 		let size_delta = originalStartOffset - newStartOffset;
 		piece.length += size_delta;
-		this.updateTreeMetadata(node, size_delta, lf_delta);
+		updateTreeMetadata(this, node, size_delta, lf_delta);
 	}
 
 	shrinkNode(node: TreeNode, start: BufferCursor, end: BufferCursor) {
@@ -1008,7 +887,7 @@ export class PieceTreeBase {
 		let newLength = this.offsetInBuffer(piece.bufferIndex, start) - this.offsetInBuffer(piece.bufferIndex, originalStartPos);
 		let newLFCnt = piece.lineFeedCnt;
 		piece.length = newLength;
-		this.updateTreeMetadata(node, newLength - oldLength, newLFCnt - oldLFCnt);
+		updateTreeMetadata(this, node, newLength - oldLength, newLFCnt - oldLFCnt);
 
 		// new right piece, end, originalEndPos
 		let newPiece = new Piece(
@@ -1052,7 +931,7 @@ export class PieceTreeBase {
 		node.piece.lineFeedCnt = newLineFeedCnt;
 		let lf_delta = newLineFeedCnt - oldLineFeedCnt;
 		this._lastChangeBufferPos = endPos;
-		this.updateTreeMetadata(node, value.length, lf_delta);
+		updateTreeMetadata(this, node, value.length, lf_delta);
 	}
 
 	nodeAt(offset: number): NodePosition {
@@ -1247,7 +1126,7 @@ export class PieceTreeBase {
 		prev.piece.length -= 1;
 		prev.piece.lineFeedCnt -= 1;
 
-		this.updateTreeMetadata(prev, - 1, -1);
+		updateTreeMetadata(this, prev, - 1, -1);
 		if (prev.piece.length === 0) {
 			nodesToDel.push(prev);
 		}
@@ -1259,7 +1138,7 @@ export class PieceTreeBase {
 		next.piece.lineFeedCnt = this.getLineFeedCnt(next.piece.bufferIndex, next.piece.start, next.piece.end); // @todo, we can optimize
 		// }
 
-		this.updateTreeMetadata(next, - 1, -1);
+		updateTreeMetadata(this, next, - 1, -1);
 		if (next.piece.length === 0) {
 			nodesToDel.push(next);
 		}
@@ -1270,7 +1149,7 @@ export class PieceTreeBase {
 		// delete empty nodes
 
 		for (let i = 0; i < nodesToDel.length; i++) {
-			this.rbDelete(nodesToDel[i]);
+			rbDelete(this, nodesToDel[i]);
 		}
 	}
 
@@ -1282,7 +1161,7 @@ export class PieceTreeBase {
 				value += '\n';
 
 				if (nextNode.piece.length === 1) {
-					this.rbDelete(nextNode);
+					rbDelete(this, nextNode);
 				} else {
 
 					let piece = nextNode.piece;
@@ -1290,7 +1169,7 @@ export class PieceTreeBase {
 					piece.start = newStart;
 					piece.length -= 1;
 					piece.lineFeedCnt = this.getLineFeedCnt(piece.bufferIndex, piece.start, piece.end); // @todo, we can optimize
-					this.updateTreeMetadata(nextNode, -1, -1);
+					updateTreeMetadata(this, nextNode, -1, -1);
 				}
 				return true;
 			}
@@ -1303,7 +1182,7 @@ export class PieceTreeBase {
 
 	// #endregion
 
-	// #region Red Black Tree
+	// #region Tree operations
 	iterate(node: TreeNode, callback: (node: TreeNode) => boolean): boolean {
 		if (node === SENTINEL) {
 			return callback(SENTINEL);
@@ -1330,53 +1209,6 @@ export class PieceTreeBase {
 		return currentContent;
 	}
 
-	leftRotate(x: TreeNode) {
-		let y = x.right;
-
-		// fix size_left
-		y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
-		y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-		x.right = y.left;
-
-		if (y.left !== SENTINEL) {
-			y.left.parent = x;
-		}
-		y.parent = x.parent;
-		if (x.parent === SENTINEL) {
-			this.root = y;
-		} else if (x.parent.left === x) {
-			x.parent.left = y;
-		} else {
-			x.parent.right = y;
-		}
-		y.left = x;
-		x.parent = y;
-	}
-
-	rightRotate(y: TreeNode) {
-		let x = y.left;
-		y.left = x.right;
-		if (x.right !== SENTINEL) {
-			x.right.parent = y;
-		}
-		x.parent = y.parent;
-
-		// fix size_left
-		y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
-		y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
-
-		if (y.parent === SENTINEL) {
-			this.root = x;
-		} else if (y === y.parent.right) {
-			y.parent.right = x;
-		} else {
-			y.parent.left = x;
-		}
-
-		x.right = y;
-		y.parent = x;
-	}
-
 	/**
 	 *      node              node
 	 *     /  \              /  \
@@ -1405,7 +1237,7 @@ export class PieceTreeBase {
 			z.parent = nextNode;
 		}
 
-		this.fixInsert(z);
+		fixInsert(this, z);
 		return z;
 	}
 
@@ -1437,266 +1269,10 @@ export class PieceTreeBase {
 			z.parent = prevNode;
 		}
 
-		this.fixInsert(z);
+		fixInsert(this, z);
 		return z;
 	}
 
-	rbDelete(z: TreeNode) {
-		let x: TreeNode;
-		let y: TreeNode;
-
-		if (z.left === SENTINEL) {
-			y = z;
-			x = y.right;
-		} else if (z.right === SENTINEL) {
-			y = z;
-			x = y.left;
-		} else {
-			y = leftest(z.right);
-			x = y.right;
-		}
-
-		if (y === this.root) {
-			this.root = x;
-
-			// if x is null, we are removing the only node
-			x.color = NodeColor.Black;
-			z.detach();
-			resetSentinel();
-			this.root.parent = SENTINEL;
-
-			return;
-		}
-
-		let yWasRed = (y.color === NodeColor.Red);
-
-		if (y === y.parent.left) {
-			y.parent.left = x;
-		} else {
-			y.parent.right = x;
-		}
-
-		if (y === z) {
-			x.parent = y.parent;
-			this.recomputeTreeMetadata(x);
-		} else {
-			if (y.parent === z) {
-				x.parent = y;
-			} else {
-				x.parent = y.parent;
-			}
-
-			// as we make changes to x's hierarchy, update size_left of subtree first
-			this.recomputeTreeMetadata(x);
-
-			y.left = z.left;
-			y.right = z.right;
-			y.parent = z.parent;
-			y.color = z.color;
-
-			if (z === this.root) {
-				this.root = y;
-			} else {
-				if (z === z.parent.left) {
-					z.parent.left = y;
-				} else {
-					z.parent.right = y;
-				}
-			}
-
-			if (y.left !== SENTINEL) {
-				y.left.parent = y;
-			}
-			if (y.right !== SENTINEL) {
-				y.right.parent = y;
-			}
-			// update metadata
-			// we replace z with y, so in this sub tree, the length change is z.item.length
-			y.size_left = z.size_left;
-			y.lf_left = z.lf_left;
-			this.recomputeTreeMetadata(y);
-		}
-
-		z.detach();
-
-		if (x.parent.left === x) {
-			let newSizeLeft = calculateSize(x);
-			let newLFLeft = calculateLF(x);
-			if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
-				let delta = newSizeLeft - x.parent.size_left;
-				let lf_delta = newLFLeft - x.parent.lf_left;
-				x.parent.size_left = newSizeLeft;
-				x.parent.lf_left = newLFLeft;
-				this.updateTreeMetadata(x.parent, delta, lf_delta);
-			}
-		}
-
-		this.recomputeTreeMetadata(x.parent);
-
-		if (yWasRed) {
-			resetSentinel();
-			return;
-		}
-
-		// RB-DELETE-FIXUP
-		let w: TreeNode;
-		while (x !== this.root && x.color === NodeColor.Black) {
-			if (x === x.parent.left) {
-				w = x.parent.right;
-
-				if (w.color === NodeColor.Red) {
-					w.color = NodeColor.Black;
-					x.parent.color = NodeColor.Red;
-					this.leftRotate(x.parent);
-					w = x.parent.right;
-				}
-
-				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-					w.color = NodeColor.Red;
-					x = x.parent;
-				} else {
-					if (w.right.color === NodeColor.Black) {
-						w.left.color = NodeColor.Black;
-						w.color = NodeColor.Red;
-						this.rightRotate(w);
-						w = x.parent.right;
-					}
-
-					w.color = x.parent.color;
-					x.parent.color = NodeColor.Black;
-					w.right.color = NodeColor.Black;
-					this.leftRotate(x.parent);
-					x = this.root;
-				}
-			} else {
-				w = x.parent.left;
-
-				if (w.color === NodeColor.Red) {
-					w.color = NodeColor.Black;
-					x.parent.color = NodeColor.Red;
-					this.rightRotate(x.parent);
-					w = x.parent.left;
-				}
-
-				if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
-					w.color = NodeColor.Red;
-					x = x.parent;
-
-				} else {
-					if (w.left.color === NodeColor.Black) {
-						w.right.color = NodeColor.Black;
-						w.color = NodeColor.Red;
-						this.leftRotate(w);
-						w = x.parent.left;
-					}
-
-					w.color = x.parent.color;
-					x.parent.color = NodeColor.Black;
-					w.left.color = NodeColor.Black;
-					this.rightRotate(x.parent);
-					x = this.root;
-				}
-			}
-		}
-		x.color = NodeColor.Black;
-		resetSentinel();
-	}
-
-	fixInsert(x: TreeNode) {
-		this.recomputeTreeMetadata(x);
-
-		while (x !== this.root && x.parent.color === NodeColor.Red) {
-			if (x.parent === x.parent.parent.left) {
-				const y = x.parent.parent.right;
-
-				if (y.color === NodeColor.Red) {
-					x.parent.color = NodeColor.Black;
-					y.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					x = x.parent.parent;
-				} else {
-					if (x === x.parent.right) {
-						x = x.parent;
-						this.leftRotate(x);
-					}
-
-					x.parent.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					this.rightRotate(x.parent.parent);
-				}
-			} else {
-				const y = x.parent.parent.left;
-
-				if (y.color === NodeColor.Red) {
-					x.parent.color = NodeColor.Black;
-					y.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					x = x.parent.parent;
-				} else {
-					if (x === x.parent.left) {
-						x = x.parent;
-						this.rightRotate(x);
-					}
-					x.parent.color = NodeColor.Black;
-					x.parent.parent.color = NodeColor.Red;
-					this.leftRotate(x.parent.parent);
-				}
-			}
-		}
-
-		this.root.color = NodeColor.Black;
-	}
-
-	updateTreeMetadata(x: TreeNode, delta: number, lineFeedCntDelta: number): void {
-		// node length change or line feed count change
-		while (x !== this.root && x !== SENTINEL) {
-			if (x.parent.left === x) {
-				x.parent.size_left += delta;
-				x.parent.lf_left += lineFeedCntDelta;
-			}
-
-			x = x.parent;
-		}
-	}
-
-	recomputeTreeMetadata(x: TreeNode) {
-		let delta = 0;
-		let lf_delta = 0;
-		if (x === this.root) {
-			return;
-		}
-
-		if (delta === 0) {
-			// go upwards till the node whose left subtree is changed.
-			while (x !== this.root && x === x.parent.right) {
-				x = x.parent;
-			}
-
-			if (x === this.root) {
-				// well, it means we add a node to the end (inorder)
-				return;
-			}
-
-			// x is the node whose right subtree is changed.
-			x = x.parent;
-
-			delta = calculateSize(x.left) - x.size_left;
-			lf_delta = calculateLF(x.left) - x.lf_left;
-			x.size_left += delta;
-			x.lf_left += lf_delta;
-		}
-
-		// go upwards till root. O(logN)
-		while (x !== this.root && (delta !== 0 || lf_delta !== 0)) {
-			if (x.parent.left === x) {
-				x.parent.size_left += delta;
-				x.parent.lf_left += lf_delta;
-			}
-
-			x = x.parent;
-		}
-	}
-
 	getContentOfSubTree(node: TreeNode): string {
 		let str = '';
 
diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
new file mode 100644
index 00000000000..84417b947cd
--- /dev/null
+++ b/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.ts
@@ -0,0 +1,427 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { Piece, PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+
+export class TreeNode {
+	parent: TreeNode;
+	left: TreeNode;
+	right: TreeNode;
+	color: NodeColor;
+
+	// Piece
+	piece: Piece;
+	size_left: number; // size of the left subtree (not inorder)
+	lf_left: number; // line feeds cnt in the left subtree (not in order)
+
+	constructor(piece: Piece, color: NodeColor) {
+		this.piece = piece;
+		this.color = color;
+		this.size_left = 0;
+		this.lf_left = 0;
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+
+	public next(): TreeNode {
+		if (this.right !== SENTINEL) {
+			return leftest(this.right);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.left === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public prev(): TreeNode {
+		if (this.left !== SENTINEL) {
+			return righttest(this.left);
+		}
+
+		let node: TreeNode = this;
+
+		while (node.parent !== SENTINEL) {
+			if (node.parent.right === node) {
+				break;
+			}
+
+			node = node.parent;
+		}
+
+		if (node.parent === SENTINEL) {
+			return SENTINEL;
+		} else {
+			return node.parent;
+		}
+	}
+
+	public detach(): void {
+		this.parent = null;
+		this.left = null;
+		this.right = null;
+	}
+}
+
+export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
+SENTINEL.parent = SENTINEL;
+SENTINEL.left = SENTINEL;
+SENTINEL.right = SENTINEL;
+SENTINEL.color = NodeColor.Black;
+
+export const enum NodeColor {
+	Black = 0,
+	Red = 1,
+}
+
+export function leftest(node: TreeNode): TreeNode {
+	while (node.left !== SENTINEL) {
+		node = node.left;
+	}
+	return node;
+}
+
+export function righttest(node: TreeNode): TreeNode {
+	while (node.right !== SENTINEL) {
+		node = node.right;
+	}
+	return node;
+}
+
+export function calculateSize(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.size_left + node.piece.length + calculateSize(node.right);
+}
+
+export function calculateLF(node: TreeNode): number {
+	if (node === SENTINEL) {
+		return 0;
+	}
+
+	return node.lf_left + node.piece.lineFeedCnt + calculateLF(node.right);
+}
+
+export function resetSentinel(): void {
+	SENTINEL.parent = SENTINEL;
+}
+
+export function leftRotate(tree: PieceTreeBase, x: TreeNode) {
+	let y = x.right;
+
+	// fix size_left
+	y.size_left += x.size_left + (x.piece ? x.piece.length : 0);
+	y.lf_left += x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+	x.right = y.left;
+
+	if (y.left !== SENTINEL) {
+		y.left.parent = x;
+	}
+	y.parent = x.parent;
+	if (x.parent === SENTINEL) {
+		tree.root = y;
+	} else if (x.parent.left === x) {
+		x.parent.left = y;
+	} else {
+		x.parent.right = y;
+	}
+	y.left = x;
+	x.parent = y;
+}
+
+export function rightRotate(tree: PieceTreeBase, y: TreeNode) {
+	let x = y.left;
+	y.left = x.right;
+	if (x.right !== SENTINEL) {
+		x.right.parent = y;
+	}
+	x.parent = y.parent;
+
+	// fix size_left
+	y.size_left -= x.size_left + (x.piece ? x.piece.length : 0);
+	y.lf_left -= x.lf_left + (x.piece ? x.piece.lineFeedCnt : 0);
+
+	if (y.parent === SENTINEL) {
+		tree.root = x;
+	} else if (y === y.parent.right) {
+		y.parent.right = x;
+	} else {
+		y.parent.left = x;
+	}
+
+	x.right = y;
+	y.parent = x;
+}
+
+export function rbDelete(tree: PieceTreeBase, z: TreeNode) {
+	let x: TreeNode;
+	let y: TreeNode;
+
+	if (z.left === SENTINEL) {
+		y = z;
+		x = y.right;
+	} else if (z.right === SENTINEL) {
+		y = z;
+		x = y.left;
+	} else {
+		y = leftest(z.right);
+		x = y.right;
+	}
+
+	if (y === tree.root) {
+		tree.root = x;
+
+		// if x is null, we are removing the only node
+		x.color = NodeColor.Black;
+		z.detach();
+		resetSentinel();
+		tree.root.parent = SENTINEL;
+
+		return;
+	}
+
+	let yWasRed = (y.color === NodeColor.Red);
+
+	if (y === y.parent.left) {
+		y.parent.left = x;
+	} else {
+		y.parent.right = x;
+	}
+
+	if (y === z) {
+		x.parent = y.parent;
+		recomputeTreeMetadata(tree, x);
+	} else {
+		if (y.parent === z) {
+			x.parent = y;
+		} else {
+			x.parent = y.parent;
+		}
+
+		// as we make changes to x's hierarchy, update size_left of subtree first
+		recomputeTreeMetadata(tree, x);
+
+		y.left = z.left;
+		y.right = z.right;
+		y.parent = z.parent;
+		y.color = z.color;
+
+		if (z === tree.root) {
+			tree.root = y;
+		} else {
+			if (z === z.parent.left) {
+				z.parent.left = y;
+			} else {
+				z.parent.right = y;
+			}
+		}
+
+		if (y.left !== SENTINEL) {
+			y.left.parent = y;
+		}
+		if (y.right !== SENTINEL) {
+			y.right.parent = y;
+		}
+		// update metadata
+		// we replace z with y, so in this sub tree, the length change is z.item.length
+		y.size_left = z.size_left;
+		y.lf_left = z.lf_left;
+		recomputeTreeMetadata(tree, y);
+	}
+
+	z.detach();
+
+	if (x.parent.left === x) {
+		let newSizeLeft = calculateSize(x);
+		let newLFLeft = calculateLF(x);
+		if (newSizeLeft !== x.parent.size_left || newLFLeft !== x.parent.lf_left) {
+			let delta = newSizeLeft - x.parent.size_left;
+			let lf_delta = newLFLeft - x.parent.lf_left;
+			x.parent.size_left = newSizeLeft;
+			x.parent.lf_left = newLFLeft;
+			updateTreeMetadata(tree, x.parent, delta, lf_delta);
+		}
+	}
+
+	recomputeTreeMetadata(tree, x.parent);
+
+	if (yWasRed) {
+		resetSentinel();
+		return;
+	}
+
+	// RB-DELETE-FIXUP
+	let w: TreeNode;
+	while (x !== tree.root && x.color === NodeColor.Black) {
+		if (x === x.parent.left) {
+			w = x.parent.right;
+
+			if (w.color === NodeColor.Red) {
+				w.color = NodeColor.Black;
+				x.parent.color = NodeColor.Red;
+				leftRotate(tree, x.parent);
+				w = x.parent.right;
+			}
+
+			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+				w.color = NodeColor.Red;
+				x = x.parent;
+			} else {
+				if (w.right.color === NodeColor.Black) {
+					w.left.color = NodeColor.Black;
+					w.color = NodeColor.Red;
+					rightRotate(tree, w);
+					w = x.parent.right;
+				}
+
+				w.color = x.parent.color;
+				x.parent.color = NodeColor.Black;
+				w.right.color = NodeColor.Black;
+				leftRotate(tree, x.parent);
+				x = tree.root;
+			}
+		} else {
+			w = x.parent.left;
+
+			if (w.color === NodeColor.Red) {
+				w.color = NodeColor.Black;
+				x.parent.color = NodeColor.Red;
+				rightRotate(tree, x.parent);
+				w = x.parent.left;
+			}
+
+			if (w.left.color === NodeColor.Black && w.right.color === NodeColor.Black) {
+				w.color = NodeColor.Red;
+				x = x.parent;
+
+			} else {
+				if (w.left.color === NodeColor.Black) {
+					w.right.color = NodeColor.Black;
+					w.color = NodeColor.Red;
+					leftRotate(tree, w);
+					w = x.parent.left;
+				}
+
+				w.color = x.parent.color;
+				x.parent.color = NodeColor.Black;
+				w.left.color = NodeColor.Black;
+				rightRotate(tree, x.parent);
+				x = tree.root;
+			}
+		}
+	}
+	x.color = NodeColor.Black;
+	resetSentinel();
+}
+
+export function fixInsert(tree: PieceTreeBase, x: TreeNode) {
+	recomputeTreeMetadata(tree, x);
+
+	while (x !== tree.root && x.parent.color === NodeColor.Red) {
+		if (x.parent === x.parent.parent.left) {
+			const y = x.parent.parent.right;
+
+			if (y.color === NodeColor.Red) {
+				x.parent.color = NodeColor.Black;
+				y.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				x = x.parent.parent;
+			} else {
+				if (x === x.parent.right) {
+					x = x.parent;
+					leftRotate(tree, x);
+				}
+
+				x.parent.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				rightRotate(tree, x.parent.parent);
+			}
+		} else {
+			const y = x.parent.parent.left;
+
+			if (y.color === NodeColor.Red) {
+				x.parent.color = NodeColor.Black;
+				y.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				x = x.parent.parent;
+			} else {
+				if (x === x.parent.left) {
+					x = x.parent;
+					rightRotate(tree, x);
+				}
+				x.parent.color = NodeColor.Black;
+				x.parent.parent.color = NodeColor.Red;
+				leftRotate(tree, x.parent.parent);
+			}
+		}
+	}
+
+	tree.root.color = NodeColor.Black;
+}
+
+export function updateTreeMetadata(tree: PieceTreeBase, x: TreeNode, delta: number, lineFeedCntDelta: number): void {
+	// node length change or line feed count change
+	while (x !== tree.root && x !== SENTINEL) {
+		if (x.parent.left === x) {
+			x.parent.size_left += delta;
+			x.parent.lf_left += lineFeedCntDelta;
+		}
+
+		x = x.parent;
+	}
+}
+
+export function recomputeTreeMetadata(tree: PieceTreeBase, x: TreeNode) {
+	let delta = 0;
+	let lf_delta = 0;
+	if (x === tree.root) {
+		return;
+	}
+
+	if (delta === 0) {
+		// go upwards till the node whose left subtree is changed.
+		while (x !== tree.root && x === x.parent.right) {
+			x = x.parent;
+		}
+
+		if (x === tree.root) {
+			// well, it means we add a node to the end (inorder)
+			return;
+		}
+
+		// x is the node whose right subtree is changed.
+		x = x.parent;
+
+		delta = calculateSize(x.left) - x.size_left;
+		lf_delta = calculateLF(x.left) - x.lf_left;
+		x.size_left += delta;
+		x.lf_left += lf_delta;
+	}
+
+	// go upwards till root. O(logN)
+	while (x !== tree.root && (delta !== 0 || lf_delta !== 0)) {
+		if (x.parent.left === x) {
+			x.parent.size_left += delta;
+			x.parent.lf_left += lf_delta;
+		}
+
+		x = x.parent;
+	}
+}
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 a04ab200bd6..a396f91cc40 100644
--- a/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
+++ b/src/vs/editor/test/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.test.ts
@@ -9,7 +9,8 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { PieceTreeTextBufferBuilder } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder';
 import { DefaultEndOfLine } from 'vs/editor/common/model';
-import { PieceTreeBase, SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { PieceTreeBase } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase';
+import { SENTINEL, NodeColor, TreeNode } from 'vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase';
 import { PieceTreeTextBuffer } from 'vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n';

From cdf4061d47b10ac38462bf6a4c5913f2b64c4104 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 21:09:15 -0800
Subject: [PATCH 532/710] Prevent local settings search from searching setting
 descriptions

---
 .../electron-browser/preferencesSearch.ts     | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index b347d735afd..f59e1ff3b7a 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -100,7 +100,7 @@ export class LocalSearchProvider implements ISearchProvider {
 
 		let score = 1000; // Sort is not stable
 		const settingMatcher = (setting: ISetting) => {
-			const matches = new SettingMatches(this._filter, setting, true, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
+			const matches = new SettingMatches(this._filter, setting, true, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
 			return matches && matches.length ?
 				{
 					matches,
@@ -254,7 +254,7 @@ class RemoteSearchProvider implements ISearchProvider {
 		return (setting: ISetting, group: ISettingsGroup) => {
 			const remoteSetting = scoredResults[getSettingKey(setting.key, group.id)] || scoredResults[getSettingKey(setting.key)];
 			if (remoteSetting && remoteSetting.score >= minScore) {
-				const settingMatches = new SettingMatches(this.options.filter, setting, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
+				const settingMatches = new SettingMatches(this.options.filter, setting, false, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
 				return { matches: settingMatches, score: remoteSetting.score };
 			}
 
@@ -369,7 +369,7 @@ class SettingMatches {
 
 	public readonly matches: IRange[];
 
-	constructor(searchString: string, setting: ISetting, private requireFullQueryMatch: boolean, private valuesMatcher: (filter: string, setting: ISetting) => IRange[]) {
+	constructor(searchString: string, setting: ISetting, private requireFullQueryMatch: boolean, private searchDescription, private valuesMatcher: (filter: string, setting: ISetting) => IRange[]) {
 		this.matches = distinct(this._findMatchesInSetting(searchString, setting), (match) => `${match.startLineNumber}_${match.startColumn}_${match.endLineNumber}_${match.endColumn}_`);
 	}
 
@@ -377,7 +377,7 @@ class SettingMatches {
 		const result = this._doFindMatchesInSetting(searchString, setting);
 		if (setting.overrides && setting.overrides.length) {
 			for (const subSetting of setting.overrides) {
-				const subSettingMatches = new SettingMatches(searchString, subSetting, this.requireFullQueryMatch, this.valuesMatcher);
+				const subSettingMatches = new SettingMatches(searchString, subSetting, this.requireFullQueryMatch, this.searchDescription, this.valuesMatcher);
 				let words = searchString.split(' ');
 				const descriptionRanges: IRange[] = this.getRangesForWords(words, this.descriptionMatchingWords, [subSettingMatches.descriptionMatchingWords, subSettingMatches.keyMatchingWords, subSettingMatches.valueMatchingWords]);
 				const keyRanges: IRange[] = this.getRangesForWords(words, this.keyMatchingWords, [subSettingMatches.descriptionMatchingWords, subSettingMatches.keyMatchingWords, subSettingMatches.valueMatchingWords]);
@@ -398,10 +398,12 @@ class SettingMatches {
 		const settingKeyAsWords: string = setting.key.split('.').join(' ');
 
 		for (const word of words) {
-			for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
-				const descriptionMatches = matchesWords(word, setting.description[lineIndex], true);
-				if (descriptionMatches) {
-					this.descriptionMatchingWords.set(word, descriptionMatches.map(match => this.toDescriptionRange(setting, match, lineIndex)));
+			if (this.searchDescription) {
+				for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
+					const descriptionMatches = matchesWords(word, setting.description[lineIndex], true);
+					if (descriptionMatches) {
+						this.descriptionMatchingWords.set(word, descriptionMatches.map(match => this.toDescriptionRange(setting, match, lineIndex)));
+					}
 				}
 			}
 
@@ -419,12 +421,14 @@ class SettingMatches {
 		}
 
 		const descriptionRanges: IRange[] = [];
-		for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
-			const matches = or(matchesContiguousSubString)(searchString, setting.description[lineIndex] || '') || [];
-			descriptionRanges.push(...matches.map(match => this.toDescriptionRange(setting, match, lineIndex)));
-		}
-		if (descriptionRanges.length === 0) {
-			descriptionRanges.push(...this.getRangesForWords(words, this.descriptionMatchingWords, [this.keyMatchingWords, this.valueMatchingWords]));
+		if (this.searchDescription) {
+			for (let lineIndex = 0; lineIndex < setting.description.length; lineIndex++) {
+				const matches = or(matchesContiguousSubString)(searchString, setting.description[lineIndex] || '') || [];
+				descriptionRanges.push(...matches.map(match => this.toDescriptionRange(setting, match, lineIndex)));
+			}
+			if (descriptionRanges.length === 0) {
+				descriptionRanges.push(...this.getRangesForWords(words, this.descriptionMatchingWords, [this.keyMatchingWords, this.valueMatchingWords]));
+			}
 		}
 
 		const keyMatches = or(matchesPrefix, matchesContiguousSubString)(searchString, setting.key);

From 439ecdf3470762925ac4f632f1fd41af14ef14ef Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 21:10:22 -0800
Subject: [PATCH 533/710] Fix core setting search matching with "post" request

---
 .../parts/preferences/electron-browser/preferencesSearch.ts   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index f59e1ff3b7a..7614813e29f 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -252,7 +252,9 @@ class RemoteSearchProvider implements ISearchProvider {
 
 	private getRemoteSettingMatcher(scoredResults: IScoredResults, minScore: number, preferencesModel: ISettingsEditorModel): ISettingMatcher {
 		return (setting: ISetting, group: ISettingsGroup) => {
-			const remoteSetting = scoredResults[getSettingKey(setting.key, group.id)] || scoredResults[getSettingKey(setting.key)];
+			const remoteSetting = scoredResults[getSettingKey(setting.key, group.id)] || // extension setting
+				scoredResults[getSettingKey(setting.key, 'core')] || // core setting
+				scoredResults[getSettingKey(setting.key)]; // core setting from original prod endpoint
 			if (remoteSetting && remoteSetting.score >= minScore) {
 				const settingMatches = new SettingMatches(this.options.filter, setting, false, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches;
 				return { matches: settingMatches, score: remoteSetting.score };

From 8c6fb54fb046df25363b4faac71884a7cb7b8a5c Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 21:18:57 -0800
Subject: [PATCH 534/710] Remove unused import

---
 extensions/typescript/src/features/bufferSyncSupport.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts
index f3b005cdb4b..186cd02ba6b 100644
--- a/extensions/typescript/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript/src/features/bufferSyncSupport.ts
@@ -10,7 +10,6 @@ import * as Proto from '../protocol';
 import { ITypeScriptServiceClient } from '../typescriptService';
 import { Delayer } from '../utils/async';
 import * as languageModeIds from '../utils/languageModeIds';
-import * as fileSchemes from '../utils/fileSchemes';
 
 interface IDiagnosticRequestor {
 	requestDiagnostic(filepath: string): void;

From 6b9c28032a74431871df5e5d9df63eaa81cb0f23 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Mon, 22 Jan 2018 21:25:11 -0800
Subject: [PATCH 535/710] Settings search - Remove unused css rule

---
 .../parts/preferences/browser/media/preferences.css        | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/media/preferences.css b/src/vs/workbench/parts/preferences/browser/media/preferences.css
index e3832b44473..04251e95105 100644
--- a/src/vs/workbench/parts/preferences/browser/media/preferences.css
+++ b/src/vs/workbench/parts/preferences/browser/media/preferences.css
@@ -276,13 +276,6 @@
 	cursor: pointer;
 }
 
-.monaco-editor .newExtensionInstall {
-	background: url('info.svg') center center no-repeat;
-	width: 16px;
-	height: 16px;
-	cursor: pointer;
-}
-
 .monaco-editor .edit-preferences-widget.hidden {
 	display: none;
 	visibility: hidden;

From 200e4013571881949f3c7196088c61f3752b1716 Mon Sep 17 00:00:00 2001
From: kieferrm 
Date: Mon, 22 Jan 2018 21:21:12 -0800
Subject: [PATCH 536/710] Revert "Use special prefix to tell TS that a resource
 is in-memory only (#42001)"

This reverts commit 00f0f2c8962bfad8201d225cdb46646fb5f104f0.
---
 .../src/features/bufferSyncSupport.ts         |  5 ++-
 .../typescript/src/typescriptServiceClient.ts | 37 ++++++-------------
 2 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts
index 186cd02ba6b..63f0bdfbc86 100644
--- a/extensions/typescript/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript/src/features/bufferSyncSupport.ts
@@ -48,7 +48,10 @@ class SyncedBuffer {
 		}
 
 		if (this.client.apiVersion.has230Features()) {
-			args.projectRootPath = this.client.getWorkspaceRootForResource(this.document.uri);
+			const root = this.client.getWorkspaceRootForResource(this.document.uri);
+			if (root) {
+				args.projectRootPath = root;
+			}
 		}
 
 		if (this.client.apiVersion.has240Features()) {
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index a36818b3905..2901d184ba1 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -578,12 +578,12 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	}
 
 	public normalizePath(resource: Uri): string | null {
-		if (this._apiVersion.has213Features()) {
-			if (resource.scheme === fileSchemes.walkThroughSnippet || resource.scheme === fileSchemes.untitled) {
-				const dirName = path.dirname(resource.path);
-				const fileName = this.inMemoryResourcePrefix + path.basename(resource.path);
-				return resource.with({ path: path.join(dirName, fileName) }).toString(true);
-			}
+		if (resource.scheme === fileSchemes.walkThroughSnippet) {
+			return resource.toString();
+		}
+
+		if (resource.scheme === fileSchemes.untitled && this._apiVersion.has213Features()) {
+			return resource.toString();
 		}
 
 		if (resource.scheme !== fileSchemes.file) {
@@ -599,24 +599,11 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/');
 	}
 
-	private get inMemoryResourcePrefix(): string {
-		return this._apiVersion.has270Features() ? '^' : '';
-	}
-
 	public asUrl(filepath: string): Uri {
-		if (this._apiVersion.has213Features()) {
-			if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON) || (filepath.startsWith(fileSchemes.untitled + ':'))
-			) {
-				let resource = Uri.parse(filepath);
-				if (this.inMemoryResourcePrefix) {
-					const dirName = path.dirname(resource.path);
-					const fileName = path.basename(resource.path);
-					if (fileName.startsWith(this.inMemoryResourcePrefix)) {
-						resource = resource.with({ path: path.join(dirName, fileName.slice(this.inMemoryResourcePrefix.length)) });
-					}
-				}
-				return resource;
-			}
+		if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON)
+			|| (filepath.startsWith(fileSchemes.untitled + ':') && this._apiVersion.has213Features())
+		) {
+			return Uri.parse(filepath);
 		}
 		return Uri.file(filepath);
 	}
@@ -633,10 +620,8 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 					return root.uri.fsPath;
 				}
 			}
-			return roots[0].uri.fsPath;
 		}
-
-		return undefined;
+		return roots[0].uri.fsPath;
 	}
 
 	public execute(command: string, args: any, expectsResultOrToken?: boolean | CancellationToken): Promise {

From 1502c8c2a007af5e3e1b85992766f546d9b94db6 Mon Sep 17 00:00:00 2001
From: kieferrm 
Date: Mon, 22 Jan 2018 22:26:32 -0800
Subject: [PATCH 537/710] update distro

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

diff --git a/package.json b/package.json
index 965756d054b..dc5b1d8acfc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.20.0",
-  "distro": "3e04fd7a1141705f5e82fb1175edc03d0d4ddf9c",
+  "distro": "2478cca5311e147817eef29cb81c0995a3517842",
   "author": {
     "name": "Microsoft Corporation"
   },

From a29d44c682505fa83bb6153fdb8ed8f29d7b0d0d Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 07:31:13 +0100
Subject: [PATCH 538/710] fix #41940

---
 .../browser/parts/editor/editorCommands.ts    | 97 +++++++++++++------
 .../browser/parts/editor/titleControl.ts      |  6 +-
 src/vs/workbench/common/editor.ts             | 10 ++
 3 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts
index 42d2ed951c4..f31156a4099 100644
--- a/src/vs/workbench/browser/parts/editor/editorCommands.ts
+++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts
@@ -8,7 +8,7 @@ import * as types from 'vs/base/common/types';
 import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
-import { ActiveEditorMoveArguments, ActiveEditorMovePositioning, ActiveEditorMovePositioningBy, EditorCommands, TextCompareEditorVisible, EditorInput, IEditorIdentifier } from 'vs/workbench/common/editor';
+import { ActiveEditorMoveArguments, ActiveEditorMovePositioning, ActiveEditorMovePositioningBy, EditorCommands, TextCompareEditorVisible, EditorInput, IEditorIdentifier, IEditorCommandsContext } from 'vs/workbench/common/editor';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditor, Position, POSITIONS, Direction, IEditorInput } from 'vs/platform/editor/common/editor';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
@@ -190,10 +190,18 @@ function registerDiffEditorCommands(): void {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: void 0,
-		handler: (accessor) => {
+		handler: (accessor, resource, context: IEditorCommandsContext) => {
 			const editorService = accessor.get(IWorkbenchEditorService);
+			const editorGroupService = accessor.get(IEditorGroupService);
+
+			let editor: IEditor;
+			if (context) {
+				const position = positionAndInput(editorGroupService, editorService, context).position;
+				editor = editorService.getVisibleEditors()[position];
+			} else {
+				editor = editorService.getActiveEditor();
+			}
 
-			const editor = editorService.getActiveEditor();
 			if (editor instanceof TextDiffEditor) {
 				const control = editor.getControl();
 				const isInlineMode = !control.renderSideBySide;
@@ -262,15 +270,15 @@ function registerEditorCommands() {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_U),
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const model = editorGroupService.getStacksModel();
 			const editorService = accessor.get(IWorkbenchEditorService);
-			const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService));
+			const contexts = getMultiSelectedEditorContexts(toEditorIdentifier(context, editorGroupService), accessor.get(IListService));
 
-			let positionOne: { unmodifiedOnly: boolean } = undefined;
-			let positionTwo: { unmodifiedOnly: boolean } = undefined;
-			let positionThree: { unmodifiedOnly: boolean } = undefined;
+			let positionOne: { unmodifiedOnly: boolean } = void 0;
+			let positionTwo: { unmodifiedOnly: boolean } = void 0;
+			let positionThree: { unmodifiedOnly: boolean } = void 0;
 			contexts.forEach(c => {
 				switch (model.positionOfGroup(c.group)) {
 					case Position.ONE: positionOne = { unmodifiedOnly: true }; break;
@@ -288,10 +296,10 @@ function registerEditorCommands() {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.KEY_W),
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
-			const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService));
+			const contexts = getMultiSelectedEditorContexts(toEditorIdentifier(context, editorGroupService), accessor.get(IListService));
 			const distinctGroups = distinct(contexts.map(c => c.group));
 
 			if (distinctGroups.length) {
@@ -312,11 +320,11 @@ function registerEditorCommands() {
 		when: void 0,
 		primary: KeyMod.CtrlCmd | KeyCode.KEY_W,
 		win: { primary: KeyMod.CtrlCmd | KeyCode.F4, secondary: [KeyMod.CtrlCmd | KeyCode.KEY_W] },
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
 
-			const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService));
+			const contexts = getMultiSelectedEditorContexts(toEditorIdentifier(context, editorGroupService), accessor.get(IListService));
 			const groups = distinct(contexts.map(context => context.group));
 
 			const editorsToClose = new Map();
@@ -326,7 +334,7 @@ function registerEditorCommands() {
 				if (position >= 0) {
 					editorsToClose.set(position, contexts.map(c => {
 						if (group === c.group) {
-							let input = c ? c.editor : undefined;
+							let input = c ? c.editor : void 0;
 							if (!input) {
 
 								// Get Top Editor at Position
@@ -339,7 +347,7 @@ function registerEditorCommands() {
 							return input;
 						}
 
-						return undefined;
+						return void 0;
 					}).filter(input => !!input));
 				}
 			});
@@ -365,10 +373,10 @@ function registerEditorCommands() {
 		when: void 0,
 		primary: void 0,
 		mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KEY_T },
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
-			const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService));
+			const contexts = getMultiSelectedEditorContexts(toEditorIdentifier(context, editorGroupService), accessor.get(IListService));
 			const groups = distinct(contexts.map(context => context.group));
 			const editorsToClose = new Map();
 
@@ -378,7 +386,7 @@ function registerEditorCommands() {
 						return c.editor;
 					}
 
-					return undefined;
+					return void 0;
 				}).filter(input => !!input);
 
 				const toClose = group.getEditors().filter(input => inputsToSkip.indexOf(input) === -1);
@@ -398,11 +406,11 @@ function registerEditorCommands() {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: void 0,
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
 
-			const { position, input } = positionAndInput(editorGroupService, editorService, editorContext);
+			const { position, input } = positionAndInput(editorGroupService, editorService, context);
 
 			if (typeof position === 'number' && input) {
 				return editorService.closeEditors(position, { except: input, direction: Direction.RIGHT });
@@ -417,11 +425,11 @@ function registerEditorCommands() {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyCode.Enter),
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorIdentifier | IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
 
-			const { position, input } = positionAndInput(editorGroupService, editorService, editorContext);
+			const { position, input } = positionAndInput(editorGroupService, editorService, context);
 
 			if (typeof position === 'number' && input) {
 				return editorGroupService.pinEditor(position, input);
@@ -436,7 +444,7 @@ function registerEditorCommands() {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: void 0,
 		primary: void 0,
-		handler: (accessor, resource: URI, editorContext: IEditorIdentifier) => {
+		handler: (accessor, resource: URI, context: IEditorCommandsContext) => {
 			const editorGroupService = accessor.get(IEditorGroupService);
 			const editorService = accessor.get(IWorkbenchEditorService);
 			const quickOpenService = accessor.get(IQuickOpenService);
@@ -447,7 +455,7 @@ function registerEditorCommands() {
 				return quickOpenService.show(NAVIGATE_ALL_EDITORS_GROUP_PREFIX);
 			}
 
-			const { position } = positionAndInput(editorGroupService, editorService, editorContext);
+			const { position } = positionAndInput(editorGroupService, editorService, context);
 
 			switch (position) {
 				case Position.TWO:
@@ -481,7 +489,10 @@ function registerEditorCommands() {
 	});
 }
 
-function positionAndInput(editorGroupService: IEditorGroupService, editorService: IWorkbenchEditorService, editorContext?: IEditorIdentifier): { position: Position, input: IEditorInput } {
+function positionAndInput(editorGroupService: IEditorGroupService, editorService: IWorkbenchEditorService, context?: IEditorIdentifier | IEditorCommandsContext): { position: Position, input: IEditorInput } {
+
+	// Resolve from context
+	const editorContext = toEditorIdentifier(context, editorGroupService);
 	let position = editorContext ? editorGroupService.getStacksModel().positionOfGroup(editorContext.group) : null;
 	let input = editorContext ? editorContext.editor : null;
 
@@ -496,14 +507,14 @@ function positionAndInput(editorGroupService: IEditorGroupService, editorService
 }
 
 export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier, listService: IListService): IEditorIdentifier[] {
-	const list = listService.lastFocusedList;
-	// Mapping for open editors view
-	const isEditorIdentifier = (element: any) => 'group' in element && 'editor' in element;
-	const elementToContext = (element: IEditorIdentifier | EditorGroup) => element instanceof EditorGroup ? { group: element, editor: undefined } : element;
+	const elementToContext = (element: IEditorIdentifier | EditorGroup) => element instanceof EditorGroup ? { group: element, editor: void 0 } : element;
 
+	// First check for a focused list to return the selected items from
+	const list = listService.lastFocusedList;
 	if (list instanceof List && list.isDOMFocused()) {
 		const selection = list.getSelectedElements();
 		const focus = list.getFocusedElements();
+
 		// Only respect selection if it contains focused element
 		if (focus.length && selection && selection.indexOf(focus[0]) >= 0) {
 			return list.getSelectedElements().filter(e => e instanceof EditorGroup || isEditorIdentifier(e)).map(elementToContext);
@@ -514,5 +525,35 @@ export function getMultiSelectedEditorContexts(editorContext: IEditorIdentifier,
 		}
 	}
 
+	// Otherwise go with passed in context
 	return !!editorContext ? [editorContext] : [];
 }
+
+function isEditorIdentifier(object: any): object is IEditorIdentifier {
+	const identifier = object as IEditorIdentifier;
+
+	return identifier && !!identifier.group && !!identifier.editor;
+}
+
+function isEditorGroupContext(object: any): object is IEditorCommandsContext {
+	const context = object as IEditorCommandsContext;
+
+	return context && typeof context.groupId === 'number';
+}
+
+function toEditorIdentifier(object: IEditorIdentifier | IEditorCommandsContext, editorGroupService: IEditorGroupService): IEditorIdentifier {
+	if (isEditorIdentifier(object)) {
+		return object as IEditorIdentifier;
+	}
+
+	if (isEditorGroupContext(object)) {
+		const stacks = editorGroupService.getStacksModel();
+		const group = stacks.getGroup(object.groupId);
+		return {
+			group,
+			editor: typeof object.editorIndex === 'number' ? group.getEditor(object.editorIndex) : void 0
+		};
+	}
+
+	return void 0;
+}
\ No newline at end of file
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
index c7054d7fb5b..a4dba3d6963 100644
--- a/src/vs/workbench/browser/parts/editor/titleControl.ts
+++ b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -15,7 +15,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { RunOnceScheduler } from 'vs/base/common/async';
 import arrays = require('vs/base/common/arrays');
-import { IEditorStacksModel, IEditorGroup, IEditorIdentifier, EditorInput, IStacksModelChangeEvent, toResource } from 'vs/workbench/common/editor';
+import { IEditorStacksModel, IEditorGroup, IEditorIdentifier, EditorInput, IStacksModelChangeEvent, toResource, IEditorCommandsContext } from 'vs/workbench/common/editor';
 import { IActionItem, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
 import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -171,7 +171,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 	public setContext(group: IEditorGroup): void {
 		this.context = group;
 
-		this.editorActionsToolbar.context = { group };
+		this.editorActionsToolbar.context = { groupId: group ? group.id : void 0 } as IEditorCommandsContext;
 	}
 
 	public hasContext(): boolean {
@@ -398,7 +398,7 @@ export abstract class TitleControl extends Themable implements ITitleAreaControl
 		this.contextMenuService.showContextMenu({
 			getAnchor: () => anchor,
 			getActions: () => TPromise.as(actions),
-			getActionsContext: () => identifier,
+			getActionsContext: () => ({ groupId: identifier.group.id, editorIndex: identifier.group.indexOf(identifier.editor) } as IEditorCommandsContext),
 			getKeyBinding: (action) => this.getKeybinding(action),
 			onHide: (cancel) => {
 
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
index 03436fe0657..96b57287a71 100644
--- a/src/vs/workbench/common/editor.ts
+++ b/src/vs/workbench/common/editor.ts
@@ -788,6 +788,16 @@ export interface IEditorIdentifier {
 	editor: IEditorInput;
 }
 
+/**
+ * The editor commands context is used for editor commands (e.g. in the editor title)
+ * and we must ensure that the context is serializable because it potentially travels
+ * to the extension host!
+ */
+export interface IEditorCommandsContext {
+	groupId: GroupIdentifier;
+	editorIndex?: number;
+}
+
 export interface IEditorCloseEvent extends IEditorIdentifier {
 	replaced: boolean;
 	index: number;

From 545fcb99989a54b249da73c559684f8276f45191 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 07:59:57 +0100
Subject: [PATCH 539/710] linux - disable failing test

---
 src/vs/base/test/node/extfs/extfs.test.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/base/test/node/extfs/extfs.test.ts b/src/vs/base/test/node/extfs/extfs.test.ts
index 686934d9e01..f521abbfd01 100644
--- a/src/vs/base/test/node/extfs/extfs.test.ts
+++ b/src/vs/base/test/node/extfs/extfs.test.ts
@@ -16,6 +16,7 @@ import strings = require('vs/base/common/strings');
 import extfs = require('vs/base/node/extfs');
 import { onError } from 'vs/base/test/common/utils';
 import { Readable } from 'stream';
+import { isLinux } from 'vs/base/common/platform';
 
 const ignore = () => { };
 
@@ -376,7 +377,11 @@ suite('Extfs', () => {
 		});
 	});
 
-	test('pasero writeFileAndFlush (stream, error handling EACCES)', function (done: () => void) {
+	test('writeFileAndFlush (stream, error handling EACCES)', function (done: () => void) {
+		if (isLinux) {
+			return done(); // somehow this test fails on Linux in our TFS builds
+		}
+
 		const id = uuid.generateUuid();
 		const parentDir = path.join(os.tmpdir(), 'vsctests', id);
 		const newDir = path.join(parentDir, 'extfs', id);

From 60440c72461e96893766bce73d7bdf1f5136a19f Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 08:01:49 +0100
Subject: [PATCH 540/710] reduce test pressure

---
 .../services/backup/test/node/backupFileService.test.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
index 2720754abbb..ff58403e381 100644
--- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
+++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts
@@ -147,7 +147,7 @@ suite('BackupFileService', () => {
 		});
 
 		test('text file (large file, ITextSnapshot)', function (done: () => void) {
-			const largeString = (new Array(100 * 1024)).join('Large String\n');
+			const largeString = (new Array(10 * 1024)).join('Large String\n');
 			const model = TextModel.createFromString(largeString);
 
 			service.backupResource(fooFile, model.createSnapshot()).then(() => {
@@ -160,7 +160,7 @@ suite('BackupFileService', () => {
 		});
 
 		test('untitled file (large file, ITextSnapshot)', function (done: () => void) {
-			const largeString = (new Array(100 * 1024)).join('Large String\n');
+			const largeString = (new Array(10 * 1024)).join('Large String\n');
 			const model = TextModel.createFromString(largeString);
 
 			service.backupResource(untitledFile, model.createSnapshot()).then(() => {

From 5c2c5a5e2cc1d3fd96a0659858840670ea41e871 Mon Sep 17 00:00:00 2001
From: Alex 
Date: Tue, 23 Jan 2018 10:27:03 +0300
Subject: [PATCH 541/710] Allow to copy from extension contributions

---
 .../workbench/parts/extensions/browser/media/extensionEditor.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css b/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
index 01dd0458f1d..75f9f139f12 100644
--- a/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
+++ b/src/vs/workbench/parts/extensions/browser/media/extensionEditor.css
@@ -171,6 +171,7 @@
 	height: calc(100% - 36px);
 	position: relative;
 	overflow: hidden;
+	user-select: text;
 }
 
 .extension-editor > .body > .content.loading {

From 0d025550f3817490aa6c8718ddc79acb4ca7bab4 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 09:29:45 +0100
Subject: [PATCH 542/710] cleanup list alt key change

---
 src/vs/base/browser/ui/list/listPaging.ts     |  8 +--
 src/vs/base/browser/ui/list/listWidget.ts     | 54 +++++++++------
 src/vs/platform/list/browser/listService.ts   | 68 +++++++++++--------
 .../electron-browser/views/openEditorsView.ts |  5 +-
 4 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/src/vs/base/browser/ui/list/listPaging.ts b/src/vs/base/browser/ui/list/listPaging.ts
index 0c72f6ff5e3..2de68902c7c 100644
--- a/src/vs/base/browser/ui/list/listPaging.ts
+++ b/src/vs/base/browser/ui/list/listPaging.ts
@@ -7,7 +7,7 @@ import 'vs/css!./list';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { range } from 'vs/base/common/arrays';
 import { IDelegate, IRenderer, IListEvent } from './list';
-import { List, IListCreationOptions, IListStyles, IListOptions } from './listWidget';
+import { List, IListStyles, IListOptions } from './listWidget';
 import { IPagedModel } from 'vs/base/common/paging';
 import Event, { mapEvent } from 'vs/base/common/event';
 
@@ -67,7 +67,7 @@ export class PagedList {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IPagedRenderer[],
-		options: IListCreationOptions = {} // TODO@Joao: should be IListOptions
+		options: IListOptions = {}
 	) {
 		const pagedRenderers = renderers.map(r => new PagedRenderer>(r, () => this.model));
 		this.list = new List(container, delegate, pagedRenderers, options);
@@ -181,8 +181,4 @@ export class PagedList {
 	style(styles: IListStyles): void {
 		this.list.style(styles);
 	}
-
-	updateOptions(options: IListOptions): void {
-		this.list.updateOptions(options);
-	}
 }
\ No newline at end of file
diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts
index 1ee43f1916c..d1c7b582008 100644
--- a/src/vs/base/browser/ui/list/listWidget.ts
+++ b/src/vs/base/browser/ui/list/listWidget.ts
@@ -265,7 +265,7 @@ class KeyboardController implements IDisposable {
 	constructor(
 		private list: List,
 		private view: ListView,
-		options: IListCreationOptions
+		options: IListOptions
 	) {
 		const multipleSelectionSupport = !(options.multipleSelectionSupport === false);
 		this.disposables = [];
@@ -344,9 +344,23 @@ class KeyboardController implements IDisposable {
 	}
 }
 
+export function isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+	return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
+}
+
+export function isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+	return event.browserEvent.shiftKey;
+}
+
+const DefaultMultipleSelectionContoller = {
+	isSelectionSingleChangeEvent,
+	isSelectionRangeChangeEvent
+};
+
 class MouseController implements IDisposable {
 
 	private multipleSelectionSupport: boolean;
+	private multipleSelectionController: IMultipleSelectionController | undefined;
 	private didJustPressContextMenuKey: boolean = false;
 	private disposables: IDisposable[] = [];
 
@@ -384,9 +398,13 @@ class MouseController implements IDisposable {
 	constructor(
 		private list: List,
 		private view: ListView,
-		private options: IListCreationOptions = {}
+		private options: IListOptions = {}
 	) {
-		this.multipleSelectionSupport = options.multipleSelectionSupport !== false;
+		this.multipleSelectionSupport = !(options.multipleSelectionSupport === false);
+
+		if (this.multipleSelectionSupport) {
+			this.multipleSelectionController = options.multipleSelectionController || DefaultMultipleSelectionContoller;
+		}
 
 		view.onMouseDown(this.onMouseDown, this, this.disposables);
 		view.onMouseClick(this.onPointer, this, this.disposables);
@@ -396,19 +414,19 @@ class MouseController implements IDisposable {
 		Gesture.addTarget(view.domNode);
 	}
 
-	updateOptions(options: IListOptions): void {
-		this.options.useAltAsMultiSelectModifier = options.useAltAsMultiSelectModifier;
-	}
-
 	private isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
-		if (this.options.useAltAsMultiSelectModifier) {
-			return event.browserEvent.altKey;
+		if (this.multipleSelectionController) {
+			return this.multipleSelectionController.isSelectionSingleChangeEvent(event);
 		}
 
 		return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
 	}
 
 	private isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		if (this.multipleSelectionController) {
+			return this.multipleSelectionController.isSelectionRangeChangeEvent(event);
+		}
+
 		return event.browserEvent.shiftKey;
 	}
 
@@ -500,11 +518,12 @@ class MouseController implements IDisposable {
 	}
 }
 
-export interface IListOptions {
-	useAltAsMultiSelectModifier?: boolean;
+export interface IMultipleSelectionController {
+	isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean;
+	isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean;
 }
 
-export interface IListCreationOptions extends IListViewOptions, IListStyles, IListOptions {
+export interface IListOptions extends IListViewOptions, IListStyles {
 	identityProvider?: IIdentityProvider;
 	ariaLabel?: string;
 	mouseSupport?: boolean;
@@ -513,6 +532,7 @@ export interface IListCreationOptions extends IListViewOptions, IListStyles,
 	keyboardSupport?: boolean;
 	verticalScrollMode?: ScrollbarVisibility;
 	multipleSelectionSupport?: boolean;
+	multipleSelectionController?: IMultipleSelectionController;
 }
 
 export interface IListStyles {
@@ -545,7 +565,7 @@ const defaultStyles: IListStyles = {
 	listDropBackground: Color.fromHex('#383B3D')
 };
 
-const DefaultOptions: IListCreationOptions = {
+const DefaultOptions: IListOptions = {
 	keyboardSupport: true,
 	mouseSupport: true,
 	multipleSelectionSupport: true
@@ -722,7 +742,7 @@ export class List implements ISpliceable, IDisposable {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IRenderer[],
-		options: IListCreationOptions = DefaultOptions
+		options: IListOptions = DefaultOptions
 	) {
 		const aria = new Aria();
 		this.focus = new FocusTrait(i => this.getElementDomId(i));
@@ -772,12 +792,6 @@ export class List implements ISpliceable, IDisposable {
 		this.style(options);
 	}
 
-	updateOptions(options: IListOptions): void {
-		if (this.mouseController) {
-			this.mouseController.updateOptions(options);
-		}
-	}
-
 	splice(start: number, deleteCount: number, elements: T[] = []): void {
 		if (deleteCount === 0 && elements.length === 0) {
 			return;
diff --git a/src/vs/platform/list/browser/listService.ts b/src/vs/platform/list/browser/listService.ts
index 1bba7f047a6..d283b200549 100644
--- a/src/vs/platform/list/browser/listService.ts
+++ b/src/vs/platform/list/browser/listService.ts
@@ -5,12 +5,12 @@
 'use strict';
 
 import { ITree, ITreeConfiguration, ITreeOptions } from 'vs/base/parts/tree/browser/tree';
-import { List, IListCreationOptions } from 'vs/base/browser/ui/list/listWidget';
+import { List, IListOptions, isSelectionRangeChangeEvent, isSelectionSingleChangeEvent, IMultipleSelectionController } from 'vs/base/browser/ui/list/listWidget';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, toDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IContextKeyService, IContextKey, RawContextKey, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { PagedList, IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
-import { IDelegate, IRenderer } from 'vs/base/browser/ui/list/list';
+import { IDelegate, IRenderer, IListMouseEvent, IListTouchEvent } from 'vs/base/browser/ui/list/list';
 import { Tree } from 'vs/base/parts/tree/browser/treeImpl';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -96,8 +96,25 @@ function createScopedContextKeyService(contextKeyService: IContextKeyService, wi
 
 export const multiSelectModifierSettingKey = 'workbench.multiSelectModifier';
 
-function useAltAsMultiSelectModifier(configurationService: IConfigurationService): { useAltAsMultiSelectModifier: boolean } {
-	return { useAltAsMultiSelectModifier: configurationService.getValue(multiSelectModifierSettingKey) === 'alt' };
+export function useAltAsMultipleSelectionModifier(configurationService: IConfigurationService): boolean {
+	return configurationService.getValue(multiSelectModifierSettingKey) === 'alt';
+}
+
+class MultipleSelectionController implements IMultipleSelectionController {
+
+	constructor(private configurationService: IConfigurationService) { }
+
+	isSelectionSingleChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		if (useAltAsMultipleSelectionModifier(this.configurationService)) {
+			return event.browserEvent.altKey;
+		}
+
+		return isSelectionSingleChangeEvent(event);
+	}
+
+	isSelectionRangeChangeEvent(event: IListMouseEvent | IListTouchEvent): boolean {
+		return isSelectionRangeChangeEvent(event);
+	}
 }
 
 export class WorkbenchList extends List {
@@ -109,34 +126,28 @@ export class WorkbenchList extends List {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IRenderer[],
-		private options: IListCreationOptions,
+		options: IListOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, mixin(options, useAltAsMultiSelectModifier(configurationService)));
+		const multipleSelectionSupport = !(options.multipleSelectionSupport === false);
+
+		if (multipleSelectionSupport && !options.multipleSelectionController) {
+			options.multipleSelectionController = new MultipleSelectionController(configurationService);
+		}
+
+		super(container, delegate, renderers, mixin(options, useAltAsMultipleSelectionModifier(configurationService)));
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 		this.listDoubleSelection = WorkbenchListDoubleSelection.bindTo(this.contextKeyService);
 
 		this.disposables.push(combinedDisposable([
 			this.contextKeyService,
 			(listService as ListService).register(this),
-			attachListStyler(this, themeService)
+			attachListStyler(this, themeService),
+			this.onSelectionChange(() => this.listDoubleSelection.set(this.getSelection().length === 2))
 		]));
-		this.disposables.push(this.onSelectionChange(() => {
-			const selection = this.getSelection();
-			this.listDoubleSelection.set(selection && selection.length === 2);
-		}));
-		this.disposables.push(configurationService.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
-				this.updateOptions(useAltAsMultiSelectModifier(configurationService));
-			}
-		}));
-	}
-
-	public get useAltAsMultiSelectModifier(): boolean {
-		return this.options.useAltAsMultiSelectModifier;
 	}
 }
 
@@ -149,24 +160,25 @@ export class WorkbenchPagedList extends PagedList {
 		container: HTMLElement,
 		delegate: IDelegate,
 		renderers: IPagedRenderer[],
-		options: IListCreationOptions,
+		options: IListOptions,
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IListService listService: IListService,
 		@IThemeService themeService: IThemeService,
 		@IConfigurationService configurationService: IConfigurationService
 	) {
-		super(container, delegate, renderers, mixin(options, useAltAsMultiSelectModifier(configurationService)));
+		const multipleSelectionSupport = !(options.multipleSelectionSupport === false);
+
+		if (multipleSelectionSupport && !options.multipleSelectionController) {
+			options.multipleSelectionController = new MultipleSelectionController(configurationService);
+		}
+
+		super(container, delegate, renderers, mixin(options, useAltAsMultipleSelectionModifier(configurationService)));
 		this.contextKeyService = createScopedContextKeyService(contextKeyService, this);
 
 		this.disposable = combinedDisposable([
 			this.contextKeyService,
 			(listService as ListService).register(this),
-			attachListStyler(this, themeService),
-			configurationService.onDidChangeConfiguration(e => {
-				if (e.affectsConfiguration(multiSelectModifierSettingKey)) {
-					this.updateOptions(useAltAsMultiSelectModifier(configurationService));
-				}
-			})
+			attachListStyler(this, themeService)
 		]);
 	}
 
diff --git a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
index 2c882a9221b..d411f925e09 100644
--- a/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
+++ b/src/vs/workbench/parts/files/electron-browser/views/openEditorsView.ts
@@ -28,7 +28,7 @@ import { EditorGroup } from 'vs/workbench/common/editor/editorStacksModel';
 import { attachStylerCallback } from 'vs/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { badgeBackground, badgeForeground, contrastBorder } from 'vs/platform/theme/common/colorRegistry';
-import { WorkbenchList } from 'vs/platform/list/browser/listService';
+import { WorkbenchList, useAltAsMultipleSelectionModifier } from 'vs/platform/list/browser/listService';
 import { IDelegate, IRenderer, IListContextMenuEvent, IListMouseEvent } from 'vs/base/browser/ui/list/list';
 import { EditorLabel } from 'vs/workbench/browser/labels';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -278,7 +278,8 @@ export class OpenEditorsView extends ViewsViewletPanel {
 			const position = this.model.positionOfGroup(element.group);
 			this.editorService.closeEditor(position, element.editor).done(null, errors.onUnexpectedError);
 		} else {
-			this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide: this.list.useAltAsMultiSelectModifier ? (event.browserEvent.ctrlKey || event.browserEvent.metaKey) : event.browserEvent.altKey });
+			const sideBySide = useAltAsMultipleSelectionModifier(this.configurationService) ? event.browserEvent.altKey : (event.browserEvent.ctrlKey || event.browserEvent.metaKey);
+			this.openEditor(element, { preserveFocus: !isDoubleClick, pinned: isDoubleClick, sideBySide });
 		}
 	}
 

From f7cde7af9c25e8553453197e40d9f87e0eb60ddf Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 09:37:50 +0100
Subject: [PATCH 543/710] fix bad state expectation

---
 src/vs/platform/update/electron-main/abstractUpdateService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index fcc47b9f7a6..04e3ccdfeb3 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -120,7 +120,7 @@ export abstract class AbstractUpdateService implements IUpdateService {
 	applyUpdate(): TPromise {
 		this.logService.trace('update#applyUpdate, state = ', this.state.type);
 
-		if (this.state.type !== StateType.Ready) {
+		if (this.state.type !== StateType.Downloaded) {
 			return TPromise.as(null);
 		}
 

From 3359b50c4d5b0fb0f2dbe29e18c5ec18e3f8b820 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 10:09:12 +0100
Subject: [PATCH 544/710] use windowsVerbatimArguments

---
 src/typings/node.d.ts                                       | 1 +
 src/vs/platform/update/electron-main/updateService.win32.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/typings/node.d.ts b/src/typings/node.d.ts
index 37db4dd80f0..4fa18421982 100644
--- a/src/typings/node.d.ts
+++ b/src/typings/node.d.ts
@@ -1720,6 +1720,7 @@ declare module "child_process" {
         uid?: number;
         gid?: number;
         shell?: boolean | string;
+        windowsVerbatimArguments?: boolean;
     }
     export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
 
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index b50b3ac33b6..ef20367626c 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -172,7 +172,8 @@ export class Win32UpdateService extends AbstractUpdateService {
 			return pfs.writeFile(this.availableUpdate.updateFilePath, 'flag').then(() => {
 				const child = spawn(this.availableUpdate.packagePath, ['/verysilent', `/update="${this.availableUpdate.updateFilePath}"`, '/nocloseapplications', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 					detached: true,
-					stdio: ['ignore', 'ignore', 'ignore']
+					stdio: ['ignore', 'ignore', 'ignore'],
+					windowsVerbatimArguments: true
 				});
 
 				child.once('exit', () => {

From 3ecef8c1dd1d23afdab60ee8a5ff0b7006498810 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Tue, 23 Jan 2018 10:17:51 +0100
Subject: [PATCH 545/710] add 'configuration' (read uri/path) of workspace
 config file, #41408

---
 src/vs/platform/workspace/common/workspace.ts        | 2 +-
 src/vs/workbench/api/node/extHost.protocol.ts        | 1 +
 src/vs/workbench/api/node/extHostExtensionService.ts | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index af594644bae..1493935a013 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -198,7 +198,7 @@ export class Workspace implements IWorkspace {
 	}
 
 	public toJSON(): IWorkspace {
-		return { id: this.id, folders: this.folders, name: this.name };
+		return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration };
 	}
 }
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index d4dcd03d363..faacf07efa7 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -71,6 +71,7 @@ export interface IWorkspaceData {
 	id: string;
 	name: string;
 	folders: { uri: UriComponents, name: string, index: number }[];
+	configuration: UriComponents;
 }
 
 export interface IInitData {
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index d39a58a432e..73a8df57d4e 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -22,6 +22,7 @@ import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
+import URI from 'vs/base/common/uri';
 
 class ExtensionMemento implements IExtensionMemento {
 
@@ -108,6 +109,7 @@ class ExtensionStoragePath {
 				join(storagePath, 'meta.json'),
 				JSON.stringify({
 					id: this._workspace.id,
+					configuration: URI.revive(this._workspace.configuration).toString(),
 					name: this._workspace.name
 				}, undefined, 2)
 			);

From c425644317ca8847b5a22aaea2e58c4553f5c38c Mon Sep 17 00:00:00 2001
From: Alex 
Date: Tue, 23 Jan 2018 12:20:53 +0300
Subject: [PATCH 546/710] Revert - move striping logic back to javascript for
 running extensions

---
 .../electron-browser/media/runtimeExtensionsEditor.css          | 2 +-
 .../extensions/electron-browser/runtimeExtensionsEditor.ts      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css
index bad1b92e994..8a9a44e97df 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css
+++ b/src/vs/workbench/parts/extensions/electron-browser/media/runtimeExtensionsEditor.css
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-.runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row:nth-child(even):not(:hover):not(.focused) {
+.runtime-extensions-editor .monaco-list .monaco-list-rows > .monaco-list-row.odd:not(:hover):not(.focused) {
 	background-color: rgba(130, 130, 130, 0.08);
 }
 
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
index 23c2fa6549b..bc300591ee4 100644
--- a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
+++ b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -291,6 +291,8 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 
 				data.elementDisposables = dispose(data.elementDisposables);
 
+				toggleClass(data.root, 'odd', index % 2 === 1);
+
 				data.name.textContent = element.marketplaceInfo ? element.marketplaceInfo.displayName : element.description.displayName;
 
 				const activationTimes = element.status.activationTimes;

From 67880b353d91014356a7648791ea32fe55abfba1 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Tue, 23 Jan 2018 10:41:19 +0100
Subject: [PATCH 547/710] debug: introduce WorkspaceLaunch

---
 .../parts/debug/browser/debugActionItems.ts   |  6 +-
 .../parts/debug/browser/debugActions.ts       |  2 +-
 .../parts/debug/browser/debugQuickOpen.ts     |  8 +-
 .../parts/debug/browser/debugStatus.ts        |  2 +-
 src/vs/workbench/parts/debug/common/debug.ts  |  5 ++
 .../debug/electron-browser/debugCommands.ts   |  2 +-
 .../debugConfigurationManager.ts              | 74 ++++++++++++++++---
 .../debug/electron-browser/debugService.ts    | 25 +++++--
 8 files changed, 97 insertions(+), 27 deletions(-)

diff --git a/src/vs/workbench/parts/debug/browser/debugActionItems.ts b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
index 12887c33f44..2f8e4a05dfa 100644
--- a/src/vs/workbench/parts/debug/browser/debugActionItems.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActionItems.ts
@@ -158,7 +158,7 @@ export class StartDebugActionItem implements IActionItem {
 				if (name === manager.selectedName && launch === manager.selectedLaunch) {
 					this.selected = this.options.length;
 				}
-				const label = launches.length > 1 ? `${name} (${launch.workspace.name})` : name;
+				const label = launches.length > 1 ? `${name} (${launch.name})` : name;
 				this.options.push({ label, handler: () => { manager.selectConfiguration(launch, name); return true; } });
 			}));
 
@@ -169,10 +169,10 @@ export class StartDebugActionItem implements IActionItem {
 
 		const disabledIdx = this.options.length - 1;
 		launches.forEach(l => {
-			const label = launches.length > 1 ? nls.localize("addConfigTo", "Add Config ({0})...", l.workspace.name) : nls.localize('addConfiguration', "Add Configuration...");
+			const label = launches.length > 1 ? nls.localize("addConfigTo", "Add Config ({0})...", l.name) : nls.localize('addConfiguration', "Add Configuration...");
 			this.options.push({
 				label, handler: () => {
-					this.commandService.executeCommand('debug.addConfiguration', l.workspace.uri.toString()).done(undefined, errors.onUnexpectedError);
+					this.commandService.executeCommand('debug.addConfiguration', l.uri.toString()).done(undefined, errors.onUnexpectedError);
 					return false;
 				}
 			});
diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index e98c1e52ab3..562bae5c743 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -142,7 +142,7 @@ export class StartAction extends AbstractDebugAction {
 		if (contextService && contextService.getWorkbenchState() === WorkbenchState.EMPTY && processes.length > 0) {
 			return false;
 		}
-		if (processes.some(p => p.getName(false) === configName && (!launch || p.session.root.uri.toString() === launch.workspace.uri.toString()))) {
+		if (processes.some(p => p.getName(false) === configName && (!launch || p.session.root.uri.toString() === launch.uri.toString()))) {
 			return false;
 		}
 		const compound = launch && launch.getCompound(configName);
diff --git a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
index cd90a6fd6fc..4b93cc51109 100644
--- a/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
+++ b/src/vs/workbench/parts/debug/browser/debugQuickOpen.ts
@@ -29,7 +29,7 @@ class AddConfigEntry extends Model.QuickOpenEntry {
 	}
 
 	public getDescription(): string {
-		return this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? this.launch.workspace.name : '';
+		return this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? this.launch.name : '';
 	}
 
 	public getAriaLabel(): string {
@@ -40,7 +40,7 @@ class AddConfigEntry extends Model.QuickOpenEntry {
 		if (mode === QuickOpen.Mode.PREVIEW) {
 			return false;
 		}
-		this.commandService.executeCommand('debug.addConfiguration', this.launch.workspace.uri.toString()).done(undefined, errors.onUnexpectedError);
+		this.commandService.executeCommand('debug.addConfiguration', this.launch.uri.toString()).done(undefined, errors.onUnexpectedError);
 
 		return true;
 	}
@@ -57,7 +57,7 @@ class StartDebugEntry extends Model.QuickOpenEntry {
 	}
 
 	public getDescription(): string {
-		return this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? this.launch.workspace.name : '';
+		return this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? this.launch.name : '';
 	}
 
 	public getAriaLabel(): string {
@@ -110,7 +110,7 @@ export class DebugQuickOpenHandler extends Quickopen.QuickOpenHandler {
 				});
 		}
 		launches.forEach((l, index) => {
-			const label = launches.length > 1 ? nls.localize("addConfigTo", "Add Config ({0})...", l.workspace.name) : nls.localize('addConfiguration', "Add Configuration...");
+			const label = launches.length > 1 ? nls.localize("addConfigTo", "Add Config ({0})...", l.name) : nls.localize('addConfiguration', "Add Configuration...");
 			const entry = new AddConfigEntry(label, l, this.commandService, this.contextService, Filters.matchesContiguousSubString(input, label));
 			if (index === 0) {
 				configurations.push(new QuickOpenEntryGroup(entry, undefined, true));
diff --git a/src/vs/workbench/parts/debug/browser/debugStatus.ts b/src/vs/workbench/parts/debug/browser/debugStatus.ts
index da4007a0a80..01e55d619ed 100644
--- a/src/vs/workbench/parts/debug/browser/debugStatus.ts
+++ b/src/vs/workbench/parts/debug/browser/debugStatus.ts
@@ -95,7 +95,7 @@ export class DebugStatus extends Themable implements IStatusbarItem {
 			if (manager.selectedName) {
 				const name = manager.selectedName;
 				this.statusBarItem.style.display = 'block';
-				this.label.textContent = manager.getLaunches().length > 1 ? `${name} (${manager.selectedLaunch.workspace.name})` : name;
+				this.label.textContent = manager.getLaunches().length > 1 ? `${name} (${manager.selectedLaunch.name})` : name;
 			} else {
 				this.statusBarItem.style.display = 'none';
 			}
diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 43d81946f37..8b5a6174a64 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -437,6 +437,11 @@ export interface ILaunch {
 	 */
 	uri: uri;
 
+	/**
+	 * Name of the launch.
+	 */
+	name: string;
+
 	workspace: IWorkspaceFolder;
 
 	/**
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
index af425b59ffb..e033c2cdeca 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
@@ -169,7 +169,7 @@ export function registerCommands(): void {
 				accessor.get(IMessageService).show(severity.Info, nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 				return TPromise.as(null);
 			}
-			const launch = manager.getLaunches().filter(l => l.workspace.uri.toString() === workspaceUri).pop() || manager.selectedLaunch;
+			const launch = manager.getLaunches().filter(l => l.uri.toString() === workspaceUri).pop() || manager.selectedLaunch;
 
 			return launch.openConfigFile(false).done(result => {
 				if (result.editor && !result.configFileCreated) {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 26594a28da5..2a067455762 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -24,7 +24,7 @@ import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IJSONContributionRegistry, Extensions as JSONExtensions } from 'vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IFileService } from 'vs/platform/files/common/files';
-import { IWorkspaceContextService, IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService, IWorkspaceFolder, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IDebugConfigurationProvider, IRawAdapter, ICompound, IDebugConfiguration, IConfig, IEnvConfig, IGlobalConfig, IConfigurationManager, ILaunch } from 'vs/workbench/parts/debug/common/debug';
@@ -231,7 +231,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		this.registerListeners(lifecycleService);
 		this.initLaunches();
 		const previousSelectedRoot = this.storageService.get(DEBUG_SELECTED_ROOT, StorageScope.WORKSPACE);
-		const filtered = this.launches.filter(l => l.workspace.uri.toString() === previousSelectedRoot);
+		const filtered = this.launches.filter(l => l.uri.toString() === previousSelectedRoot);
 		this.selectConfiguration(filtered.length ? filtered[0] : undefined, this.storageService.get(DEBUG_SELECTED_CONFIG_NAME_KEY, StorageScope.WORKSPACE));
 	}
 
@@ -334,6 +334,10 @@ export class ConfigurationManager implements IConfigurationManager {
 
 	private initLaunches(): void {
 		this.launches = this.contextService.getWorkspace().folders.map(folder => this.instantiationService.createInstance(Launch, this, folder));
+		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+			this.launches.push(this.instantiationService.createInstance(WorkspaceLaunch, this));
+		}
+
 		if (this.launches.indexOf(this._selectedLaunch) === -1) {
 			this._selectedLaunch = undefined;
 		}
@@ -355,6 +359,14 @@ export class ConfigurationManager implements IConfigurationManager {
 		return this._onDidSelectConfigurationName.event;
 	}
 
+	public getWorkspaceLaunch(): ILaunch {
+		if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
+			return this.launches[this.launches.length - 1];
+		}
+
+		return undefined;
+	}
+
 	public selectConfiguration(launch?: ILaunch, name?: string, debugStarted?: boolean): void {
 		const previousLaunch = this._selectedLaunch;
 		const previousName = this._selectedName;
@@ -437,7 +449,7 @@ export class ConfigurationManager implements IConfigurationManager {
 	private store(): void {
 		this.storageService.store(DEBUG_SELECTED_CONFIG_NAME_KEY, this.selectedName, StorageScope.WORKSPACE);
 		if (this._selectedLaunch) {
-			this.storageService.store(DEBUG_SELECTED_ROOT, this._selectedLaunch.workspace.uri.toString(), StorageScope.WORKSPACE);
+			this.storageService.store(DEBUG_SELECTED_ROOT, this._selectedLaunch.uri.toString(), StorageScope.WORKSPACE);
 		}
 	}
 
@@ -452,15 +464,27 @@ class Launch implements ILaunch {
 		private configurationManager: ConfigurationManager,
 		public workspace: IWorkspaceFolder,
 		@IFileService private fileService: IFileService,
-		@IWorkbenchEditorService private editorService: IWorkbenchEditorService,
-		@IConfigurationService private configurationService: IConfigurationService,
+		@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
+		@IConfigurationService protected configurationService: IConfigurationService,
 		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService
 	) {
 		// noop
 	}
 
+	public get uri(): uri {
+		return this.workspace.uri.with({ path: paths.join(this.workspace.uri.path, '/.vscode/launch.json') });
+	}
+
+	public get name(): string {
+		return this.workspace.name;
+	}
+
+	protected getConfig(): IGlobalConfig {
+		return this.configurationService.getValue('launch', { resource: this.workspace.uri });
+	}
+
 	public getCompound(name: string): ICompound {
-		const config = this.configurationService.getValue('launch', { resource: this.workspace.uri });
+		const config = this.getConfig();
 		if (!config || !config.compounds) {
 			return null;
 		}
@@ -469,7 +493,7 @@ class Launch implements ILaunch {
 	}
 
 	public getConfigurationNames(): string[] {
-		const config = this.configurationService.getValue('launch', { resource: this.workspace.uri });
+		const config = this.getConfig();
 		if (!config || !config.configurations || !Array.isArray(config.configurations)) {
 			return [];
 		} else {
@@ -486,7 +510,7 @@ class Launch implements ILaunch {
 	}
 
 	public getConfiguration(name: string): IConfig {
-		const config = objects.deepClone(this.configurationService.getValue('launch', { resource: this.workspace.uri }));
+		const config = this.getConfig();
 		if (!config || !config.configurations) {
 			return null;
 		}
@@ -517,10 +541,6 @@ class Launch implements ILaunch {
 		return this.configurationResolverService.resolveInteractiveVariables(result, adapter ? adapter.variables : null);
 	}
 
-	public get uri(): uri {
-		return this.workspace.uri.with({ path: paths.join(this.workspace.uri.path, '/.vscode/launch.json') });
-	}
-
 	public openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor; configFileCreated: boolean; }> {
 		const resource = this.uri;
 		let configFileCreated = false;
@@ -576,3 +596,33 @@ class Launch implements ILaunch {
 		});
 	}
 }
+
+class WorkspaceLaunch extends Launch implements ILaunch {
+
+	constructor(
+		configurationManager: ConfigurationManager,
+		@IFileService fileService: IFileService,
+		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IConfigurationResolverService configurationResolverService: IConfigurationResolverService,
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
+	) {
+		super(configurationManager, undefined, fileService, editorService, configurationService, configurationResolverService);
+	}
+
+	get uri(): uri {
+		return this.workspaceContextService.getWorkspace().configuration;
+	}
+
+	get name(): string {
+		return nls.localize('workspace', "workspace");
+	}
+
+	protected getConfig(): IGlobalConfig {
+		return this.configurationService.inspect('launch').workspace;
+	}
+
+	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor; configFileCreated: boolean; }, any> {
+		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration }).then(editor => ({ editor, configFileCreated: false }));
+	}
+}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index b2434227ac5..288a5760b2f 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -668,8 +668,8 @@ export class DebugService implements debug.IDebugService {
 					this.model.getBreakpoints().forEach(bp => bp.verified = false);
 				}
 				this.launchJsonChanged = false;
-				const manager = this.getConfigurationManager();
-				const launch = root ? manager.getLaunches().filter(l => l.workspace.uri.toString() === root.uri.toString()).pop() : undefined;
+				const launch = root ? this.configurationManager.getLaunches().filter(l => l.uri.toString() === root.uri.toString()).pop()
+					: this.configurationManager.getWorkspaceLaunch();
 
 				let config: debug.IConfig, compound: debug.ICompound;
 				if (!configOrName) {
@@ -683,7 +683,7 @@ export class DebugService implements debug.IDebugService {
 				}
 				if (launch) {
 					// in the drop down the name of the top most compound takes precedence over the launch config name
-					manager.selectConfiguration(launch, topCompoundName || (typeof configOrName === 'string' ? configOrName : undefined), true);
+					this.configurationManager.selectConfiguration(launch, topCompoundName || (typeof configOrName === 'string' ? configOrName : undefined), true);
 				}
 
 				if (compound) {
@@ -692,7 +692,22 @@ export class DebugService implements debug.IDebugService {
 							"Compound must have \"configurations\" attribute set in order to start multiple configurations.")));
 					}
 
-					return TPromise.join(compound.configurations.map(name => name !== compound.name ? this.startDebugging(root, name, noDebug, topCompoundName || compound.name) : TPromise.as(null)));
+					return TPromise.join(compound.configurations.map(name => {
+						if (name === compound.name) {
+							return TPromise.as(null);
+						}
+
+						let rootForName = root;
+						if (launch === this.configurationManager.getWorkspaceLaunch()) {
+							// For workspace launches allow comound referencing configurations across folder
+							const launchContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name)).pop();
+							if (launchContainingName) {
+								rootForName = launchContainingName.workspace;
+							}
+						}
+
+						return this.startDebugging(rootForName, name, noDebug, topCompoundName || compound.name);
+					}));
 				}
 				if (configOrName && !config) {
 					const message = !!launch ? nls.localize('configMissing', "Configuration '{0}' is missing in 'launch.json'.", configOrName) :
@@ -723,7 +738,7 @@ export class DebugService implements debug.IDebugService {
 
 				return (type ? TPromise.as(null) : this.configurationManager.guessAdapter().then(a => type = a && a.type)).then(() =>
 					(type ? this.extensionService.activateByEvent(`onDebugResolve:${type}`) : TPromise.as(null)).then(() =>
-						this.configurationManager.resolveConfigurationByProviders(launch ? launch.workspace.uri : undefined, type, config).then(config => {
+						this.configurationManager.resolveConfigurationByProviders(launch ? launch.uri : undefined, type, config).then(config => {
 							// a falsy config indicates an aborted launch
 							if (config && config.type) {
 								return this.createProcess(root, config, sessionId);

From 802be774a72f0e53a2c96c208a93b7a68df9fe31 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 10:50:09 +0100
Subject: [PATCH 548/710] #36967 - Support reading workspace launches in mulit
 root workspace

---
 .../common/configurationModels.ts             | 43 ++++++++++----
 .../configuration/node/configuration.ts       | 41 +++++++------
 .../node/configurationService.ts              |  2 +-
 .../test/node/configurationService.test.ts    | 59 ++++++++++++++++---
 4 files changed, 105 insertions(+), 40 deletions(-)

diff --git a/src/vs/workbench/services/configuration/common/configurationModels.ts b/src/vs/workbench/services/configuration/common/configurationModels.ts
index 2d9b9a6bd33..27be593edfe 100644
--- a/src/vs/workbench/services/configuration/common/configurationModels.ts
+++ b/src/vs/workbench/services/configuration/common/configurationModels.ts
@@ -14,7 +14,7 @@ import { Workspace } from 'vs/platform/workspace/common/workspace';
 import { StrictResourceMap } from 'vs/base/common/map';
 import URI from 'vs/base/common/uri';
 
-export class WorkspaceSettingsModel extends ConfigurationModel {
+export class SettingsModel extends ConfigurationModel {
 
 	private _unsupportedKeys: string[];
 
@@ -32,30 +32,49 @@ export class WorkspaceSettingsModel extends ConfigurationModel {
 export class WorkspaceConfigurationModelParser extends ConfigurationModelParser {
 
 	private _folders: IStoredWorkspaceFolder[] = [];
-	private _workspaceSettingsModelParser: FolderSettingsModelParser;
+	private _settingsModelParser: FolderSettingsModelParser;
+	private _launchModel: ConfigurationModel;
 
 	constructor(name: string) {
 		super(name);
-		this._workspaceSettingsModelParser = new FolderSettingsModelParser(name);
+		this._settingsModelParser = new FolderSettingsModelParser(name);
+		this._launchModel = new ConfigurationModel();
 	}
 
 	get folders(): IStoredWorkspaceFolder[] {
 		return this._folders;
 	}
 
-	get workspaceSettingsModel(): WorkspaceSettingsModel {
-		return this._workspaceSettingsModelParser.folderSettingsModel;
+	get settingsModel(): SettingsModel {
+		return this._settingsModelParser.settingsModel;
+	}
+
+	get launchModel(): ConfigurationModel {
+		return this._launchModel;
 	}
 
 	reprocessWorkspaceSettings(): void {
-		this._workspaceSettingsModelParser.reprocess();
+		this._settingsModelParser.reprocess();
 	}
 
 	protected parseRaw(raw: any): IConfigurationModel {
 		this._folders = (raw['folders'] || []) as IStoredWorkspaceFolder[];
-		this._workspaceSettingsModelParser.parse(raw['settings']);
+		this._settingsModelParser.parse(raw['settings']);
+		this._launchModel = this.createConfigurationModelFrom(raw, 'launch');
 		return super.parseRaw(raw);
 	}
+
+	private createConfigurationModelFrom(raw: any, key: string): ConfigurationModel {
+		const data = raw[key];
+		if (data) {
+			const contents = toValuesTree(data, message => console.error(`Conflict in settings file ${this._name}: ${message}`));
+			const scopedContents = Object.create(null);
+			scopedContents[key] = contents;
+			const keys = Object.keys(data).map(k => `${key}.${k}`);
+			return new ConfigurationModel(scopedContents, keys, []);
+		}
+		return new ConfigurationModel();
+	}
 }
 
 export class StandaloneConfigurationModelParser extends ConfigurationModelParser {
@@ -77,7 +96,7 @@ export class StandaloneConfigurationModelParser extends ConfigurationModelParser
 export class FolderSettingsModelParser extends ConfigurationModelParser {
 
 	private _raw: any;
-	private _workspaceSettingsModel: WorkspaceSettingsModel;
+	private _settingsModel: SettingsModel;
 
 	constructor(name: string, private configurationScope?: ConfigurationScope) {
 		super(name);
@@ -89,11 +108,11 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 	}
 
 	get configurationModel(): ConfigurationModel {
-		return this._workspaceSettingsModel || new WorkspaceSettingsModel({}, [], [], []);
+		return this._settingsModel || new SettingsModel({}, [], [], []);
 	}
 
-	get folderSettingsModel(): WorkspaceSettingsModel {
-		return this.configurationModel;
+	get settingsModel(): SettingsModel {
+		return this.configurationModel;
 	}
 
 	reprocess(): void {
@@ -114,7 +133,7 @@ export class FolderSettingsModelParser extends ConfigurationModelParser {
 			}
 		}
 		const configurationModel = this.parseRaw(rawWorkspaceSettings);
-		this._workspaceSettingsModel = new WorkspaceSettingsModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides, unsupportedKeys);
+		this._settingsModel = new SettingsModel(configurationModel.contents, configurationModel.keys, configurationModel.overrides, unsupportedKeys);
 	}
 
 	private getScope(key: string, configurationProperties: { [qualifiedKey: string]: IConfigurationPropertySchema }): ConfigurationScope {
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
index 983bf2b902f..897e2c0faac 100644
--- a/src/vs/workbench/services/configuration/node/configuration.ts
+++ b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -16,7 +16,7 @@ import { FileChangeType, FileChangesEvent } from 'vs/platform/files/common/files
 import { isLinux } from 'vs/base/common/platform';
 import { ConfigWatcher } from 'vs/base/node/config';
 import { ConfigurationModel, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
-import { WorkspaceConfigurationModelParser, FolderSettingsModelParser, StandaloneConfigurationModelParser, WorkspaceSettingsModel } from 'vs/workbench/services/configuration/common/configurationModels';
+import { WorkspaceConfigurationModelParser, FolderSettingsModelParser, StandaloneConfigurationModelParser } from 'vs/workbench/services/configuration/common/configurationModels';
 import { WORKSPACE_STANDALONE_CONFIGURATIONS, FOLDER_SETTINGS_PATH, TASKS_CONFIGURATION_KEY, LAUNCH_CONFIGURATION_KEY } from 'vs/workbench/services/configuration/common/configuration';
 import { IStoredWorkspace, IStoredWorkspaceFolder } from 'vs/platform/workspaces/common/workspaces';
 import * as extfs from 'vs/base/node/extfs';
@@ -82,6 +82,9 @@ export class WorkspaceConfiguration extends Disposable {
 	private _onDidUpdateConfiguration: Emitter = this._register(new Emitter());
 	public readonly onDidUpdateConfiguration: Event = this._onDidUpdateConfiguration.event;
 
+	private _workspaceConfigurationModelParser: WorkspaceConfigurationModelParser = new WorkspaceConfigurationModelParser(this._workspaceConfigPath ? this._workspaceConfigPath.fsPath : '');
+	private _cache: ConfigurationModel = new ConfigurationModel();
+
 	load(workspaceConfigPath: URI): TPromise {
 		if (this._workspaceConfigPath && this._workspaceConfigPath.fsPath === workspaceConfigPath.fsPath) {
 			return this.reload();
@@ -98,20 +101,17 @@ export class WorkspaceConfiguration extends Disposable {
 				onError: error => errors.onUnexpectedError(error),
 				defaultConfig,
 				parse: (content: string, parseErrors: any[]) => {
-					const workspaceConfigurationModel = new WorkspaceConfigurationModelParser(this._workspaceConfigPath.fsPath);
-					workspaceConfigurationModel.parse(content);
-					parseErrors = [...workspaceConfigurationModel.errors];
-					return workspaceConfigurationModel;
+					this._workspaceConfigurationModelParser = new WorkspaceConfigurationModelParser(this._workspaceConfigPath.fsPath);
+					this._workspaceConfigurationModelParser.parse(content);
+					parseErrors = [...this._workspaceConfigurationModelParser.errors];
+					this.consolidate();
+					return this._workspaceConfigurationModelParser;
 				}, initCallback: () => c(null)
 			});
 			this.listenToWatcher();
 		});
 	}
 
-	private get workspaceConfigurationModelParser(): WorkspaceConfigurationModelParser {
-		return this._workspaceConfigurationWatcher ? this._workspaceConfigurationWatcher.getConfig() : new WorkspaceConfigurationModelParser(this._workspaceConfigPath ? this._workspaceConfigPath.fsPath : '');
-	}
-
 	reload(): TPromise {
 		this.stopListeningToWatcher();
 		return new TPromise(c => this._workspaceConfigurationWatcher.reload(() => {
@@ -121,7 +121,7 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 
 	getFolders(): IStoredWorkspaceFolder[] {
-		return this.workspaceConfigurationModelParser.folders;
+		return this._workspaceConfigurationModelParser.folders;
 	}
 
 	setFolders(folders: IStoredWorkspaceFolder[], jsonEditingService: JSONEditingService): TPromise {
@@ -130,15 +130,16 @@ export class WorkspaceConfiguration extends Disposable {
 	}
 
 	getConfiguration(): ConfigurationModel {
-		return this.workspaceConfigurationModelParser.workspaceSettingsModel;
+		return this._cache;
 	}
 
-	getWorkspaceSettings(): WorkspaceSettingsModel {
-		return this.workspaceConfigurationModelParser.workspaceSettingsModel;
+	getUnsupportedKeys(): string[] {
+		return this._workspaceConfigurationModelParser.settingsModel.unsupportedKeys;
 	}
 
 	reprocessWorkspaceSettings(): ConfigurationModel {
-		this.workspaceConfigurationModelParser.reprocessWorkspaceSettings();
+		this._workspaceConfigurationModelParser.reprocessWorkspaceSettings();
+		this.consolidate();
 		return this.getConfiguration();
 	}
 
@@ -151,6 +152,10 @@ export class WorkspaceConfiguration extends Disposable {
 		this._workspaceConfigurationWatcherDisposables = dispose(this._workspaceConfigurationWatcherDisposables);
 	}
 
+	private consolidate(): void {
+		this._cache = this._workspaceConfigurationModelParser.settingsModel.merge(this._workspaceConfigurationModelParser.launchModel);
+	}
+
 	dispose(): void {
 		dispose(this._workspaceConfigurationWatcherDisposables);
 		super.dispose();
@@ -190,20 +195,20 @@ export class FolderConfiguration extends Disposable {
 	}
 
 	reprocess(): ConfigurationModel {
-		const oldContents = this._folderSettingsModelParser.folderSettingsModel.contents;
+		const oldContents = this._folderSettingsModelParser.settingsModel.contents;
 		this._folderSettingsModelParser.reprocess();
-		if (!equals(oldContents, this._folderSettingsModelParser.folderSettingsModel.contents)) {
+		if (!equals(oldContents, this._folderSettingsModelParser.settingsModel.contents)) {
 			this.consolidate();
 		}
 		return this._cache;
 	}
 
 	getUnsupportedKeys(): string[] {
-		return this._folderSettingsModelParser.folderSettingsModel.unsupportedKeys;
+		return this._folderSettingsModelParser.settingsModel.unsupportedKeys;
 	}
 
 	private consolidate(): void {
-		this._cache = this._folderSettingsModelParser.folderSettingsModel.merge(...this._standAloneConfigurations);
+		this._cache = this._folderSettingsModelParser.settingsModel.merge(...this._standAloneConfigurations);
 	}
 
 	private loadWorkspaceConfigFiles(): TPromise<{ [relativeWorkspacePath: string]: ConfigurationModelParser }> {
diff --git a/src/vs/workbench/services/configuration/node/configurationService.ts b/src/vs/workbench/services/configuration/node/configurationService.ts
index d5c3af13b8b..4e3b25efb56 100644
--- a/src/vs/workbench/services/configuration/node/configurationService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationService.ts
@@ -279,7 +279,7 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
 	}
 
 	getUnsupportedWorkspaceKeys(): string[] {
-		const unsupportedWorkspaceKeys = [...this.workspaceConfiguration.getWorkspaceSettings().unsupportedKeys];
+		const unsupportedWorkspaceKeys = [...this.workspaceConfiguration.getUnsupportedKeys()];
 		for (const folder of this.workspace.folders) {
 			unsupportedWorkspaceKeys.push(...this.cachedFolderConfigs.get(folder.uri).getUnsupportedKeys());
 		}
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 d41ac767a69..1989f5e6baf 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
@@ -1038,6 +1038,56 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			});
 	});
 
+	test('get launch configuration', () => {
+		const expectedLaunchConfiguration = {
+			'version': '0.1.0',
+			'configurations': [
+				{
+					'type': 'node',
+					'request': 'launch',
+					'name': 'Gulp Build',
+					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
+					'stopOnEntry': true,
+					'args': [
+						'watch-extension:json-client'
+					],
+					'cwd': '${workspaceFolder}'
+				}
+			]
+		};
+		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'launch', value: expectedLaunchConfiguration }, true)
+			.then(() => testObject.reloadConfiguration())
+			.then(() => {
+				const actual = testObject.getValue('launch');
+				assert.deepEqual(actual, expectedLaunchConfiguration);
+			});
+	});
+
+	test('inspect launch configuration', () => {
+		const expectedLaunchConfiguration = {
+			'version': '0.1.0',
+			'configurations': [
+				{
+					'type': 'node',
+					'request': 'launch',
+					'name': 'Gulp Build',
+					'program': '${workspaceFolder}/node_modules/gulp/bin/gulp.js',
+					'stopOnEntry': true,
+					'args': [
+						'watch-extension:json-client'
+					],
+					'cwd': '${workspaceFolder}'
+				}
+			]
+		};
+		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'launch', value: expectedLaunchConfiguration }, true)
+			.then(() => testObject.reloadConfiguration())
+			.then(() => {
+				const actual = testObject.inspect('launch').workspace;
+				assert.deepEqual(actual, expectedLaunchConfiguration);
+			});
+	});
+
 	test('update user configuration', () => {
 		return testObject.updateValue('configurationService.workspace.testSetting', 'userValue', ConfigurationTarget.USER)
 			.then(() => assert.equal(testObject.getValue('configurationService.workspace.testSetting'), 'userValue'));
@@ -1102,13 +1152,4 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 				assert.equal(actual.workspace, void 0);
 			});
 	});
-
-	test('launch configurations are not read from workspace', () => {
-		return jsonEditingServce.write(workspaceContextService.getWorkspace().configuration, { key: 'launch', value: { 'version': '1.0' } }, true)
-			.then(() => testObject.reloadConfiguration())
-			.then(() => {
-				const actual = testObject.inspect('launch.version');
-				assert.equal(actual.workspace, void 0);
-			});
-	});
 });

From 4f5b23ef527648d84439bb8b2569115ae582deca Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 10:51:25 +0100
Subject: [PATCH 549/710] update: should not show progress if user quits code

---
 build/win32/code.iss         |  23 ++++++++++++++++++-----
 build/win32/inno_updater.exe | Bin 180224 -> 181248 bytes
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/build/win32/code.iss b/build/win32/code.iss
index 1601f540fa2..4230f7d0517 100644
--- a/build/win32/code.iss
+++ b/build/win32/code.iss
@@ -971,13 +971,18 @@ begin
   Result := not IsBackgroundUpdate();
 end;
 
+// VS Code will create a flag file before the update starts (/update=C:\foo\bar)
+// - if the file exists at this point, the user quit Code before the update finished, so don't start Code after update
+// - otherwise, the user has accepted to apply the update and Code should start
+function LockFileExists(): Boolean;
+begin
+  Result := FileExists(ExpandConstant('{param:update}'))
+end;
+
 function ShouldRunAfterUpdate(): Boolean;
 begin
   if IsBackgroundUpdate() then
-    // VS Code will create a flag file before the update starts (/update=C:\foo\bar)
-    // - if the file exists at this point, the user quit Code before the update finished, so don't start Code after update
-    // - otherwise, the user has accepted to apply the update and Code should start
-    Result := not FileExists(ExpandConstant('{param:update}'))
+    Result := not LockFileExists()
   else
     Result := True;
 end;
@@ -998,6 +1003,14 @@ begin
     Result := ExpandConstant('{app}');
 end;
 
+function BoolToStr(Value: Boolean): String; 
+begin
+  if Value then
+    Result := 'true'
+  else
+    Result := 'false';
+end;
+
 procedure CurStepChanged(CurStep: TSetupStep);
 var
   UpdateResultCode: Integer;
@@ -1012,7 +1025,7 @@ begin
       Sleep(1000);
     end;
 
-    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('--apply-update _ "{app}\unins000.dat"'), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
+    Exec(ExpandConstant('{app}\inno_updater.exe'), ExpandConstant('_ "{app}\unins000.dat" ' + BoolToStr(LockFileExists())), '', SW_SHOW, ewWaitUntilTerminated, UpdateResultCode);
   end;
 end;
 
diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index d82b1430c6407c1bf6a21418629564ddd599956e..6b8c7a981423d8c8c8cd66b1389b5864d2731d41 100644
GIT binary patch
delta 46572
zcma&P2Ut``_dmXKaTOF;K$=)6t^#5KD_B_-T@)0%QKQCKV~v7c!2s&IZlaEQZApwV
z(O9Ap6~u-OY%yXI#TJcegIKTzE5FaVcb8rBe*e$&_jzCLJ!j6GIdkUBnKNhRZqm}K
zr7fo%|CP;<5t-
zv0q4!==7?RaVq?WDN9{vV?CwG)wO(GaaGP|MW!6X*L6
zFs9!NGn%9LIBlbDZ^P})m$-|E029nz%M^*kKY;$PCeGL^*?NB{oZr??s2drE8ku>?
z&7#g2GtVT)m5dZE?8IfFb-2WTIO)qXE4Px;s_-L~Ye?Eqezo$%kd~op%_eG1L&;>(
z2Fxl{6C1|IR_PvLsw`=A)r=OmusA4h`vXRhsk1)XXqu~!HJbYBjil*lp{dV*tFk1-
zyZ(RJek^LBC53IGsZ`VnB3j)cVlpM;Y;-!m1l;28J^}Dkq3km2E8vyV(#ie(neCn
z@Xq=mqd7yL11drqbsib|tyI+${n3S?SQmyibzx|o*x#lyu)nBDrI!qS9wGjh&I7^`
zokn?P=u1IH4PB%s8XB$(v(|+ONmSymbSFcf1`3kGS*h7sKZQD-WVH0vPZ6t#o}g7o}e)qYa765gp=58br76-A|DLS4SG+DFpM5bo;Q(&Kmt
zag4Jv%njkaT|4L_+Dn?;nh;Jbn8nb^eDMLuqAnS7{DH(|79WQ2eXe1w75~k(Z=HZ*
z8ema}Cn-=USK``Iw1_^?=t9wh`aZou(zh4|c;M|lpCX4U3zs<-gyh+=!6Ti50tz1!%2g21`8NG5GE
zb+|zMRqI`u{;9>k@@^<)cjZ5Mrw$eiXHy-Z-Pu$FBs6x4Qt_guq$$4fmbCPU
z6czD@wL2@CtKCtidaS4(K%;h^U-U2prK673rb@+J0Ppmvb`152x$vc)Ej=!wn!QVB
z1NbG+n7S=(JzDdz+M}7EavZ|h0n{VbjbHFi;@iEN58qd#qQx?F>RW*JPJIDLa63h*
zSPG!{mc3I)Zd*H5ujxCT`qoeB6z0?}pEjN$E#N%J0VP;4WksI{{FRSEe+YWW)sg-$
zPgbSf@Bgl}IsSaOZ$q}2TYTrHz5+{|KZT_C0NN$}6Ohq7S8o)*IFN}S32iFHBwvhn
zFv&4##z(4>4ph8@xaVV)^t}47|A0PNVPX?Z`9{+fqv@PTR~Q-$IUZm^b1{>cX6B{%
zgIN?gn>nmvtrc?Qy
zf;5NWe&Cg!8#AA$%r0I_jab|QP%$?c?_$bC(#NxgR=j&>83f6fm9ZPO%WaTA+
z!XKTX7Sl*1^gF5xs)ADKs_XeF4k-j6+T9!}Zu9}lb*8uGnYg&olH9Xl8y!bac}4o1^s
z(T|U<6&=;rPF4hSi36Bm?qv15?Es0Uc8W3);l&GU1w~`%gN&vNMzgyJL9sD?zK15c
zrqMjzSqRT}+6@|7d;=H?OoE1<;KjA#+k9fDpt&>+pxr{p0|Fm^F~m+~3qN{#@`<(U
zwY~cnoQ2Y&FTyBi;bo^R6V<4G`us3WG8G1iXC4*el!*r({6g*eu8aRJFDHQz(4F9=
zb?P*GP??6VvmWM*720Ug&KpM7MC+zSyB0=3?*okmSXB{5LWSB&{D(RXf|Vjz^gvPN
zC$c7G5R41%(JTT{@1}f6o!b6=Y}}0)H>gc*;{CJyhrmEKk{1Rxm&RP+GXkUQT2`uZ
zP_yG;KmXJ0FT?qsI^nKLnbPi+A9d{Iys>&$lt`HYAO8E(k&hIqoT4sE5+)emPzOS|T|=&!ExT>V(1sm!=YyMZd2t|pjXmS0KC
ze4gwj?z&m^n23P+4>ukj+$w6b4Tr@91Gx&I-F7U1#3y!&GBL-EFAuIEUHXRa2#%4q
z{LTLfZWZ{qt9^XH;|f5#G5qAp+l4gr{_swDxmax{EES)*@_8ZtlHVCFhXhIIllWSF
zyROn
zZ$1qt@|N`)@Fc7qTi@r4>!!21+*RK|DjUM1^$lvTd>@WT^-yOLOod|h8Fg|F$Fw`a
zzl5yc#PI_m!F5+4qO}P*hu$HdO-S0Ghy_onS?50Em1cYJ7WE>$&Yw4$S%TT%Y%~=b
zO~;Fe7V;_e)=7~r+_nA)sjm;8QopA($C)3i?<@6k=2z>7OZA<3rO7Y^$Yx5=&=zq5pP?A<=Z7XF%F6FmSZQEp7p
z^j1boPsnvmm~UWOntS>iEtP5*Oh8!h`g%5pFiPvi|MmJMITUUm8mH7GwbG`06LDSC4aALs_
z;-M1{kJ#k(ug<1R)8j;-m*?=C5lg&3m#jTYKmZ(s0TRoltT_!oVD3IJ1kydZ!sg@o
z-9`~CD9g8TL&gGlrzTgu#9O9_M7u_E>v!K~HIDq0>5Oj(ugFv;65nKa3)pe$t{{l
z2Y#~hXuwNbxa%rA@+mLlZY>+PIaB7q`#1n&dV#+&{gg<#MiLGuGfwssn`~sHI@&vk
z)n$Bo%RWQXkCIIx%qxf&pCeI0oaFkUp*O#hV{^rM8dDk0&jiAwF-Ah@t13^S;h@`fo
zNoq`LC;qZk0~W^XMF-XY2Rl3mdZ9!)|Doso`Kwmp-SWVzxD-4PRHPty%XOi4rC&+p
z(YndnfiSP)f0ZWOUSo+-V7Nb;vr?4!!B_}a^VmX}kkQB3pX%pt2DA{8R7
z3m&;j%>UC(g$%ukL`xcKHvzuPtJbo(#j5;*
z{iJr9+(0TyRf-O%&hM^BQd?HV`1%J`j10Yzx(&7NMippq5U<<1zVFwxtXC)(TU#pX
z!iTkPP`x|FFf?^U%suQRtBH<(@(ryQIQ^iJcu<>Y-Hs;?_VvRPKBi5aZlELX{U`ij
zo0`(}N4%&_J?Y^lUf!mbw56QaZrePf+8NczBfD8D1*-zU$b+yFC7N!FKIJr`*eBc-
zcTV%UZEHyl%K5ssU8J^0_?@;*q=P^6>g~F<*z%}ia+Q{NMdg*W5-Wj9GVJvPY~QU#N0@@uA=(%;0m{xG6p*N8qoVoeQ_BBs-`lepRyswFrIqKWx2$va@vsB$$ng*uH$gy<*n}eGK<8y0dPw+e~`V
zJ$w%1XgAl2^hvLhbuM;1>wMv!UGrE>j{;1n=yNt8vBO3|%lJ16V8|gCmuPxOGdk%7
zpWX45lvtKEqf-Yax&F&@I#29V;0$AA6K?`YJ97n2XSEY+vsDc=8^KkD*xR4g{+
zRzF?}T}1)3>na?OsAH!n6Mp~jXI(Ewb@=<8T9E+lwZZ_2+IEUE;rlm#ZVaur{V`K!
z^S@YAFmP_=%JbnRyw`SuN#j|s8t)i?U*eClqPq2GQS-11c93ooKzlo*0g1tOiZapn
z51!L~ZB*8scWP}0Xs@*akXUY~C=*NW@J|w2N>9Jwxd|(z=?{31#PpWUez)>K;tYDx
z1GL*`EkFsDWPOZqwUN;pto@x==`k$g?=3VS)?qj%T79mL4?>og;;d3;q}&6NA)oW*
zJtDk}w^_wfPWIUCHowrLss7L_pp`U_S1Z-N9^WFF?DqBa7T5Pg5~M2c-E+S5xP)Ko
zc|kYww~EdeiE+R2T}hqUIQ}##$nX2RU}GMl4l)c7dYb!<13=ofni
z@i7+71Fp3EOvD>7h*-r~dbRkhD&uS4i;8Tn6g)z7CrzWoRE>yuL!j7DA-@#ceMsjvzEaZret&o8PjG(qGF
zjtReCI2+tWT5vlnesE7IG!iy~$)=qPi@>v8hVp!P2JbBv(>uA?&+hW0@Bb^g-sCw$
zw|6-MZ)}WF)4a(Y(T5x$3^|H7tb;Z2o$`>1^18HQnwKisVG(+Re>beY^yV=y92O*9
zxz3*qi_+b`P|?{^@z;f{X2U;WUOj(wG?m+;*N<5R9}Hum&gV%@hx9Y6f^Tww(Y#kb
z1+OCioCA}i=Xm0Wde2*`vkOAbh~kY6E%+xNMunCTbjoP@*_e4>mvOlTz|8B(wM2}a
zLy>5Ij$iw*t@J#E`;Uy19!BzEBYix7dzatZ<~(y`ROnp_*uW3_L-6~#Iq@q8zm{h!
zBq|ea&hnch+e%M@dCgJnr6*1J;8B^>V|NU_3V6Yo7R;Z&8M9d$Ux$A^Hq=Kd
z0WF+ARv3&MMKWS?Lw;*)ury&Lm&O^Ra!*+s#@vL*+YZp4G5i{kSYx9g$FckrpEItO
zw68H=J8qZp5H?s2j(R6RyUYCskXUD@C=;B@vHzSIRZdfuR^9|tv1nb$mwhxX@#+xt
z)3iYuWutkAek_LAXu4%IJ%~5m!c3@5tj=J^V!)=#7XZ?0ZsOqyrZF9h%F8^H($8Qz
z86R^a#a&!G!IQ=}WRLi~@pUB23I6%`2whtcT4fcY#R-08e0|R=q}iqV-AWAjSa>wz
z?i1eXPhb(tMcP6mD%T)Q7l^-)QC+*H#W5Z^F&gJ><0g)lS{&nr6WBd0VB>_AK3A|I0Jgcx(=U75xm;k%|pvqoG@860!$a7D|M
zoY(`~(}}rz{i84)eJmNA?SW6~p{8JV`I<HNgtl!A50By(FZk+
zF$KwfwiLxNS}a>Ctdgau>zJ%qjfNm_ukefg4)N@%b-bI{aI`%e4lzaDL%euuq*tG1
zh@cVUTX0lG=&x(=h-nehgwuTBv?wX&G&fIc5#@eb?cW>9QJXg?lf!5}q)(#$VjhQz
zkb@3wh92aPrgdd{9+O;O`mlh1kR0iCFo<-hv_p0(4r00`$F$nmAL#T~w8yQDHK9Um
zUjXF6!YGxELQ0oZSjLM3yn4!PX~qHmS&C2R;RhV;Xdobwh(8t7T>ucPJaD3&YNV~O
zLKXT0T%B{mtsB;#`L#LmjNGxVEBQx8m(S;
z#qd*EBd5DC_E*-V87-OL@cjzzgtV&8Dluk1Pn%Vb4d-sN
zx=TCu@jh81igQfPp+p7
z6PQ{T8jQ0>WH?gJ%i^ESiS%eEK@i%HD*|X6^PlDfuz)nrUAIkt^J+7bMPN4C9RBn{U`2i
z2RjrO2O&u!;(@U{eS=ctkdjLfjU9+Z=nnqZC($)@YcVz8VD#eVcDr)Lo$b73xO;?eU*dGEzfrMY{!(X?HF0eJsJ!((ie+rD5Rse7NE)Oa=;w_*bgs_>-D3
z_^ZC+>6REakRP@TPPzwqZ7Ux<`b~iLIr1wYan?>D#0dbj`jYQcBZuww;xe&&BOm)|
zTWM?=|Mt^Jx9OF^%v6kRte8`Y|M6)|tKn@)jpa1TH@~cCScuC2NWHctH_u*JBo2JZ
z`+PR0M>ji;4&&MYv`g9ykO;F=6p3H}#4^u1&eiONrJ~Z8+<94$SLbQvWFRLe2-p-FK^J{z`6H{GwsWx^lH-JzVWn^E`
z=ihCmcg3-7Sx(C6}VCn
z1His^*HYH*S!s~guR}oq|8b?e
zw0si3xiY%>!?pGXpwQa@?P3)HGMe6svkpY!#9AJ|s(!#5N_MEDxWutIeJwYwIwS2_
z!~3r8mpXWjBfma?Y{H6I02MJ(41m~dR@@n>XHj3NWDCseD3uPWfj~9KN|lt7y-GAl
zlQapg!)QrBQUE*k_?GZhH4=35FVfvFFL6n(Xs%40les~T@qT;&(piv7M#Wqu2avar
ze=3K17dRGFhiXOULViXL_TJ-IKo^fh(n9`L_G>8jB~{_%!I@;x=73H~Qj#cd*@DCE(5@a#2lQqoHP
zc8wn!zhtPOX2y8-=QF&EPboQ1w;B}$lkX}7cj4hqtxt8G
ziJ(WVd7)S-h)2Qb4HI395qhWv9h3qox15jKFs930Y@M+QA5>Ai8}5n}9*Yca#Q{!4
zIrTR~K^E6nWeBaPG7oO^^XgLBTfYDEIjJ(tg!)B+Yc94B8sU;=Rc@YAr2PtyT&&X?
zp_^qbssDqb<0^Ql$+KrOttA_%89GQ3A(Lr9guDzEaqM;w*^QD7vA7vQV{0-xH-d;)
zrz-VfQ$$1mXhmLzzyJp?8H)2P{#w~WxTV8|iRb;f_#&`T3&nn{!uz0>Xr?d{&i~tL
z9p3!Q8PcOHzVpkFh6|ziiqTYtfBbxsfUe|`r=~l9=r-wkB!Bf~-PA;f3dL9#sAL;l
zquTx3f2pHDRdU@S2OXmgehoh0M@Zsl?Y)i^C0
zC+M?StIFh8!6NZ5UbwM(`_tGb+ibx>imx2TKpn3RHYxImQ?)rzMM
zU}2-2u`Zr}xhYs`sLwjSX`-YrQsmgH&%={0o`AJRcrPIz*H=HBB90DbKIEIIh65?z
zhdW)v5jp5G=7B81Qm;FvJtgXg8!a1@E1{!xft@uPzWbZ{ssALq>$0n~Yt#rG%}fWq
znq=@ZIrwuA010%^c1>KN{GXM7%ICBs-X>8xf&$Jr1|~(vbi?TomO@Qu;7S&YzA7!|SB5rz6d=aROBK8EE#mdDbgFVZ%8ZfeqN{Vp~Mj+la5C5O&
z9B)eTNHFbC@8X8FIE7eD=ZSq7amKoJo1Qf3Nr#vQ7Xj1oqdAQ+m71pDgdp(>*&3sH
z0p05X5gLLPS%f2fO@CIr%&TqHONU$XsI9fSq;Q}q
zfF?Z;M@}7B#yDfv4$`$tdO@%d%i
z&^~!;$|zlCC6pyt4prRhCJm>OHZ*u4pGsOLZI_~xYNeF^#b1L1IDV{hOs-L;
z&WHg@l^3EPJu%y9E?ei45vU`PSokB<8Gm>$$|82?58)xAlzK?kUK0)R3ZD~5GYJ!p
ziVdbb!!Z$PV0nhZGE*sDSt*a%UNP<^FA`BK69?SQ#mINepk6mvF~|5Ut634MHe9Vg+e&Mqz5Kyy;fLEykt
zmqGU;X~#fHNPrgd@J!4+qs#abFWoJbbXeg=EB|bskAJyiKn<+JuzjfUSKL0tjO(9;%j8jrg|F73!spc?5OLB
zisSXe1Cuo&)oL>2M?N?2=qc(eXoE*
z=a~Z5aULpXT5vq$;PH3p*Ff!H6sOUBIumq`K|mge$zxumCp;!ianaY>k`VyKQvCs|
zH&%2RGr%C;6lhGv@X{g>Z|dqy3~8wG?m_P~%y{>w_dM{xJ3ir2nHzMTU4!CGlcVEJ
zlVe56Jhe|GGqrRdF!et3x-J73wlLIf;IiATBWx#U>jF7O##rGP-Nl
zCKZq_OpUaX@Py$9hPTRHmb==+tpzt9N_TfZ+U7S}e$
zqr@F>oC=S|BUkxSu=z-(Qkb^;Dv)@fZc}
zUa_bDv5hz=5T8gYV@^{~{G6oPggT+$u?a$nEPMy03s?3dZUsmjC0HS3G^jpqBNWocXzmeYGsYMZw&1%B_;Zw5w+@HOr8FERv1OHtvUzHURd5BOj(Ae@z@P_Up
z8cIzso2kph9v3IxfXE49@l&2Y}H$G!p$Re1TUCG)1gsQgSosz2$m7Fej|nN|Ypr7|k{55=j7E
z`x%OABGHji7b_#t$`Ko>Vq-L%r3rj1<34F}G6T$>7N`vFTK56FGbwGc@7Gz!dqzO3paY)X&_aC@;ZYv0j<%=f1iBwXA^EMZ&W`eB6Hk%yUlyO;$@
z2UhU7V=>ac6+G=2zMoyew;!t^ty#hIft+@Rv*S&i?yP0<@8MEyr@CjD%o<1meB$wj
z(vx$1{qY)7-eJD~cmrv}a(?G{AD4Eg(UQgI>>=L%L}SSxY4Q_;r0ECw*%RSX_k;Wy
z9^xPmI=R5T)7T3AlnEo>b+VJxU>SdUa*^k_F>2>*6Jb1GdMZ#VOyfIGEqDKRv_rM+
zJRv{UXW6Hi21?}mytCEZSAELA%C|&xxeIA%!P|sR!&daDOgq4Mv0;?jhQC#TU-0(|
zf+AiOQ~7gUh8x;evk*5xXf(I@-B$8~I6V?a`R0PQZ8rle1|X4RG}m6NP@t_L@JspH
zWdMQJdXfla$_6rJT}CuGLqSu`yw>TknioN(%VdNzYo90_@=~x|`E=O8hn)^yp>kYA-+RV
zD~DFn*YlcZ!Vsq_t+ZBK>8@POXs4%EJV)Y+4?;Uc+7oC)gw?QznEK(nx=RL3rcYsa
zJEAhh7z+$!ni|u`SQfP7zzTVw48ow);EdJ#2e&@JraUq|F*Y<6A$r@1$Rl5S1b<1&
z4k&a~+f)+X;7^jGLu4?<%-PZE8Bbj$+v=U<%-O6(4L$JN~?e>31A|8MjG
z<07r)Zxa6t{3Y=NQRXQAZOl4|m$sO@p9`z`8>n=d-x1ENWkhNfKXEPZbuR3^b0~-S
zmGFT0*L9g*Bz_3|0Gx=d*rnFtU)aY6F-5P@;0Rffm3Ey;4Q#LYb%y06QgWeG^{Ezy`d)2%T3(wA~ui
zR=e_GD2ZinsFYW^(4bW(;-xlZbZlq~sKsifinXE709YIH9>&LBs9X8b9nk#7mtXMp
zY-eR|b738L&V}GE&A?F?XrEo3F#niD^}#)
zuo~!5>$8*p{!a+|gs&{z@3C$WI{jSfHvN#qaz5x%-_BqB25C)LEE3G^M%;p)(hOq{`gXu-%C)WbO%W=k=T6aavt?_
zSY!#x(35*NmFd4g8U5P70m4Fx**W38cL#G4H~rk8`!T{Q16cc0B2@?Qs;CFN@K&lQ
zCS4@l02ocLC~{jth5rsz`PsIqFZkP^n|Nkhv9|c;0B`?GM93T~Hi?A7{&5~)NUzJN
zgAPN*CqCxpU&aLwyP@{qpCoax?#qgveP+$)KEH<5yaFm+=9fzUv@ZeJ^w8xqKJeGD
z@RNkHxShJL=;0sGp#?u|OG@V8r7?oClBsy{`IvwAYt5vhR2ulW(%dE>6ff`6)&jMU
z%|{n+)J99#B(?Yuyx^`=QpKbG?`rW0VB9OFLSHZ)G=+O#ZWz~mfK96{7*(}7)it0N
zixd`$R!c>iQeSbZT2w;INs2()1*tsqa$~7*KHqn_l~3th;_{BwWp3dg7lyF8Tz{pB
z&#`MLCym)Hrv6+$_DYyv21*o*$s!V~#r!jeZ@CgC&AY}6uhj5-+4tQ(z2>j3G)V2)
z&(??b$UdmEE*q5MTZP=}=)MGCb=eJ2Ar04RQrz;pI5R}!MvBIfwRs_2P=v1aU8>GQ
zJk*bPKBVEN-Osg&(6ncqFj^9Ci$?c=<(rE_e0p4cr(5$d5wd3U>qTLHo+wG_hKUeO
zB-UdVsW2$dx|CSYJJ1+gjMDMdYZ5HG#)q+
zt&m%L8U?^;`WM}?GA`Z)3}jz7f&X%~S(}@^Ro=Gwa0@UAMrL6euXL{r-76Iv?oy}i
zzh!V^4)1uam-OO_Jb5Sc*N!x6Z(QMfu7yjp=J1=>YDn|H;bqrqMbEs#G^31W*LnjL
z%dd2d4h-vp@n~IY8ci(2A!w7_$KRLLma&!ec|4mZTo3j9flwB=J$RH~G;6C`+p341
z>1F=a^}5pO%ktKpELe-`y)W~7*K14eb9l8IwOuM~)m
zmGV-eON`+9a5hi7(bT
z>VU@n#gs1~vv$u#e&hF)ro5ZAIsz~xVKM;PlQ44uVZ4t1WFPL5X*~T-sQ(f|S={E}
zQGPK#{WY78&+xP-r}5)=B3y1k0*vUC1^oG)w8%;E6)n(pu3-S}${qknB-klRMI8V3
zk5HHLsR|2^Y5ejZBiRbx=FdHini+vp?nWCh{$@Zh5I0c?FV=4j<`_)*@iEVlKY7Rl
z{%RsUN#Wi9G6tn|rQ?NsWBTFS2yJPj-2oVD;7}x@dDdTgEBA$=@r-@W!CSUbW
zD<6*u3cceR|IKQ6+hFPCcwR|d^LdNa1Pm`C2q>bD9-!P4>-ZBfH6gW=U392(3PAfu
z1Y-e-_w5vAqCWu2Pc6}8U^V;^tQKc(fd|3h?JM9v6bHE`#b2M;tkRdkEQDhP%1}BMKrdQ54&5-^Y?rt@X_vC
z+WT3wdnR+wmmyOAD!%*f81^IgF9{Avz;bD{SUhN}Wm&Zbdso8&<)YCN-lwE~z`vx3
z{}e0ta=LL|5*d*Fe-vW_gy@RjENNVIkwFO=1v7A;dwMo3tM$E4nNO__jwa|0NVs(1
zH}9`tH~EwY4cH$1_2#=C__9Sj|3Q7+lfVC@TuB_JTj#d80+81so2wmJq<+J7!`35?+vpGAN#PHp8{nxWh!=7kV$rA
z4R}|L;q2)S$!|2@_0&&lJer?=`ib|-(X=!mJXgPSfkHkR&4)f4Bk4x-f@dE|J4W$l
z&*P+VqxkIS(Ne^yti8_%Nz#G$xyOr!m4iNn@auWU7dxa*gLvtSKxx$oW!wx4F_J#K
z+siJJH(`7#;j5YveEZA!()Qsz;#CKDpYgBi)SMQF(MmrY1Uton`XD7&W1-7YViw>0
zsvCRGAHEvd?7Pl1riT@4ruz^3#?o9fJx(xZuECoyDdiS2a~wa?DSs=z@bxh1-=6%R
z*FtJEj2FJ~ll1BQ?wdVQ*Z27sZ&$Kh-mE;)Yh)wq(0~;&74PvC24;_RVjnUoctG}=7R%X7kCw?+W
z%Il{By(_cU(i#OAT-g`#TXBTEz=H)y!B&FcDlA00-&ds`T!nR(M)j4ys={hYv-`?N
zs<1jzqrUQQ1b6ByzascqAC)-DnZ;HqMDSG1->!CMHEL$l`%Yx9urFfCRSaqKS>D`9
zFvQqC@(yR#S1Re9ExE80ObYEK7gS{prMF4)GkX4-B-gEm=Z++~S2fm1`XotCtA<49
z;3RnmJ)0-VMb%ixsLMUk!dzHI?0!ZUW^|cXl&zum1`6WoE=3}iiVDlk?Dl5BU=}*2;gXt#q_w>5v|BA(e*PN|!m7R_`GPxuf)UqLuS}$I`Qj@?_9Orem%Av?z@?{RVZ>B)2M~G(jG$W8qcKB4R2|`J|1rj}24{4AU$nwCb-s+~71bVW%($;QrXHWK~@_57xVzu1Wi^Z@y
z*$cdw#AFQDD7?>Gq!$E3(g3XPp?kEbDxj
zk58VT!(2i99)@FrJ#q}399t~+^T90GA}{n|You=ta*!`Gdd~HwCJi~Xc)}fv`SL7Z
zHrw#XM@8FGH%|cDG9oyI#X1sKil4H_7A;+a6dM=myc4c
zx_dbE$^h*%`mHy3n^TI!L%dj5?ouHD(2pzbMr*Xaf)W-rf;Q;r??_`g$e-2s{=%Vx
zwX@6RLH?{O|KM0{X?h3wwm+-qJ`5`>ZAfs5LWtRN^%|_P)N878Zjjf}dTzj`s^j1ZGh|DcZ>wYO-$b6WS`Wmtp6gCqm`=wb+>UGdwEj)SuvJEk*)m
zSLhHxM)M4R0aLVbEEQb{ThLXW5Ww{E!&jml`!Bh5Z8pGtn$Drl1o_L_
zY)0S%cPkF3zxWlTTL2w?1?jTfq7ED3IZ+`}zyBsnnk;Xv!@}yi3E{kr2_xltes^vwAWI#+%_
zkkyx#N0XTa$X^Ds$cTBr(Ch%)KkF%*QRUNwvDIiJ0%TyQ9r;9l8OS2MzXVg&wv#>a
znL&9&F|)n&`%&x0^a`^#5?Se#VZRjw1v43gVA`Ga5<#=6Q&f>|$?
zDBlQX?fgrs+Epd~1W+6Xe=o}9s1R1ybGK4z$f4vM>1dBUDujizq4H-T%-7w}Qq@US
z$QjX6&I)0nUJa}@Y!k6zRry{BtK<373Il-f~hXksHw_tCbv&16>9wrMtl=N7Be8#muMLP$HvUjZcAmM$fvqwP;R6#h5L-
zMU-5t9_yI+ErfTpq^*E$>57g)N+-~GVv#tdrCySG8cjxWY^6F+aQFGO8Szw31}@3l
z>#+oOF1xHAb7I~FH0$%o@mLc;k3?fx7s}eYzlc%a$7)sJ`kB2259p
zndK3USv#pwL;0)5tUW81Z#Rbd9+ZQc!0|tl+cse>-CionvKW!E6ko`xP1u5_mELG7
zc)~3|!zsVrFWm}9sM~HAOj2utqMPfQhMVd2X0pT8(
z6CDM{V7}3vkzPt6KFvxrolZ3Uj?uZ-lC_Q5yOWxncQL^nN29Qtu6r+Agk*O5yxoXz
z-@}$AftH57&qz{3PB2*zCeD8OgH|lO-iU7in&X1tT!LXmK^Q%{Bocu}$+^(GE>zyt
ziZ%2Kw{oyeq=;wo{Z^PrFP^HLZTMGmEqo|1oePw^N3$UJwMsFXq_gc6@~mhU%f6O#
zqnW|eg^I3MjEUx{>>2}aaafLwVNII^pcHn7tAeI3&iJ7vPqFt2wqaeIHKs1EIkY7+
znkwg40nPQ~V38~@kHJt4m3PLl8eOKF>CB*CnbG_{ep?Iv1O2!|9*pjESrR?Os7Ka$
z+7`a60{d`@byW5TAWA5dU0bsR=}%XAP-`~VyH#J<6*X%(pak7G-D)P^ZOsB%r|hb2
zSUYX%DP)1^cEC-fft0~L4@8MK?jGU3yU5P5VlMzoUsCK>$mn(o&H81^)UKHIG1ZAz
zTp4DohGzZZL}#M~pee2h)4Tg2>OGBk9MnVEP;K;Ibrc*{X>B95vSV7}csoiLDm`AM5$>ldA@-)l{UAQ_ZSdqZL29eV~Z>;uPKLiWIsze0okuRGVUauY9TN0
z!a7Ow+_EosVUm=Pyq&tE{5tM6QLs@3@B@X{#2}>vc~!E-ok|IYKf!cKY*Yb@+ZMzf
ziZ010s(vNwQV`~{3n*DJC8|mbJ1-Gb4Tt%plw*1i(eF&{8
z|J92%kw#XNeS5PJthqd^H`~ObvTOBW_;tTtmF0u|7=GHdiu|A-8^iw1?%$u8CCPk0
z`;UQGw+x2+;OSYp*o3oN%+#iE21u6;hM&m|!;p#Jam@}{yV;*n(=_Qk*3sJmGNPzU
zLRu#$3}UO;efiEH7Q)WT+QF<5+aNa^%zB5X7Fzp6o4*VItbJQEZpz
zPx(}4$Z3dPQl|^$E~BBX`SRq^%r_tlEt6-dg&Dct`c7UZ^^N@HXcp?(-dfw{O=9IM
zqgkMr`+v|L`LgpEY(oDim79%W@$QRHRj8{>ERdIsVcjFT_9rJW?>1axX~`+Harq{-
z9p_vU3}77X0RYf1Zi3(?-Eh;R~q8;}M~y9h4_kTK8{Ur<@BBm{lf
zSbSJTtRjRPA$F*U<%B?vLQ}ln0YRUX6~omLccn@-`gEpbF2EI3fyzs0SG~Cc8V+bb
zL4H)$8_-dL@ZF52q%)wy1i28@5>O67l-(<#&L1I2;TZtv6hS0X31ylu5kx=4D0ljZ
zRS)}ig`y`Yo^InQs=E#fo9a}v*QSNY^FLyB!?(-u5GQc8WWmWbV4=nk7Ppl+6~a7x
zhV@FFhn?iJAFeztU%hIr47)8BI
ztFg)({h7B5AjNRc%ZDc+%Q5PHcF82xkNK>`lBw8YLELF8TT?B$-xM}VT3M2PXbRiF
zq@~s6K~q_T^h0%d(NxyhcLA*tF&AL#dxA(Il__X_!Q}DfN
z12&hl3NRW{E<16eGS#TK>@*A8FYOYra`?>3c3Wr~(6}vxgKxU*^kX#a24cK{7`O&e
zBLmSRu5BQ1h;#8Tl_uzSl($67Kh0#mT|NUjjvkZUs7@~G6k|v=AefH=F&^{=Q-MK|
z9BaQq+C`j2Oz0SzpO+(MvEVv+#LFgC767^(g1apA^UJQ$@<+2+&D1|o6+dRJ{x(N@
zk)&`!uPK!o4?wiHV@gFUqRzZ-H2tQ_tWB54)Ekua3vW2LwYU|RC`0CjnWtWgaK<-l
zim?W&lQEh~lp7Tf&^KK*x-PNmoa{0iTdrAGXT{@`fp!>4#9K@dEisZOC;5f4Ae>lF7tQ>n3$-C#U
zM5*UJxqJ?*?H&sj^chSLb}Zrd}%ATi`rmYwIZT0u34
zo{}P_$0e~#y0FFY?&hBGT3zAue9o1~PV-o>w7W#EKMyOc&Rrfgk2MNT`;AzTA1hDt
z&&W%uZ8TRlnvJLyOVy6M$yxI-MK;})Z_Hyg+&{Z(7i!*J*=art@wsx3q77}DL(zo0
za_jk!_c?qOxIEIyAJ1nI?#AyOmK1}$Z9a={{Rq>;7I9<8atEM&$8rr2{Zh+$I}u%$
z4WhfUN90DSxJ$aFSniq1g5CEP+a=prEYDA6f$qB;aO;cZ?WwGh%R(eIAkqSN`S(=z
zS*=PSQGdt3nBqU9xf{CPk-C0I$V=0he>WkBg6?`2FMOBc7D|e7;O1ECnw@&!yCsD}
zegJ+gPbd_$G!^ULrP!mCC<`ib1dd#{3c2k9=3i@#Lg7Yrm767YY0W~O0*cf*3WY0C
zY{DOh{!CO#u(E237r$FFR4H)=vgBij3OyAx30gA90c}vw#0NM2?EFLDGKa(4a3{oMN%H#DteKxL4i&8p(+pHD
z$P`yuE&sKe?Ptg24KnM-rpy1xYzLc_y>bof!=zC=NUj-WzGD447wCR@QoT>s3j
zc<~E>a-WSVTaeB7W^(xFtU;SzMBkTsZ*gk}fpYcKTHQ$$lVN2Wgx+9pfvq^UXge(m
zR{e6vW2^k>=d5w3=HQGkAv{E&y}csgPgu*)pfoJ{DV5Xax7H*NRsV||=j=G!cMa;~$dQ|U!FooHu$5z{4S(MUU}D7;neKo@tepZsTO;rJf^B3=
zF(I_P4eNdS&H|zui(#U!yE;#
zsGQ}@+$49|%;sXuPHaXN<(%yG4QnsC?v{Ih!}@vc13esHyZalJXNzYWvk!d3;+@zX
z+37nrkByWUe8;x5JoJgR({N(NC()$X28{i#(I!Cg_;sO`Habd6SmdGGSoh#I?@%@a
zB*GlYg5|T@Sp9lW7dSG!2MCGDAaN5fHcuxm%RbxL0?!@_&VCY-ByZUc3p%!g#!Wr)
z_-=>%Y(%uiEQZ?mA&a+4h_*mLE7(5vMSb|BOow_UdEU}Kw&*$N?#ccGDoozRa3
zXSTJP!O}I<2(tW^#4w?oZ^h=XmBV(j4$d{e7kB@)bOW!ZBx&WPJ8{zecO|+LS5G=x
zNye|1%#_>?%kkf{1kawRP7YBAg^~gElE3|)&GS4q?_HU3*0&2XfA$~ra(VPF$UJhZ
zykZxd7I$kd)dCy!hSx=a_Q`k}5SFqWalnB}>`}0Bx6|ecP0A>@{--y)Si=f?`A&!S5_)rSLel`+19Qje~uqg9MWbx_Mf(S0cWrQpgnS22}t>G
z>tx!gDniE@a`F#sR_lMkv4R2pbbf2`Cs1}KHvlOIc|ST(iu~Cc`C?5Ll-+d?^J3BF
zS^vXjCQx=RQvfMkK5(EEgXHB|tgEymTfUaXK54&rW(6195nu{Xc7;v^q#OYbb)Xaj
z2x~h6JhB&oy=lMvW-sgEJ#IfrC=Z0w6$(1c+9q%0Vf%2ILH9;Z-3KFi@>*WM4_oE@
z*YfFoEKvI9HI@52de=&%YJrE`tFtdX*RA{yxNZ)^SD=Xy=*o{(kRHdp!nTb
zad0Sw@c%d3ky#I;zyQmJmgmb)vRQD|(^N!@T;0OqDxJg&LBZtl=87z+x>+`p0bnqY4v7p;}HSKNBsJBk_Gg
znVgo(7WpSqng^Gmnj3OzDBYnGEg#(uIq)D1)%#z$<3TnhJoh<S8jHMMLC73IJfu$Pi)7$&h*;kvG(k>fjSxpUrT&
z)IZT(9+3wZ+;M_^-iWU9?mX7c{onBpxYzQlJT^r7Vx9cnF>D$-%D62T;ojIrLizqs
z`Q$NHH}VB=^tC#^&`KUH9)3hj>{s9(0an(((~t?vU8@Y)?>M#{JLMtASwNRb3c2bG
z#TWn-!+VJVHZ--91b}{Ywid3k%`c^}&r7tl6O@W3@}c7xu+P%vTgTD2Q{yW7Q6#Y4
zJ%LHOW}LG0*D;}tEKWVB#DPuvJ**HD@DZ+A`|yFBdIINGo#n4jux8Sc`*P6<)-Nb~
ztd$*wM!NxsZ|oR>6U4-mEXeEM`=G)R=qnf9$~=Um|J;{TPqK!!KHjQ~(h59s>ycqb
z`dCd?UM3fuWL=_Dw~_wTfwOvmL&#_XbrEA(#FVjAj*4$n+F6Bt#%+`1PO+9wp7%98
zcArmGUFJ}Xx>@_^p8WYK80oL~}(jp;c-Xbs1WTNGbbTq1YCXTkEpeC8sZE|K%|Sp%mHCAJ3f-?%}8b4z5e0@lJQ
z4*1l4{_=(l^+yR&^bK0THm6w4b=BMtvkv3&G2
zi+4G>Sy9(tn`O^4nE0Mc<-{|r8B35CoWYjWPu_oqwPi2m!n3T7^YfIJC0)d$5%PxB
ztZ@ta&7-v=97cWx0QxUA)DfT9&6O
zA5<{2)q1~phuq;D+s5i;-#v#dWc_m%`bnq58>?Zw%%AVZgY37K7(C3uW`@i1k8F{9
z{?H0snK&vpyuf1WUs+1qr_a^;hp9e%C+d%}(NcIeK{j9bf9+j)cvIE3-)GZ8OBqrm
zv`iYHg))`UG89AzqbV|kNd_5GprvIjw8es8ii#ExOr@}^*C8#XGbJh-E_yM7SBl~#
zI2N3uS0#W~BO+EWSKex4p#{oW>(4_kN`H
zN?HcZ_(m^aFMxdM&VUVYb4_Z66u1jSUlj$0u$Mp5>>WL~I6I4{r3b@X6Qc(9zv+|TE!__B=E9-_q(Hyxxf~w+B|t-j53y
z2;NNMufptXy=#wX(Xa1eAJ?O;nV5DK;}Mz3x}Vin(g_bS=UJ`4(E%&;_{MvttzKg9
zoz+qjU%<_e3cVhADS>$N0rRIJ1)jKR(GbXo!0tGy8QBBpv?%&?E-O5zjq7p>YW}GZ
z-ofR!e((^>Z~Vc1!*q7#oOZO!W!zTXu)rf?A>xZbZ*Y^r>~Ei7ja0mwwf`L~@H`pb;7sEVe+i4Xn
z@>^|AvmO;>_cO<$Y49ob=(o59XupHK_^mdh>hQzKed*#k>@oFP20}$
z&LhuLx3lu|82t+Nv4g$o07|l%zc;;|j^4Mo5ADpR2DC6bp^VK9;P~XxZOj?a`b5p!
zhUxW{!j@*#fc4?uT4y;>L!Ujt&IGhBwAVKFLqLmdO`P1QRZGPEaslghLF+j3B6bZ%
zANFJJ2=HSxvC#Nl=vqSzUE%y!o9
zcWqU>{@ayd8W78r{l@dwpBy5jTA%pOX|cV30D7EOQ;#@4pu&mcK};aS3`Pd74e
zD772=J<5IJ5t|d^O{x&iZe)X-(`m-5vV6oP%>TRyn{8!(YEHXR`&M?eIo(9pZS{<3
zL2D>2e8_V#oOaXb+AXYg1RX+GZDHdhXgsxUVL1_Wtg-zT5s%1=8aX1juy-R6So{`G
zFoI4Bxx+G)Z+LvtHBRC?;LoMC%{(&&yCJbZ4QBTl=;wEg9U_hTO8leI)j`}Sk?n}2
ziS3RK7M8{`for-xILPCRq;G2N0*Ug1PvDxa6$zfQ+vpuy#F`AuS?DsY(=wQ^JzYr~
zmU%`RX%-Dn8OQT)+?2zPMA3Q1==CBu0hC%$Z#wC$cQj2gzL+g8H7?N8+3fjfWORNO
z!w9i4yk`y%to89UHohYrWBg3|@FFn%!1v-(zMM}CA3H`wYffYJ9qCZxsO5>w0EWhFTPd7X-U%|TE4$qY<*?5k5
zD?O`kr+=k1e6eS6H~O(g6XvrvJ?Kul?>^bpbMKQ~z5RT4r3WpcvzN1?7;48y`PpwV
zbQ%3@E?W{yd(#)^vR$#X51lfP9f_r5>E(2GJ(hND<4@;Vm&5XF>8wvrinBhh!&zTC
zOX*2xbln6|eu?nX)Enn0J1p4iH%?AxXL{0(bYwdFj^p2#u@=3kmHsfBP3uM1(oM73
zo4sfpoj#j=--{;DZ)daaar935X_}lAV$yEL{z@9#6-RM&)<{>F#$Ju1{lnL%iWIF)
zWk1HzxpYVxo79`e(iy2N3;zL6|C%C4`9TSCl+Q`QDBp)pPi6i3&|+#@%1-y8Vk7q*w((NC)~Rn=u0Q}xQL!9)(lwjCgULb3ZE6k7sYah
zUW&xfxOOz_+K)~!pabfU?(y53M_5)rdZz=usL}c?9@3<3f4`JJ@RJJ*us_eYPOry4
z*&ci9vDt#I7c^JU?Seio=q^E>f=c^B!S5BcNYJMReMZpd1a&zCln7cXXqliDf>sGy
zBWSIlZb4rZ^pK#h2zpr1BZ9sr=uttvf*up}O+nuhv`)~s+dFv9P6^>}g8Bq~PtXqp
z{YcPyLC*>Lsi2<=>KF7YLBAICTR{VYK569P7Ye#p&>}&f7W5e-nT*TN3Be_3iJ+x|
zP7%~BXgfg%3HrMT+9Y@?Xo#R6wP(5U=t7rTuzm4#P|r}lZnl8nHk$ua|gjI(5U-yEs-x}P4^xDGk6l{2#=>E+lI5JaQ_?^I1W$3E)Kf@kQoni
zcndaj03Flo_lK}x{uL)fcodc3|EDIN2t5y#9PW*7Boe78FtWc4pwa!;NO2Az&
z5n2gb-pDV7;YA)xKE95*{hdHMhF5GqP%{=s*FzZoQ1{7J4`3>G%A{qoGiLfKHEdzK
z2GY*$`l69HBaVLTeQ!iljw?_X0$orboE?
zXJiE>wd~S)>ki}74mK$Pk;dh*2NP(AE+$x9Zflr~=c7Zr2tKlP4DhYc3;1w3EP8E3
z(nTRfPulUu;mPwb#S9Bwd-Pw|b2eC)gqDKAIFxdf{Ud?yY2OL$P8POh2FlTtch@Kf
z+nY%Hw&{WWXX}o$JKnY?8b5xJoleAJ(DNYsA(4*0=MZ+At*<7Oe9`}@zToaWo|A*R
z*f}|xPvF;$AGYCM`4~ObTjU5#nud=v27B)$3+X~m*+&V=Z4Ukl(u45hR`YDeHL)@!95nRdxp}n;osv1
z7~=W)j18rOXmV@z?oisX&G#E*^Gx)f2>pBmyE2q6r<*r0dlDVqAq~6VqaUu*#%&9|
z5A3BD?A;_fAUXsW+8+6~eb(v|p>?@3tP`Qfa#{Of)a)pP=Ha@q
z6QK`-;Y*5bp
    zIxo0ecQuzrW2vdA)@!;LOM8JZAqwoe5~4nIx~!3h`$y`wIzCo
zg|5W)wtJ9a^}8NB4;}1!?0iAf1f3)3a6!jK;90`!vA+wUNYHhHUK8|tLF)y5ThP}8
zEfZAQUl#mQLH{PGRZtnhBZ6-uXhS$p$`Qej5OgG{;d-n^2xA2OE{shdj+t;*OI9?T
z?x5iqHvzVbQdMX^EaHhgEh1m)pQn*WDmBM2JF?O6&iYp33
z4#^0j74}m&T;W88^A)aC_=v*23J)oKOW_9!zgF155%H6jFRKU@_Eb1rp;h6`BhoHO
zVT?k9!mHxJd_w#R-%{vSxL4siWzVaY$4^|Z$bdP|e^ZnkuW+TpJcXSUE>t*DVM~Qe
zRf0Dv%vV^buuS3Mm#K)KyrmT96n>}hH-$1;gj`e+98-8opCdCi?bGWY<_~;ggLiSz@L_zd}8{hP&i-mb#r9TJ=*>0LW6d(-9tTc@L=CO`eIutKTOtaG2+F({`rFTR6(Ms`-C<{-!iGlBWvWe&kk$mVwf6^pYj1Sy{rE{b@3Nx!X63Wy~sKqRV<`^0Bp3=qQJ!
z053biMz3BS^RSHM`deK$ol%8%3;&k)
zbTqD+vSnac4T_(QeL0n~1ap>Da})kM&&~ksZ
zq3OBV+-Y=;=3*zO(E+zCmtYTBUglmBO)(N}3S~?fuU}W!l|ql(9;fuZCFb>!=i%Tn&Iajur8?_Rq^g7xG$@p9f-Gim9O6E4v
z0=OUDgJlr=Y6e~HNLnouc0;dZ{zwb|O;s{lh4_W8l=gZ;o5~NQ{_#4=kTQ19#BcSQ
z?9}0=={c)S_h)3Mo7m}@bYP@wl{A{8jPh9IEZVDEvQq24u4ym4hs~WupNRZ#W}aVX
z(Y9KoZmt3)yI9BBbhe|p$^q_E#jmMZ(;N|H&zIBu*Yvu{l#*>4E@*swJgQFFx0B}N
z5Q&;~ZmYEwCStqdbgnUcTn;*q^}kDrr~;7$^v>mvO<~bxd^hk3o$vm+1Z82yPNf1
zgn1CQi|8mw#f#|c)SSZ>+v!M3a#)F-?xp4|Havw+(JX9RiWr?Pq|p02H67~iK&fI!
zfxvp>Vj7RYDi_mUw;a7JJ7k}lnzdxjQp{!gAi?`3|LN!(EQ@0m=9H9Wsiev1bfXK}
z)aZXt#_FZqzY5Pm^m5cOxJyPnHYY24%_>4NcS>3BvpV{fe#IXHyb<9II~884no0GH
z$m^&X-O#&>om)b$CNyo*e@E5uCjCc`H~pDjU^JDcMfx_#lIX&-hhLCwNTpL9w;JBf
zcmhS_`3;G7Jhj2)TSeni*E5exyF7(i*-O{tWE0}sD5JkkL{9Wsyd}{G6gQiehJN8>
zU#6jDIoZHvXi`qLb{V~!8aA;b%V;ecT1Gm39t*DU4EjVL`(_zroC*^CU6hvLL8;ff
zi0MIgEQ5}m=u~>%%=mA=lJ%;+Rn{^u$Sk=PIxn(`%V`?!y=6QIidB!JUB?8KqL&Ds
zko5?e=l50tyT6wKlOH4+f~?aDI50s8^J3wxPRZIZng}A
zvb$CC^p($qb!%45%1#?NM9s;{zQc{CsW(yb3nFF27-*X`s
zi}3CZyQE&9SjZDn)`v;>FWHEj2)okj!{K@*>j{Ki%LnL$ZXfNI{`Jw=@U)b5e-E>@
z575(Sprbd@sDa-+C9k$osrpID`l$4alJ)hR^v%2vpv2IslX`nqbb9c$C}Qr}r9A3$
zk&nHxnMRFnn!2F!-c!Zjp-`qruc+IVtd~yX_=6A9T;9|8D&k7n
z@*T9hVcUt0sh(q{V|O0epL^lW@NMjw9W>cs9y&BFbx_i
z7RL>R95a)9=9#sjy(`_ujT@IPUIu+M{+5(C%lLKKOJb5okLI?fKj`L(LW^sxnL)fS9;4du0}Y*df;`IR+S4sv^Yon0eBV8M=C;B0g7UAnX7opK?DL
zT#iWqOTLDV*NoC7a$N&-{8`rcj0j;kh%3FGf?af})_O6`)a-<4&6|oknup$RPBNtdvvoU}_6w|Gcdw+JCEUTkLOlIN6@MrtiPw<4X>yO7(oJK3cIy4|zo
zNg6{thtSZFW|~cF*(|nYv(N<1hL{Y^wi=p+U1l|fG}d#rkj~NAU3;moZ_8#muz63~
zgm4?J9f9A-uvwAKT9t&ETVyu3hx(fZaTDE-(M6%DFn>z=e3gODal#7EQ!<%#BYW7xtX
zJU6tZ2x~H4ruy$UzBO(`eb(O8-HV;dIOxLMH+6;BjWkTBq~YLA-79>D5;|8SJBmHL
z3h3O8w%mQ#?>jsLwo->v6#Onj83tvrk>~c<)NO$0qDGzvLFa;}BC;wUcOo%7Fgl2{^Lj^U3
z*dN6WKi}P_t`|J(D(GI#F#=PJ9h21}ED`y1V+US@9
z4ckoc{K1JNEH#&cw*WuJ0^
zV1o^I($*|X&Hx-W5G`vzN(lH5I9{SSW*}D`n6F#m0>Ko$2rdRZP7=t7A*c@S0XX(<
zLdJo&0oNxJG9Nt7UkJ`fL=|w{k7Z6a^lso~IG#(Kr4TP1uO^OLXAtrTY@EO;bFsSw
z-eCh1d!H&sjtlW50uKlni8T|i4ioSo_H%eqyMg>!EkCybmcD>p3(f=I_M%ErH9la(
zFwaK
zZ!U8i?ERCSaPaFOPB8Do@p|$DpNQAUOrBEUy9pY}1n&bbNaSy*BQoH-aQR#hv<#9t
z9QZ^maubB`3*OLw91#$F@O;a7
zjkw{#2`sj1Etj0L)&CM8PHxSdA?&UZQT`2{;rx@c}C~p#EF&RD+qkStGCE0uFx2GB|FO3EYno
z;sLpVBeu$%S%5Y;Zo@Gfjwd<~SgLq8a2~#2BDyZ{?R+%YDntxiuuWCvHvA9pBM`V}
zC$I*N2kPdi^nT!~?b1Ug@G&@U;{*=hfkiq>1sl&KeWz?(*!v~e=M^Qy@yIS|;{|>M
z$Nl<&{}4RJe{3F;5d|_4xK$<-;6%=V%M_mpJn$sy5|O!qMY}c8U0p!u9*qowo?{<|
zdIfI=E_e#{58e*^_IZ>9_#p88V)P2|exTn`s*!pw0E_p_uH^<=DrJ3h{2LsP*azHL
zC5to_yLvhbMXvHeW2#VooL$CTr$3V@s8cqwAbnH-1X
zUCswQ_ZCV8;roG>cToR4rC>{0;91qkE{2h*WGxDQGR{SK#fJ|WP
zE3(~SOPO4R<2?o2(4@sxlr;PrfR5`RqF8>>NLM(X8xwFS-VNiqw*X&<<3q0(IPzD?
zTY#Crsrm*UgyT7L0~b>&2Bl2k8946O4_wqt@^)Zx3)oa+{C9(KMxaRGnPWK|PlOvd
z(}1dg-VS^pjz{1Jc5IJpC>0a1zzBcPyMV92alhD~Bu_<2zu2QBOQLZv4IAuJ5^ODs
zlH>T7X!L*K0m7plrI8c(KAfmCAl?ZTHU{88#an;};6#prFZDp{Mg(4RRNDA}KO~_f;5P`Y8YaVZ1JA%YxMw{4L(apQ5E&i-
zB6u`NESWh*Vt<7%pW6cqv9A&bo?{st*L#7H7StuT0ZxYFdOSWvo`U0HJ_CGUG!g-R
z6VNyYRRKPF4C;Rb1a8D}nc~xd9>pI9o`&Or`hc6qQc?r{5b!h{*IxmS9FI~2KMq*L
z9ry~MU-2CKOu)Vv^!BafQu3~p_U9q#oRpKrQmW1sy?2FrH-e=us+h^Yw*w?VnP--eYT1UY1^#Tjne)Dsz=plzGeQ%6w(@W&W~;GDCTExw$;4+*0l=ca^)#z2)`g
zK}UH*IjIP%FjY7!TovvLZ-uYIUlFXZRN5+YEAuOhD&wk>s;t#>s@>JzYG1X#I#_L}
zvDLV04%hfp|oq6J-micLiJxuCU^yVr%gnWF@!QiOl4e6qQ8pOW)_(
z=ilcl^_S-EuiGDoBsvb41(32hq{~)rFV8K{7ip{GX+y%ID-4x!m6pni%EOgmRi>)A
zDl?K}tC~|~uga{-t8!MEsxy(ahU$tM>w)?M!2_h$QfsTV*XGvd)#ld*YoiaE4_Xh}
z4$e7Pbg<&!VV=-DG%SGGWp&MQxH4V2DEJDO*Hu?sUmPf|FAJ6hYN8Ls9q`urYW=lw
z2a^zh^PuaXn|pSmx$-bvMeuXjRp+WN4i=M==#sdSq!Me%oRW%taivM6)>3<^xyn-I
zs|r*Fs~W0EwV~QnZLYRf+fbHyD9K~|8V*Jy;tE84*t6#-U84OL8*JZn

delta 45689
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%0D*3D?v$J&WDNMUHx?kiBr#VWaF+ARQJ
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


From 82532abe87d0a9b67ee8cb2aa48d6e3992a965ae Mon Sep 17 00:00:00 2001
From: isidor 
Date: Tue, 23 Jan 2018 10:59:27 +0100
Subject: [PATCH 550/710] debug: simplify openConfigFile

---
 src/vs/workbench/parts/debug/common/debug.ts  |  2 +-
 .../debug/electron-browser/debugCommands.ts   |  6 ++--
 .../debugConfigurationManager.ts              | 34 ++++++++++++-------
 .../debug/electron-browser/debugService.ts    |  7 +---
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 8b5a6174a64..8356f23b448 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -471,7 +471,7 @@ export interface ILaunch {
 	/**
 	 * Opens the launch.json file. Creates if it does not exist.
 	 */
-	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor; configFileCreated: boolean; }>;
+	openConfigFile(sideBySide: boolean, type?: string): TPromise;
 }
 
 // Debug service interfaces
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
index e033c2cdeca..c0610e8e9a9 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
@@ -171,9 +171,9 @@ export function registerCommands(): void {
 			}
 			const launch = manager.getLaunches().filter(l => l.uri.toString() === workspaceUri).pop() || manager.selectedLaunch;
 
-			return launch.openConfigFile(false).done(result => {
-				if (result.editor && !result.configFileCreated) {
-					const codeEditor = result.editor.getControl();
+			return launch.openConfigFile(false).done(editor => {
+				if (editor) {
+					const codeEditor = editor.getControl();
 					if (codeEditor) {
 						return codeEditor.getContribution(EDITOR_CONTRIBUTION_ID).addLaunchConfiguration();
 					}
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index 2a067455762..c7351052731 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -9,6 +9,7 @@ import Event, { Emitter } from 'vs/base/common/event';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
 import { first } from 'vs/base/common/arrays';
+import severity from 'vs/base/common/severity';
 import { isLinux, isMacintosh, isWindows } from 'vs/base/common/platform';
 import * as objects from 'vs/base/common/objects';
 import uri from 'vs/base/common/uri';
@@ -34,6 +35,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 { IMessageService } from 'vs/platform/message/common/message';
 
 // debuggers extension point
 export const debuggersExtPoint = extensionsRegistry.ExtensionsRegistry.registerExtensionPoint('debuggers', [], {
@@ -466,7 +468,8 @@ class Launch implements ILaunch {
 		@IFileService private fileService: IFileService,
 		@IWorkbenchEditorService protected editorService: IWorkbenchEditorService,
 		@IConfigurationService protected configurationService: IConfigurationService,
-		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService
+		@IConfigurationResolverService private configurationResolverService: IConfigurationResolverService,
+		@IMessageService private messageService: IMessageService
 	) {
 		// noop
 	}
@@ -541,11 +544,11 @@ class Launch implements ILaunch {
 		return this.configurationResolverService.resolveInteractiveVariables(result, adapter ? adapter.variables : null);
 	}
 
-	public openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor; configFileCreated: boolean; }> {
+	public openConfigFile(sideBySide: boolean, type?: string): TPromise {
 		const resource = this.uri;
 		let configFileCreated = false;
 
-		return this.fileService.resolveContent(resource).then(content => content, err => {
+		return this.fileService.resolveContent(resource).then(content => content.value, err => {
 
 			// launch.json not found: create one by collecting launch configs from debugConfigProviders
 
@@ -566,17 +569,17 @@ class Launch implements ILaunch {
 				configFileCreated = true;
 				return this.fileService.updateContent(resource, content).then(() => {
 					// convert string into IContent; see #32135
-					return { value: content };
+					return content;
 				});
 			});
 		}).then(content => {
 			if (!content) {
-				return { editor: undefined, configFileCreated };
+				return undefined;
 			}
-			const index = content.value.indexOf(`"${this.configurationManager.selectedName}"`);
+			const index = content.indexOf(`"${this.configurationManager.selectedName}"`);
 			let startLineNumber = 1;
 			for (let i = 0; i < index; i++) {
-				if (content.value.charAt(i) === '\n') {
+				if (content.charAt(i) === '\n') {
 					startLineNumber++;
 				}
 			}
@@ -590,7 +593,13 @@ class Launch implements ILaunch {
 					pinned: configFileCreated, // pin only if config file is created #8727
 					revealIfVisible: true
 				},
-			}, sideBySide).then(editor => ({ editor, configFileCreated }));
+			}, sideBySide).then(editor => {
+				if (configFileCreated) {
+					this.messageService.show(severity.Info, nls.localize('NewLaunchConfig', "Please set up the launch configuration file for your application."));
+				}
+
+				return editor;
+			});
 		}, (error) => {
 			throw new Error(nls.localize('DebugConfig.failed', "Unable to create 'launch.json' file inside the '.vscode' folder ({0}).", error));
 		});
@@ -605,9 +614,10 @@ class WorkspaceLaunch extends Launch implements ILaunch {
 		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
 		@IConfigurationService configurationService: IConfigurationService,
 		@IConfigurationResolverService configurationResolverService: IConfigurationResolverService,
-		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService
+		@IWorkspaceContextService private workspaceContextService: IWorkspaceContextService,
+		@IMessageService messageService: IMessageService
 	) {
-		super(configurationManager, undefined, fileService, editorService, configurationService, configurationResolverService);
+		super(configurationManager, undefined, fileService, editorService, configurationService, configurationResolverService, messageService);
 	}
 
 	get uri(): uri {
@@ -622,7 +632,7 @@ class WorkspaceLaunch extends Launch implements ILaunch {
 		return this.configurationService.inspect('launch').workspace;
 	}
 
-	openConfigFile(sideBySide: boolean, type?: string): TPromise<{ editor: IEditor; configFileCreated: boolean; }, any> {
-		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration }).then(editor => ({ editor, configFileCreated: false }));
+	openConfigFile(sideBySide: boolean, type?: string): TPromise {
+		return this.editorService.openEditor({ resource: this.workspaceContextService.getWorkspace().configuration });
 	}
 }
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index 288a5760b2f..d737a4165f4 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -818,12 +818,7 @@ export class DebugService implements debug.IDebugService {
 					return undefined;
 				}
 
-				return this.configurationManager.selectedLaunch.openConfigFile(false).then(result => {
-					if (result.configFileCreated) {
-						this.messageService.show(severity.Info, nls.localize('NewLaunchConfig', "Please set up the launch configuration file for your application. {0}", err.message));
-					}
-					return undefined;
-				});
+				return this.configurationManager.selectedLaunch.openConfigFile(false).then(editor => void 0);
 			})
 		);
 	}

From 0583f92291c52b2378fd6fd485bd506a184cffd5 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 11:15:35 +0100
Subject: [PATCH 551/710] #36967 Support writing launches in workspace
 configuration file

---
 .../node/configurationEditingService.ts         | 17 ++++++++++-------
 .../test/node/configurationService.test.ts      |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
index faad43ebd7d..f91fcb78f79 100644
--- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts
+++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts
@@ -390,8 +390,8 @@ export class ConfigurationEditingService {
 				return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_USER_TARGET, target, operation);
 			}
 
-			// Workspace tasks and launches are not supported
-			if (this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && operation.target === ConfigurationTarget.WORKSPACE) {
+			// Workspace tasks are not supported
+			if (operation.workspaceStandAloneConfigurationKey === TASKS_CONFIGURATION_KEY && this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && operation.target === ConfigurationTarget.WORKSPACE) {
 				return this.wrapError(ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET, target, operation);
 			}
 		}
@@ -432,8 +432,6 @@ export class ConfigurationEditingService {
 
 	private getConfigurationEditOperation(target: ConfigurationTarget, config: IConfigurationValue, overrides: IConfigurationOverrides): IConfigurationEditOperation {
 
-		const workspace = this.contextService.getWorkspace();
-
 		// Check for standalone workspace configurations
 		if (config.key) {
 			const standaloneConfigurationKeys = Object.keys(WORKSPACE_STANDALONE_CONFIGURATIONS);
@@ -443,14 +441,14 @@ export class ConfigurationEditingService {
 
 				// Check for prefix
 				if (config.key === key) {
-					const jsonPath = workspace.configuration && resource && workspace.configuration.fsPath === resource.fsPath ? [key] : [];
+					const jsonPath = this.isWorkspaceConfigurationResource(resource) ? [key] : [];
 					return { key: jsonPath[jsonPath.length - 1], jsonPath, value: config.value, resource, workspaceStandAloneConfigurationKey: key, target };
 				}
 
 				// Check for prefix.
 				const keyPrefix = `${key}.`;
 				if (config.key.indexOf(keyPrefix) === 0) {
-					const jsonPath = workspace.configuration && resource && workspace.configuration.fsPath === resource.fsPath ? [key, config.key.substr(keyPrefix.length)] : [config.key.substr(keyPrefix.length)];
+					const jsonPath = this.isWorkspaceConfigurationResource(resource) ? [key, config.key.substr(keyPrefix.length)] : [config.key.substr(keyPrefix.length)];
 					return { key: jsonPath[jsonPath.length - 1], jsonPath, value: config.value, resource, workspaceStandAloneConfigurationKey: key, target };
 				}
 			}
@@ -463,12 +461,17 @@ export class ConfigurationEditingService {
 		}
 
 		const resource = this.getConfigurationFileResource(target, FOLDER_SETTINGS_PATH, overrides.resource);
-		if (workspace.configuration && resource && workspace.configuration.fsPath === resource.fsPath) {
+		if (this.isWorkspaceConfigurationResource(resource)) {
 			jsonPath = ['settings', ...jsonPath];
 		}
 		return { key, jsonPath, value: config.value, resource, target };
 	}
 
+	private isWorkspaceConfigurationResource(resource: URI): boolean {
+		const workspace = this.contextService.getWorkspace();
+		return workspace.configuration && resource && workspace.configuration.fsPath === resource.fsPath;
+	}
+
 	private getConfigurationFileResource(target: ConfigurationTarget, relativePath: string, resource: URI): URI {
 		if (target === ConfigurationTarget.USER) {
 			return URI.file(this.environmentService.appSettingsPath);
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 1989f5e6baf..424b704b3d5 100644
--- a/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/node/configurationService.test.ts
@@ -1138,10 +1138,10 @@ suite('WorkspaceConfigurationService - Multiroot', () => {
 			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET));
 	});
 
-	test('update launch configuration in a workspace is not supported', () => {
+	test('update launch configuration in a workspace', () => {
 		const workspace = workspaceContextService.getWorkspace();
 		return testObject.updateValue('launch', { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }, { resource: workspace.folders[0].uri }, ConfigurationTarget.WORKSPACE, true)
-			.then(() => assert.fail('Should not be supported'), (e) => assert.equal(e.code, ConfigurationEditingErrorCode.ERROR_INVALID_WORKSPACE_TARGET));
+			.then(() => assert.deepEqual(testObject.getValue('launch'), { 'version': '1.0.0', configurations: [{ 'name': 'myLaunch' }] }));
 	});
 
 	test('task configurations are not read from workspace', () => {

From 1cacde34962c0c03cfa2de5eb72b3dbbc772e992 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 11:23:02 +0100
Subject: [PATCH 552/710] Revert "add 'configuration' (read uri/path) of
 workspace config file, #41408"

This reverts commit 3ecef8c1dd1d23afdab60ee8a5ff0b7006498810.
---
 src/vs/platform/workspace/common/workspace.ts        | 2 +-
 src/vs/workbench/api/node/extHost.protocol.ts        | 1 -
 src/vs/workbench/api/node/extHostExtensionService.ts | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 1493935a013..af594644bae 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -198,7 +198,7 @@ export class Workspace implements IWorkspace {
 	}
 
 	public toJSON(): IWorkspace {
-		return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration };
+		return { id: this.id, folders: this.folders, name: this.name };
 	}
 }
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index faacf07efa7..d4dcd03d363 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -71,7 +71,6 @@ export interface IWorkspaceData {
 	id: string;
 	name: string;
 	folders: { uri: UriComponents, name: string, index: number }[];
-	configuration: UriComponents;
 }
 
 export interface IInitData {
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index 73a8df57d4e..d39a58a432e 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -22,7 +22,6 @@ import { Barrier } from 'vs/base/common/async';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
-import URI from 'vs/base/common/uri';
 
 class ExtensionMemento implements IExtensionMemento {
 
@@ -109,7 +108,6 @@ class ExtensionStoragePath {
 				join(storagePath, 'meta.json'),
 				JSON.stringify({
 					id: this._workspace.id,
-					configuration: URI.revive(this._workspace.configuration).toString(),
 					name: this._workspace.name
 				}, undefined, 2)
 			);

From c903bd7120cbf3afb4beffc5bce00a3e842c2226 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Tue, 23 Jan 2018 11:58:50 +0100
Subject: [PATCH 553/710] Remove default keybinding for SelectToBracket

---
 src/vs/editor/contrib/bracketMatching/bracketMatching.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
index 64258d6d816..98de48b6899 100644
--- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
+++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts
@@ -51,11 +51,7 @@ class SelectToBracketAction extends EditorAction {
 			id: 'editor.action.selectToBracket',
 			label: nls.localize('smartSelect.selectToBracket', "Select to Bracket"),
 			alias: 'Select to Bracket',
-			precondition: null,
-			kbOpts: {
-				kbExpr: EditorContextKeys.textFocus,
-				primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_Q
-			}
+			precondition: null
 		});
 	}
 

From 653182731a306dd0aef65c0f71adcb77a5c6b8a7 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 12:04:15 +0100
Subject: [PATCH 554/710] fix #42031

---
 src/vs/workbench/browser/parts/editor/editorActions.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/browser/parts/editor/editorActions.ts b/src/vs/workbench/browser/parts/editor/editorActions.ts
index 81e001915bb..ae87fa3a82a 100644
--- a/src/vs/workbench/browser/parts/editor/editorActions.ts
+++ b/src/vs/workbench/browser/parts/editor/editorActions.ts
@@ -9,7 +9,7 @@ import nls = require('vs/nls');
 import { Action } from 'vs/base/common/actions';
 import { mixin } from 'vs/base/common/objects';
 import { getCodeEditor } from 'vs/editor/browser/services/codeEditorService';
-import { EditorInput, TextEditorOptions, EditorOptions, IEditorIdentifier, ActiveEditorMoveArguments, ActiveEditorMovePositioning, EditorCommands, ConfirmResult } from 'vs/workbench/common/editor';
+import { EditorInput, TextEditorOptions, EditorOptions, IEditorIdentifier, ActiveEditorMoveArguments, ActiveEditorMovePositioning, EditorCommands, ConfirmResult, IEditorCommandsContext } from 'vs/workbench/common/editor';
 import { QuickOpenEntryGroup } from 'vs/base/parts/quickopen/browser/quickOpenModel';
 import { EditorQuickOpenEntry, EditorQuickOpenEntryGroup, IEditorQuickOpenEntry, QuickOpenAction } from 'vs/workbench/browser/quickopen';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
@@ -38,10 +38,11 @@ export class SplitEditorAction extends Action {
 		super(id, label, 'split-editor-action');
 	}
 
-	public run(context?: IEditorIdentifier): TPromise {
+	public run(context?: IEditorCommandsContext): TPromise {
 		let editorToSplit: IEditor;
 		if (context) {
-			editorToSplit = this.editorService.getVisibleEditors()[this.editorGroupService.getStacksModel().positionOfGroup(context.group)];
+			const stacks = this.editorGroupService.getStacksModel();
+			editorToSplit = this.editorService.getVisibleEditors()[stacks.positionOfGroup(stacks.getGroup(context.groupId))];
 		} else {
 			editorToSplit = this.editorService.getActiveEditor();
 		}

From 24ecf49479920cb624286d27a0b5ba26a80e0b22 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Tue, 23 Jan 2018 12:11:16 +0100
Subject: [PATCH 555/710] make =~ actually be a regex test operation, #26044

---
 .../platform/contextkey/common/contextkey.ts  | 41 +++++++++++--------
 .../contextkey/test/common/contextkey.test.ts | 13 +++---
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts
index 5461a40cf07..6a3155f7aad 100644
--- a/src/vs/platform/contextkey/common/contextkey.ts
+++ b/src/vs/platform/contextkey/common/contextkey.ts
@@ -6,7 +6,6 @@
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import Event from 'vs/base/common/event';
-import { match } from 'vs/base/common/glob';
 
 export enum ContextKeyExprType {
 	Defined = 1,
@@ -14,7 +13,7 @@ export enum ContextKeyExprType {
 	Equals = 3,
 	NotEquals = 4,
 	And = 5,
-	Glob = 6
+	Regex = 6
 }
 
 export abstract class ContextKeyExpr {
@@ -31,8 +30,8 @@ export abstract class ContextKeyExpr {
 		return new ContextKeyNotEqualsExpr(key, value);
 	}
 
-	public static glob(key: string, value: string): ContextKeyExpr {
-		return new ContextKeyGlobExpr(key, value);
+	public static regex(key: string, value: string): ContextKeyExpr {
+		return new ContextKeyRegexExpr(key, value);
 	}
 
 	public static not(key: string): ContextKeyExpr {
@@ -68,7 +67,7 @@ export abstract class ContextKeyExpr {
 
 		if (serializedOne.indexOf('=~') >= 0) {
 			let pieces = serializedOne.split('=~');
-			return new ContextKeyGlobExpr(pieces[0].trim(), this._deserializeValue(pieces[1]));
+			return new ContextKeyRegexExpr(pieces[0].trim(), this._deserializeValue(pieces[1]));
 		}
 
 		if (/^\!\s*/.test(serializedOne)) {
@@ -120,8 +119,8 @@ function cmp(a: ContextKeyExpr, b: ContextKeyExpr): number {
 			return (a).cmp(b);
 		case ContextKeyExprType.NotEquals:
 			return (a).cmp(b);
-		case ContextKeyExprType.Glob:
-			return (a).cmp(b);
+		case ContextKeyExprType.Regex:
+			return (a).cmp(b);
 		default:
 			throw new Error('Unknown ContextKeyExpr!');
 	}
@@ -333,40 +332,48 @@ export class ContextKeyNotExpr implements ContextKeyExpr {
 	}
 }
 
-export class ContextKeyGlobExpr implements ContextKeyExpr {
+export class ContextKeyRegexExpr implements ContextKeyExpr {
 
-	constructor(private key: string, private value: any) {
+	private regexp: { source: string, test(s: string): boolean };
+
+	constructor(private key: string, value: any) {
+		try {
+			this.regexp = new RegExp(value);
+		} catch (e) {
+			this.regexp = { source: '', test() { return false; } };
+			console.warn(`Bad value for glob-context key expression: ${value}`);
+		}
 	}
 
 	public getType(): ContextKeyExprType {
-		return ContextKeyExprType.Glob;
+		return ContextKeyExprType.Regex;
 	}
 
-	public cmp(other: ContextKeyGlobExpr): number {
+	public cmp(other: ContextKeyRegexExpr): number {
 		if (this.key < other.key) {
 			return -1;
 		}
 		if (this.key > other.key) {
 			return 1;
 		}
-		if (this.value < other.value) {
+		if (this.regexp.source < other.regexp.source) {
 			return -1;
 		}
-		if (this.value > other.value) {
+		if (this.regexp.source > other.regexp.source) {
 			return 1;
 		}
 		return 0;
 	}
 
 	public equals(other: ContextKeyExpr): boolean {
-		if (other instanceof ContextKeyGlobExpr) {
-			return (this.key === other.key && this.value === other.value);
+		if (other instanceof ContextKeyRegexExpr) {
+			return (this.key === other.key && this.regexp.source === other.regexp.source);
 		}
 		return false;
 	}
 
 	public evaluate(context: IContext): boolean {
-		return match(this.value, context.getValue(this.key));
+		return this.regexp.test(context.getValue(this.key));
 	}
 
 	public normalize(): ContextKeyExpr {
@@ -374,7 +381,7 @@ export class ContextKeyGlobExpr implements ContextKeyExpr {
 	}
 
 	public serialize(): string {
-		return this.key + ' =~ \'' + this.value + '\'';
+		return this.key + ' =~ \'' + this.regexp.source + '\'';
 	}
 
 	public keys(): string[] {
diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts
index 4cdda5588c5..9433bf7ca02 100644
--- a/src/vs/platform/contextkey/test/common/contextkey.test.ts
+++ b/src/vs/platform/contextkey/test/common/contextkey.test.ts
@@ -6,7 +6,6 @@
 
 import * as assert from 'assert';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
-import { match } from 'vs/base/common/glob';
 
 function createContext(ctx: any) {
 	return {
@@ -22,8 +21,8 @@ suite('ContextKeyExpr', () => {
 			ContextKeyExpr.has('a1'),
 			ContextKeyExpr.and(ContextKeyExpr.has('and.a')),
 			ContextKeyExpr.has('a2'),
-			ContextKeyExpr.glob('d3', '**/d*'),
-			ContextKeyExpr.glob('d4', '**/3*'),
+			ContextKeyExpr.regex('d3', 'd.*'),
+			ContextKeyExpr.regex('d4', '\\*\\*/3*'),
 			ContextKeyExpr.equals('b1', 'bb1'),
 			ContextKeyExpr.equals('b2', 'bb2'),
 			ContextKeyExpr.notEquals('c1', 'cc1'),
@@ -35,11 +34,11 @@ suite('ContextKeyExpr', () => {
 			ContextKeyExpr.equals('b2', 'bb2'),
 			ContextKeyExpr.notEquals('c1', 'cc1'),
 			ContextKeyExpr.not('d1'),
-			ContextKeyExpr.glob('d4', '**/3*'),
+			ContextKeyExpr.regex('d4', '\\*\\*/3*'),
 			ContextKeyExpr.notEquals('c2', 'cc2'),
 			ContextKeyExpr.has('a2'),
 			ContextKeyExpr.equals('b1', 'bb1'),
-			ContextKeyExpr.glob('d3', '**/d*'),
+			ContextKeyExpr.regex('d3', 'd.*'),
 			ContextKeyExpr.has('a1'),
 			ContextKeyExpr.and(ContextKeyExpr.equals('and.a', true)),
 			ContextKeyExpr.not('d2')
@@ -68,7 +67,7 @@ suite('ContextKeyExpr', () => {
 			'd': 'd'
 		});
 		function testExpression(expr: string, expected: boolean): void {
-			console.log(expr + ' ' + expected);
+			// console.log(expr + ' ' + expected);
 			let rules = ContextKeyExpr.deserialize(expr);
 			assert.equal(rules.evaluate(context), expected, expr);
 		}
@@ -81,7 +80,7 @@ suite('ContextKeyExpr', () => {
 			testExpression(expr + ' == 5', value == '5');
 			testExpression(expr + ' != 5', value != '5');
 			testExpression('!' + expr, !value);
-			testExpression(expr + ' =~ **/d*', match('**/d*', value));
+			testExpression(expr + ' =~ d.*', /d.*/.test(value));
 		}
 
 		testBatch('a', true);

From 36cafba0ac1693e5f58cd73842644311a9d6434e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 12:20:31 +0100
Subject: [PATCH 556/710] ext dev - delete untitled workspace on close

---
 src/vs/code/electron-main/windows.ts | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 8ecf8499910..b1bdea73fb4 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -1318,7 +1318,10 @@ export class WindowsManager implements IWindowsMainService {
 		}
 
 		if (e.window.config && !!e.window.config.extensionDevelopmentPath) {
-			return; // do not ask to save workspace when doing extension development
+			// do not ask to save workspace when doing extension development
+			// but still delete it.
+			this.workspacesMainService.deleteUntitledWorkspaceSync(workspace);
+			return;
 		}
 
 		if (windowClosing && !isMacintosh && this.getWindowCount() === 1) {
@@ -1716,8 +1719,8 @@ class Dialogs {
 class WorkspacesManager {
 
 	constructor(
-		private workspacesService: IWorkspacesMainService,
-		private backupService: IBackupMainService,
+		private workspacesMainService: IWorkspacesMainService,
+		private backupMainService: IBackupMainService,
 		private environmentService: IEnvironmentService,
 		private windowsMainService: IWindowsMainService
 	) {
@@ -1741,7 +1744,7 @@ class WorkspacesManager {
 				return TPromise.as(null); // return early if the workspace is not valid
 			}
 
-			return this.workspacesService.createWorkspace(folders).then(workspace => {
+			return this.workspacesMainService.createWorkspace(folders).then(workspace => {
 				return this.doSaveAndOpenWorkspace(window, workspace, path);
 			});
 		});
@@ -1758,7 +1761,7 @@ class WorkspacesManager {
 		}
 
 		// Prevent overwriting a workspace that is currently opened in another window
-		if (findWindowOnWorkspace(this.windowsMainService.getWindows(), { id: this.workspacesService.getWorkspaceId(path), configPath: path })) {
+		if (findWindowOnWorkspace(this.windowsMainService.getWindows(), { id: this.workspacesMainService.getWorkspaceId(path), configPath: path })) {
 			const options: Electron.MessageBoxOptions = {
 				title: product.nameLong,
 				type: 'info',
@@ -1777,7 +1780,7 @@ class WorkspacesManager {
 	private doSaveAndOpenWorkspace(window: CodeWindow, workspace: IWorkspaceIdentifier, path?: string): TPromise {
 		let savePromise: TPromise;
 		if (path) {
-			savePromise = this.workspacesService.saveWorkspace(workspace, path);
+			savePromise = this.workspacesMainService.saveWorkspace(workspace, path);
 		} else {
 			savePromise = TPromise.as(workspace);
 		}
@@ -1788,7 +1791,7 @@ class WorkspacesManager {
 			// Register window for backups and migrate current backups over
 			let backupPath: string;
 			if (!window.config.extensionDevelopmentPath) {
-				backupPath = this.backupService.registerWorkspaceBackupSync(workspace, window.config.backupPath);
+				backupPath = this.backupMainService.registerWorkspaceBackupSync(workspace, window.config.backupPath);
 			}
 
 			// Update window configuration properly based on transition to workspace
@@ -1861,7 +1864,7 @@ class WorkspacesManager {
 
 				// Don't Save: delete workspace
 				case ConfirmResult.DONT_SAVE:
-					this.workspacesService.deleteUntitledWorkspaceSync(workspace);
+					this.workspacesMainService.deleteUntitledWorkspaceSync(workspace);
 					return false;
 
 				// Save: save workspace, but do not veto unload
@@ -1873,7 +1876,7 @@ class WorkspacesManager {
 						defaultPath: this.getUntitledWorkspaceSaveDialogDefaultPath(workspace)
 					}, window).then(target => {
 						if (target) {
-							return this.workspacesService.saveWorkspace(workspace, target).then(() => false, () => false);
+							return this.workspacesMainService.saveWorkspace(workspace, target).then(() => false, () => false);
 						}
 
 						return true; // keep veto if no target was provided
@@ -1889,7 +1892,7 @@ class WorkspacesManager {
 				return dirname(workspace);
 			}
 
-			const resolvedWorkspace = this.workspacesService.resolveWorkspaceSync(workspace.configPath);
+			const resolvedWorkspace = this.workspacesMainService.resolveWorkspaceSync(workspace.configPath);
 			if (resolvedWorkspace && resolvedWorkspace.folders.length > 0) {
 				for (const folder of resolvedWorkspace.folders) {
 					if (folder.uri.scheme === Schemas.file) {

From 2140e0320e30d50bf30ee5ce76a33b0f224bac50 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Tue, 23 Jan 2018 12:25:02 +0100
Subject: [PATCH 557/710] Paint secondary cursors with the same opacity as the
 primary cursor

---
 .../editor/browser/viewParts/viewCursors/viewCursor.ts | 10 ++--------
 .../browser/viewParts/viewCursors/viewCursors.css      |  3 ---
 .../browser/viewParts/viewCursors/viewCursors.ts       |  4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
index 92838c8a6d7..8c93fd9ef2b 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursor.ts
@@ -34,7 +34,6 @@ class ViewCursorRenderData {
 
 export class ViewCursor {
 	private readonly _context: ViewContext;
-	private readonly _isSecondary: boolean;
 	private readonly _domNode: FastDomNode;
 
 	private _cursorStyle: TextEditorCursorStyle;
@@ -49,9 +48,8 @@ export class ViewCursor {
 	private _lastRenderedContent: string;
 	private _renderData: ViewCursorRenderData;
 
-	constructor(context: ViewContext, isSecondary: boolean) {
+	constructor(context: ViewContext) {
 		this._context = context;
-		this._isSecondary = isSecondary;
 
 		this._cursorStyle = this._context.configuration.editor.viewInfo.cursorStyle;
 		this._lineHeight = this._context.configuration.editor.lineHeight;
@@ -62,11 +60,7 @@ export class ViewCursor {
 
 		// Create the dom node
 		this._domNode = createFastDomNode(document.createElement('div'));
-		if (this._isSecondary) {
-			this._domNode.setClassName('cursor secondary');
-		} else {
-			this._domNode.setClassName('cursor');
-		}
+		this._domNode.setClassName('cursor');
 		this._domNode.setHeight(this._lineHeight);
 		this._domNode.setTop(0);
 		this._domNode.setLeft(0);
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css
index 4fc3fbb24c6..a0ecc219714 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.css
@@ -12,9 +12,6 @@
 	cursor: text;
 	overflow: hidden;
 }
-.monaco-editor .cursors-layer > .cursor.secondary {
-	opacity: 0.6;
-}
 
 /* -- block-outline-style -- */
 .monaco-editor .cursors-layer.cursor-block-outline-style > .cursor {
diff --git a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
index c54b332a631..98ec0b5a063 100644
--- a/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
+++ b/src/vs/editor/browser/viewParts/viewCursors/viewCursors.ts
@@ -49,7 +49,7 @@ export class ViewCursors extends ViewPart {
 		this._cursorStyle = this._context.configuration.editor.viewInfo.cursorStyle;
 		this._selectionIsEmpty = true;
 
-		this._primaryCursor = new ViewCursor(this._context, false);
+		this._primaryCursor = new ViewCursor(this._context);
 		this._secondaryCursors = [];
 		this._renderData = [];
 
@@ -109,7 +109,7 @@ export class ViewCursors extends ViewPart {
 			// Create new cursors
 			let addCnt = secondaryPositions.length - this._secondaryCursors.length;
 			for (let i = 0; i < addCnt; i++) {
-				let newCursor = new ViewCursor(this._context, true);
+				let newCursor = new ViewCursor(this._context);
 				this._domNode.domNode.insertBefore(newCursor.getDomNode().domNode, this._primaryCursor.getDomNode().domNode.nextSibling);
 				this._secondaryCursors.push(newCursor);
 			}

From 35aa8fb5316612ae713ffa40375332b7ae6ac6e2 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 12:28:04 +0100
Subject: [PATCH 558/710] Fix languageId typo

---
 .../sharedProcess/contrib/languagePackExtensions.ts         | 6 +++---
 .../extensionManagement/common/extensionManagement.ts       | 2 +-
 .../test/common/extensionEnablementService.test.ts          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
index 64fd8395763..824a6c2ee62 100644
--- a/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
+++ b/src/vs/code/electron-browser/sharedProcess/contrib/languagePackExtensions.ts
@@ -71,10 +71,10 @@ export class LanguagePackExtensions extends Disposable {
 			if (extension && extension.manifest && extension.manifest.contributes && extension.manifest.contributes.localizations && extension.manifest.contributes.localizations.length) {
 				const extensionIdentifier = { id: getGalleryExtensionIdFromLocal(extension), uuid: extension.identifier.uuid };
 				for (const localizationContribution of extension.manifest.contributes.localizations) {
-					if (localizationContribution.languagId && localizationContribution.translations) {
-						const languageSources = languagePacks[localizationContribution.languagId] || [];
+					if (localizationContribution.languageId && localizationContribution.translations) {
+						const languageSources = languagePacks[localizationContribution.languageId] || [];
 						languageSources.splice(0, 0, { extensionIdentifier, translations: join(extension.path, localizationContribution.translations), version: extension.manifest.version });
-						languagePacks[localizationContribution.languagId] = languageSources;
+						languagePacks[localizationContribution.languageId] = languageSources;
 					}
 				}
 			}
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 9789db5e966..8ae29d3f01c 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -86,7 +86,7 @@ export interface IColor {
 }
 
 export interface ILocalization {
-	languagId: string;
+	languageId: string;
 	languageName?: string;
 	translations: string;
 }
diff --git a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
index efdb210e498..c4da64ca7cf 100644
--- a/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
+++ b/src/vs/platform/extensionManagement/test/common/extensionEnablementService.test.ts
@@ -326,7 +326,7 @@ suite('ExtensionEnablementService Test', () => {
 	});
 
 	test('test canChangeEnablement return false for language packs', () => {
-		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { localizations: [{ languagId: 'gr', translations: 'somepath' }] })), false);
+		assert.equal(testObject.canChangeEnablement(aLocalExtension('pub.a', { localizations: [{ languageId: 'gr', translations: 'somepath' }] })), false);
 	});
 });
 

From 6c16a67536d395b127021eb9ccc78266f0c3ed10 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 12:33:31 +0100
Subject: [PATCH 559/710] Show localizations contributions in the extensions
 editor

---
 .../extensions/browser/extensionEditor.ts     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index 94917051daf..84e9f9c800e 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -465,7 +465,8 @@ export class ExtensionEditor extends BaseEditor {
 					this.renderColors(content, manifest, layout),
 					this.renderJSONValidation(content, manifest, layout),
 					this.renderDebuggers(content, manifest, layout),
-					this.renderViews(content, manifest, layout)
+					this.renderViews(content, manifest, layout),
+					this.renderLocalizations(content, manifest, layout)
 				];
 
 				const isEmpty = !renders.reduce((v, r) => r || v, false);
@@ -621,6 +622,26 @@ export class ExtensionEditor extends BaseEditor {
 		return true;
 	}
 
+	private renderLocalizations(container: HTMLElement, manifest: IExtensionManifest, onDetailsToggle: Function): boolean {
+		const contributes = manifest.contributes;
+		const localizations = contributes && contributes.localizations || [];
+
+		if (!localizations.length) {
+			return false;
+		}
+
+		const details = $('details', { open: true, ontoggle: onDetailsToggle },
+			$('summary', null, localize('localizations', "Localizations ({0})", localizations.length)),
+			$('table', null,
+				$('tr', null, $('th', null, localize('localizations language id', "Language Id")), $('th', null, localize('localizations language name', "Langauge Name")), $('th', null, localize('translations location', "Translations Location"))),
+				...localizations.map(localization => $('tr', null, $('td', null, localization.languageId), $('td', null, localization.languageName), $('td', null, localization.translations)))
+			)
+		);
+
+		append(container, details);
+		return true;
+	}
+
 	private renderColorThemes(container: HTMLElement, manifest: IExtensionManifest, onDetailsToggle: Function): boolean {
 		const contributes = manifest.contributes;
 		const contrib = contributes && contributes.themes || [];

From b9cdcecf333f2b924ac5ffe9269f7d6902ad5ef8 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 12:35:32 +0100
Subject: [PATCH 560/710] polish from feedback

---
 src/vs/code/electron-main/window.ts           |  2 +-
 .../actions/browser/menuItemActionItem.ts     | 33 +++++++------------
 src/vs/platform/actions/common/actions.ts     |  2 +-
 .../electron-browser/menusExtensionPoint.ts   |  4 +--
 .../parts/editor/editor.contribution.ts       |  4 +--
 .../electron-browser/toggleWordWrap.ts        |  4 +--
 .../electron-browser/debug.contribution.ts    |  2 +-
 .../fileActions.contribution.ts               |  2 +-
 8 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index bbe6e486f12..e79a7400e20 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -953,7 +953,7 @@ export class CodeWindow implements ICodeWindow {
 		const segments: ITouchBarSegment[] = items.map(item => {
 			let icon: Electron.NativeImage;
 			if (item.iconPath) {
-				icon = nativeImage.createFromPath(typeof item.iconPath === 'string' ? item.iconPath : item.iconPath.dark);
+				icon = nativeImage.createFromPath(item.iconPath.dark);
 				if (icon.isEmpty()) {
 					icon = void 0;
 				}
diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 787ae98fb14..93dad79a5e7 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -127,12 +127,12 @@ export class MenuItemActionItem extends ActionItem {
 	private _itemClassDispose: IDisposable;
 
 	constructor(
-		private action: MenuItemAction,
+		public _action: MenuItemAction,
 		@IKeybindingService private _keybindingService: IKeybindingService,
 		@IMessageService protected _messageService: IMessageService,
 		@IContextMenuService private _contextMenuService: IContextMenuService
 	) {
-		super(undefined, action, { icon: !!(action.class || action.item.iconPath), label: !action.class && !action.item.iconPath });
+		super(undefined, _action, { icon: !!(_action.class || _action.item.iconPath), label: !_action.class && !_action.item.iconPath });
 	}
 
 	protected get _commandAction(): IAction {
@@ -150,7 +150,7 @@ export class MenuItemActionItem extends ActionItem {
 	render(container: HTMLElement): void {
 		super.render(container);
 
-		this._updateItemClass(this.action.item);
+		this._updateItemClass(this._action.item);
 
 		let mouseOver = false;
 		let altDown = false;
@@ -200,9 +200,9 @@ export class MenuItemActionItem extends ActionItem {
 	_updateClass(): void {
 		if (this.options.icon) {
 			if (this._commandAction !== this._action) {
-				this._updateItemClass(this.action.alt.item);
+				this._updateItemClass(this._action.alt.item);
 			} else if ((this._action).alt) {
-				this._updateItemClass(this.action.item);
+				this._updateItemClass(this._action.item);
 			}
 		}
 	}
@@ -213,23 +213,14 @@ export class MenuItemActionItem extends ActionItem {
 
 		if (item.iconPath) {
 			let iconClass: string;
-			if (typeof item.iconPath === 'string') {
-				if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath)) {
-					iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath);
-				} else {
-					iconClass = ids.nextId();
-					createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath).toString()}")`);
-					MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath, iconClass);
-				}
+
+			if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath.dark)) {
+				iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath.dark);
 			} else {
-				if (MenuItemActionItem.ICON_PATH_TO_CSS_RULES.has(item.iconPath.dark)) {
-					iconClass = MenuItemActionItem.ICON_PATH_TO_CSS_RULES.get(item.iconPath.dark);
-				} else {
-					iconClass = ids.nextId();
-					createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.light).toString()}")`);
-					createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.dark).toString()}")`);
-					MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath.dark, iconClass);
-				}
+				iconClass = ids.nextId();
+				createCSSRule(`.icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.light || item.iconPath.dark).toString()}")`);
+				createCSSRule(`.vs-dark .icon.${iconClass}, .hc-black .icon.${iconClass}`, `background-image: url("${URI.file(item.iconPath.dark).toString()}")`);
+				MenuItemActionItem.ICON_PATH_TO_CSS_RULES.set(item.iconPath.dark, iconClass);
 			}
 
 			this.$e.getHTMLElement().classList.add('icon', iconClass);
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index 40703ce8563..f8786606a24 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -23,7 +23,7 @@ export interface ICommandAction {
 	id: string;
 	title: string | ILocalizedString;
 	category?: string | ILocalizedString;
-	iconPath?: string | { light: string; dark: string; };
+	iconPath?: { dark: string; light?: string; };
 	precondition?: ContextKeyExpr;
 }
 
diff --git a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts
index be1f3f20705..3955afd293e 100644
--- a/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts
+++ b/src/vs/platform/actions/electron-browser/menusExtensionPoint.ts
@@ -286,10 +286,10 @@ ExtensionsRegistry.registerExtensionPoint {
 		MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
 			command: {
-				id, title, iconPath: URI.parse(require.toUrl(`vs/workbench/parts/debug/electron-browser/media/${icon}`)).fsPath
+				id, title, iconPath: { dark: URI.parse(require.toUrl(`vs/workbench/parts/debug/electron-browser/media/${icon}`)).fsPath }
 			},
 			when,
 			group: '9_debug',
diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
index a1c5b1628ef..f365329c68a 100644
--- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
+++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts
@@ -125,7 +125,7 @@ appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges',
 	dark: URI.parse(require.toUrl(`vs/workbench/parts/files/electron-browser/media/undo-inverse.svg`)).fsPath
 }, -9, revertLocalChangesCommand);
 
-function appendSaveConflictEditorTitleAction(id: string, title: string, iconPath: { dark: string; light: string; }, order: number, command: ICommandHandler): void {
+function appendSaveConflictEditorTitleAction(id: string, title: string, iconPath: { dark: string; light?: string; }, order: number, command: ICommandHandler): void {
 
 	// Command
 	CommandsRegistry.registerCommand(id, command);

From 9df63af4eec827c00a24d4a0bbc7433b03e225da Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 12:59:00 +0100
Subject: [PATCH 561/710] fix leak

---
 src/vs/platform/actions/browser/menuItemActionItem.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index 93dad79a5e7..2ce14fddef7 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -227,4 +227,13 @@ export class MenuItemActionItem extends ActionItem {
 			this._itemClassDispose = { dispose: () => this.$e.getHTMLElement().classList.remove('icon', iconClass) };
 		}
 	}
+
+	dispose(): void {
+		if (this._itemClassDispose) {
+			dispose(this._itemClassDispose);
+			this._itemClassDispose = undefined;
+		}
+
+		super.dispose();
+	}
 }

From 3ecae53188f00f569ef31e08a4cbf51cec7b4619 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Tue, 23 Jan 2018 16:13:16 +0100
Subject: [PATCH 562/710] fixes around mr compound debugging

---
 src/vs/workbench/parts/debug/browser/debugActions.ts     | 2 +-
 src/vs/workbench/parts/debug/common/debugModel.ts        | 2 +-
 .../parts/debug/electron-browser/debugCommands.ts        | 4 ++--
 .../parts/debug/electron-browser/debugService.ts         | 9 +++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts
index 562bae5c743..293425c4a9f 100644
--- a/src/vs/workbench/parts/debug/browser/debugActions.ts
+++ b/src/vs/workbench/parts/debug/browser/debugActions.ts
@@ -142,7 +142,7 @@ export class StartAction extends AbstractDebugAction {
 		if (contextService && contextService.getWorkbenchState() === WorkbenchState.EMPTY && processes.length > 0) {
 			return false;
 		}
-		if (processes.some(p => p.getName(false) === configName && (!launch || p.session.root.uri.toString() === launch.uri.toString()))) {
+		if (processes.some(p => p.getName(false) === configName && (!launch || !launch.workspace || !p.session.root || p.session.root.uri.toString() === launch.workspace.uri.toString()))) {
 			return false;
 		}
 		const compound = launch && launch.getCompound(configName);
diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts
index 2923456a42c..d585e6276d8 100644
--- a/src/vs/workbench/parts/debug/common/debugModel.ts
+++ b/src/vs/workbench/parts/debug/common/debugModel.ts
@@ -545,7 +545,7 @@ export class Process implements IProcess {
 	}
 
 	public getName(includeRoot: boolean): string {
-		return includeRoot ? `${this.configuration.name} (${resources.basenameOrAuthority(this.session.root.uri)})` : this.configuration.name;
+		return includeRoot && this.session.root ? `${this.configuration.name} (${resources.basenameOrAuthority(this.session.root.uri)})` : this.configuration.name;
 	}
 
 	public get state(): ProcessState {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
index c0610e8e9a9..3387c35f8a5 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugCommands.ts
@@ -163,13 +163,13 @@ export function registerCommands(): void {
 		weight: KeybindingsRegistry.WEIGHT.workbenchContrib(),
 		when: undefined,
 		primary: undefined,
-		handler: (accessor, workspaceUri: string) => {
+		handler: (accessor, launchUri: string) => {
 			const manager = accessor.get(IDebugService).getConfigurationManager();
 			if (accessor.get(IWorkspaceContextService).getWorkbenchState() === WorkbenchState.EMPTY) {
 				accessor.get(IMessageService).show(severity.Info, nls.localize('noFolderDebugConfig', "Please first open a folder in order to do advanced debug configuration."));
 				return TPromise.as(null);
 			}
-			const launch = manager.getLaunches().filter(l => l.uri.toString() === workspaceUri).pop() || manager.selectedLaunch;
+			const launch = manager.getLaunches().filter(l => l.uri.toString() === launchUri).pop() || manager.selectedLaunch;
 
 			return launch.openConfigFile(false).done(editor => {
 				if (editor) {
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index d737a4165f4..b42ea9956db 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -53,6 +53,7 @@ import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-br
 import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console';
 import { Source } from 'vs/workbench/parts/debug/common/debugSource';
 import { TaskEvent, TaskEventKind } from 'vs/workbench/parts/tasks/common/tasks';
+import { sequence } from 'vs/base/common/async';
 
 const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint';
 const DEBUG_BREAKPOINTS_ACTIVATED_KEY = 'debug.breakpointactivated';
@@ -668,7 +669,7 @@ export class DebugService implements debug.IDebugService {
 					this.model.getBreakpoints().forEach(bp => bp.verified = false);
 				}
 				this.launchJsonChanged = false;
-				const launch = root ? this.configurationManager.getLaunches().filter(l => l.uri.toString() === root.uri.toString()).pop()
+				const launch = root ? this.configurationManager.getLaunches().filter(l => l.workspace && l.workspace.uri.toString() === root.uri.toString()).pop()
 					: this.configurationManager.getWorkspaceLaunch();
 
 				let config: debug.IConfig, compound: debug.ICompound;
@@ -692,7 +693,7 @@ export class DebugService implements debug.IDebugService {
 							"Compound must have \"configurations\" attribute set in order to start multiple configurations.")));
 					}
 
-					return TPromise.join(compound.configurations.map(name => {
+					return sequence(compound.configurations.map(name => () => {
 						if (name === compound.name) {
 							return TPromise.as(null);
 						}
@@ -738,7 +739,7 @@ export class DebugService implements debug.IDebugService {
 
 				return (type ? TPromise.as(null) : this.configurationManager.guessAdapter().then(a => type = a && a.type)).then(() =>
 					(type ? this.extensionService.activateByEvent(`onDebugResolve:${type}`) : TPromise.as(null)).then(() =>
-						this.configurationManager.resolveConfigurationByProviders(launch ? launch.uri : undefined, type, config).then(config => {
+						this.configurationManager.resolveConfigurationByProviders(launch && launch.workspace ? launch.workspace.uri : undefined, type, config).then(config => {
 							// a falsy config indicates an aborted launch
 							if (config && config.type) {
 								return this.createProcess(root, config, sessionId);
@@ -1035,7 +1036,7 @@ export class DebugService implements debug.IDebugService {
 		const preserveFocus = focusedProcess && process.getId() === focusedProcess.getId();
 
 		return process.session.disconnect(true).then(() => {
-			if (strings.equalsIgnoreCase(process.configuration.type, 'extensionHost')) {
+			if (strings.equalsIgnoreCase(process.configuration.type, 'extensionHost') && process.session.root) {
 				return this.broadcastService.broadcast({
 					channel: EXTENSION_RELOAD_BROADCAST_CHANNEL,
 					payload: [process.session.root.uri.fsPath]

From f3ffbcf5408eb972ec61b0b45ade88ff223df154 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 15:48:20 +0100
Subject: [PATCH 563/710] fix bad state change in darwin update service

---
 .../platform/update/electron-main/updateService.darwin.ts  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index 88b0f193102..25d9cf28beb 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -36,12 +36,17 @@ export class DarwinUpdateService extends AbstractUpdateService {
 		@ILogService logService: ILogService
 	) {
 		super(lifecycleService, configurationService, environmentService, logService);
-		this.onRawError(this.logService.error, this.logService, this.disposables);
+		this.onRawError(this.onError, this, this.disposables);
 		this.onRawUpdateAvailable(this.onUpdateAvailable, this, this.disposables);
 		this.onRawUpdateDownloaded(this.onUpdateDownloaded, this, this.disposables);
 		this.onRawUpdateNotAvailable(this.onUpdateNotAvailable, this, this.disposables);
 	}
 
+	private onError(err: string): void {
+		this.logService.error('UpdateService error: ', err);
+		this.setState(State.Idle);
+	}
+
 	protected setUpdateFeedUrl(quality: string): boolean {
 		try {
 			electron.autoUpdater.setFeedURL(createUpdateURL('darwin', quality));

From 53a2781d80213421a679d43fe833c9355da0bda0 Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 15:49:41 +0100
Subject: [PATCH 564/710] add extensions control url

---
 package.json                                  |  4 +-
 .../common/extensionManagement.ts             |  7 +++
 .../node/extensionGalleryService.ts           | 44 ++++++++++++++++++-
 src/vs/platform/node/product.ts               |  1 +
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index dc5b1d8acfc..744c612172f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.20.0",
-  "distro": "2478cca5311e147817eef29cb81c0995a3517842",
+  "distro": "e14a5a3afaae557ff651b344462ed39e776435a2",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -129,4 +129,4 @@
     "windows-mutex": "^0.2.0",
     "windows-process-tree": "0.1.6"
   }
-}
+}
\ No newline at end of file
diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
index 8ae29d3f01c..6512e977822 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
@@ -229,6 +229,12 @@ export enum StatisticType {
 	Uninstall = 'uninstall'
 }
 
+export interface IReportedExtension {
+	id: IExtensionIdentifier;
+	malicious: boolean;
+	slow: boolean;
+}
+
 export interface IExtensionGalleryService {
 	_serviceBrand: any;
 	isEnabled(): boolean;
@@ -240,6 +246,7 @@ export interface IExtensionGalleryService {
 	getChangelog(extension: IGalleryExtension): TPromise;
 	loadCompatibleVersion(extension: IGalleryExtension): TPromise;
 	loadAllDependencies(dependencies: IExtensionIdentifier[]): TPromise;
+	getExtensionsReport(): TPromise;
 }
 
 export interface InstallExtensionEvent {
diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
index e79adfe2cbc..ae9aa3ca924 100644
--- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
+++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts
@@ -9,7 +9,7 @@ import * as path from 'path';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { distinct } from 'vs/base/common/arrays';
 import { getErrorMessage, isPromiseCanceledError } from 'vs/base/common/errors';
-import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement';
+import { StatisticType, IGalleryExtension, IExtensionGalleryService, IGalleryExtensionAsset, IQueryOptions, SortBy, SortOrder, IExtensionManifest, IExtensionIdentifier, IReportedExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { getGalleryExtensionId, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { assign, getOrDefault } from 'vs/base/common/objects';
 import { IRequestService } from 'vs/platform/request/node/request';
@@ -23,6 +23,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { readFile } from 'vs/base/node/pfs';
 import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import { generateUuid, isUUID } from 'vs/base/common/uuid';
+import { values } from 'vs/base/common/map';
 
 interface IRawGalleryExtensionFile {
 	assetType: string;
@@ -309,11 +310,17 @@ function toExtension(galleryExtension: IRawGalleryExtension, extensionsGalleryUr
 	};
 }
 
+interface IRawExtensionsReport {
+	malicious: string[];
+	slow: string[];
+}
+
 export class ExtensionGalleryService implements IExtensionGalleryService {
 
 	_serviceBrand: any;
 
 	private extensionsGalleryUrl: string;
+	private extensionsControlUrl: string;
 
 	private readonly commonHeadersPromise: TPromise<{ [key: string]: string; }>;
 
@@ -324,6 +331,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 	) {
 		const config = product.extensionsGallery;
 		this.extensionsGalleryUrl = config && config.serviceUrl;
+		this.extensionsControlUrl = config && config.controlUrl;
 		this.commonHeadersPromise = resolveMarketplaceHeaders(this.environmentService);
 	}
 
@@ -711,6 +719,40 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		}
 		return false;
 	}
+
+	getExtensionsReport(): TPromise {
+		if (!this.isEnabled()) {
+			return TPromise.wrapError(new Error('No extension gallery service configured.'));
+		}
+
+		if (!this.extensionsControlUrl) {
+			return TPromise.as([]);
+		}
+
+		return this.requestService.request({ type: 'GET', url: this.extensionsControlUrl }).then(context => {
+			if (context.res.statusCode !== 200) {
+				return TPromise.wrapError(new Error('Could not get extensions report.'));
+			}
+
+			return asJson(context).then(result => {
+				const map = new Map();
+
+				for (const id of result.malicious) {
+					const ext = map.get(id) || { id: { id }, malicious: true, slow: false };
+					ext.malicious = true;
+					map.set(id, ext);
+				}
+
+				for (const id of result.slow) {
+					const ext = map.get(id) || { id: { id }, malicious: false, slow: true };
+					ext.slow = true;
+					map.set(id, ext);
+				}
+
+				return TPromise.as(values(map));
+			});
+		});
+	}
 }
 
 export function resolveMarketplaceHeaders(environmentService: IEnvironmentService): TPromise<{ [key: string]: string; }> {
diff --git a/src/vs/platform/node/product.ts b/src/vs/platform/node/product.ts
index 00a76d6fc38..ebd1d8e22a4 100644
--- a/src/vs/platform/node/product.ts
+++ b/src/vs/platform/node/product.ts
@@ -25,6 +25,7 @@ export interface IProductConfiguration {
 	extensionsGallery: {
 		serviceUrl: string;
 		itemUrl: string;
+		controlUrl: string;
 	};
 	extensionTips: { [id: string]: string; };
 	extensionImportantTips: { [id: string]: { name: string; pattern: string; }; };

From 5bdb90de36863ae2fdfbc424e34800f4e4eb484a Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Tue, 23 Jan 2018 16:40:41 +0100
Subject: [PATCH 565/710] scripts/code.sh picks up marketplace built-in
 extensions automatically

---
 build/builtInExtensions.json                  |  4 +++
 build/gulpfile.vscode.js                      | 26 ++++++++++++---
 build/lib/builtInExtensions.js                | 32 ++++++++++++++++++
 extensions/ms-vscode.node-debug/package.json  |  4 +--
 extensions/ms-vscode.node-debug2/package.json |  4 +--
 scripts/code.sh                               |  3 ++
 .../electron-browser/extensionPoints.ts       |  4 +++
 .../electron-browser/extensionService.ts      | 33 ++++++++++++++++++-
 8 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 build/builtInExtensions.json
 create mode 100644 build/lib/builtInExtensions.js

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
new file mode 100644
index 00000000000..4921d2a27c7
--- /dev/null
+++ b/build/builtInExtensions.json
@@ -0,0 +1,4 @@
+[
+	{ "name": "ms-vscode.node-debug", "version": "1.20.3" },
+	{ "name": "ms-vscode.node-debug2", "version": "1.20.1" }
+]
\ No newline at end of file
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 15b95986668..b0ff0a2a732 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -44,14 +44,13 @@ const nodeModules = ['electron', 'original-fs']
 
 // Build
 
-const builtInExtensions = [
-	{ name: 'ms-vscode.node-debug', version: '1.20.3' },
-	{ name: 'ms-vscode.node-debug2', version: '1.20.1' }
-];
+const builtInExtensions = require('./builtInExtensions');
 
 const excludedExtensions = [
 	'vscode-api-tests',
-	'vscode-colorize-tests'
+	'vscode-colorize-tests',
+	'ms-vscode.node-debug',
+	'ms-vscode.node-debug2',
 ];
 
 const vscodeEntryPoints = _.flatten([
@@ -584,3 +583,20 @@ gulp.task('generate-vscode-configuration', () => {
 		console.error(e.toString());
 	});
 });
+
+//#region Built-In Extensions
+gulp.task('clean-builtInExtensions', util.rimraf('.build/builtInExtensions'));
+
+gulp.task('builtInExtensions', ['clean-builtInExtensions'], function() {
+	const marketplaceExtensions = es.merge(...builtInExtensions.map(extension => {
+		return ext.fromMarketplace(extension.name, extension.version)
+			.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
+	}));
+
+	return (
+		marketplaceExtensions
+		.pipe(util.setExecutableBit(['**/*.sh']))
+		.pipe(vfs.dest('.build/builtInExtensions'))
+	);
+});
+//#endregion
diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
new file mode 100644
index 00000000000..0a78f4ccffd
--- /dev/null
+++ b/build/lib/builtInExtensions.js
@@ -0,0 +1,32 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const root = path.dirname(path.dirname(__dirname));
+
+function isUpToDate(extension) {
+	const packagePath = path.join(root, '.build', 'builtInExtensions', extension.name, 'package.json');
+	if (!fs.existsSync(packagePath)) {
+		return false;
+	}
+	const packageContents = fs.readFileSync(packagePath);
+	try {
+		const diskVersion = JSON.parse(packageContents).version;
+		return (diskVersion === extension.version);
+	} catch(err) {
+		return false;
+	}
+}
+
+const builtInExtensions = require('../builtInExtensions');
+builtInExtensions.forEach((extension) => {
+	if (!isUpToDate(extension)) {
+		process.exit(1);
+	}
+});
+process.exit(0);
diff --git a/extensions/ms-vscode.node-debug/package.json b/extensions/ms-vscode.node-debug/package.json
index 87569809e43..9d065dd4a5c 100644
--- a/extensions/ms-vscode.node-debug/package.json
+++ b/extensions/ms-vscode.node-debug/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "node-debug-placeholder",
+	"name": "node-debug",
 	"version": "1.6.0",
-	"publisher": "vscode",
+	"publisher": "ms-vscode",
 	"engines": {
 		"vscode": "1.6.x"
 	}
diff --git a/extensions/ms-vscode.node-debug2/package.json b/extensions/ms-vscode.node-debug2/package.json
index 26777f7dae6..96c454263b3 100644
--- a/extensions/ms-vscode.node-debug2/package.json
+++ b/extensions/ms-vscode.node-debug2/package.json
@@ -1,7 +1,7 @@
 {
-	"name": "node-debug2-placeholder",
+	"name": "node-debug2",
 	"version": "0.0.3",
-	"publisher": "vscode",
+	"publisher": "ms-vscode",
 	"engines": {
 		"vscode": "1.6.x"
 	}
diff --git a/scripts/code.sh b/scripts/code.sh
index 6339ad06bd4..089d380c1b5 100755
--- a/scripts/code.sh
+++ b/scripts/code.sh
@@ -24,6 +24,9 @@ function code() {
 	# Get electron
 	node build/lib/electron.js || ./node_modules/.bin/gulp electron
 
+	# Get built-in extensions
+	node build/lib/builtInExtensions.js || ./node_modules/.bin/gulp builtInExtensions
+
 	# Build
 	test -d out || ./node_modules/.bin/gulp compile
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionPoints.ts b/src/vs/workbench/services/extensions/electron-browser/extensionPoints.ts
index b0b0f300177..1ce6fdca2c2 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionPoints.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionPoints.ts
@@ -334,6 +334,10 @@ export class ExtensionScanner {
 			}
 
 			const rawFolders = await pfs.readDirsInDir(absoluteFolderPath);
+
+			// Ensure the same extension order
+			rawFolders.sort();
+
 			let folders: string[] = null;
 			if (isBuiltin) {
 				folders = rawFolders;
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
index 8abc3ff6140..4d51f56bd85 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -44,6 +44,7 @@ import * as strings from 'vs/base/common/strings';
 import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
 
 const SystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', 'extensions'));
+const ExtraDevSystemExtensionsRoot = path.normalize(path.join(URI.parse(require.toUrl('')).fsPath, '..', '.build', 'builtInExtensions'));
 
 // Enable to see detailed message communication between window and extension host
 const logExtensionHostCommunication = false;
@@ -624,6 +625,36 @@ export class ExtensionService extends Disposable implements IExtensionService {
 			log
 		);
 
+		let finalBuiltinExtensions: TPromise = builtinExtensions;
+
+		if (devMode) {
+			const extraBuiltinExtensions = ExtensionScanner.scanExtensions(new ExtensionScannerInput(version, commit, locale, devMode, ExtraDevSystemExtensionsRoot, true), log);
+			finalBuiltinExtensions = TPromise.join([builtinExtensions, extraBuiltinExtensions]).then(([builtinExtensions, extraBuiltinExtensions]) => {
+				let resultMap: { [id: string]: IExtensionDescription; } = Object.create(null);
+				for (let i = 0, len = builtinExtensions.length; i < len; i++) {
+					resultMap[builtinExtensions[i].id] = builtinExtensions[i];
+				}
+				// Overwrite with extensions found in extra
+				for (let i = 0, len = extraBuiltinExtensions.length; i < len; i++) {
+					resultMap[extraBuiltinExtensions[i].id] = extraBuiltinExtensions[i];
+				}
+
+				let resultArr = Object.keys(resultMap).map((id) => resultMap[id]);
+				resultArr.sort((a, b) => {
+					const aLastSegment = path.basename(a.extensionFolderPath);
+					const bLastSegment = path.basename(b.extensionFolderPath);
+					if (aLastSegment < bLastSegment) {
+						return -1;
+					}
+					if (aLastSegment > bLastSegment) {
+						return 1;
+					}
+					return 0;
+				});
+				return resultArr;
+			});
+		}
+
 		const userExtensions = (
 			environmentService.disableExtensions || !environmentService.extensionsPath
 				? TPromise.as([])
@@ -646,7 +677,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 				: TPromise.as([])
 		);
 
-		return TPromise.join([builtinExtensions, userExtensions, developedExtensions])
+		return TPromise.join([finalBuiltinExtensions, userExtensions, developedExtensions])
 			.then((extensionDescriptions: IExtensionDescription[][]) => {
 				const system = extensionDescriptions[0];
 				const user = extensionDescriptions[1];

From 018cc146a786cf3adf04ab5d56b6a0f301e5ea3e Mon Sep 17 00:00:00 2001
From: Joao Moreno 
Date: Tue, 23 Jan 2018 16:33:06 +0100
Subject: [PATCH 566/710] use 32 bit version of inno_updater

---
 build/win32/inno_updater.exe | Bin 181248 -> 147456 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe
index 6b8c7a981423d8c8c8cd66b1389b5864d2731d41..c83bcd48cacd90aaa9e5e0a2fda90ae0f568e210 100644
GIT binary patch
literal 147456
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%0Ati%`MS+43hdoZ2gUTyL`>
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%0D!hP36)m2
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
ieUbal?F-vK7U{MiWlndSmg}W8fo72K
Date: Tue, 23 Jan 2018 16:59:23 +0100
Subject: [PATCH 567/710] make WorkspaceEdit more sane

---
 src/vs/workbench/api/node/extHostTypes.ts | 42 +++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
index b62d6592c54..5a230349a39 100644
--- a/src/vs/workbench/api/node/extHostTypes.ts
+++ b/src/vs/workbench/api/node/extHostTypes.ts
@@ -496,8 +496,7 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	private _seqPool: number = 0;
 
 	private _resourceEdits: { seq: number, from: URI, to: URI }[] = [];
-	private _textEdits: [URI, TextEdit[]][] = [];
-	private _textEditsIndex = new Map();
+	private _textEdits = new Map();
 
 	createResource(uri: vscode.Uri): void {
 		this.renameResource(undefined, uri);
@@ -521,8 +520,9 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		if (array) {
 			array.push(edit);
 		} else {
-			this.set(uri, [edit]);
+			array = [edit];
 		}
+		this.set(uri, array);
 	}
 
 	insert(resource: URI, position: Position, newText: string): void {
@@ -534,30 +534,34 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	}
 
 	has(uri: URI): boolean {
-		return this._textEditsIndex.has(uri.toString());
+		return this._textEdits.has(uri.toString());
 	}
 
 	set(uri: URI, edits: TextEdit[]): void {
-		if (!this._textEditsIndex.has(uri.toString())) {
-			let newLen = this._textEdits.push([uri, edits]);
-			this._textEditsIndex.set(uri.toString(), { idx: newLen - 1, seq: this._seqPool++ });
+		let data = this._textEdits.get(uri.toString());
+		if (!data) {
+			data = { seq: this._seqPool++, uri, edits: [] };
+			this._textEdits.set(uri.toString(), data);
+		}
+		if (!edits) {
+			data.edits = undefined;
 		} else {
-			const { idx } = this._textEditsIndex.get(uri.toString());
-			this._textEdits[idx][1] = edits;
+			data.edits = edits.slice(0);
 		}
 	}
 
 	get(uri: URI): TextEdit[] {
-		if (!this._textEditsIndex.has(uri.toString())) {
+		if (!this._textEdits.has(uri.toString())) {
 			return undefined;
 		}
-		const { idx } = this._textEditsIndex.get(uri.toString());
-		return this._textEdits[idx][1];
+		const { edits } = this._textEdits.get(uri.toString());
+		return edits ? edits.slice() : undefined;
 	}
 
 	entries(): [URI, TextEdit[]][] {
-		// todo@joh - make this immutable
-		return this._textEdits;
+		const res: [URI, TextEdit[]][] = [];
+		this._textEdits.forEach(value => res.push([value.uri, value.edits]));
+		return res.slice();
 	}
 
 	allEntries(): ([URI, TextEdit[]] | [URI, URI])[] {
@@ -565,9 +569,9 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 		// the operation and use that order in the resulting
 		// array
 		const res: ([URI, TextEdit[]] | [URI, URI])[] = [];
-		this._textEditsIndex.forEach(value => {
-			const { idx, seq } = value;
-			res[seq] = this._textEdits[idx];
+		this._textEdits.forEach(value => {
+			const { seq, uri, edits } = value;
+			res[seq] = [uri, edits];
 		});
 		this._resourceEdits.forEach(value => {
 			const { seq, from, to } = value;
@@ -577,11 +581,11 @@ export class WorkspaceEdit implements vscode.WorkspaceEdit {
 	}
 
 	get size(): number {
-		return this._textEdits.length + this._resourceEdits.length;
+		return this._textEdits.size + this._resourceEdits.length;
 	}
 
 	toJSON(): any {
-		return this._textEdits;
+		return this.entries();
 	}
 }
 

From 1ccfbe4024aa6eb439c8f4d93d64e9789712af64 Mon Sep 17 00:00:00 2001
From: Johannes Rieken 
Date: Tue, 23 Jan 2018 17:21:43 +0100
Subject: [PATCH 568/710] missing merge change

---
 src/vs/workbench/api/node/extHost.protocol.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 8827d4cf011..b6272b1f035 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -648,7 +648,7 @@ export interface CodeActionDto {
 	edit?: WorkspaceEditDto;
 	diagnostics?: IMarkerData[];
 	command?: modes.Command;
-	scope?: string;
+	kind?: string;
 }
 
 export interface ExtHostLanguageFeaturesShape {

From de24732aa964197104c0e8a3b4ddd2aeb3b383b7 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 17:16:08 +0100
Subject: [PATCH 569/710] Implement #39574

---
 .../sharedProcess/sharedProcessMain.ts        |  6 ++-
 src/vs/code/electron-main/app.ts              |  6 +++
 src/vs/platform/log/common/bufferLog.ts       | 19 ++------
 src/vs/platform/log/common/logIpc.ts          | 43 ++++++++++++++++++
 src/vs/platform/log/node/spdlogService.ts     | 28 +++++-------
 .../electron-browser/mainThreadLogService.ts  | 24 ++++++++++
 src/vs/workbench/api/node/extHost.protocol.ts |  7 ++-
 .../api/node/extHostExtensionService.ts       |  2 +-
 .../workbench/api/node/extHostLogService.ts   | 44 ++++++++++++-------
 src/vs/workbench/electron-browser/main.ts     | 16 ++++---
 10 files changed, 137 insertions(+), 58 deletions(-)
 create mode 100644 src/vs/platform/log/common/logIpc.ts
 create mode 100644 src/vs/workbench/api/electron-browser/mainThreadLogService.ts

diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 2f0521cf00e..17fdc47c3e7 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -38,7 +38,8 @@ import { ipcRenderer } from 'electron';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ILogService, FollowerLogService } from 'vs/platform/log/common/log';
+import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -81,7 +82,8 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	const services = new ServiceCollection();
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
-	const logService = createSpdLogService('sharedprocess', environmentService);
+	const logLevelClient = new LogLevelChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
+	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', environmentService));
 	process.once('exit', () => logService.dispose());
 
 	logService.info('main', JSON.stringify(configuration));
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 24fb6d6ca51..eec6c2bae9b 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -57,6 +57,7 @@ import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateServ
 import { IIssueService } from 'vs/platform/issue/common/issue';
 import { IssueChannel } from 'vs/platform/issue/common/issueIpc';
 import { IssueService } from 'vs/platform/issue/electron-main/issueService';
+import { LogLevelChannel } from 'vs/platform/log/common/logIpc';
 
 export class CodeApplication {
 
@@ -378,6 +379,11 @@ export class CodeApplication {
 		this.electronIpcServer.registerChannel('windows', windowsChannel);
 		this.sharedProcessClient.done(client => client.registerChannel('windows', windowsChannel));
 
+		// Log level management
+		const logLevelChannel = new LogLevelChannel(accessor.get(ILogService));
+		this.electronIpcServer.registerChannel('loglevel', logLevelChannel);
+		this.sharedProcessClient.done(client => client.registerChannel('loglevel', logLevelChannel));
+
 		// Lifecycle
 		this.lifecycleService.ready();
 
diff --git a/src/vs/platform/log/common/bufferLog.ts b/src/vs/platform/log/common/bufferLog.ts
index caa628e51da..65fa32adb0e 100644
--- a/src/vs/platform/log/common/bufferLog.ts
+++ b/src/vs/platform/log/common/bufferLog.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { ILogService, LogLevel } from 'vs/platform/log/common/log';
+import { ILogService, LogLevel, AbstractLogService } from 'vs/platform/log/common/log';
 
 interface ILog {
 	level: LogLevel;
@@ -24,17 +24,12 @@ function getLogFunction(logger: ILogService, level: LogLevel): Function {
 	}
 }
 
-export class BufferLogService implements ILogService {
+export class BufferLogService extends AbstractLogService implements ILogService {
 
 	_serviceBrand: any;
 	private buffer: ILog[] = [];
 	private _logger: ILogService | undefined = undefined;
 
-	constructor(
-		private level: LogLevel = LogLevel.Error
-	) {
-	}
-
 	set logger(logger: ILogService) {
 		this._logger = logger;
 
@@ -46,19 +41,11 @@ export class BufferLogService implements ILogService {
 		this.buffer = [];
 	}
 
-	setLevel(logLevel: LogLevel): void {
-		this.level = logLevel;
-	}
-
-	getLevel(): LogLevel {
-		return this.level;
-	}
-
 	private _log(level: LogLevel, args: IArguments): void {
 		if (this._logger) {
 			const fn = getLogFunction(this._logger, level);
 			fn.apply(this._logger, args);
-		} else if (this.level <= level) {
+		} else if (this.getLevel() <= level) {
 			this.buffer.push({ level, args });
 		}
 	}
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts
new file mode 100644
index 00000000000..9eb0764c54e
--- /dev/null
+++ b/src/vs/platform/log/common/logIpc.ts
@@ -0,0 +1,43 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
+import { TPromise } from 'vs/base/common/winjs.base';
+import { LogLevel, ILogService } from 'vs/platform/log/common/log';
+import Event, { buffer } from 'vs/base/common/event';
+
+export interface ILogLevelManagementChannel extends IChannel {
+	call(command: 'event:onDidChangeLogLevel'): TPromise;
+	call(command: 'setLogLevel', logLevel: LogLevel): TPromise;
+}
+
+export class LogLevelChannel implements ILogLevelManagementChannel {
+
+	onDidChangeLogLevel: Event;
+
+	constructor(private service: ILogService) {
+		this.onDidChangeLogLevel = buffer(service.onDidChangeLogLevel, true);
+	}
+
+	call(command: string, arg?: any): TPromise {
+		switch (command) {
+			case 'event:onDidChangeLogLevel': return eventToCall(this.onDidChangeLogLevel);
+			case 'setLogLevel': this.service.setLevel(arg); return TPromise.as(null);
+		}
+		return undefined;
+	}
+}
+
+export class LogLevelChannelClient {
+
+	constructor(private channel: ILogLevelManagementChannel) { }
+
+	private _onDidChangeLogLevel = eventFromCall(this.channel, 'event:onDidChangeLogLevel');
+	get onDidChangeLogLevel(): Event { return this._onDidChangeLogLevel; }
+
+	setLogLevel(level: LogLevel): TPromise {
+		return this.channel.call('setLogLevel', level);
+	}
+}
\ No newline at end of file
diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts
index 6493d6e1c8d..9df00ce99f6 100644
--- a/src/vs/platform/log/node/spdlogService.ts
+++ b/src/vs/platform/log/node/spdlogService.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as path from 'path';
-import { ILogService, LogLevel, NullLogService } from 'vs/platform/log/common/log';
+import { ILogService, LogLevel, NullLogService, AbstractLogService } from 'vs/platform/log/common/log';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { RotatingLogger, setAsyncMode } from 'spdlog';
 
@@ -25,50 +25,44 @@ export function createSpdLogService(processName: string, environmentService: IEn
 	return new NullLogService();
 }
 
-class SpdLogService implements ILogService {
+class SpdLogService extends AbstractLogService implements ILogService {
 
 	_serviceBrand: any;
 
 	constructor(
 		private readonly logger: RotatingLogger,
-		private level: LogLevel = LogLevel.Error
+		level: LogLevel
 	) {
-	}
-
-	setLevel(logLevel: LogLevel): void {
-		this.level = logLevel;
-	}
-
-	getLevel(): LogLevel {
-		return this.level;
+		super();
+		this.setLevel(level);
 	}
 
 	trace(): void {
-		if (this.level <= LogLevel.Trace) {
+		if (this.getLevel() <= LogLevel.Trace) {
 			this.logger.trace(this.format(arguments));
 		}
 	}
 
 	debug(): void {
-		if (this.level <= LogLevel.Debug) {
+		if (this.getLevel() <= LogLevel.Debug) {
 			this.logger.debug(this.format(arguments));
 		}
 	}
 
 	info(): void {
-		if (this.level <= LogLevel.Info) {
+		if (this.getLevel() <= LogLevel.Info) {
 			this.logger.info(this.format(arguments));
 		}
 	}
 
 	warn(): void {
-		if (this.level <= LogLevel.Warning) {
+		if (this.getLevel() <= LogLevel.Warning) {
 			this.logger.warn(this.format(arguments));
 		}
 	}
 
 	error(): void {
-		if (this.level <= LogLevel.Error) {
+		if (this.getLevel() <= LogLevel.Error) {
 			const arg = arguments[0];
 
 			if (arg instanceof Error) {
@@ -82,7 +76,7 @@ class SpdLogService implements ILogService {
 	}
 
 	critical(): void {
-		if (this.level <= LogLevel.Critical) {
+		if (this.getLevel() <= LogLevel.Critical) {
 			this.logger.critical(this.format(arguments));
 		}
 	}
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLogService.ts b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
new file mode 100644
index 00000000000..c24b24c619a
--- /dev/null
+++ b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+'use strict';
+
+import { ExtHostContext, IExtHostContext } from '../node/extHost.protocol';
+import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
+import { ILogService } from 'vs/platform/log/common/log';
+import { Disposable } from 'vs/base/common/lifecycle';
+
+@extHostCustomer
+export class MainThreadLogLevelManagementChannel extends Disposable {
+
+	constructor(
+		extHostContext: IExtHostContext,
+		@ILogService logService: ILogService,
+	) {
+		super();
+		this._register(logService.onDidChangeLogLevel(level => extHostContext.getProxy(ExtHostContext.ExtHostLogService).$setLogLevel(level)));
+	}
+
+}
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index d4dcd03d363..955e29ee3fc 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -54,6 +54,7 @@ import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { CommentRule, CharacterPair, EnterAction } from 'vs/editor/common/modes/languageConfiguration';
 import { EndOfLineSequence, ISingleEditOperation } from 'vs/editor/common/model';
 import { ILineMatch, IPatternInfo } from 'vs/platform/search/common/search';
+import { LogLevel } from 'vs/platform/log/common/log';
 
 export interface IEnvironment {
 	isExtensionDevelopmentDebug: boolean;
@@ -744,6 +745,10 @@ export interface ExtHostWindowShape {
 	$onDidChangeWindowFocus(value: boolean): void;
 }
 
+export interface ExtHostLogServiceShape {
+	$setLogLevel(level: LogLevel);
+}
+
 // --- proxy identifiers
 
 export const MainContext = {
@@ -794,7 +799,7 @@ export const ExtHostContext = {
 	ExtHostLanguageFeatures: createExtId('ExtHostLanguageFeatures'),
 	ExtHostQuickOpen: createExtId('ExtHostQuickOpen'),
 	ExtHostExtensionService: createExtId('ExtHostExtensionService'),
-	// ExtHostLogService: createExtId('ExtHostLogService'),
+	ExtHostLogService: createExtId('ExtHostLogService'),
 	ExtHostTerminalService: createExtId('ExtHostTerminalService'),
 	ExtHostSCM: createExtId('ExtHostSCM'),
 	ExtHostTask: createExtId('ExtHostTask', ProxyType.CustomMarshaller),
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index d39a58a432e..fb50ec716d8 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -150,7 +150,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		this._storagePath = new ExtensionStoragePath(initData.workspace, initData.environment);
 		this._proxy = extHostContext.getProxy(MainContext.MainThreadExtensionService);
 		this._activator = null;
-		this._extHostLogService = new ExtHostLogService(environmentService);
+		this._extHostLogService = new ExtHostLogService(environmentService, this._logService);
 
 		// initialize API first (i.e. do not release barrier until the API is initialized)
 		const apiFactory = createApiFactory(initData, extHostContext, extHostWorkspace, extHostConfiguration, this, logService);
diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts
index fff0755018d..4689e038ae8 100644
--- a/src/vs/workbench/api/node/extHostLogService.ts
+++ b/src/vs/workbench/api/node/extHostLogService.ts
@@ -8,47 +8,59 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { mkdirp, dirExists } from 'vs/base/node/pfs';
-import Event, { Emitter } from 'vs/base/common/event';
+import Event from 'vs/base/common/event';
 import { LogLevel } from 'vs/workbench/api/node/extHostTypes';
 import { ILogService } from 'vs/platform/log/common/log';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { memoize } from 'vs/base/common/decorators';
+import { ExtHostLogServiceShape } from 'vs/workbench/api/node/extHost.protocol';
+import { Disposable } from 'vs/base/common/lifecycle';
 
-export class ExtHostLogService {
+export class ExtHostLogService extends Disposable implements ExtHostLogServiceShape {
 	private _loggers: Map = new Map();
 
-	constructor(private _environmentService: IEnvironmentService) {
+	constructor(
+		private _environmentService: IEnvironmentService,
+		private _logService: ILogService
+	) {
+		super();
+	}
+
+	$setLogLevel(level: LogLevel) {
+		this._logService.setLevel(level);
 	}
 
 	getExtLogger(extensionID: string): ExtHostLogger {
-		if (!this._loggers.has(extensionID)) {
-			const logService = createSpdLogService(extensionID, this._environmentService, extensionID);
-			const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
-			this._loggers.set(extensionID, new ExtHostLogger(logService, logsDirPath));
+		let logger = this._loggers.get(extensionID);
+		if (!logger) {
+			logger = this.createLogger(extensionID);
+			this._loggers.set(extensionID, logger);
 		}
+		return logger;
+	}
 
-		return this._loggers.get(extensionID);
+	private createLogger(extensionID: string): ExtHostLogger {
+		const logService = createSpdLogService(extensionID, this._environmentService, extensionID);
+		const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
+		this._register(this._logService.onDidChangeLogLevel(level => logService.setLevel(level)));
+		return new ExtHostLogger(logService, logsDirPath);
 	}
 }
 
 export class ExtHostLogger implements vscode.Logger {
-	private _currentLevel: LogLevel;
-	private _onDidChangeLogLevel: Emitter;
 
 	constructor(
 		private readonly _logService: ILogService,
 		private readonly _logDirectory: string
 	) {
-		this._currentLevel = this._logService.getLevel();
-		this._onDidChangeLogLevel = new Emitter();
-		this.onDidChangeLogLevel = this._onDidChangeLogLevel.event;
 	}
 
-	// TODO
-	readonly onDidChangeLogLevel: Event;
+	get onDidChangeLogLevel(): Event {
+		return this._logService.onDidChangeLogLevel;
+	}
 
-	get currentLevel(): LogLevel { return this._currentLevel; }
+	get currentLevel(): LogLevel { return this._logService.getLevel(); }
 
 	@memoize
 	get logDirectory(): TPromise {
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 9f6e912a251..f40edbae3fc 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -43,9 +43,10 @@ import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 
 import fs = require('fs');
-import { ConsoleLogService, MultiplexLogService } from 'vs/platform/log/common/log';
+import { ConsoleLogService, MultiplexLogService, ILogService, FollowerLogService } from 'vs/platform/log/common/log';
 import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc';
 import { IIssueService } from 'vs/platform/issue/common/issue';
+import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 gracefulFs.gracefulify(fs); // enable gracefulFs
 
 export function startup(configuration: IWindowConfiguration): TPromise {
@@ -75,10 +76,7 @@ function openWorkbench(configuration: IWindowConfiguration): TPromise {
 	const mainServices = createMainProcessServices(mainProcessClient, configuration);
 
 	const environmentService = new EnvironmentService(configuration, configuration.execPath);
-	const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, environmentService);
-	const consoleLogService = new ConsoleLogService(environmentService);
-	const logService = new MultiplexLogService([consoleLogService, spdlogService]);
-
+	const logService = createLogService(mainProcessClient, configuration, environmentService);
 	logService.trace('openWorkbench configuration', JSON.stringify(configuration));
 
 	// Since the configuration service is one of the core services that is used in so many places, we initialize it
@@ -200,6 +198,14 @@ function createStorageService(workspaceService: IWorkspaceContextService, enviro
 	return new StorageService(storage, storage, workspaceId, secondaryWorkspaceId);
 }
 
+function createLogService(mainProcessClient: ElectronIPCClient, configuration: IWindowConfiguration, environmentService: IEnvironmentService): ILogService {
+	const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, environmentService);
+	const consoleLogService = new ConsoleLogService(environmentService);
+	const logService = new MultiplexLogService([consoleLogService, spdlogService]);
+	const logLevelClient = new LogLevelChannelClient(mainProcessClient.getChannel('loglevel'));
+	return new FollowerLogService(logLevelClient, logService);
+}
+
 function createMainProcessServices(mainProcessClient: ElectronIPCClient, configuration: IWindowConfiguration): ServiceCollection {
 	const serviceCollection = new ServiceCollection();
 

From b0cd8f8481e12d221374fa39ebd344e74cdec5ac Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 17:28:43 +0100
Subject: [PATCH 570/710] #39574

---
 src/vs/platform/log/common/log.ts | 125 ++++++++++++++++++++----------
 1 file changed, 84 insertions(+), 41 deletions(-)

diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index 823ec1cd2e0..f7019d95418 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -7,8 +7,10 @@
 
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { createDecorator as createServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { IDisposable } from 'vs/base/common/lifecycle';
+import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { isWindows } from 'vs/base/common/platform';
+import Event, { Emitter } from 'vs/base/common/event';
+import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 
 export const ILogService = createServiceDecorator('logService');
 
@@ -25,6 +27,7 @@ export enum LogLevel {
 export interface ILogService extends IDisposable {
 	_serviceBrand: any;
 
+	onDidChangeLogLevel: Event;
 	setLevel(level: LogLevel): void;
 	getLevel(): LogLevel;
 	trace(message: string, ...args: any[]): void;
@@ -35,27 +38,37 @@ export interface ILogService extends IDisposable {
 	critical(message: string | Error, ...args: any[]): void;
 }
 
-export class ConsoleLogMainService implements ILogService {
+export abstract class AbstractLogService extends Disposable {
 
-	_serviceBrand: any;
 	private level: LogLevel = LogLevel.Error;
-	private useColors: boolean;
-
-	constructor( @IEnvironmentService environmentService: IEnvironmentService) {
-		this.setLevel(environmentService.logLevel);
-		this.useColors = !isWindows;
-	}
+	private readonly _onDidChangeLogLevel: Emitter = this._register(new Emitter());
+	readonly onDidChangeLogLevel: Event = this._onDidChangeLogLevel.event;
 
 	setLevel(level: LogLevel): void {
-		this.level = level;
+		if (this.level !== level) {
+			this.level = level;
+			this._onDidChangeLogLevel.fire(this.level);
+		}
 	}
 
 	getLevel(): LogLevel {
 		return this.level;
 	}
+}
+
+export class ConsoleLogMainService extends AbstractLogService implements ILogService {
+
+	_serviceBrand: any;
+	private useColors: boolean;
+
+	constructor( @IEnvironmentService environmentService: IEnvironmentService) {
+		super();
+		this.setLevel(environmentService.logLevel);
+		this.useColors = !isWindows;
+	}
 
 	trace(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Trace) {
+		if (this.getLevel() <= LogLevel.Trace) {
 			if (this.useColors) {
 				console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -65,7 +78,7 @@ export class ConsoleLogMainService implements ILogService {
 	}
 
 	debug(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Debug) {
+		if (this.getLevel() <= LogLevel.Debug) {
 			if (this.useColors) {
 				console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -75,7 +88,7 @@ export class ConsoleLogMainService implements ILogService {
 	}
 
 	info(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Info) {
+		if (this.getLevel() <= LogLevel.Info) {
 			if (this.useColors) {
 				console.log(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -85,7 +98,7 @@ export class ConsoleLogMainService implements ILogService {
 	}
 
 	warn(message: string | Error, ...args: any[]): void {
-		if (this.level <= LogLevel.Warning) {
+		if (this.getLevel() <= LogLevel.Warning) {
 			if (this.useColors) {
 				console.warn(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -95,7 +108,7 @@ export class ConsoleLogMainService implements ILogService {
 	}
 
 	error(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Error) {
+		if (this.getLevel() <= LogLevel.Error) {
 			if (this.useColors) {
 				console.error(`\x1b[91m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -105,7 +118,7 @@ export class ConsoleLogMainService implements ILogService {
 	}
 
 	critical(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Critical) {
+		if (this.getLevel() <= LogLevel.Critical) {
 			if (this.useColors) {
 				console.error(`\x1b[90m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, message, ...args);
 			} else {
@@ -119,55 +132,47 @@ export class ConsoleLogMainService implements ILogService {
 	}
 }
 
-export class ConsoleLogService implements ILogService {
+export class ConsoleLogService extends AbstractLogService implements ILogService {
 
 	_serviceBrand: any;
-	private level: LogLevel = LogLevel.Error;
 
 	constructor( @IEnvironmentService environmentService: IEnvironmentService) {
+		super();
 		this.setLevel(environmentService.logLevel);
 	}
 
-	setLevel(level: LogLevel): void {
-		this.level = level;
-	}
-
-	getLevel(): LogLevel {
-		return this.level;
-	}
-
 	trace(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Trace) {
+		if (this.getLevel() <= LogLevel.Trace) {
 			console.log('%cTRACE', 'color: #888', message, ...args);
 		}
 	}
 
 	debug(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Debug) {
+		if (this.getLevel() <= LogLevel.Debug) {
 			console.log('%cDEBUG', 'background: #eee; color: #888', message, ...args);
 		}
 	}
 
 	info(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Info) {
+		if (this.getLevel() <= LogLevel.Info) {
 			console.log('%c INFO', 'color: #33f', message, ...args);
 		}
 	}
 
 	warn(message: string | Error, ...args: any[]): void {
-		if (this.level <= LogLevel.Warning) {
+		if (this.getLevel() <= LogLevel.Warning) {
 			console.log('%c WARN', 'color: #993', message, ...args);
 		}
 	}
 
 	error(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Error) {
+		if (this.getLevel() <= LogLevel.Error) {
 			console.log('%c  ERR', 'color: #f33', message, ...args);
 		}
 	}
 
 	critical(message: string, ...args: any[]): void {
-		if (this.level <= LogLevel.Critical) {
+		if (this.getLevel() <= LogLevel.Critical) {
 			console.log('%cCRITI', 'background: #f33; color: white', message, ...args);
 		}
 	}
@@ -175,22 +180,18 @@ export class ConsoleLogService implements ILogService {
 	dispose(): void { }
 }
 
-export class MultiplexLogService implements ILogService {
+export class MultiplexLogService extends AbstractLogService implements ILogService {
 	_serviceBrand: any;
 
-	constructor(private logServices: ILogService[]) { }
+	constructor(private logServices: ILogService[]) {
+		super();
+	}
 
 	setLevel(level: LogLevel): void {
 		for (const logService of this.logServices) {
 			logService.setLevel(level);
 		}
-	}
-
-	getLevel(): LogLevel {
-		for (const logService of this.logServices) {
-			return logService.getLevel();
-		}
-		return LogLevel.Info;
+		super.setLevel(level);
 	}
 
 	trace(message: string, ...args: any[]): void {
@@ -236,8 +237,50 @@ export class MultiplexLogService implements ILogService {
 	}
 }
 
+export class FollowerLogService extends AbstractLogService implements ILogService {
+	_serviceBrand: any;
+
+	constructor(private client: LogLevelChannelClient, private logService: ILogService) {
+		super();
+		this._register(client.onDidChangeLogLevel(level => logService.setLevel(level)));
+	}
+
+	setLevel(level: LogLevel): void {
+		this.client.setLogLevel(level);
+	}
+
+	trace(message: string, ...args: any[]): void {
+		this.logService.trace(message, ...args);
+	}
+
+	debug(message: string, ...args: any[]): void {
+		this.logService.debug(message, ...args);
+	}
+
+	info(message: string, ...args: any[]): void {
+		this.logService.info(message, ...args);
+	}
+
+	warn(message: string, ...args: any[]): void {
+		this.logService.warn(message, ...args);
+	}
+
+	error(message: string | Error, ...args: any[]): void {
+		this.logService.error(message, ...args);
+	}
+
+	critical(message: string | Error, ...args: any[]): void {
+		this.logService.critical(message, ...args);
+	}
+
+	dispose(): void {
+		this.logService.dispose();
+	}
+}
+
 export class NullLogService implements ILogService {
 	_serviceBrand: any;
+	readonly onDidChangeLogLevel: Event = new Emitter().event;
 	setLevel(level: LogLevel): void { }
 	getLevel(): LogLevel { return LogLevel.Info; }
 	trace(message: string, ...args: any[]): void { }

From c5ea1cf551379b5df8a64140844c4e577fa811ac Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Tue, 23 Jan 2018 17:35:26 +0100
Subject: [PATCH 571/710] builtInExtensions.json keeps pointer to repo

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

diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json
index 4921d2a27c7..f03be115d34 100644
--- a/build/builtInExtensions.json
+++ b/build/builtInExtensions.json
@@ -1,4 +1,12 @@
 [
-	{ "name": "ms-vscode.node-debug", "version": "1.20.3" },
-	{ "name": "ms-vscode.node-debug2", "version": "1.20.1" }
+	{
+		"name": "ms-vscode.node-debug",
+		"version": "1.20.3",
+		"repo": "https://github.com/Microsoft/vscode-node-debug"
+	},
+	{
+		"name": "ms-vscode.node-debug2",
+		"version": "1.20.1",
+		"repo": "https://github.com/Microsoft/vscode-node-debug2"
+	}
 ]
\ No newline at end of file

From 7af951014b83dbc5b217ed2a7a7d57ad1b9a9423 Mon Sep 17 00:00:00 2001
From: Alex Dima 
Date: Tue, 23 Jan 2018 17:46:13 +0100
Subject: [PATCH 572/710] Remove node-debug and node-debug2 obsolete marker
 files

---
 .../ms-vscode.node-debug/package-lock.json    | 7087 -----------------
 extensions/ms-vscode.node-debug/package.json  |    8 -
 .../ms-vscode.node-debug2/package-lock.json   | 5106 ------------
 extensions/ms-vscode.node-debug2/package.json |    8 -
 4 files changed, 12209 deletions(-)
 delete mode 100644 extensions/ms-vscode.node-debug/package-lock.json
 delete mode 100644 extensions/ms-vscode.node-debug/package.json
 delete mode 100644 extensions/ms-vscode.node-debug2/package-lock.json
 delete mode 100644 extensions/ms-vscode.node-debug2/package.json

diff --git a/extensions/ms-vscode.node-debug/package-lock.json b/extensions/ms-vscode.node-debug/package-lock.json
deleted file mode 100644
index 526e856f483..00000000000
--- a/extensions/ms-vscode.node-debug/package-lock.json
+++ /dev/null
@@ -1,7087 +0,0 @@
-{
-	"name": "node-debug",
-	"version": "1.19.7",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"@gulp-sourcemaps/identity-map": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
-			"integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
-			"dev": true,
-			"requires": {
-				"acorn": "5.2.1",
-				"css": "2.2.1",
-				"normalize-path": "2.1.1",
-				"source-map": "0.5.7",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-					"integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"@gulp-sourcemaps/map-sources": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-			"dev": true,
-			"requires": {
-				"normalize-path": "2.1.1",
-				"through2": "2.0.3"
-			}
-		},
-		"@types/mocha": {
-			"version": "2.2.44",
-			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz",
-			"integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==",
-			"dev": true
-		},
-		"@types/node": {
-			"version": "7.0.43",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.43.tgz",
-			"integrity": "sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ==",
-			"dev": true
-		},
-		"@types/source-map": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/@types/source-map/-/source-map-0.5.2.tgz",
-			"integrity": "sha512-++w4WmMbk3dS3UeHGzAG+xJOSz5Xqtjys/TBkqG3qp3SeWE7Wwezqe5eB7B51cxUyh4PW7bwVotpsLdBK0D8cw==",
-			"dev": true
-		},
-		"abbrev": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-			"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-			"dev": true
-		},
-		"acorn": {
-			"version": "4.0.13",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-			"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-			"integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-		},
-		"ajv": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz",
-			"integrity": "sha1-MtHPCNvIDEMvQm8S4QslEfa0ZHQ=",
-			"dev": true,
-			"requires": {
-				"co": "4.6.0",
-				"fast-deep-equal": "1.0.0",
-				"fast-json-stable-stringify": "2.0.0",
-				"json-schema-traverse": "0.3.1"
-			}
-		},
-		"align-text": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-			"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
-			"dev": true,
-			"requires": {
-				"kind-of": "3.2.2",
-				"longest": "1.0.1",
-				"repeat-string": "1.6.1"
-			}
-		},
-		"amdefine": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-			"dev": true
-		},
-		"ansi-align": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-			"integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
-			"dev": true,
-			"requires": {
-				"string-width": "2.1.1"
-			}
-		},
-		"ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-			"dev": true
-		},
-		"anymatch": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-			"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
-			"dev": true,
-			"requires": {
-				"micromatch": "2.3.11",
-				"normalize-path": "2.1.1"
-			}
-		},
-		"archy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-			"dev": true
-		},
-		"argparse": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-			"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "1.0.3"
-			}
-		},
-		"arr-diff": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "1.1.0"
-			}
-		},
-		"arr-flatten": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-			"dev": true
-		},
-		"array-differ": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-			"dev": true
-		},
-		"array-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-			"dev": true
-		},
-		"array-slice": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
-			"integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=",
-			"dev": true
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "1.0.3"
-			}
-		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-			"dev": true
-		},
-		"array-unique": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-			"dev": true
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true
-		},
-		"asn1": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-			"dev": true
-		},
-		"assert-plus": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-			"dev": true
-		},
-		"async": {
-			"version": "0.2.10",
-			"resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-			"integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-			"dev": true
-		},
-		"async-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-			"integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-			"dev": true
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
-		"atob": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-			"integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-			"dev": true
-		},
-		"aws-sign2": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-			"dev": true
-		},
-		"babel-code-frame": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-			"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"esutils": "2.0.2",
-				"js-tokens": "3.0.2"
-			}
-		},
-		"balanced-match": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"tweetnacl": "0.14.5"
-			}
-		},
-		"beeper": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-			"integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-			"dev": true
-		},
-		"binary-extensions": {
-			"version": "1.11.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
-			"integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
-			"dev": true
-		},
-		"block-stream": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3"
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
-		},
-		"boom": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-			"dev": true,
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"boxen": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz",
-			"integrity": "sha1-Px1AMsMP/qnUsCwyLq8up0HcvOU=",
-			"dev": true,
-			"requires": {
-				"ansi-align": "2.0.0",
-				"camelcase": "4.1.0",
-				"chalk": "2.3.0",
-				"cli-boxes": "1.0.0",
-				"string-width": "2.1.1",
-				"term-size": "1.2.0",
-				"widest-line": "1.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.1"
-					}
-				},
-				"camelcase": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-					"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"brace-expansion": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-			"requires": {
-				"balanced-match": "1.0.0",
-				"concat-map": "0.0.1"
-			}
-		},
-		"braces": {
-			"version": "1.8.5",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-			"dev": true,
-			"requires": {
-				"expand-range": "1.8.2",
-				"preserve": "0.2.0",
-				"repeat-element": "1.1.2"
-			}
-		},
-		"browser-stdout": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-			"dev": true
-		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-			"dev": true
-		},
-		"builtin-modules": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-			"dev": true
-		},
-		"camelcase": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-			"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-			"dev": true
-		},
-		"capture-stack-trace": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
-			"integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
-			"dev": true
-		},
-		"caseless": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-			"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-			"dev": true
-		},
-		"center-align": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
-			"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
-			"dev": true,
-			"requires": {
-				"align-text": "0.1.4",
-				"lazy-cache": "1.0.4"
-			}
-		},
-		"chalk": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "2.2.1",
-				"escape-string-regexp": "1.0.5",
-				"has-ansi": "2.0.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0"
-			}
-		},
-		"cheerio": {
-			"version": "1.0.0-rc.2",
-			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-			"dev": true,
-			"requires": {
-				"css-select": "1.2.0",
-				"dom-serializer": "0.1.0",
-				"entities": "1.1.1",
-				"htmlparser2": "3.9.2",
-				"lodash": "4.17.4",
-				"parse5": "3.0.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"chokidar": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
-			"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
-			"dev": true,
-			"requires": {
-				"anymatch": "1.3.2",
-				"async-each": "1.0.1",
-				"fsevents": "1.1.3",
-				"glob-parent": "2.0.0",
-				"inherits": "2.0.3",
-				"is-binary-path": "1.0.1",
-				"is-glob": "2.0.1",
-				"path-is-absolute": "1.0.1",
-				"readdirp": "2.1.0"
-			}
-		},
-		"cli-boxes": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-			"integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
-			"dev": true
-		},
-		"cliui": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-			"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-			"dev": true,
-			"requires": {
-				"center-align": "0.1.3",
-				"right-align": "0.1.3",
-				"wordwrap": "0.0.2"
-			}
-		},
-		"clone": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-			"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-			"dev": true
-		},
-		"clone-buffer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-			"dev": true
-		},
-		"clone-stats": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-			"dev": true
-		},
-		"cloneable-readable": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-			"integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3",
-				"process-nextick-args": "1.0.7",
-				"through2": "2.0.3"
-			}
-		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-			"dev": true
-		},
-		"color-convert": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-			"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-			"dev": true,
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"combined-stream": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-			"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-			"dev": true
-		},
-		"concat-map": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"configstore": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.1.tgz",
-			"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
-			"dev": true,
-			"requires": {
-				"dot-prop": "4.2.0",
-				"graceful-fs": "4.1.11",
-				"make-dir": "1.1.0",
-				"unique-string": "1.0.0",
-				"write-file-atomic": "2.3.0",
-				"xdg-basedir": "3.0.0"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				}
-			}
-		},
-		"convert-source-map": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
-			"integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
-			"dev": true
-		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-			"dev": true
-		},
-		"create-error-class": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-			"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-			"dev": true,
-			"requires": {
-				"capture-stack-trace": "1.0.0"
-			}
-		},
-		"cross-spawn": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-			"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-			"dev": true,
-			"requires": {
-				"lru-cache": "4.1.1",
-				"shebang-command": "1.2.0",
-				"which": "1.3.0"
-			}
-		},
-		"cryptiles": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-			"dev": true,
-			"requires": {
-				"boom": "2.10.1"
-			}
-		},
-		"crypto-random-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-			"integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
-			"dev": true
-		},
-		"css": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-			"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3",
-				"source-map": "0.1.43",
-				"source-map-resolve": "0.3.1",
-				"urix": "0.1.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.1.43",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-					"dev": true,
-					"requires": {
-						"amdefine": "1.0.1"
-					}
-				}
-			}
-		},
-		"css-select": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-			"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-			"dev": true,
-			"requires": {
-				"boolbase": "1.0.0",
-				"css-what": "2.1.0",
-				"domutils": "1.5.1",
-				"nth-check": "1.0.1"
-			}
-		},
-		"css-what": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-			"integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-			"dev": true
-		},
-		"d": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-			"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.35"
-			}
-		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"dateformat": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-			"integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-			"dev": true
-		},
-		"debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"requires": {
-				"ms": "2.0.0"
-			}
-		},
-		"debug-fabulous": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.2.1.tgz",
-			"integrity": "sha512-u0TV6HcfLsZ03xLBhdhSViQMldaiQ2o+8/nSILaXkuNSWvxkx66vYJUAam0Eu7gAilJRX/69J4kKdqajQPaPyw==",
-			"dev": true,
-			"requires": {
-				"debug": "3.1.0",
-				"memoizee": "0.4.11",
-				"object-assign": "4.1.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				}
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
-		},
-		"deep-assign": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz",
-			"integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=",
-			"dev": true,
-			"requires": {
-				"is-obj": "1.0.1"
-			}
-		},
-		"deep-extend": {
-			"version": "0.4.2",
-			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-			"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-			"dev": true
-		},
-		"defaults": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-			"integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3"
-			}
-		},
-		"del": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-			"integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-			"dev": true,
-			"requires": {
-				"globby": "6.1.0",
-				"is-path-cwd": "1.0.0",
-				"is-path-in-cwd": "1.0.0",
-				"p-map": "1.2.0",
-				"pify": "3.0.0",
-				"rimraf": "2.6.2"
-			}
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
-		"denodeify": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
-			"integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
-			"dev": true
-		},
-		"deprecated": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-			"integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-			"dev": true
-		},
-		"detect-file": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
-			"integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=",
-			"dev": true,
-			"requires": {
-				"fs-exists-sync": "0.1.0"
-			}
-		},
-		"detect-newline": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-			"dev": true
-		},
-		"diff": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-			"integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
-			"dev": true
-		},
-		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.1.3",
-				"entities": "1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
-			}
-		},
-		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-			"dev": true
-		},
-		"domhandler": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.3.0"
-			}
-		},
-		"domutils": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-			"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-			"dev": true,
-			"requires": {
-				"dom-serializer": "0.1.0",
-				"domelementtype": "1.3.0"
-			}
-		},
-		"dot-prop": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-			"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
-			"dev": true,
-			"requires": {
-				"is-obj": "1.0.1"
-			}
-		},
-		"duplexer": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-			"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-			"dev": true
-		},
-		"duplexer2": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.14"
-			}
-		},
-		"duplexer3": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
-			"integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=",
-			"dev": true
-		},
-		"duplexify": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-			"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "1.4.0",
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.3",
-				"stream-shift": "1.0.0"
-			},
-			"dependencies": {
-				"end-of-stream": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-					"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-					"dev": true,
-					"requires": {
-						"once": "1.4.0"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"ecc-jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"jsbn": "0.1.1"
-			}
-		},
-		"end-of-stream": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-			"integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
-			"dev": true,
-			"requires": {
-				"once": "1.3.3"
-			},
-			"dependencies": {
-				"once": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-					"dev": true,
-					"requires": {
-						"wrappy": "1.0.2"
-					}
-				}
-			}
-		},
-		"entities": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-			"dev": true
-		},
-		"es5-ext": {
-			"version": "0.10.35",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
-			"integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
-			"dev": true,
-			"requires": {
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"es6-iterator": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"es6-promise": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-			"integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=",
-			"dev": true
-		},
-		"es6-symbol": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35"
-			}
-		},
-		"es6-weak-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-			"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35",
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-			"dev": true
-		},
-		"esutils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35"
-			}
-		},
-		"event-stream": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-			"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-			"dev": true,
-			"requires": {
-				"duplexer": "0.1.1",
-				"from": "0.1.7",
-				"map-stream": "0.1.0",
-				"pause-stream": "0.0.11",
-				"split": "0.3.3",
-				"stream-combiner": "0.0.4",
-				"through": "2.3.8"
-			}
-		},
-		"execa": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-			"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-			"dev": true,
-			"requires": {
-				"cross-spawn": "5.1.0",
-				"get-stream": "3.0.0",
-				"is-stream": "1.1.0",
-				"npm-run-path": "2.0.2",
-				"p-finally": "1.0.0",
-				"signal-exit": "3.0.2",
-				"strip-eof": "1.0.0"
-			}
-		},
-		"expand-brackets": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-			"dev": true,
-			"requires": {
-				"is-posix-bracket": "0.1.1"
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "2.2.3"
-			}
-		},
-		"expand-tilde": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-			"integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2"
-			}
-		},
-		"extend": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-		},
-		"extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-			"dev": true,
-			"requires": {
-				"is-extendable": "0.1.1"
-			}
-		},
-		"extglob": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
-		"fancy-log": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-			"integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"time-stamp": "1.1.0"
-			}
-		},
-		"fast-deep-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-			"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-			"dev": true
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-			"dev": true
-		},
-		"fd-slicer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-			"dev": true,
-			"requires": {
-				"pend": "1.2.0"
-			}
-		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
-		"fill-range": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-			"dev": true,
-			"requires": {
-				"is-number": "2.1.0",
-				"isobject": "2.1.0",
-				"randomatic": "1.1.7",
-				"repeat-element": "1.1.2",
-				"repeat-string": "1.6.1"
-			}
-		},
-		"find-index": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-			"integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-			"dev": true
-		},
-		"findup-sync": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
-			"integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=",
-			"dev": true,
-			"requires": {
-				"detect-file": "0.1.0",
-				"is-glob": "2.0.1",
-				"micromatch": "2.3.11",
-				"resolve-dir": "0.1.1"
-			}
-		},
-		"fined": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
-			"integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "2.0.2",
-				"is-plain-object": "2.0.4",
-				"object.defaults": "1.1.0",
-				"object.pick": "1.3.0",
-				"parse-filepath": "1.0.1"
-			},
-			"dependencies": {
-				"expand-tilde": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-					"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "1.0.1"
-					}
-				}
-			}
-		},
-		"first-chunk-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-			"integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-			"dev": true
-		},
-		"flagged-respawn": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
-			"integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
-			"dev": true
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"dev": true,
-			"requires": {
-				"for-in": "1.0.2"
-			}
-		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-			"dev": true,
-			"requires": {
-				"asynckit": "0.4.0",
-				"combined-stream": "1.0.5",
-				"mime-types": "2.1.17"
-			}
-		},
-		"from": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-			"integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-			"dev": true
-		},
-		"fs-exists-sync": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-			"integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
-			"dev": true
-		},
-		"fs.realpath": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-		},
-		"fsevents": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
-			"integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"nan": "2.8.0",
-				"node-pre-gyp": "0.6.39"
-			},
-			"dependencies": {
-				"abbrev": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz",
-					"integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=",
-					"dev": true,
-					"optional": true
-				},
-				"ajv": {
-					"version": "4.11.8",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-					"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"co": "4.6.0",
-						"json-stable-stringify": "1.0.1"
-					}
-				},
-				"ansi-regex": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-					"dev": true
-				},
-				"aproba": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz",
-					"integrity": "sha1-ldNgDwdxCqDpKYxyatXs8urLq6s=",
-					"dev": true,
-					"optional": true
-				},
-				"are-we-there-yet": {
-					"version": "1.1.4",
-					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-					"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"delegates": "1.0.0",
-						"readable-stream": "2.2.9"
-					}
-				},
-				"asn1": {
-					"version": "0.2.3",
-					"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-					"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-					"dev": true,
-					"optional": true
-				},
-				"assert-plus": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-					"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-					"dev": true,
-					"optional": true
-				},
-				"asynckit": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-					"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-					"dev": true,
-					"optional": true
-				},
-				"aws-sign2": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-					"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-					"dev": true,
-					"optional": true
-				},
-				"aws4": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-					"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-					"dev": true,
-					"optional": true
-				},
-				"balanced-match": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
-					"integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=",
-					"dev": true
-				},
-				"bcrypt-pbkdf": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-					"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"tweetnacl": "0.14.5"
-					}
-				},
-				"block-stream": {
-					"version": "0.0.9",
-					"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-					"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.3"
-					}
-				},
-				"boom": {
-					"version": "2.10.1",
-					"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-					"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.16.3"
-					}
-				},
-				"brace-expansion": {
-					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
-					"integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-					"dev": true,
-					"requires": {
-						"balanced-match": "0.4.2",
-						"concat-map": "0.0.1"
-					}
-				},
-				"buffer-shims": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
-					"integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
-					"dev": true
-				},
-				"caseless": {
-					"version": "0.12.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-					"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-					"dev": true,
-					"optional": true
-				},
-				"co": {
-					"version": "4.6.0",
-					"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-					"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-					"dev": true,
-					"optional": true
-				},
-				"code-point-at": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-					"dev": true
-				},
-				"combined-stream": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-					"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-					"dev": true,
-					"requires": {
-						"delayed-stream": "1.0.0"
-					}
-				},
-				"concat-map": {
-					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-					"dev": true
-				},
-				"console-control-strings": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-					"dev": true
-				},
-				"core-util-is": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-					"dev": true
-				},
-				"cryptiles": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-					"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-					"dev": true,
-					"requires": {
-						"boom": "2.10.1"
-					}
-				},
-				"dashdash": {
-					"version": "1.14.1",
-					"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-					"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-							"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"debug": {
-					"version": "2.6.8",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-					"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"deep-extend": {
-					"version": "0.4.2",
-					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
-					"integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
-					"dev": true,
-					"optional": true
-				},
-				"delayed-stream": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-					"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-					"dev": true
-				},
-				"delegates": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-					"dev": true,
-					"optional": true
-				},
-				"detect-libc": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.2.tgz",
-					"integrity": "sha1-ca1dIEvxempsqPRQxhRUBm70YeE=",
-					"dev": true,
-					"optional": true
-				},
-				"ecc-jsbn": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-					"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsbn": "0.1.1"
-					}
-				},
-				"extend": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-					"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-					"dev": true,
-					"optional": true
-				},
-				"extsprintf": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz",
-					"integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=",
-					"dev": true
-				},
-				"forever-agent": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-					"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-					"dev": true,
-					"optional": true
-				},
-				"form-data": {
-					"version": "2.1.4",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-					"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.15"
-					}
-				},
-				"fs.realpath": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-					"dev": true
-				},
-				"fstream": {
-					"version": "1.0.11",
-					"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-					"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "4.1.11",
-						"inherits": "2.0.3",
-						"mkdirp": "0.5.1",
-						"rimraf": "2.6.1"
-					}
-				},
-				"fstream-ignore": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
-					"integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"fstream": "1.0.11",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4"
-					}
-				},
-				"gauge": {
-					"version": "2.7.4",
-					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aproba": "1.1.1",
-						"console-control-strings": "1.1.0",
-						"has-unicode": "2.0.1",
-						"object-assign": "4.1.1",
-						"signal-exit": "3.0.2",
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1",
-						"wide-align": "1.1.2"
-					}
-				},
-				"getpass": {
-					"version": "0.1.7",
-					"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-					"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-							"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"glob": {
-					"version": "7.1.2",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-					"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "1.0.0",
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"har-schema": {
-					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-					"integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-					"dev": true,
-					"optional": true
-				},
-				"har-validator": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-					"integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"ajv": "4.11.8",
-						"har-schema": "1.0.5"
-					}
-				},
-				"has-unicode": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-					"dev": true,
-					"optional": true
-				},
-				"hawk": {
-					"version": "3.1.3",
-					"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-					"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-					"dev": true,
-					"requires": {
-						"boom": "2.10.1",
-						"cryptiles": "2.0.5",
-						"hoek": "2.16.3",
-						"sntp": "1.0.9"
-					}
-				},
-				"hoek": {
-					"version": "2.16.3",
-					"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-					"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-					"dev": true
-				},
-				"http-signature": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-					"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "0.2.0",
-						"jsprim": "1.4.0",
-						"sshpk": "1.13.0"
-					}
-				},
-				"inflight": {
-					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-					"dev": true,
-					"requires": {
-						"once": "1.4.0",
-						"wrappy": "1.0.2"
-					}
-				},
-				"inherits": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-					"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-					"dev": true
-				},
-				"ini": {
-					"version": "1.3.4",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-					"integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
-					"dev": true,
-					"optional": true
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"is-typedarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-					"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-					"dev": true,
-					"optional": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"isstream": {
-					"version": "0.1.2",
-					"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-					"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-					"dev": true,
-					"optional": true
-				},
-				"jodid25519": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
-					"integrity": "sha1-BtSRIlUJNBlHfUJWM2BuDpB4KWc=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsbn": "0.1.1"
-					}
-				},
-				"jsbn": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-					"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-					"dev": true,
-					"optional": true
-				},
-				"json-schema": {
-					"version": "0.2.3",
-					"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-					"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-					"dev": true,
-					"optional": true
-				},
-				"json-stable-stringify": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-					"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"jsonify": "0.0.0"
-					}
-				},
-				"json-stringify-safe": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-					"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-					"dev": true,
-					"optional": true
-				},
-				"jsonify": {
-					"version": "0.0.0",
-					"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-					"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-					"dev": true,
-					"optional": true
-				},
-				"jsprim": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz",
-					"integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"extsprintf": "1.0.2",
-						"json-schema": "0.2.3",
-						"verror": "1.3.6"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-							"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"mime-db": {
-					"version": "1.27.0",
-					"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz",
-					"integrity": "sha1-gg9XIpa70g7CXtVeW13oaeVDbrE=",
-					"dev": true
-				},
-				"mime-types": {
-					"version": "2.1.15",
-					"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz",
-					"integrity": "sha1-pOv1BkCUVpI3uM9wBGd20J/JKu0=",
-					"dev": true,
-					"requires": {
-						"mime-db": "1.27.0"
-					}
-				},
-				"minimatch": {
-					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.7"
-					}
-				},
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
-				},
-				"ms": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-					"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-					"dev": true,
-					"optional": true
-				},
-				"node-pre-gyp": {
-					"version": "0.6.39",
-					"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz",
-					"integrity": "sha512-OsJV74qxnvz/AMGgcfZoDaeDXKD3oY3QVIbBmwszTFkRisTSXbMQyn4UWzUMOtA5SVhrBZOTp0wcoSBgfMfMmQ==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"detect-libc": "1.0.2",
-						"hawk": "3.1.3",
-						"mkdirp": "0.5.1",
-						"nopt": "4.0.1",
-						"npmlog": "4.1.0",
-						"rc": "1.2.1",
-						"request": "2.81.0",
-						"rimraf": "2.6.1",
-						"semver": "5.3.0",
-						"tar": "2.2.1",
-						"tar-pack": "3.4.0"
-					}
-				},
-				"nopt": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"abbrev": "1.1.0",
-						"osenv": "0.1.4"
-					}
-				},
-				"npmlog": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz",
-					"integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"are-we-there-yet": "1.1.4",
-						"console-control-strings": "1.1.0",
-						"gauge": "2.7.4",
-						"set-blocking": "2.0.0"
-					}
-				},
-				"number-is-nan": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-					"dev": true
-				},
-				"oauth-sign": {
-					"version": "0.8.2",
-					"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-					"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-					"dev": true,
-					"optional": true
-				},
-				"object-assign": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-					"dev": true,
-					"optional": true
-				},
-				"once": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-					"dev": true,
-					"requires": {
-						"wrappy": "1.0.2"
-					}
-				},
-				"os-homedir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-					"dev": true,
-					"optional": true
-				},
-				"os-tmpdir": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-					"dev": true,
-					"optional": true
-				},
-				"osenv": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-					"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"os-homedir": "1.0.2",
-						"os-tmpdir": "1.0.2"
-					}
-				},
-				"path-is-absolute": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-					"dev": true
-				},
-				"performance-now": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-					"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-					"dev": true,
-					"optional": true
-				},
-				"process-nextick-args": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-					"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-					"dev": true
-				},
-				"punycode": {
-					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-					"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-					"dev": true,
-					"optional": true
-				},
-				"qs": {
-					"version": "6.4.0",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-					"integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-					"dev": true,
-					"optional": true
-				},
-				"rc": {
-					"version": "1.2.1",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
-					"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"deep-extend": "0.4.2",
-						"ini": "1.3.4",
-						"minimist": "1.2.0",
-						"strip-json-comments": "2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"readable-stream": {
-					"version": "2.2.9",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.9.tgz",
-					"integrity": "sha1-z3jsb0ptHrQ9JkiMrJfwQudLf8g=",
-					"dev": true,
-					"requires": {
-						"buffer-shims": "1.0.0",
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"string_decoder": "1.0.1",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"request": {
-					"version": "2.81.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-					"integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"caseless": "0.12.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "2.1.4",
-						"har-validator": "4.2.1",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.15",
-						"oauth-sign": "0.8.2",
-						"performance-now": "0.2.0",
-						"qs": "6.4.0",
-						"safe-buffer": "5.0.1",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.2",
-						"tunnel-agent": "0.6.0",
-						"uuid": "3.0.1"
-					}
-				},
-				"rimraf": {
-					"version": "2.6.1",
-					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
-					"integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-					"dev": true,
-					"requires": {
-						"glob": "7.1.2"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
-					"integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.3.0",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-					"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-					"dev": true,
-					"optional": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-					"dev": true,
-					"optional": true
-				},
-				"signal-exit": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-					"dev": true,
-					"optional": true
-				},
-				"sntp": {
-					"version": "1.0.9",
-					"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-					"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-					"dev": true,
-					"requires": {
-						"hoek": "2.16.3"
-					}
-				},
-				"sshpk": {
-					"version": "1.13.0",
-					"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.0.tgz",
-					"integrity": "sha1-/yo+T9BEl1Vf7Zezmg/YL6+zozw=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"asn1": "0.2.3",
-						"assert-plus": "1.0.0",
-						"bcrypt-pbkdf": "1.0.1",
-						"dashdash": "1.14.1",
-						"ecc-jsbn": "0.1.1",
-						"getpass": "0.1.7",
-						"jodid25519": "1.0.2",
-						"jsbn": "0.1.1",
-						"tweetnacl": "0.14.5"
-					},
-					"dependencies": {
-						"assert-plus": {
-							"version": "1.0.0",
-							"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-							"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-							"dev": true,
-							"optional": true
-						}
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-					"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.0.1"
-					}
-				},
-				"stringstream": {
-					"version": "0.0.5",
-					"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-					"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-					"dev": true,
-					"optional": true
-				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"strip-json-comments": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-					"dev": true,
-					"optional": true
-				},
-				"tar": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-					"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-					"dev": true,
-					"requires": {
-						"block-stream": "0.0.9",
-						"fstream": "1.0.11",
-						"inherits": "2.0.3"
-					}
-				},
-				"tar-pack": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz",
-					"integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"debug": "2.6.8",
-						"fstream": "1.0.11",
-						"fstream-ignore": "1.0.5",
-						"once": "1.4.0",
-						"readable-stream": "2.2.9",
-						"rimraf": "2.6.1",
-						"tar": "2.2.1",
-						"uid-number": "0.0.6"
-					}
-				},
-				"tough-cookie": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz",
-					"integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"punycode": "1.4.1"
-					}
-				},
-				"tunnel-agent": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-					"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"safe-buffer": "5.0.1"
-					}
-				},
-				"tweetnacl": {
-					"version": "0.14.5",
-					"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-					"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-					"dev": true,
-					"optional": true
-				},
-				"uid-number": {
-					"version": "0.0.6",
-					"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz",
-					"integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=",
-					"dev": true,
-					"optional": true
-				},
-				"util-deprecate": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-					"dev": true
-				},
-				"uuid": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz",
-					"integrity": "sha1-ZUS7ot/ajBzxfmKaOjBeK7H+5sE=",
-					"dev": true,
-					"optional": true
-				},
-				"verror": {
-					"version": "1.3.6",
-					"resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz",
-					"integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"extsprintf": "1.0.2"
-					}
-				},
-				"wide-align": {
-					"version": "1.1.2",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-					"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"string-width": "1.0.2"
-					}
-				},
-				"wrappy": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-					"dev": true
-				}
-			}
-		},
-		"fstream": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"inherits": "2.0.3",
-				"mkdirp": "0.5.1",
-				"rimraf": "2.6.2"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-			"integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
-			"dev": true,
-			"requires": {
-				"globule": "0.1.0"
-			}
-		},
-		"generate-function": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-			"dev": true
-		},
-		"generate-object-property": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-			"dev": true,
-			"requires": {
-				"is-property": "1.0.2"
-			}
-		},
-		"get-stream": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-			"integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-			"dev": true
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"glob": {
-			"version": "7.1.2",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-			"requires": {
-				"fs.realpath": "1.0.0",
-				"inflight": "1.0.6",
-				"inherits": "2.0.3",
-				"minimatch": "3.0.4",
-				"once": "1.4.0",
-				"path-is-absolute": "1.0.1"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "2.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"glob-parent": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-			"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-			"dev": true,
-			"requires": {
-				"is-glob": "2.0.1"
-			}
-		},
-		"glob-stream": {
-			"version": "3.1.18",
-			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-			"integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
-			"dev": true,
-			"requires": {
-				"glob": "4.5.3",
-				"glob2base": "0.0.12",
-				"minimatch": "2.0.10",
-				"ordered-read-streams": "0.1.0",
-				"through2": "0.6.5",
-				"unique-stream": "1.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "4.5.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-					"integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-					"dev": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "2.0.10",
-						"once": "1.4.0"
-					}
-				},
-				"minimatch": {
-					"version": "2.0.10",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-					"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "1.1.8"
-					}
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				}
-			}
-		},
-		"glob-watcher": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-			"integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
-			"dev": true,
-			"requires": {
-				"gaze": "0.5.2"
-			}
-		},
-		"glob2base": {
-			"version": "0.0.12",
-			"resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-			"integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
-			"dev": true,
-			"requires": {
-				"find-index": "0.1.1"
-			}
-		},
-		"global-dirs": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-			"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
-			"dev": true,
-			"requires": {
-				"ini": "1.3.5"
-			}
-		},
-		"global-modules": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-			"integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
-			"dev": true,
-			"requires": {
-				"global-prefix": "0.1.5",
-				"is-windows": "0.2.0"
-			}
-		},
-		"global-prefix": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-			"integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "1.0.1",
-				"ini": "1.3.5",
-				"is-windows": "0.2.0",
-				"which": "1.3.0"
-			}
-		},
-		"globby": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-			"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-			"dev": true,
-			"requires": {
-				"array-union": "1.0.2",
-				"glob": "7.1.2",
-				"object-assign": "4.1.1",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1"
-			},
-			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
-				}
-			}
-		},
-		"globule": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-			"integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
-			"dev": true,
-			"requires": {
-				"glob": "3.1.21",
-				"lodash": "1.0.2",
-				"minimatch": "0.2.14"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "3.1.21",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-					"integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "1.2.3",
-						"inherits": "1.0.2",
-						"minimatch": "0.2.14"
-					}
-				},
-				"graceful-fs": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-					"integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-					"integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-					"dev": true
-				},
-				"lru-cache": {
-					"version": "2.7.3",
-					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-					"integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "0.2.14",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-					"integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "2.7.3",
-						"sigmund": "1.0.1"
-					}
-				}
-			}
-		},
-		"glogg": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-			"integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-			"dev": true,
-			"requires": {
-				"sparkles": "1.0.0"
-			}
-		},
-		"got": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-			"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-			"dev": true,
-			"requires": {
-				"create-error-class": "3.0.2",
-				"duplexer3": "0.1.4",
-				"get-stream": "3.0.0",
-				"is-redirect": "1.0.0",
-				"is-retry-allowed": "1.1.0",
-				"is-stream": "1.1.0",
-				"lowercase-keys": "1.0.0",
-				"safe-buffer": "5.1.1",
-				"timed-out": "4.0.1",
-				"unzip-response": "2.0.1",
-				"url-parse-lax": "1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "3.0.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-			"integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-			"dev": true,
-			"requires": {
-				"natives": "1.1.0"
-			}
-		},
-		"growl": {
-			"version": "1.10.3",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
-			"integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
-			"dev": true
-		},
-		"gulp": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-			"integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
-			"dev": true,
-			"requires": {
-				"archy": "1.0.0",
-				"chalk": "1.1.3",
-				"deprecated": "0.0.1",
-				"gulp-util": "3.0.8",
-				"interpret": "1.0.4",
-				"liftoff": "2.3.0",
-				"minimist": "1.2.0",
-				"orchestrator": "0.3.8",
-				"pretty-hrtime": "1.0.3",
-				"semver": "4.3.6",
-				"tildify": "1.2.0",
-				"v8flags": "2.1.1",
-				"vinyl-fs": "0.3.14"
-			}
-		},
-		"gulp-chmod": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-2.0.0.tgz",
-			"integrity": "sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=",
-			"dev": true,
-			"requires": {
-				"deep-assign": "1.0.0",
-				"stat-mode": "0.2.2",
-				"through2": "2.0.3"
-			}
-		},
-		"gulp-filter": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.0.1.tgz",
-			"integrity": "sha512-5olRzAhFdXB2klCu1lnazP65aO9YdA/5WfC9VdInIc8PrUeDIoZfaA3Edb0yUBGhVdHv4eHKL9Fg5tUoEJ9z5A==",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"multimatch": "2.1.0",
-				"streamfilter": "1.0.5"
-			}
-		},
-		"gulp-gunzip": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz",
-			"integrity": "sha1-FbdBFF6Dqcb1CIYkG1fMWHHxUak=",
-			"dev": true,
-			"requires": {
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"gulp-remote-src": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz",
-			"integrity": "sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"node.extend": "1.1.6",
-				"request": "2.79.0",
-				"through2": "2.0.3",
-				"vinyl": "2.0.2"
-			},
-			"dependencies": {
-				"clone-stats": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-					"dev": true
-				},
-				"replace-ext": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-					"dev": true
-				},
-				"request": {
-					"version": "2.79.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"caseless": "0.11.0",
-						"combined-stream": "1.0.5",
-						"extend": "3.0.1",
-						"forever-agent": "0.6.1",
-						"form-data": "2.1.4",
-						"har-validator": "2.0.6",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.17",
-						"oauth-sign": "0.8.2",
-						"qs": "6.3.2",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.3",
-						"tunnel-agent": "0.4.3",
-						"uuid": "3.1.0"
-					}
-				},
-				"vinyl": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-					"integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-buffer": "1.0.0",
-						"clone-stats": "1.0.0",
-						"cloneable-readable": "1.0.0",
-						"is-stream": "1.1.0",
-						"remove-trailing-separator": "1.1.0",
-						"replace-ext": "1.0.0"
-					}
-				}
-			}
-		},
-		"gulp-sourcemaps": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz",
-			"integrity": "sha512-1qHCI3hdmsMdq/SUotxwUh/L8YzlI6J9zQ5ifNOtx4Y6KV5y5sGuORv1KZzWhuKtz/mXNh5xLESUtwC4EndCjA==",
-			"dev": true,
-			"requires": {
-				"@gulp-sourcemaps/identity-map": "1.0.1",
-				"@gulp-sourcemaps/map-sources": "1.0.0",
-				"acorn": "4.0.13",
-				"convert-source-map": "1.5.0",
-				"css": "2.2.1",
-				"debug-fabulous": "0.2.1",
-				"detect-newline": "2.1.0",
-				"graceful-fs": "4.1.11",
-				"source-map": "0.6.1",
-				"strip-bom-string": "1.0.0",
-				"through2": "2.0.3",
-				"vinyl": "1.2.0"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				}
-			}
-		},
-		"gulp-symdest": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz",
-			"integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"mkdirp": "0.5.1",
-				"queue": "3.1.0",
-				"vinyl-fs": "2.4.4"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "3.0.1",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.0",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "2.3.3"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "3.5.1",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "2.3.3",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					}
-				}
-			}
-		},
-		"gulp-tsb": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/gulp-tsb/-/gulp-tsb-2.0.4.tgz",
-			"integrity": "sha1-CymAktTf1OXP2AZ57Uwdk7/bpko=",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"through": "2.3.8",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"gulp-tslint": {
-			"version": "8.1.2",
-			"resolved": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.2.tgz",
-			"integrity": "sha512-0RNGqbp2TKPdbG+sWU3mNMXEMuF/noY1KS4+jd5lOStkvuFINkFL29dHX3IT1u+vVFD4Glwf+lkcdR2QMVNMzA==",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"map-stream": "0.0.7",
-				"through": "2.3.8"
-			},
-			"dependencies": {
-				"map-stream": {
-					"version": "0.0.7",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-					"integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-					"dev": true
-				}
-			}
-		},
-		"gulp-typescript": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-3.2.2.tgz",
-			"integrity": "sha1-t+Xh08s193LlPmBAJmAYJuK+d/w=",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"source-map": "0.5.7",
-				"through2": "2.0.3",
-				"vinyl-fs": "2.4.4"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "3.0.1",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.0",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "2.3.3"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "3.5.1",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "2.3.3",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					}
-				}
-			}
-		},
-		"gulp-uglify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-2.0.0.tgz",
-			"integrity": "sha1-y+Sq5P4La912AzW8RvIA//aZxK8=",
-			"dev": true,
-			"requires": {
-				"gulplog": "1.0.0",
-				"has-gulplog": "0.1.0",
-				"lodash": "4.17.4",
-				"make-error-cause": "1.2.2",
-				"through2": "2.0.3",
-				"uglify-js": "2.7.0",
-				"uglify-save-license": "0.4.1",
-				"vinyl-sourcemaps-apply": "0.2.1"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"gulp-untar": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.6.tgz",
-			"integrity": "sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"gulp-util": "3.0.8",
-				"streamifier": "0.1.1",
-				"tar": "2.2.1",
-				"through2": "2.0.3"
-			}
-		},
-		"gulp-util": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-			"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-			"dev": true,
-			"requires": {
-				"array-differ": "1.0.0",
-				"array-uniq": "1.0.3",
-				"beeper": "1.1.1",
-				"chalk": "1.1.3",
-				"dateformat": "2.2.0",
-				"fancy-log": "1.3.0",
-				"gulplog": "1.0.0",
-				"has-gulplog": "0.1.0",
-				"lodash._reescape": "3.0.0",
-				"lodash._reevaluate": "3.0.0",
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.template": "3.6.2",
-				"minimist": "1.2.0",
-				"multipipe": "0.1.2",
-				"object-assign": "3.0.0",
-				"replace-ext": "0.0.1",
-				"through2": "2.0.3",
-				"vinyl": "0.5.3"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-					"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-					"dev": true
-				}
-			}
-		},
-		"gulp-vinyl-zip": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz",
-			"integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"queue": "4.4.2",
-				"through2": "2.0.3",
-				"vinyl": "2.1.0",
-				"vinyl-fs": "2.4.4",
-				"yauzl": "2.9.1",
-				"yazl": "2.4.3"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-					"integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-					"dev": true
-				},
-				"clone-stats": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-					"dev": true
-				},
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "3.0.1",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "2.0.3",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.0",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					},
-					"dependencies": {
-						"clone": {
-							"version": "1.0.3",
-							"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-							"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-							"dev": true
-						},
-						"clone-stats": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-							"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-							"dev": true
-						},
-						"replace-ext": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-							"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-							"dev": true
-						},
-						"vinyl": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-							"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-							"dev": true,
-							"requires": {
-								"clone": "1.0.3",
-								"clone-stats": "0.0.1",
-								"replace-ext": "0.0.1"
-							}
-						}
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "2.3.3"
-					}
-				},
-				"queue": {
-					"version": "4.4.2",
-					"resolved": "https://registry.npmjs.org/queue/-/queue-4.4.2.tgz",
-					"integrity": "sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "2.0.3"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"replace-ext": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
-					"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
-					"dev": true,
-					"requires": {
-						"clone": "2.1.1",
-						"clone-buffer": "1.0.0",
-						"clone-stats": "1.0.0",
-						"cloneable-readable": "1.0.0",
-						"remove-trailing-separator": "1.1.0",
-						"replace-ext": "1.0.0"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "3.5.1",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "2.3.3",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					},
-					"dependencies": {
-						"clone": {
-							"version": "1.0.3",
-							"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-							"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-							"dev": true
-						},
-						"clone-stats": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-							"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-							"dev": true
-						},
-						"replace-ext": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-							"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-							"dev": true
-						},
-						"vinyl": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-							"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-							"dev": true,
-							"requires": {
-								"clone": "1.0.3",
-								"clone-stats": "0.0.1",
-								"replace-ext": "0.0.1"
-							}
-						}
-					}
-				}
-			}
-		},
-		"gulplog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-			"dev": true,
-			"requires": {
-				"glogg": "1.0.0"
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
-		},
-		"har-validator": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-			"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"commander": "2.11.0",
-				"is-my-json-valid": "2.16.1",
-				"pinkie-promise": "2.0.1"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "2.1.1"
-			}
-		},
-		"has-flag": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-			"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-			"dev": true
-		},
-		"has-gulplog": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-			"dev": true,
-			"requires": {
-				"sparkles": "1.0.0"
-			}
-		},
-		"hawk": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-			"dev": true,
-			"requires": {
-				"boom": "2.10.1",
-				"cryptiles": "2.0.5",
-				"hoek": "2.16.3",
-				"sntp": "1.0.9"
-			}
-		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-			"dev": true
-		},
-		"hoek": {
-			"version": "2.16.3",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-			"dev": true
-		},
-		"homedir-polyfill": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-			"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-			"dev": true,
-			"requires": {
-				"parse-passwd": "1.0.0"
-			}
-		},
-		"htmlparser2": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.3.0",
-				"domhandler": "2.4.1",
-				"domutils": "1.5.1",
-				"entities": "1.1.1",
-				"inherits": "2.0.3",
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"http-proxy-agent": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-			"integrity": "sha1-4X/aZfCQLZUs55IeYsf/iGJlWl4=",
-			"requires": {
-				"agent-base": "1.0.2",
-				"debug": "2.6.9",
-				"extend": "3.0.1"
-			}
-		},
-		"http-signature": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "0.2.0",
-				"jsprim": "1.4.1",
-				"sshpk": "1.13.1"
-			}
-		},
-		"https-proxy-agent": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-			"integrity": "sha1-cT+jjl01P1DrFKNC/r4pAz7RYZs=",
-			"requires": {
-				"agent-base": "1.0.2",
-				"debug": "2.6.9",
-				"extend": "3.0.1"
-			}
-		},
-		"iconv-lite": {
-			"version": "0.4.19",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-			"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-			"dev": true
-		},
-		"ignore-by-default": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
-			"integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=",
-			"dev": true
-		},
-		"import-lazy": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-			"integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=",
-			"dev": true
-		},
-		"imurmurhash": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-			"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-			"dev": true
-		},
-		"inflight": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"requires": {
-				"once": "1.4.0",
-				"wrappy": "1.0.2"
-			}
-		},
-		"inherits": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-		},
-		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-			"dev": true
-		},
-		"interpret": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
-			"integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
-			"dev": true
-		},
-		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-			"dev": true
-		},
-		"is": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-			"dev": true
-		},
-		"is-absolute": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
-			"integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
-			"dev": true,
-			"requires": {
-				"is-relative": "0.2.1",
-				"is-windows": "0.2.0"
-			}
-		},
-		"is-binary-path": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-			"dev": true,
-			"requires": {
-				"binary-extensions": "1.11.0"
-			}
-		},
-		"is-buffer": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-			"dev": true
-		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "2.0.0"
-			}
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
-		"is-extglob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-			"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-			"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-			"dev": true
-		},
-		"is-glob": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-			"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"is-installed-globally": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-			"integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
-			"dev": true,
-			"requires": {
-				"global-dirs": "0.1.1",
-				"is-path-inside": "1.0.0"
-			}
-		},
-		"is-my-json-valid": {
-			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-			"integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
-			"dev": true,
-			"requires": {
-				"generate-function": "2.0.0",
-				"generate-object-property": "1.2.0",
-				"jsonpointer": "4.0.1",
-				"xtend": "4.0.1"
-			}
-		},
-		"is-npm": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-			"integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
-			"dev": true
-		},
-		"is-number": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-			"dev": true,
-			"requires": {
-				"kind-of": "3.2.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-			"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "1.0.2"
-			}
-		},
-		"is-plain-object": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-			"dev": true,
-			"requires": {
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-property": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-			"dev": true
-		},
-		"is-redirect": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-			"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-			"integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "0.1.2"
-			}
-		},
-		"is-retry-allowed": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-			"integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-			"dev": true
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
-		"is-unc-path": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
-			"integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"is-valid-glob": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-			"integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-			"dev": true
-		},
-		"is-windows": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-			"integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-			"dev": true
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"isobject": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-			"dev": true,
-			"requires": {
-				"isarray": "1.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				}
-			}
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true,
-			"optional": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-			"dev": true
-		},
-		"json-stable-stringify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"dev": true,
-			"requires": {
-				"jsonify": "0.0.0"
-			}
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
-		},
-		"jsonify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-			"dev": true
-		},
-		"jsonpointer": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-			"dev": true
-		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"requires": {
-				"is-buffer": "1.1.6"
-			}
-		},
-		"latest-version": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-			"integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
-			"dev": true,
-			"requires": {
-				"package-json": "4.0.1"
-			}
-		},
-		"lazy-cache": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
-			"integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
-			"dev": true
-		},
-		"lazystream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-			"dev": true,
-			"requires": {
-				"invert-kv": "1.0.0"
-			}
-		},
-		"liftoff": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
-			"integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=",
-			"dev": true,
-			"requires": {
-				"extend": "3.0.1",
-				"findup-sync": "0.4.3",
-				"fined": "1.1.0",
-				"flagged-respawn": "0.3.2",
-				"lodash.isplainobject": "4.0.6",
-				"lodash.isstring": "4.0.1",
-				"lodash.mapvalues": "4.6.0",
-				"rechoir": "0.6.2",
-				"resolve": "1.5.0"
-			}
-		},
-		"linkify-it": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-			"integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-			"dev": true,
-			"requires": {
-				"uc.micro": "1.0.3"
-			}
-		},
-		"lodash": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-			"integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
-			"dev": true
-		},
-		"lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash.keys": "3.1.2"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._basetostring": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-			"integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-			"dev": true
-		},
-		"lodash._basevalues": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-			"integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-			"dev": true
-		},
-		"lodash._bindcallback": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-			"integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-			"dev": true
-		},
-		"lodash._createassigner": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-			"integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
-			"dev": true,
-			"requires": {
-				"lodash._bindcallback": "3.0.1",
-				"lodash._isiterateecall": "3.0.9",
-				"lodash.restparam": "3.6.1"
-			}
-		},
-		"lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash._reescape": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-			"integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-			"dev": true
-		},
-		"lodash._reevaluate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-			"integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-			"dev": true
-		},
-		"lodash._reinterpolate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-			"dev": true
-		},
-		"lodash._root": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-			"integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-			"dev": true
-		},
-		"lodash.assign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
-			"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "3.2.0",
-				"lodash._createassigner": "3.1.1",
-				"lodash.keys": "3.1.2"
-			}
-		},
-		"lodash.defaults": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
-			"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
-			"dev": true,
-			"requires": {
-				"lodash.assign": "3.2.0",
-				"lodash.restparam": "3.6.1"
-			}
-		},
-		"lodash.escape": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-			"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-			"dev": true,
-			"requires": {
-				"lodash._root": "3.0.1"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-			"dev": true
-		},
-		"lodash.isplainobject": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-			"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-			"dev": true
-		},
-		"lodash.isstring": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-			"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-			"dev": true
-		},
-		"lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "3.9.1",
-				"lodash.isarguments": "3.1.0",
-				"lodash.isarray": "3.0.4"
-			}
-		},
-		"lodash.mapvalues": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-			"integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-			"dev": true
-		},
-		"lodash.restparam": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-			"dev": true
-		},
-		"lodash.template": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-			"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash._basetostring": "3.0.1",
-				"lodash._basevalues": "3.0.0",
-				"lodash._isiterateecall": "3.0.9",
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.escape": "3.2.0",
-				"lodash.keys": "3.1.2",
-				"lodash.restparam": "3.6.1",
-				"lodash.templatesettings": "3.1.1"
-			}
-		},
-		"lodash.templatesettings": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-			"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.escape": "3.2.0"
-			}
-		},
-		"longest": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
-			"integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
-			"dev": true
-		},
-		"lowercase-keys": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
-			"integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
-			"dev": true
-		},
-		"lru-cache": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-			"integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
-			"dev": true,
-			"requires": {
-				"pseudomap": "1.0.2",
-				"yallist": "2.1.2"
-			}
-		},
-		"lru-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.35"
-			}
-		},
-		"make-dir": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
-			"integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
-			"dev": true,
-			"requires": {
-				"pify": "3.0.0"
-			}
-		},
-		"make-error": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.0.tgz",
-			"integrity": "sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y=",
-			"dev": true
-		},
-		"make-error-cause": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz",
-			"integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
-			"dev": true,
-			"requires": {
-				"make-error": "1.3.0"
-			}
-		},
-		"map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true
-		},
-		"map-stream": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-			"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-			"dev": true
-		},
-		"markdown-it": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz",
-			"integrity": "sha512-tNuOCCfunY5v5uhcO2AUMArvKAyKMygX8tfup/JrgnsDqcCATQsAExBq7o5Ml9iMmO82bk6jYNLj6khcrl0JGA==",
-			"dev": true,
-			"requires": {
-				"argparse": "1.0.9",
-				"entities": "1.1.1",
-				"linkify-it": "2.0.3",
-				"mdurl": "1.0.1",
-				"uc.micro": "1.0.3"
-			}
-		},
-		"mdurl": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-			"dev": true
-		},
-		"memoizee": {
-			"version": "0.4.11",
-			"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz",
-			"integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.35",
-				"es6-weak-map": "2.0.2",
-				"event-emitter": "0.3.5",
-				"is-promise": "2.1.0",
-				"lru-queue": "0.1.0",
-				"next-tick": "1.0.0",
-				"timers-ext": "0.1.2"
-			}
-		},
-		"merge-stream": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"micromatch": {
-			"version": "2.3.11",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-			"dev": true,
-			"requires": {
-				"arr-diff": "2.0.0",
-				"array-unique": "0.2.1",
-				"braces": "1.8.5",
-				"expand-brackets": "0.1.5",
-				"extglob": "0.3.2",
-				"filename-regex": "2.0.1",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1",
-				"kind-of": "3.2.2",
-				"normalize-path": "2.1.1",
-				"object.omit": "2.0.1",
-				"parse-glob": "3.0.4",
-				"regex-cache": "0.4.4"
-			}
-		},
-		"mime": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.5.0.tgz",
-			"integrity": "sha512-v/jMDoK/qKptnTuC3YUNbIj8uUYvTCIHzVu9BHldKSWja48wusAtfjlcBlqnFrqClu3yf69ScDxBPrIyFnF51g==",
-			"dev": true
-		},
-		"mime-db": {
-			"version": "1.30.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-			"integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.17",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-			"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.30.0"
-			}
-		},
-		"minimatch": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-			"requires": {
-				"brace-expansion": "1.1.8"
-			}
-		},
-		"minimist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-			"dev": true
-		},
-		"mkdirp": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-			"dev": true,
-			"requires": {
-				"minimist": "0.0.8"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				}
-			}
-		},
-		"mocha": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
-			"integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
-			"dev": true,
-			"requires": {
-				"browser-stdout": "1.3.0",
-				"commander": "2.11.0",
-				"debug": "3.1.0",
-				"diff": "3.3.1",
-				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.2",
-				"growl": "1.10.3",
-				"he": "1.1.1",
-				"mkdirp": "0.5.1",
-				"supports-color": "4.4.0"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "2.0.0"
-					}
-				},
-				"supports-color": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-					"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-		},
-		"multimatch": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-			"dev": true,
-			"requires": {
-				"array-differ": "1.0.0",
-				"array-union": "1.0.2",
-				"arrify": "1.0.1",
-				"minimatch": "3.0.4"
-			}
-		},
-		"multipipe": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-			"integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-			"dev": true,
-			"requires": {
-				"duplexer2": "0.0.2"
-			}
-		},
-		"mute-stream": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-			"dev": true
-		},
-		"nan": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-			"integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-			"dev": true,
-			"optional": true
-		},
-		"natives": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-			"integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-			"dev": true
-		},
-		"next-tick": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-			"dev": true
-		},
-		"node.extend": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz",
-			"integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=",
-			"dev": true,
-			"requires": {
-				"is": "3.2.1"
-			}
-		},
-		"nodemon": {
-			"version": "1.12.1",
-			"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.12.1.tgz",
-			"integrity": "sha1-mWpW3EnZ8Wu/G3ik3gjxNjSzh40=",
-			"dev": true,
-			"requires": {
-				"chokidar": "1.7.0",
-				"debug": "2.6.9",
-				"es6-promise": "3.3.1",
-				"ignore-by-default": "1.0.1",
-				"lodash.defaults": "3.1.2",
-				"minimatch": "3.0.4",
-				"ps-tree": "1.1.0",
-				"touch": "3.1.0",
-				"undefsafe": "0.0.3",
-				"update-notifier": "2.3.0"
-			}
-		},
-		"nopt": {
-			"version": "1.0.10",
-			"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
-			"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
-			"dev": true,
-			"requires": {
-				"abbrev": "1.1.1"
-			}
-		},
-		"normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
-			"requires": {
-				"remove-trailing-separator": "1.1.0"
-			}
-		},
-		"npm-run-path": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-			"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-			"dev": true,
-			"requires": {
-				"path-key": "2.0.1"
-			}
-		},
-		"nth-check": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-			"integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-			"dev": true,
-			"requires": {
-				"boolbase": "1.0.0"
-			}
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-			"dev": true
-		},
-		"oauth-sign": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-			"dev": true
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true
-		},
-		"object.defaults": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-			"dev": true,
-			"requires": {
-				"array-each": "1.0.1",
-				"array-slice": "1.0.0",
-				"for-own": "1.0.0",
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-					"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-					"dev": true,
-					"requires": {
-						"for-in": "1.0.2"
-					}
-				},
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "0.1.5",
-				"is-extendable": "0.1.1"
-			}
-		},
-		"object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-			"dev": true,
-			"requires": {
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"requires": {
-				"wrappy": "1.0.2"
-			}
-		},
-		"orchestrator": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-			"integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "0.1.5",
-				"sequencify": "0.0.7",
-				"stream-consume": "0.1.0"
-			}
-		},
-		"ordered-read-streams": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-			"integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-			"dev": true
-		},
-		"os-homedir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
-		},
-		"os-locale": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-			"dev": true,
-			"requires": {
-				"lcid": "1.0.0"
-			}
-		},
-		"os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-			"dev": true
-		},
-		"osenv": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2",
-				"os-tmpdir": "1.0.2"
-			}
-		},
-		"p-finally": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-			"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-			"dev": true
-		},
-		"p-map": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-			"dev": true
-		},
-		"package-json": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-			"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
-			"dev": true,
-			"requires": {
-				"got": "6.7.1",
-				"registry-auth-token": "3.3.1",
-				"registry-url": "3.1.0",
-				"semver": "5.4.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"parse-filepath": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
-			"integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=",
-			"dev": true,
-			"requires": {
-				"is-absolute": "0.2.6",
-				"map-cache": "0.2.2",
-				"path-root": "0.1.1"
-			}
-		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "0.3.0",
-				"is-dotfile": "1.0.3",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
-		},
-		"parse-semver": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-			"dev": true,
-			"requires": {
-				"semver": "5.4.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"parse5": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-			"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
-			"dev": true,
-			"requires": {
-				"@types/node": "7.0.43"
-			}
-		},
-		"path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-			"dev": true
-		},
-		"path-key": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-			"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-			"dev": true
-		},
-		"path-root": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-			"dev": true,
-			"requires": {
-				"path-root-regex": "0.1.2"
-			}
-		},
-		"path-root-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-			"dev": true
-		},
-		"pause-stream": {
-			"version": "0.0.11",
-			"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-			"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-			"dev": true,
-			"requires": {
-				"through": "2.3.8"
-			}
-		},
-		"pend": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-			"dev": true
-		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
-		},
-		"pify": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-			"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-			"dev": true
-		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true
-		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"dev": true,
-			"requires": {
-				"pinkie": "2.0.4"
-			}
-		},
-		"prepend-http": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-			"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-			"dev": true
-		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
-		"pretty-hrtime": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-			"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-			"dev": true
-		},
-		"ps-tree": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
-			"integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4"
-			}
-		},
-		"pseudomap": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-			"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-			"dev": true
-		},
-		"punycode": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-			"dev": true
-		},
-		"q": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-			"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-			"dev": true
-		},
-		"qs": {
-			"version": "6.3.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-			"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-			"dev": true
-		},
-		"querystringify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-			"integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=",
-			"dev": true
-		},
-		"queue": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-			"integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-			"dev": true,
-			"requires": {
-				"inherits": "2.0.3"
-			}
-		},
-		"randomatic": {
-			"version": "1.1.7",
-			"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-			"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
-			"dev": true,
-			"requires": {
-				"is-number": "3.0.0",
-				"kind-of": "4.0.0"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-					"dev": true,
-					"requires": {
-						"kind-of": "3.2.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "1.1.6"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "1.1.6"
-					}
-				}
-			}
-		},
-		"rc": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
-			"integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
-			"dev": true,
-			"requires": {
-				"deep-extend": "0.4.2",
-				"ini": "1.3.5",
-				"minimist": "1.2.0",
-				"strip-json-comments": "2.0.1"
-			}
-		},
-		"read": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-			"dev": true,
-			"requires": {
-				"mute-stream": "0.0.7"
-			}
-		},
-		"readable-stream": {
-			"version": "1.1.14",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-			"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-			"dev": true,
-			"requires": {
-				"core-util-is": "1.0.2",
-				"inherits": "2.0.3",
-				"isarray": "0.0.1",
-				"string_decoder": "0.10.31"
-			}
-		},
-		"readdirp": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-			"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"minimatch": "3.0.4",
-				"readable-stream": "2.3.3",
-				"set-immediate-shim": "1.0.1"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
-			"requires": {
-				"resolve": "1.5.0"
-			}
-		},
-		"regex-cache": {
-			"version": "0.4.4",
-			"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "0.1.3"
-			}
-		},
-		"registry-auth-token": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
-			"integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
-			"dev": true,
-			"requires": {
-				"rc": "1.2.2",
-				"safe-buffer": "5.1.1"
-			}
-		},
-		"registry-url": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-			"integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
-			"dev": true,
-			"requires": {
-				"rc": "1.2.2"
-			}
-		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
-		},
-		"repeat-element": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
-		"replace-ext": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-			"dev": true
-		},
-		"request": {
-			"version": "2.83.0",
-			"resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-			"integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "0.7.0",
-				"aws4": "1.6.0",
-				"caseless": "0.12.0",
-				"combined-stream": "1.0.5",
-				"extend": "3.0.1",
-				"forever-agent": "0.6.1",
-				"form-data": "2.3.1",
-				"har-validator": "5.0.3",
-				"hawk": "6.0.2",
-				"http-signature": "1.2.0",
-				"is-typedarray": "1.0.0",
-				"isstream": "0.1.2",
-				"json-stringify-safe": "5.0.1",
-				"mime-types": "2.1.17",
-				"oauth-sign": "0.8.2",
-				"performance-now": "2.1.0",
-				"qs": "6.5.1",
-				"safe-buffer": "5.1.1",
-				"stringstream": "0.0.5",
-				"tough-cookie": "2.3.3",
-				"tunnel-agent": "0.6.0",
-				"uuid": "3.1.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				},
-				"aws-sign2": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-					"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-					"dev": true
-				},
-				"boom": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-					"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-					"dev": true,
-					"requires": {
-						"hoek": "4.2.0"
-					}
-				},
-				"caseless": {
-					"version": "0.12.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-					"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-					"dev": true
-				},
-				"cryptiles": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-					"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-					"dev": true,
-					"requires": {
-						"boom": "5.2.0"
-					},
-					"dependencies": {
-						"boom": {
-							"version": "5.2.0",
-							"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-							"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
-							"dev": true,
-							"requires": {
-								"hoek": "4.2.0"
-							}
-						}
-					}
-				},
-				"form-data": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-					"dev": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"har-validator": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-					"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-					"dev": true,
-					"requires": {
-						"ajv": "5.4.0",
-						"har-schema": "2.0.0"
-					}
-				},
-				"hawk": {
-					"version": "6.0.2",
-					"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-					"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
-					"dev": true,
-					"requires": {
-						"boom": "4.3.1",
-						"cryptiles": "3.1.2",
-						"hoek": "4.2.0",
-						"sntp": "2.1.0"
-					}
-				},
-				"hoek": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-					"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
-					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-					"dev": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"jsprim": "1.4.1",
-						"sshpk": "1.13.1"
-					}
-				},
-				"qs": {
-					"version": "6.5.1",
-					"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-					"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
-					"dev": true
-				},
-				"sntp": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-					"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
-					"dev": true,
-					"requires": {
-						"hoek": "4.2.0"
-					}
-				},
-				"tunnel-agent": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-					"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"request-light": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.1.tgz",
-			"integrity": "sha1-mG9agok+nRymqJbr5vRsUca0VX8=",
-			"requires": {
-				"http-proxy-agent": "0.2.7",
-				"https-proxy-agent": "0.3.6",
-				"vscode-nls": "2.0.2"
-			}
-		},
-		"requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-			"dev": true
-		},
-		"resolve": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-			"integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==",
-			"dev": true,
-			"requires": {
-				"path-parse": "1.0.5"
-			}
-		},
-		"resolve-dir": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-			"integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "1.2.2",
-				"global-modules": "0.2.3"
-			}
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"right-align": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
-			"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
-			"dev": true,
-			"requires": {
-				"align-text": "0.1.4"
-			}
-		},
-		"rimraf": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-			"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-			"dev": true,
-			"requires": {
-				"glob": "7.1.2"
-			}
-		},
-		"run-sequence": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-2.2.0.tgz",
-			"integrity": "sha512-xW5DmUwdvoyYQUMPKN8UW7TZSFs7AxtT59xo1m5y91jHbvwGlGgOmdV1Yw5P68fkjf3aHUZ4G1o1mZCtNe0qtw==",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"gulp-util": "3.0.8"
-			}
-		},
-		"safe-buffer": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-			"dev": true
-		},
-		"sax": {
-			"version": "1.2.4",
-			"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-			"dev": true
-		},
-		"semver": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-			"integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-			"dev": true
-		},
-		"semver-diff": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-			"integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
-			"dev": true,
-			"requires": {
-				"semver": "5.4.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"sequencify": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-			"integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
-			"dev": true
-		},
-		"set-immediate-shim": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-			"integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-			"dev": true
-		},
-		"shebang-command": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-			"dev": true,
-			"requires": {
-				"shebang-regex": "1.0.0"
-			}
-		},
-		"shebang-regex": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-			"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-			"dev": true
-		},
-		"sigmund": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-			"dev": true
-		},
-		"signal-exit": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-			"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-			"dev": true
-		},
-		"sntp": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-			"dev": true,
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"source-map": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-		},
-		"source-map-resolve": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-			"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-			"dev": true,
-			"requires": {
-				"atob": "1.1.3",
-				"resolve-url": "0.2.1",
-				"source-map-url": "0.3.0",
-				"urix": "0.1.0"
-			}
-		},
-		"source-map-support": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
-			"integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
-			"dev": true,
-			"requires": {
-				"source-map": "0.6.1"
-			}
-		},
-		"source-map-url": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-			"integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-			"dev": true
-		},
-		"sparkles": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-			"integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-			"dev": true
-		},
-		"split": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-			"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-			"dev": true,
-			"requires": {
-				"through": "2.3.8"
-			}
-		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
-		"sshpk": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-			"dev": true,
-			"requires": {
-				"asn1": "0.2.3",
-				"assert-plus": "1.0.0",
-				"bcrypt-pbkdf": "1.0.1",
-				"dashdash": "1.14.1",
-				"ecc-jsbn": "0.1.1",
-				"getpass": "0.1.7",
-				"jsbn": "0.1.1",
-				"tweetnacl": "0.14.5"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"stat-mode": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-			"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-			"dev": true
-		},
-		"stream-combiner": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-			"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-			"dev": true,
-			"requires": {
-				"duplexer": "0.1.1"
-			}
-		},
-		"stream-consume": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-			"integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
-			"dev": true
-		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
-		"streamfilter": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
-			"integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.3"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"streamifier": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-			"integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
-			"dev": true
-		},
-		"string-width": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-			"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-			"dev": true,
-			"requires": {
-				"is-fullwidth-code-point": "2.0.0",
-				"strip-ansi": "4.0.0"
-			},
-			"dependencies": {
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-					"dev": true
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "3.0.0"
-					}
-				}
-			}
-		},
-		"string_decoder": {
-			"version": "0.10.31",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-			"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-			"dev": true
-		},
-		"stringstream": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-			"dev": true
-		},
-		"strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "2.1.1"
-			}
-		},
-		"strip-bom": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-			"integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-			"dev": true,
-			"requires": {
-				"first-chunk-stream": "1.0.0",
-				"is-utf8": "0.2.1"
-			}
-		},
-		"strip-bom-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-			"integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-			"dev": true,
-			"requires": {
-				"first-chunk-stream": "1.0.0",
-				"strip-bom": "2.0.0"
-			},
-			"dependencies": {
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				}
-			}
-		},
-		"strip-bom-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-			"dev": true
-		},
-		"strip-eof": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-			"dev": true
-		},
-		"strip-json-comments": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-			"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-			"dev": true
-		},
-		"supports-color": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-			"dev": true
-		},
-		"tar": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-			"dev": true,
-			"requires": {
-				"block-stream": "0.0.9",
-				"fstream": "1.0.11",
-				"inherits": "2.0.3"
-			}
-		},
-		"term-size": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-			"integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-			"dev": true,
-			"requires": {
-				"execa": "0.7.0"
-			}
-		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-			"dev": true
-		},
-		"through2": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "2.3.3",
-				"xtend": "4.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "5.1.1",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "5.1.1"
-					}
-				}
-			}
-		},
-		"through2-filter": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-			"integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-			"dev": true,
-			"requires": {
-				"through2": "2.0.3",
-				"xtend": "4.0.1"
-			}
-		},
-		"tildify": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-			"integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2"
-			}
-		},
-		"time-stamp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-			"dev": true
-		},
-		"timed-out": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-			"integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-			"dev": true
-		},
-		"timers-ext": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
-			"integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.35",
-				"next-tick": "1.0.0"
-			}
-		},
-		"tmp": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
-			"integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "1.0.2"
-			}
-		},
-		"to-absolute-glob": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-			"integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "2.0.1"
-			}
-		},
-		"touch": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
-			"integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
-			"dev": true,
-			"requires": {
-				"nopt": "1.0.10"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-			"integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-			"dev": true,
-			"requires": {
-				"punycode": "1.4.1"
-			}
-		},
-		"tslib": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
-			"integrity": "sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg==",
-			"dev": true
-		},
-		"tslint": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.8.0.tgz",
-			"integrity": "sha1-H0mtWy53x2w69N3K5VKuTjYS6xM=",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "6.26.0",
-				"builtin-modules": "1.1.1",
-				"chalk": "2.3.0",
-				"commander": "2.11.0",
-				"diff": "3.3.1",
-				"glob": "7.1.2",
-				"minimatch": "3.0.4",
-				"resolve": "1.5.0",
-				"semver": "5.4.1",
-				"tslib": "1.8.0",
-				"tsutils": "2.12.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.1"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"tslint-microsoft-contrib": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/tslint-microsoft-contrib/-/tslint-microsoft-contrib-5.0.1.tgz",
-			"integrity": "sha1-Mo7pwo0HzfeTKTIEyW4v+rkiGZQ=",
-			"dev": true,
-			"requires": {
-				"tsutils": "1.9.1"
-			},
-			"dependencies": {
-				"tsutils": {
-					"version": "1.9.1",
-					"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-1.9.1.tgz",
-					"integrity": "sha1-ufmrROVa+WgYMdXyjQrur1x1DLA=",
-					"dev": true
-				}
-			}
-		},
-		"tsutils": {
-			"version": "2.12.2",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",
-			"integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",
-			"dev": true,
-			"requires": {
-				"tslib": "1.8.0"
-			}
-		},
-		"tunnel": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
-			"integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-			"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-			"dev": true
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true,
-			"optional": true
-		},
-		"typed-rest-client": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz",
-			"integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=",
-			"dev": true,
-			"requires": {
-				"tunnel": "0.0.4",
-				"underscore": "1.8.3"
-			}
-		},
-		"typescript": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
-			"integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
-			"dev": true
-		},
-		"uc.micro": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
-			"integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI=",
-			"dev": true
-		},
-		"uglify-js": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.0.tgz",
-			"integrity": "sha1-8CHji6LKdAhg9b1caVwqgXNF8Ow=",
-			"dev": true,
-			"requires": {
-				"async": "0.2.10",
-				"source-map": "0.5.7",
-				"uglify-to-browserify": "1.0.2",
-				"yargs": "3.10.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"uglify-save-license": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/uglify-save-license/-/uglify-save-license-0.4.1.tgz",
-			"integrity": "sha1-lXJsF8xv0XHDYX479NjYKqjEzOE=",
-			"dev": true
-		},
-		"uglify-to-browserify": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-			"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-			"dev": true
-		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-			"dev": true
-		},
-		"undefsafe": {
-			"version": "0.0.3",
-			"resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz",
-			"integrity": "sha1-7Mo6A+VrmvFzhbqsgSrIO5lKli8=",
-			"dev": true
-		},
-		"underscore": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-			"dev": true
-		},
-		"unique-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-			"integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
-			"dev": true
-		},
-		"unique-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-			"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
-			"dev": true,
-			"requires": {
-				"crypto-random-string": "1.0.0"
-			}
-		},
-		"unzip-response": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-			"integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-			"dev": true
-		},
-		"update-notifier": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.3.0.tgz",
-			"integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
-			"dev": true,
-			"requires": {
-				"boxen": "1.2.2",
-				"chalk": "2.3.0",
-				"configstore": "3.1.1",
-				"import-lazy": "2.1.0",
-				"is-installed-globally": "0.1.0",
-				"is-npm": "1.0.0",
-				"latest-version": "3.1.0",
-				"semver-diff": "2.1.0",
-				"xdg-basedir": "3.0.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.1"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
-		"url-join": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-			"integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=",
-			"dev": true
-		},
-		"url-parse": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-			"integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==",
-			"dev": true,
-			"requires": {
-				"querystringify": "1.0.0",
-				"requires-port": "1.0.0"
-			}
-		},
-		"url-parse-lax": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-			"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
-			"dev": true,
-			"requires": {
-				"prepend-http": "1.0.4"
-			}
-		},
-		"user-home": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-			"integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-			"dev": true
-		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-			"dev": true
-		},
-		"uuid": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-			"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
-			"dev": true
-		},
-		"v8flags": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-			"integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-			"dev": true,
-			"requires": {
-				"user-home": "1.1.1"
-			}
-		},
-		"vali-date": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-			"integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "1.3.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"vinyl": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-			"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3",
-				"clone-stats": "0.0.1",
-				"replace-ext": "0.0.1"
-			}
-		},
-		"vinyl-fs": {
-			"version": "0.3.14",
-			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-			"integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-			"dev": true,
-			"requires": {
-				"defaults": "1.0.3",
-				"glob-stream": "3.1.18",
-				"glob-watcher": "0.0.6",
-				"graceful-fs": "3.0.11",
-				"mkdirp": "0.5.1",
-				"strip-bom": "1.0.0",
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"vinyl-source-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz",
-			"integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=",
-			"dev": true,
-			"requires": {
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "2.0.3",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"vinyl-sourcemaps-apply": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-			"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-			"dev": true,
-			"requires": {
-				"source-map": "0.5.7"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				}
-			}
-		},
-		"vsce": {
-			"version": "1.33.2",
-			"resolved": "https://registry.npmjs.org/vsce/-/vsce-1.33.2.tgz",
-			"integrity": "sha1-NkX2mq+YTiL3TqSdNfON0Y1m/18=",
-			"dev": true,
-			"requires": {
-				"cheerio": "1.0.0-rc.2",
-				"commander": "2.11.0",
-				"denodeify": "1.2.1",
-				"glob": "7.1.2",
-				"lodash": "4.17.4",
-				"markdown-it": "8.4.0",
-				"mime": "1.5.0",
-				"minimatch": "3.0.4",
-				"osenv": "0.1.4",
-				"parse-semver": "1.1.1",
-				"read": "1.0.7",
-				"semver": "5.4.1",
-				"tmp": "0.0.29",
-				"url-join": "1.1.0",
-				"vso-node-api": "6.1.2-preview",
-				"yauzl": "2.9.1",
-				"yazl": "2.4.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"vscode": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.8.tgz",
-			"integrity": "sha512-kT6sIA1AEKR5M+us2fXk5dxwV9SR/IEdLHNmVW4/dl1wNBHoEvgIo1qMQwHNxPVTQmw70KTGZ9UVeVb8FbpNFA==",
-			"dev": true,
-			"requires": {
-				"glob": "7.1.2",
-				"gulp-chmod": "2.0.0",
-				"gulp-filter": "5.0.1",
-				"gulp-gunzip": "1.0.0",
-				"gulp-remote-src": "0.4.3",
-				"gulp-symdest": "1.1.0",
-				"gulp-untar": "0.0.6",
-				"gulp-vinyl-zip": "2.1.0",
-				"mocha": "4.0.1",
-				"request": "2.83.0",
-				"semver": "5.4.1",
-				"source-map-support": "0.5.0",
-				"url-parse": "1.2.0",
-				"vinyl-source-stream": "1.1.0"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"vscode-debugadapter": {
-			"version": "1.25.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.25.0.tgz",
-			"integrity": "sha512-tsOtNNKKTbnQanARdkFfUxI8qKVKba+QHOKWC1reDDeeyvzoNKkLMGkL/xsiKn5vQDeaP3zFBcLY8Ysak9GrvQ==",
-			"requires": {
-				"vscode-debugprotocol": "1.25.0"
-			}
-		},
-		"vscode-debugadapter-testsupport": {
-			"version": "1.25.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.25.0.tgz",
-			"integrity": "sha512-6E2N7CoH7B0KEDvI9mFVFt4H+dRFDhtj3PmLVjNojfZ1VZZS2yfhE0XO0E5Axdhef3zTpUU6WZoeOOMVFGZGIg==",
-			"dev": true,
-			"requires": {
-				"vscode-debugprotocol": "1.25.0"
-			}
-		},
-		"vscode-debugprotocol": {
-			"version": "1.25.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.25.0.tgz",
-			"integrity": "sha512-e1EUy/5npqa0NlAwRCUu8A9LnVRf6tkwiPQcCLyUFCC9o2GxcAqH5Va4mqXDoxQ58ar3zODivKQeRb3z1KH7WA=="
-		},
-		"vscode-nls": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-			"integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-		},
-		"vscode-nls-dev": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/vscode-nls-dev/-/vscode-nls-dev-2.1.6.tgz",
-			"integrity": "sha512-1IylC/ekENYqz1vEItfrzrMXS8LW9aZQnNTU6BfdwT0Jddzed+l+nvU8amgVKFFmC1/GoiMFk5wtC20zWBbEbw==",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3",
-				"event-stream": "3.3.4",
-				"glob": "6.0.4",
-				"gulp-util": "3.0.8",
-				"iconv-lite": "0.4.19",
-				"is": "3.2.1",
-				"source-map": "0.5.7",
-				"typescript": "2.6.1",
-				"vinyl": "1.2.0",
-				"xml2js": "0.4.19",
-				"yargs": "3.32.0"
-			},
-			"dependencies": {
-				"camelcase": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-					"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-					"dev": true
-				},
-				"cliui": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-					"dev": true,
-					"requires": {
-						"string-width": "1.0.2",
-						"strip-ansi": "3.0.1",
-						"wrap-ansi": "2.1.0"
-					}
-				},
-				"glob": {
-					"version": "6.0.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-					"dev": true,
-					"requires": {
-						"inflight": "1.0.6",
-						"inherits": "2.0.3",
-						"minimatch": "3.0.4",
-						"once": "1.4.0",
-						"path-is-absolute": "1.0.1"
-					}
-				},
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-					"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-					"dev": true
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				},
-				"window-size": {
-					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-					"integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-					"dev": true
-				},
-				"yargs": {
-					"version": "3.32.0",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-					"integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-					"dev": true,
-					"requires": {
-						"camelcase": "2.1.1",
-						"cliui": "3.2.0",
-						"decamelize": "1.2.0",
-						"os-locale": "1.4.0",
-						"string-width": "1.0.2",
-						"window-size": "0.1.4",
-						"y18n": "3.2.1"
-					}
-				}
-			}
-		},
-		"vso-node-api": {
-			"version": "6.1.2-preview",
-			"resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.1.2-preview.tgz",
-			"integrity": "sha1-qrNUbfJFHs2JTgcbuZtd8Zxfp48=",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1",
-				"tunnel": "0.0.4",
-				"typed-rest-client": "0.9.0",
-				"underscore": "1.8.3"
-			}
-		},
-		"which": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-			"integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-			"dev": true,
-			"requires": {
-				"isexe": "2.0.0"
-			}
-		},
-		"widest-line": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
-			"integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
-			"dev": true,
-			"requires": {
-				"string-width": "1.0.2"
-			},
-			"dependencies": {
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				}
-			}
-		},
-		"window-size": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
-			"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
-			"dev": true
-		},
-		"wordwrap": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-			"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
-			"dev": true
-		},
-		"wrap-ansi": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-			"dev": true,
-			"requires": {
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1"
-			},
-			"dependencies": {
-				"is-fullwidth-code-point": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
-				},
-				"string-width": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-					"dev": true,
-					"requires": {
-						"code-point-at": "1.1.0",
-						"is-fullwidth-code-point": "1.0.0",
-						"strip-ansi": "3.0.1"
-					}
-				}
-			}
-		},
-		"wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-		},
-		"write-file-atomic": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-			"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"imurmurhash": "0.1.4",
-				"signal-exit": "3.0.2"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				}
-			}
-		},
-		"xdg-basedir": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-			"integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
-			"dev": true
-		},
-		"xml2js": {
-			"version": "0.4.19",
-			"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-			"integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-			"dev": true,
-			"requires": {
-				"sax": "1.2.4",
-				"xmlbuilder": "9.0.4"
-			}
-		},
-		"xmlbuilder": {
-			"version": "9.0.4",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
-			"integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
-			"dev": true
-		},
-		"xtend": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-			"dev": true
-		},
-		"y18n": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-			"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-			"dev": true
-		},
-		"yallist": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-			"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-			"dev": true
-		},
-		"yargs": {
-			"version": "3.10.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-			"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-			"dev": true,
-			"requires": {
-				"camelcase": "1.2.1",
-				"cliui": "2.1.0",
-				"decamelize": "1.2.0",
-				"window-size": "0.1.0"
-			}
-		},
-		"yauzl": {
-			"version": "2.9.1",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
-			"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "0.2.13",
-				"fd-slicer": "1.0.1"
-			}
-		},
-		"yazl": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
-			"integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "0.2.13"
-			}
-		}
-	}
-}
diff --git a/extensions/ms-vscode.node-debug/package.json b/extensions/ms-vscode.node-debug/package.json
deleted file mode 100644
index 9d065dd4a5c..00000000000
--- a/extensions/ms-vscode.node-debug/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "node-debug",
-	"version": "1.6.0",
-	"publisher": "ms-vscode",
-	"engines": {
-		"vscode": "1.6.x"
-	}
-}
\ No newline at end of file
diff --git a/extensions/ms-vscode.node-debug2/package-lock.json b/extensions/ms-vscode.node-debug2/package-lock.json
deleted file mode 100644
index 7f8ba502cc4..00000000000
--- a/extensions/ms-vscode.node-debug2/package-lock.json
+++ /dev/null
@@ -1,5106 +0,0 @@
-{
-	"name": "node-debug2",
-	"version": "1.19.0",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"@gulp-sourcemaps/identity-map": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz",
-			"integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
-			"dev": true,
-			"requires": {
-				"acorn": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-				"css": "2.2.1",
-				"normalize-path": "2.1.1",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"through2": "2.0.3"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",
-					"integrity": "sha1-MXrHghgmwixwLWYYmrg1lnXxNdc=",
-					"dev": true
-				}
-			}
-		},
-		"@gulp-sourcemaps/map-sources": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz",
-			"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
-			"dev": true,
-			"requires": {
-				"normalize-path": "2.1.1",
-				"through2": "2.0.3"
-			}
-		},
-		"@types/mocha": {
-			"version": "2.2.44",
-			"resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz",
-			"integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==",
-			"dev": true
-		},
-		"@types/node": {
-			"version": "6.0.92",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.92.tgz",
-			"integrity": "sha512-awEYSSTn7dauwVCYSx2CJaPTu0Z1Ht2oR1b2AD3CYao6ZRb+opb6EL43fzmD7eMFgMHzTBWSUzlWSD+S8xN0Nw==",
-			"dev": true
-		},
-		"@types/source-map": {
-			"version": "https://registry.npmjs.org/@types/source-map/-/source-map-0.1.29.tgz",
-			"integrity": "sha1-1wSKYBgLCfiqbVO9oxHGtRy9cBg="
-		},
-		"acorn": {
-			"version": "4.0.13",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
-			"integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=",
-			"dev": true
-		},
-		"agent-base": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz",
-			"integrity": "sha1-aJDT+yFwBLYrcPiSjg+uX4lSpwY="
-		},
-		"ajv": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz",
-			"integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=",
-			"dev": true,
-			"requires": {
-				"co": "4.6.0",
-				"fast-deep-equal": "1.0.0",
-				"fast-json-stable-stringify": "2.0.0",
-				"json-schema-traverse": "0.3.1"
-			}
-		},
-		"amdefine": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-			"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-			"dev": true
-		},
-		"ansi-regex": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-			"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-			"dev": true
-		},
-		"ansi-styles": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-			"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-			"dev": true
-		},
-		"archy": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-			"integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-			"dev": true
-		},
-		"argparse": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
-			"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-			"dev": true,
-			"requires": {
-				"sprintf-js": "1.0.3"
-			}
-		},
-		"arr-diff": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
-			"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
-			"dev": true,
-			"requires": {
-				"arr-flatten": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
-			}
-		},
-		"arr-flatten": {
-			"version": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-			"integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
-			"dev": true
-		},
-		"array-differ": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
-			"integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=",
-			"dev": true
-		},
-		"array-each": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-			"integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-			"dev": true
-		},
-		"array-slice": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz",
-			"integrity": "sha1-5zA08A3MH0CHYAj9IP6ud71LfC8=",
-			"dev": true
-		},
-		"array-union": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-			"dev": true,
-			"requires": {
-				"array-uniq": "1.0.3"
-			}
-		},
-		"array-uniq": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-			"integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-			"dev": true
-		},
-		"array-unique": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
-			"integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-			"dev": true
-		},
-		"arrify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-			"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-			"dev": true
-		},
-		"asn1": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-			"integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-			"dev": true
-		},
-		"assert-plus": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-			"integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-			"dev": true
-		},
-		"asynckit": {
-			"version": "0.4.0",
-			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-			"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-			"dev": true
-		},
-		"atob": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/atob/-/atob-1.1.3.tgz",
-			"integrity": "sha1-lfE2KbEsOlGl0hWr3OKqnzL4B3M=",
-			"dev": true
-		},
-		"aws-sign2": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-			"integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-			"dev": true
-		},
-		"aws4": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-			"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-			"dev": true
-		},
-		"babel-code-frame": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-			"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"esutils": "2.0.2",
-				"js-tokens": "3.0.2"
-			}
-		},
-		"balanced-match": {
-			"version": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-		},
-		"bcrypt-pbkdf": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
-			"integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"tweetnacl": "0.14.5"
-			}
-		},
-		"beeper": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz",
-			"integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=",
-			"dev": true
-		},
-		"block-stream": {
-			"version": "0.0.9",
-			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-			"dev": true,
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-			}
-		},
-		"boolbase": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-			"dev": true
-		},
-		"boom": {
-			"version": "2.10.1",
-			"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-			"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-			"dev": true,
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"brace-expansion": {
-			"version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
-			"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
-			"requires": {
-				"balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-				"concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-			}
-		},
-		"braces": {
-			"version": "1.8.5",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
-			"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
-			"dev": true,
-			"requires": {
-				"expand-range": "1.8.2",
-				"preserve": "0.2.0",
-				"repeat-element": "1.1.2"
-			}
-		},
-		"browser-stdout": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz",
-			"integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=",
-			"dev": true
-		},
-		"buffer-crc32": {
-			"version": "0.2.13",
-			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-			"dev": true
-		},
-		"builtin-modules": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-			"dev": true
-		},
-		"camelcase": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-			"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-			"dev": true
-		},
-		"caseless": {
-			"version": "0.11.0",
-			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-			"integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-			"dev": true
-		},
-		"chalk": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-			"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-			"dev": true,
-			"requires": {
-				"ansi-styles": "2.2.1",
-				"escape-string-regexp": "1.0.5",
-				"has-ansi": "2.0.0",
-				"strip-ansi": "3.0.1",
-				"supports-color": "2.0.0"
-			}
-		},
-		"cheerio": {
-			"version": "1.0.0-rc.2",
-			"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
-			"integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=",
-			"dev": true,
-			"requires": {
-				"css-select": "1.2.0",
-				"dom-serializer": "0.1.0",
-				"entities": "1.1.1",
-				"htmlparser2": "3.9.2",
-				"lodash": "4.17.4",
-				"parse5": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				}
-			}
-		},
-		"cliui": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-			"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-			"dev": true,
-			"requires": {
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1",
-				"wrap-ansi": "2.1.0"
-			}
-		},
-		"clone": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-			"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-			"dev": true
-		},
-		"clone-buffer": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-			"integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-			"dev": true
-		},
-		"clone-stats": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-			"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-			"dev": true
-		},
-		"cloneable-readable": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz",
-			"integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=",
-			"dev": true,
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"process-nextick-args": "1.0.7",
-				"through2": "2.0.3"
-			}
-		},
-		"co": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-			"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-			"dev": true
-		},
-		"code-point-at": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-			"dev": true
-		},
-		"color-convert": {
-			"version": "1.9.1",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-			"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
-			"dev": true,
-			"requires": {
-				"color-name": "1.1.3"
-			}
-		},
-		"color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-			"dev": true
-		},
-		"combined-stream": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
-			"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
-			"dev": true,
-			"requires": {
-				"delayed-stream": "1.0.0"
-			}
-		},
-		"commander": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-			"integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
-			"dev": true,
-			"requires": {
-				"graceful-readlink": "1.0.1"
-			}
-		},
-		"concat-map": {
-			"version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-			"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-		},
-		"convert-source-map": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz",
-			"integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
-			"dev": true
-		},
-		"core-util-is": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-			"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-			"dev": true
-		},
-		"cryptiles": {
-			"version": "2.0.5",
-			"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-			"integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-			"dev": true,
-			"requires": {
-				"boom": "2.10.1"
-			}
-		},
-		"css": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/css/-/css-2.2.1.tgz",
-			"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
-			"dev": true,
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"source-map": "0.1.43",
-				"source-map-resolve": "0.3.1",
-				"urix": "0.1.0"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.1.43",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-					"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
-					"dev": true,
-					"requires": {
-						"amdefine": "1.0.1"
-					}
-				}
-			}
-		},
-		"css-select": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-			"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-			"dev": true,
-			"requires": {
-				"boolbase": "1.0.0",
-				"css-what": "2.1.0",
-				"domutils": "1.5.1",
-				"nth-check": "1.0.1"
-			}
-		},
-		"css-what": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-			"integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-			"dev": true
-		},
-		"d": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-			"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.37"
-			}
-		},
-		"dashdash": {
-			"version": "1.14.1",
-			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"dateformat": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz",
-			"integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=",
-			"dev": true
-		},
-		"debug": {
-			"version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-			"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
-			"requires": {
-				"ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-			}
-		},
-		"debug-fabulous": {
-			"version": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.2.1.tgz",
-			"integrity": "sha1-V+EWS6DprW2aZfIAdf88K9a94Nw=",
-			"dev": true,
-			"requires": {
-				"debug": "3.1.0",
-				"memoizee": "0.4.11",
-				"object-assign": "4.1.1"
-			},
-			"dependencies": {
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-					}
-				}
-			}
-		},
-		"decamelize": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-			"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-			"dev": true
-		},
-		"deep-assign": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz",
-			"integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=",
-			"dev": true,
-			"requires": {
-				"is-obj": "1.0.1"
-			}
-		},
-		"defaults": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-			"integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3"
-			}
-		},
-		"del": {
-			"version": "2.2.2",
-			"resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-			"integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-			"dev": true,
-			"requires": {
-				"globby": "5.0.0",
-				"is-path-cwd": "1.0.0",
-				"is-path-in-cwd": "1.0.0",
-				"object-assign": "4.1.1",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"
-			}
-		},
-		"delayed-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-			"dev": true
-		},
-		"denodeify": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz",
-			"integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=",
-			"dev": true
-		},
-		"deprecated": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz",
-			"integrity": "sha1-+cmvVGSvoeepcUWKi97yqpTVuxk=",
-			"dev": true
-		},
-		"detect-file": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
-			"integrity": "sha1-STXe39lIhkjgBrASlWbpOGcR6mM=",
-			"dev": true,
-			"requires": {
-				"fs-exists-sync": "0.1.0"
-			}
-		},
-		"detect-newline": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-			"integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-			"dev": true
-		},
-		"diff": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz",
-			"integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=",
-			"dev": true
-		},
-		"dom-serializer": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-			"integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.1.3",
-				"entities": "1.1.1"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-					"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-					"dev": true
-				}
-			}
-		},
-		"domelementtype": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-			"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-			"dev": true
-		},
-		"domhandler": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
-			"integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.3.0"
-			}
-		},
-		"domutils": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-			"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-			"dev": true,
-			"requires": {
-				"dom-serializer": "0.1.0",
-				"domelementtype": "1.3.0"
-			}
-		},
-		"duplexer": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-			"integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-			"dev": true
-		},
-		"duplexer2": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
-			"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "1.1.14"
-			}
-		},
-		"duplexify": {
-			"version": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-			"integrity": "sha1-ThUWvmiDi8kKSZlPCzmm5ZYL780=",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "1.4.0",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-				"stream-shift": "1.0.0"
-			},
-			"dependencies": {
-				"end-of-stream": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
-					"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
-					"dev": true,
-					"requires": {
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"ecc-jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
-			"integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"jsbn": "0.1.1"
-			}
-		},
-		"end-of-stream": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-			"integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
-			"dev": true,
-			"requires": {
-				"once": "1.3.3"
-			},
-			"dependencies": {
-				"once": {
-					"version": "1.3.3",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-					"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-					"dev": true,
-					"requires": {
-						"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-					}
-				}
-			}
-		},
-		"entities": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-			"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-			"dev": true
-		},
-		"es5-ext": {
-			"version": "0.10.37",
-			"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",
-			"integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=",
-			"dev": true,
-			"requires": {
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"es6-iterator": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.37",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"es6-symbol": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
-			"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.37"
-			}
-		},
-		"es6-weak-map": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-			"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.37",
-				"es6-iterator": "2.0.3",
-				"es6-symbol": "3.1.1"
-			}
-		},
-		"escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-			"dev": true
-		},
-		"esutils": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
-			"integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
-			"dev": true
-		},
-		"event-emitter": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-			"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.37"
-			}
-		},
-		"event-stream": {
-			"version": "3.3.4",
-			"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-			"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
-			"dev": true,
-			"requires": {
-				"duplexer": "0.1.1",
-				"from": "0.1.7",
-				"map-stream": "0.1.0",
-				"pause-stream": "0.0.11",
-				"split": "0.3.3",
-				"stream-combiner": "0.0.4",
-				"through": "2.3.8"
-			}
-		},
-		"expand-brackets": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
-			"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
-			"dev": true,
-			"requires": {
-				"is-posix-bracket": "0.1.1"
-			}
-		},
-		"expand-range": {
-			"version": "1.8.2",
-			"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
-			"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
-			"dev": true,
-			"requires": {
-				"fill-range": "2.2.3"
-			}
-		},
-		"expand-tilde": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-			"integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2"
-			}
-		},
-		"extend": {
-			"version": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-			"integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
-		},
-		"extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-			"dev": true,
-			"requires": {
-				"is-extendable": "0.1.1"
-			}
-		},
-		"extglob": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
-			"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"extsprintf": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-			"integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-			"dev": true
-		},
-		"fancy-log": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz",
-			"integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"time-stamp": "1.1.0"
-			}
-		},
-		"fast-deep-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-			"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-			"dev": true
-		},
-		"fast-json-stable-stringify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-			"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-			"dev": true
-		},
-		"fd-slicer": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
-			"dev": true,
-			"requires": {
-				"pend": "1.2.0"
-			}
-		},
-		"filename-regex": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
-			"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-			"dev": true
-		},
-		"fill-range": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-			"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
-			"dev": true,
-			"requires": {
-				"is-number": "2.1.0",
-				"isobject": "2.1.0",
-				"randomatic": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-				"repeat-element": "1.1.2",
-				"repeat-string": "1.6.1"
-			}
-		},
-		"find-index": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
-			"integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
-			"dev": true
-		},
-		"findup-sync": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
-			"integrity": "sha1-QAQ5Kee8YK3wt/SCfExudaDeyhI=",
-			"dev": true,
-			"requires": {
-				"detect-file": "0.1.0",
-				"is-glob": "2.0.1",
-				"micromatch": "2.3.11",
-				"resolve-dir": "0.1.1"
-			}
-		},
-		"fined": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz",
-			"integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "2.0.2",
-				"is-plain-object": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-				"object.defaults": "1.1.0",
-				"object.pick": "1.3.0",
-				"parse-filepath": "1.0.1"
-			},
-			"dependencies": {
-				"expand-tilde": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-					"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-					"dev": true,
-					"requires": {
-						"homedir-polyfill": "1.0.1"
-					}
-				}
-			}
-		},
-		"first-chunk-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
-			"integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=",
-			"dev": true
-		},
-		"flagged-respawn": {
-			"version": "0.3.2",
-			"resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
-			"integrity": "sha1-/xke3c1wiKZ1smEP/8l2vpuAdLU=",
-			"dev": true
-		},
-		"for-in": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-			"integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-			"dev": true
-		},
-		"for-own": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-			"dev": true,
-			"requires": {
-				"for-in": "1.0.2"
-			}
-		},
-		"forever-agent": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-			"integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-			"dev": true
-		},
-		"form-data": {
-			"version": "2.1.4",
-			"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-			"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-			"dev": true,
-			"requires": {
-				"asynckit": "0.4.0",
-				"combined-stream": "1.0.5",
-				"mime-types": "2.1.17"
-			}
-		},
-		"from": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-			"integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-			"dev": true
-		},
-		"fs-exists-sync": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-			"integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
-			"dev": true
-		},
-		"fs.realpath": {
-			"version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-		},
-		"fstream": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-			"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-			"dev": true,
-			"requires": {
-				"graceful-fs": "4.1.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"mkdirp": "0.5.1",
-				"rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				}
-			}
-		},
-		"gaze": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz",
-			"integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
-			"dev": true,
-			"requires": {
-				"globule": "0.1.0"
-			}
-		},
-		"generate-function": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-			"integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-			"dev": true
-		},
-		"generate-object-property": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-			"integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-			"dev": true,
-			"requires": {
-				"is-property": "1.0.2"
-			}
-		},
-		"getpass": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"glob": {
-			"version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-			"integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-			"requires": {
-				"fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-				"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-				"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-			}
-		},
-		"glob-base": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
-			"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
-			"dev": true,
-			"requires": {
-				"glob-parent": "2.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"glob-parent": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
-			"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
-			"dev": true,
-			"requires": {
-				"is-glob": "2.0.1"
-			}
-		},
-		"glob-stream": {
-			"version": "3.1.18",
-			"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-			"integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
-			"dev": true,
-			"requires": {
-				"glob": "4.5.3",
-				"glob2base": "0.0.12",
-				"minimatch": "2.0.10",
-				"ordered-read-streams": "0.1.0",
-				"through2": "0.6.5",
-				"unique-stream": "1.0.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "4.5.3",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-					"integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-					"dev": true,
-					"requires": {
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "2.0.10",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-					}
-				},
-				"minimatch": {
-					"version": "2.0.10",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-					"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-					"dev": true,
-					"requires": {
-						"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
-					}
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				}
-			}
-		},
-		"glob-watcher": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-			"integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
-			"dev": true,
-			"requires": {
-				"gaze": "0.5.2"
-			}
-		},
-		"glob2base": {
-			"version": "0.0.12",
-			"resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
-			"integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
-			"dev": true,
-			"requires": {
-				"find-index": "0.1.1"
-			}
-		},
-		"global-modules": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-			"integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
-			"dev": true,
-			"requires": {
-				"global-prefix": "0.1.5",
-				"is-windows": "0.2.0"
-			}
-		},
-		"global-prefix": {
-			"version": "0.1.5",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-			"integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "1.0.1",
-				"ini": "1.3.5",
-				"is-windows": "0.2.0",
-				"which": "https://registry.npmjs.org/which/-/which-1.3.0.tgz"
-			}
-		},
-		"globby": {
-			"version": "5.0.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-			"integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-			"dev": true,
-			"requires": {
-				"array-union": "1.0.2",
-				"arrify": "1.0.1",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"object-assign": "4.1.1",
-				"pify": "2.3.0",
-				"pinkie-promise": "2.0.1"
-			}
-		},
-		"globule": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-			"integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
-			"dev": true,
-			"requires": {
-				"glob": "3.1.21",
-				"lodash": "1.0.2",
-				"minimatch": "0.2.14"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "3.1.21",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
-					"integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "1.2.3",
-						"inherits": "1.0.2",
-						"minimatch": "0.2.14"
-					}
-				},
-				"graceful-fs": {
-					"version": "1.2.3",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
-					"integrity": "sha1-FaSAaldUfLLS2/J/QuiajDRRs2Q=",
-					"dev": true
-				},
-				"inherits": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
-					"integrity": "sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js=",
-					"dev": true
-				},
-				"minimatch": {
-					"version": "0.2.14",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-					"integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
-					"dev": true,
-					"requires": {
-						"lru-cache": "2.7.3",
-						"sigmund": "1.0.1"
-					}
-				}
-			}
-		},
-		"glogg": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz",
-			"integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=",
-			"dev": true,
-			"requires": {
-				"sparkles": "1.0.0"
-			}
-		},
-		"graceful-fs": {
-			"version": "3.0.11",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-			"integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-			"dev": true,
-			"requires": {
-				"natives": "1.1.0"
-			}
-		},
-		"graceful-readlink": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
-			"integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
-			"dev": true
-		},
-		"growl": {
-			"version": "1.9.2",
-			"resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
-			"integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
-			"dev": true
-		},
-		"gulp": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-			"integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
-			"dev": true,
-			"requires": {
-				"archy": "1.0.0",
-				"chalk": "1.1.3",
-				"deprecated": "0.0.1",
-				"gulp-util": "3.0.8",
-				"interpret": "1.0.4",
-				"liftoff": "2.3.0",
-				"minimist": "1.2.0",
-				"orchestrator": "0.3.8",
-				"pretty-hrtime": "1.0.3",
-				"semver": "4.3.6",
-				"tildify": "1.2.0",
-				"v8flags": "2.1.1",
-				"vinyl-fs": "0.3.14"
-			}
-		},
-		"gulp-chmod": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-2.0.0.tgz",
-			"integrity": "sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=",
-			"dev": true,
-			"requires": {
-				"deep-assign": "1.0.0",
-				"stat-mode": "0.2.2",
-				"through2": "2.0.3"
-			}
-		},
-		"gulp-filter": {
-			"version": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.0.1.tgz",
-			"integrity": "sha1-XYf2YuMX5YOe92UOYg5skAj/ktA=",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"multimatch": "2.1.0",
-				"streamfilter": "1.0.5"
-			}
-		},
-		"gulp-gunzip": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz",
-			"integrity": "sha1-FbdBFF6Dqcb1CIYkG1fMWHHxUak=",
-			"dev": true,
-			"requires": {
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"gulp-remote-src": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz",
-			"integrity": "sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"node.extend": "1.1.6",
-				"request": "2.79.0",
-				"through2": "2.0.3",
-				"vinyl": "2.0.2"
-			},
-			"dependencies": {
-				"clone-stats": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-					"dev": true
-				},
-				"replace-ext": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-					"dev": true
-				},
-				"request": {
-					"version": "2.79.0",
-					"resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-					"integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-					"dev": true,
-					"requires": {
-						"aws-sign2": "0.6.0",
-						"aws4": "1.6.0",
-						"caseless": "0.11.0",
-						"combined-stream": "1.0.5",
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"forever-agent": "0.6.1",
-						"form-data": "2.1.4",
-						"har-validator": "2.0.6",
-						"hawk": "3.1.3",
-						"http-signature": "1.1.1",
-						"is-typedarray": "1.0.0",
-						"isstream": "0.1.2",
-						"json-stringify-safe": "5.0.1",
-						"mime-types": "2.1.17",
-						"oauth-sign": "0.8.2",
-						"qs": "6.3.2",
-						"stringstream": "0.0.5",
-						"tough-cookie": "2.3.3",
-						"tunnel-agent": "0.4.3",
-						"uuid": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
-					}
-				},
-				"vinyl": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz",
-					"integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-buffer": "1.0.0",
-						"clone-stats": "1.0.0",
-						"cloneable-readable": "1.0.0",
-						"is-stream": "1.1.0",
-						"remove-trailing-separator": "1.1.0",
-						"replace-ext": "1.0.0"
-					}
-				}
-			}
-		},
-		"gulp-sourcemaps": {
-			"version": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.1.tgz",
-			"integrity": "sha1-gzpOKPC49GYQdQMs14JBf3zY+ws=",
-			"dev": true,
-			"requires": {
-				"@gulp-sourcemaps/identity-map": "1.0.1",
-				"@gulp-sourcemaps/map-sources": "1.0.0",
-				"acorn": "4.0.13",
-				"convert-source-map": "1.5.1",
-				"css": "2.2.1",
-				"debug-fabulous": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-0.2.1.tgz",
-				"detect-newline": "2.1.0",
-				"graceful-fs": "4.1.11",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"strip-bom-string": "1.0.0",
-				"through2": "2.0.3",
-				"vinyl": "1.2.0"
-			},
-			"dependencies": {
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				}
-			}
-		},
-		"gulp-symdest": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz",
-			"integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"mkdirp": "0.5.1",
-				"queue": "3.1.0",
-				"vinyl-fs": "2.4.4"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.1",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-					}
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					}
-				}
-			}
-		},
-		"gulp-tslint": {
-			"version": "https://registry.npmjs.org/gulp-tslint/-/gulp-tslint-8.1.2.tgz",
-			"integrity": "sha1-4PQxlLRz1+drtFpY/oxg59/jvrI=",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"map-stream": "0.0.7",
-				"through": "2.3.8"
-			},
-			"dependencies": {
-				"map-stream": {
-					"version": "0.0.7",
-					"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-					"integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-					"dev": true
-				}
-			}
-		},
-		"gulp-typescript": {
-			"version": "3.2.3",
-			"resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-3.2.3.tgz",
-			"integrity": "sha512-Np2sJXgtDUwIAoMtlJ9uXsVmpu1FWXlKZw164hLuo56uJa7qo5W2KZ0yAYiYH/HUsaz5L0O2toMOcLIokpFCPg==",
-			"dev": true,
-			"requires": {
-				"gulp-util": "3.0.8",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"through2": "2.0.3",
-				"vinyl-fs": "2.4.4"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.1",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-					}
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					}
-				}
-			}
-		},
-		"gulp-untar": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.6.tgz",
-			"integrity": "sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"gulp-util": "3.0.8",
-				"streamifier": "0.1.1",
-				"tar": "2.2.1",
-				"through2": "2.0.3"
-			}
-		},
-		"gulp-util": {
-			"version": "3.0.8",
-			"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
-			"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
-			"dev": true,
-			"requires": {
-				"array-differ": "1.0.0",
-				"array-uniq": "1.0.3",
-				"beeper": "1.1.1",
-				"chalk": "1.1.3",
-				"dateformat": "2.2.0",
-				"fancy-log": "1.3.0",
-				"gulplog": "1.0.0",
-				"has-gulplog": "0.1.0",
-				"lodash._reescape": "3.0.0",
-				"lodash._reevaluate": "3.0.0",
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.template": "3.6.2",
-				"minimist": "1.2.0",
-				"multipipe": "0.1.2",
-				"object-assign": "3.0.0",
-				"replace-ext": "0.0.1",
-				"through2": "2.0.3",
-				"vinyl": "0.5.3"
-			},
-			"dependencies": {
-				"object-assign": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
-					"integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=",
-					"dev": true
-				}
-			}
-		},
-		"gulp-vinyl-zip": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz",
-			"integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=",
-			"dev": true,
-			"requires": {
-				"event-stream": "3.3.4",
-				"queue": "4.4.2",
-				"through2": "2.0.3",
-				"vinyl": "2.1.0",
-				"vinyl-fs": "2.4.4",
-				"yauzl": "2.9.1",
-				"yazl": "2.4.3"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
-					"integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
-					"dev": true
-				},
-				"clone-stats": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-					"integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-					"dev": true
-				},
-				"glob": {
-					"version": "5.0.15",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-					"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-					"dev": true,
-					"requires": {
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"glob-parent": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-					"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-					"dev": true,
-					"requires": {
-						"is-glob": "3.1.0",
-						"path-dirname": "1.0.2"
-					}
-				},
-				"glob-stream": {
-					"version": "5.3.5",
-					"resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
-					"integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=",
-					"dev": true,
-					"requires": {
-						"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-						"glob": "5.0.15",
-						"glob-parent": "3.1.0",
-						"micromatch": "2.3.11",
-						"ordered-read-streams": "0.3.0",
-						"through2": "0.6.5",
-						"to-absolute-glob": "0.1.1",
-						"unique-stream": "2.2.1"
-					},
-					"dependencies": {
-						"isarray": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-							"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-							"dev": true
-						},
-						"readable-stream": {
-							"version": "1.0.34",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-							"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-							"dev": true,
-							"requires": {
-								"core-util-is": "1.0.2",
-								"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-								"isarray": "0.0.1",
-								"string_decoder": "0.10.31"
-							}
-						},
-						"string_decoder": {
-							"version": "0.10.31",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-							"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-							"dev": true
-						},
-						"through2": {
-							"version": "0.6.5",
-							"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-							"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-							"dev": true,
-							"requires": {
-								"readable-stream": "1.0.34",
-								"xtend": "4.0.1"
-							}
-						}
-					}
-				},
-				"graceful-fs": {
-					"version": "4.1.11",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-					"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-					"dev": true
-				},
-				"gulp-sourcemaps": {
-					"version": "1.6.0",
-					"resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz",
-					"integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=",
-					"dev": true,
-					"requires": {
-						"convert-source-map": "1.5.1",
-						"graceful-fs": "4.1.11",
-						"strip-bom": "2.0.0",
-						"through2": "2.0.3",
-						"vinyl": "1.2.0"
-					},
-					"dependencies": {
-						"clone": {
-							"version": "1.0.3",
-							"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-							"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-							"dev": true
-						},
-						"clone-stats": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-							"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-							"dev": true
-						},
-						"replace-ext": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-							"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-							"dev": true
-						},
-						"vinyl": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-							"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-							"dev": true,
-							"requires": {
-								"clone": "1.0.3",
-								"clone-stats": "0.0.1",
-								"replace-ext": "0.0.1"
-							}
-						}
-					}
-				},
-				"is-extglob": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-					"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-					"dev": true
-				},
-				"is-glob": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-					"dev": true,
-					"requires": {
-						"is-extglob": "2.1.1"
-					}
-				},
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"ordered-read-streams": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz",
-					"integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=",
-					"dev": true,
-					"requires": {
-						"is-stream": "1.1.0",
-						"readable-stream": "2.3.3"
-					}
-				},
-				"queue": {
-					"version": "4.4.2",
-					"resolved": "https://registry.npmjs.org/queue/-/queue-4.4.2.tgz",
-					"integrity": "sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==",
-					"dev": true,
-					"requires": {
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-					}
-				},
-				"readable-stream": {
-					"version": "2.3.3",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "1.0.3",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"replace-ext": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-					"integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"unique-stream": {
-					"version": "2.2.1",
-					"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
-					"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
-					"dev": true,
-					"requires": {
-						"json-stable-stringify": "1.0.1",
-						"through2-filter": "2.0.0"
-					}
-				},
-				"vinyl": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
-					"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
-					"dev": true,
-					"requires": {
-						"clone": "2.1.1",
-						"clone-buffer": "1.0.0",
-						"clone-stats": "1.0.0",
-						"cloneable-readable": "1.0.0",
-						"remove-trailing-separator": "1.1.0",
-						"replace-ext": "1.0.0"
-					}
-				},
-				"vinyl-fs": {
-					"version": "2.4.4",
-					"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz",
-					"integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=",
-					"dev": true,
-					"requires": {
-						"duplexify": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
-						"glob-stream": "5.3.5",
-						"graceful-fs": "4.1.11",
-						"gulp-sourcemaps": "1.6.0",
-						"is-valid-glob": "0.3.0",
-						"lazystream": "1.0.0",
-						"lodash.isequal": "4.5.0",
-						"merge-stream": "1.0.1",
-						"mkdirp": "0.5.1",
-						"object-assign": "4.1.1",
-						"readable-stream": "2.3.3",
-						"strip-bom": "2.0.0",
-						"strip-bom-stream": "1.0.0",
-						"through2": "2.0.3",
-						"through2-filter": "2.0.0",
-						"vali-date": "1.0.0",
-						"vinyl": "1.2.0"
-					},
-					"dependencies": {
-						"clone": {
-							"version": "1.0.3",
-							"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",
-							"integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=",
-							"dev": true
-						},
-						"clone-stats": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
-							"integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=",
-							"dev": true
-						},
-						"replace-ext": {
-							"version": "0.0.1",
-							"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-							"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-							"dev": true
-						},
-						"vinyl": {
-							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-							"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-							"dev": true,
-							"requires": {
-								"clone": "1.0.3",
-								"clone-stats": "0.0.1",
-								"replace-ext": "0.0.1"
-							}
-						}
-					}
-				}
-			}
-		},
-		"gulplog": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-			"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-			"dev": true,
-			"requires": {
-				"glogg": "1.0.0"
-			}
-		},
-		"har-schema": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-			"integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-			"dev": true
-		},
-		"har-validator": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-			"integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"commander": "2.9.0",
-				"is-my-json-valid": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-				"pinkie-promise": "2.0.1"
-			}
-		},
-		"has-ansi": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "2.1.1"
-			}
-		},
-		"has-flag": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-			"integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-			"dev": true
-		},
-		"has-gulplog": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz",
-			"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
-			"dev": true,
-			"requires": {
-				"sparkles": "1.0.0"
-			}
-		},
-		"hawk": {
-			"version": "3.1.3",
-			"resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-			"integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-			"dev": true,
-			"requires": {
-				"boom": "2.10.1",
-				"cryptiles": "2.0.5",
-				"hoek": "2.16.3",
-				"sntp": "1.0.9"
-			}
-		},
-		"he": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-			"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-			"dev": true
-		},
-		"hoek": {
-			"version": "2.16.3",
-			"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-			"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-			"dev": true
-		},
-		"homedir-polyfill": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
-			"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
-			"dev": true,
-			"requires": {
-				"parse-passwd": "1.0.0"
-			}
-		},
-		"htmlparser2": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
-			"integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
-			"dev": true,
-			"requires": {
-				"domelementtype": "1.3.0",
-				"domhandler": "2.4.1",
-				"domutils": "1.5.1",
-				"entities": "1.1.1",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"http-proxy-agent": {
-			"version": "0.2.7",
-			"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz",
-			"integrity": "sha1-4X/aZfCQLZUs55IeYsf/iGJlWl4=",
-			"requires": {
-				"agent-base": "1.0.2",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
-			}
-		},
-		"http-signature": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-			"integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "0.2.0",
-				"jsprim": "1.4.1",
-				"sshpk": "1.13.1"
-			}
-		},
-		"https-proxy-agent": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz",
-			"integrity": "sha1-cT+jjl01P1DrFKNC/r4pAz7RYZs=",
-			"requires": {
-				"agent-base": "1.0.2",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz"
-			}
-		},
-		"iconv-lite": {
-			"version": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-			"integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=",
-			"dev": true
-		},
-		"inflight": {
-			"version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-			"requires": {
-				"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-				"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-			}
-		},
-		"inherits": {
-			"version": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-		},
-		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-			"dev": true
-		},
-		"interpret": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
-			"integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
-			"dev": true
-		},
-		"invert-kv": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-			"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-			"dev": true
-		},
-		"is": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz",
-			"integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=",
-			"dev": true
-		},
-		"is-absolute": {
-			"version": "0.2.6",
-			"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
-			"integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
-			"dev": true,
-			"requires": {
-				"is-relative": "0.2.1",
-				"is-windows": "0.2.0"
-			}
-		},
-		"is-buffer": {
-			"version": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-			"integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
-			"dev": true
-		},
-		"is-dotfile": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
-			"integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-			"dev": true
-		},
-		"is-equal-shallow": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
-			"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
-			"dev": true,
-			"requires": {
-				"is-primitive": "2.0.0"
-			}
-		},
-		"is-extendable": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-			"integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-			"dev": true
-		},
-		"is-extglob": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-			"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
-			"dev": true
-		},
-		"is-fullwidth-code-point": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-			"dev": true,
-			"requires": {
-				"number-is-nan": "1.0.1"
-			}
-		},
-		"is-glob": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-			"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
-			"dev": true,
-			"requires": {
-				"is-extglob": "1.0.0"
-			}
-		},
-		"is-my-json-valid": {
-			"version": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
-			"integrity": "sha1-WoRnd+LCYg0eaRBOXToDsfYIjxE=",
-			"dev": true,
-			"requires": {
-				"generate-function": "2.0.0",
-				"generate-object-property": "1.2.0",
-				"jsonpointer": "4.0.1",
-				"xtend": "4.0.1"
-			}
-		},
-		"is-number": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
-			"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
-			"dev": true,
-			"requires": {
-				"kind-of": "3.2.2"
-			}
-		},
-		"is-obj": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-			"dev": true
-		},
-		"is-path-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-			"integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-			"dev": true
-		},
-		"is-path-in-cwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
-			"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-			"dev": true,
-			"requires": {
-				"is-path-inside": "1.0.0"
-			}
-		},
-		"is-path-inside": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
-			"integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-			"dev": true,
-			"requires": {
-				"path-is-inside": "1.0.2"
-			}
-		},
-		"is-plain-object": {
-			"version": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-			"integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
-			"dev": true,
-			"requires": {
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"is-posix-bracket": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
-			"integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-			"dev": true
-		},
-		"is-primitive": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
-			"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-			"dev": true
-		},
-		"is-promise": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-			"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-			"dev": true
-		},
-		"is-property": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-			"integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-			"dev": true
-		},
-		"is-relative": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-			"integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
-			"dev": true,
-			"requires": {
-				"is-unc-path": "0.1.2"
-			}
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-			"dev": true
-		},
-		"is-typedarray": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-			"integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-			"dev": true
-		},
-		"is-unc-path": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz",
-			"integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
-			"dev": true,
-			"requires": {
-				"unc-path-regex": "0.1.2"
-			}
-		},
-		"is-utf8": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-			"dev": true
-		},
-		"is-valid-glob": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz",
-			"integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=",
-			"dev": true
-		},
-		"is-windows": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-			"integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-			"dev": true
-		},
-		"isarray": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-			"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-			"dev": true
-		},
-		"isexe": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-			"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-			"dev": true
-		},
-		"isobject": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-			"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-			"dev": true,
-			"requires": {
-				"isarray": "1.0.0"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				}
-			}
-		},
-		"isstream": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-			"dev": true
-		},
-		"js-tokens": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-			"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-			"dev": true
-		},
-		"jsbn": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-			"dev": true,
-			"optional": true
-		},
-		"json-schema": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-			"integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-			"dev": true
-		},
-		"json-schema-traverse": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-			"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-			"dev": true
-		},
-		"json-stable-stringify": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-			"dev": true,
-			"requires": {
-				"jsonify": "0.0.0"
-			}
-		},
-		"json-stringify-safe": {
-			"version": "5.0.1",
-			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-			"dev": true
-		},
-		"json3": {
-			"version": "3.3.2",
-			"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-			"integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-			"dev": true
-		},
-		"jsonify": {
-			"version": "0.0.0",
-			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-			"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-			"dev": true
-		},
-		"jsonpointer": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-			"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-			"dev": true
-		},
-		"jsprim": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-			"integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"extsprintf": "1.3.0",
-				"json-schema": "0.2.3",
-				"verror": "1.10.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"kind-of": {
-			"version": "3.2.2",
-			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-			"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-			"dev": true,
-			"requires": {
-				"is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
-			}
-		},
-		"lazystream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-			"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"lcid": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-			"dev": true,
-			"requires": {
-				"invert-kv": "1.0.0"
-			}
-		},
-		"liftoff": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
-			"integrity": "sha1-qY8v9nGD2Lp8+soQVIvX/wVQs4U=",
-			"dev": true,
-			"requires": {
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"findup-sync": "0.4.3",
-				"fined": "1.1.0",
-				"flagged-respawn": "0.3.2",
-				"lodash.isplainobject": "4.0.6",
-				"lodash.isstring": "4.0.1",
-				"lodash.mapvalues": "4.6.0",
-				"rechoir": "0.6.2",
-				"resolve": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"
-			}
-		},
-		"linkify-it": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz",
-			"integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=",
-			"dev": true,
-			"requires": {
-				"uc.micro": "1.0.3"
-			}
-		},
-		"lodash": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
-			"integrity": "sha1-j1dWDIO1n8JwvT1WG2kAQ0MOJVE=",
-			"dev": true
-		},
-		"lodash._baseassign": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
-			"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash.keys": "3.1.2"
-			}
-		},
-		"lodash._basecopy": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-			"integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=",
-			"dev": true
-		},
-		"lodash._basecreate": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz",
-			"integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=",
-			"dev": true
-		},
-		"lodash._basetostring": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
-			"integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=",
-			"dev": true
-		},
-		"lodash._basevalues": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
-			"integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=",
-			"dev": true
-		},
-		"lodash._getnative": {
-			"version": "3.9.1",
-			"resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-			"integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-			"dev": true
-		},
-		"lodash._isiterateecall": {
-			"version": "3.0.9",
-			"resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-			"integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=",
-			"dev": true
-		},
-		"lodash._reescape": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
-			"integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=",
-			"dev": true
-		},
-		"lodash._reevaluate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
-			"integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=",
-			"dev": true
-		},
-		"lodash._reinterpolate": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
-			"integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
-			"dev": true
-		},
-		"lodash._root": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
-			"integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=",
-			"dev": true
-		},
-		"lodash.create": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz",
-			"integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=",
-			"dev": true,
-			"requires": {
-				"lodash._baseassign": "3.2.0",
-				"lodash._basecreate": "3.0.3",
-				"lodash._isiterateecall": "3.0.9"
-			}
-		},
-		"lodash.escape": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
-			"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
-			"dev": true,
-			"requires": {
-				"lodash._root": "3.0.1"
-			}
-		},
-		"lodash.isarguments": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-			"integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-			"dev": true
-		},
-		"lodash.isarray": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-			"integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-			"dev": true
-		},
-		"lodash.isequal": {
-			"version": "4.5.0",
-			"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-			"integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
-			"dev": true
-		},
-		"lodash.isplainobject": {
-			"version": "4.0.6",
-			"resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-			"integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=",
-			"dev": true
-		},
-		"lodash.isstring": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-			"integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=",
-			"dev": true
-		},
-		"lodash.keys": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-			"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-			"dev": true,
-			"requires": {
-				"lodash._getnative": "3.9.1",
-				"lodash.isarguments": "3.1.0",
-				"lodash.isarray": "3.0.4"
-			}
-		},
-		"lodash.mapvalues": {
-			"version": "4.6.0",
-			"resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-			"integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=",
-			"dev": true
-		},
-		"lodash.restparam": {
-			"version": "3.6.1",
-			"resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-			"integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=",
-			"dev": true
-		},
-		"lodash.template": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
-			"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
-			"dev": true,
-			"requires": {
-				"lodash._basecopy": "3.0.1",
-				"lodash._basetostring": "3.0.1",
-				"lodash._basevalues": "3.0.0",
-				"lodash._isiterateecall": "3.0.9",
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.escape": "3.2.0",
-				"lodash.keys": "3.1.2",
-				"lodash.restparam": "3.6.1",
-				"lodash.templatesettings": "3.1.1"
-			}
-		},
-		"lodash.templatesettings": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz",
-			"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
-			"dev": true,
-			"requires": {
-				"lodash._reinterpolate": "3.0.0",
-				"lodash.escape": "3.2.0"
-			}
-		},
-		"lru-cache": {
-			"version": "2.7.3",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
-			"integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
-			"dev": true
-		},
-		"lru-queue": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-			"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.37"
-			}
-		},
-		"map-cache": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-			"integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-			"dev": true
-		},
-		"map-stream": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-			"integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
-			"dev": true
-		},
-		"markdown-it": {
-			"version": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz",
-			"integrity": "sha1-4kAIgb8XH3AY7RvZ2kQdrIr2MG0=",
-			"dev": true,
-			"requires": {
-				"argparse": "1.0.9",
-				"entities": "1.1.1",
-				"linkify-it": "2.0.3",
-				"mdurl": "1.0.1",
-				"uc.micro": "1.0.3"
-			}
-		},
-		"mdurl": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-			"dev": true
-		},
-		"memoizee": {
-			"version": "0.4.11",
-			"resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.11.tgz",
-			"integrity": "sha1-vemBdmPJ5A/bKk6hw2cpYIeujI8=",
-			"dev": true,
-			"requires": {
-				"d": "1.0.0",
-				"es5-ext": "0.10.37",
-				"es6-weak-map": "2.0.2",
-				"event-emitter": "0.3.5",
-				"is-promise": "2.1.0",
-				"lru-queue": "0.1.0",
-				"next-tick": "1.0.0",
-				"timers-ext": "0.1.2"
-			}
-		},
-		"merge-stream": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-			"integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"micromatch": {
-			"version": "2.3.11",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
-			"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
-			"dev": true,
-			"requires": {
-				"arr-diff": "2.0.0",
-				"array-unique": "0.2.1",
-				"braces": "1.8.5",
-				"expand-brackets": "0.1.5",
-				"extglob": "0.3.2",
-				"filename-regex": "2.0.1",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1",
-				"kind-of": "3.2.2",
-				"normalize-path": "2.1.1",
-				"object.omit": "2.0.1",
-				"parse-glob": "3.0.4",
-				"regex-cache": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz"
-			}
-		},
-		"mime": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-			"dev": true
-		},
-		"mime-db": {
-			"version": "1.30.0",
-			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-			"integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-			"dev": true
-		},
-		"mime-types": {
-			"version": "2.1.17",
-			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
-			"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-			"dev": true,
-			"requires": {
-				"mime-db": "1.30.0"
-			}
-		},
-		"minimatch": {
-			"version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-			"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-			"requires": {
-				"brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
-			}
-		},
-		"minimist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-			"dev": true
-		},
-		"mkdirp": {
-			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-			"dev": true,
-			"requires": {
-				"minimist": "0.0.8"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				}
-			}
-		},
-		"mocha": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
-			"integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
-			"dev": true,
-			"requires": {
-				"browser-stdout": "1.3.0",
-				"commander": "2.9.0",
-				"debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-				"diff": "3.2.0",
-				"escape-string-regexp": "1.0.5",
-				"glob": "7.1.1",
-				"growl": "1.9.2",
-				"he": "1.1.1",
-				"json3": "3.3.2",
-				"lodash.create": "3.1.1",
-				"mkdirp": "0.5.1",
-				"supports-color": "3.1.2"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-					"integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=",
-					"dev": true,
-					"requires": {
-						"fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"supports-color": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
-					"integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=",
-					"dev": true,
-					"requires": {
-						"has-flag": "1.0.0"
-					}
-				}
-			}
-		},
-		"ms": {
-			"version": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-		},
-		"multimatch": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz",
-			"integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=",
-			"dev": true,
-			"requires": {
-				"array-differ": "1.0.0",
-				"array-union": "1.0.2",
-				"arrify": "1.0.1",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-			}
-		},
-		"multipipe": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
-			"integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=",
-			"dev": true,
-			"requires": {
-				"duplexer2": "0.0.2"
-			}
-		},
-		"mute-stream": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-			"integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-			"dev": true
-		},
-		"natives": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz",
-			"integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=",
-			"dev": true
-		},
-		"next-tick": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-			"integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-			"dev": true
-		},
-		"node.extend": {
-			"version": "1.1.6",
-			"resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz",
-			"integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=",
-			"dev": true,
-			"requires": {
-				"is": "3.2.1"
-			}
-		},
-		"noice-json-rpc": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/noice-json-rpc/-/noice-json-rpc-1.0.1.tgz",
-			"integrity": "sha1-XnKJpgocIIgEicsVEBVSusOSJm4="
-		},
-		"normalize-path": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-			"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-			"dev": true,
-			"requires": {
-				"remove-trailing-separator": "1.1.0"
-			}
-		},
-		"nth-check": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-			"integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-			"dev": true,
-			"requires": {
-				"boolbase": "1.0.0"
-			}
-		},
-		"number-is-nan": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-			"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-			"dev": true
-		},
-		"oauth-sign": {
-			"version": "0.8.2",
-			"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-			"integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-			"dev": true
-		},
-		"object-assign": {
-			"version": "4.1.1",
-			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true
-		},
-		"object.defaults": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-			"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-			"dev": true,
-			"requires": {
-				"array-each": "1.0.1",
-				"array-slice": "1.0.0",
-				"for-own": "1.0.0",
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"for-own": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-					"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-					"dev": true,
-					"requires": {
-						"for-in": "1.0.2"
-					}
-				},
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"object.omit": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
-			"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
-			"dev": true,
-			"requires": {
-				"for-own": "0.1.5",
-				"is-extendable": "0.1.1"
-			}
-		},
-		"object.pick": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-			"dev": true,
-			"requires": {
-				"isobject": "3.0.1"
-			},
-			"dependencies": {
-				"isobject": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-					"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-					"dev": true
-				}
-			}
-		},
-		"once": {
-			"version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-			"requires": {
-				"wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-			}
-		},
-		"options": {
-			"version": "0.0.6",
-			"resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-			"integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
-		},
-		"orchestrator": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
-			"integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
-			"dev": true,
-			"requires": {
-				"end-of-stream": "0.1.5",
-				"sequencify": "0.0.7",
-				"stream-consume": "0.1.0"
-			}
-		},
-		"ordered-read-streams": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-			"integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-			"dev": true
-		},
-		"os-homedir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-			"dev": true
-		},
-		"os-locale": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-			"dev": true,
-			"requires": {
-				"lcid": "1.0.0"
-			}
-		},
-		"os-tmpdir": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-			"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-			"dev": true
-		},
-		"osenv": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-			"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2",
-				"os-tmpdir": "1.0.2"
-			}
-		},
-		"parse-filepath": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
-			"integrity": "sha1-FZ1hVdQ5BNFsEO9piRHaHpGWm3M=",
-			"dev": true,
-			"requires": {
-				"is-absolute": "0.2.6",
-				"map-cache": "0.2.2",
-				"path-root": "0.1.1"
-			}
-		},
-		"parse-glob": {
-			"version": "3.0.4",
-			"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
-			"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
-			"dev": true,
-			"requires": {
-				"glob-base": "0.3.0",
-				"is-dotfile": "1.0.3",
-				"is-extglob": "1.0.0",
-				"is-glob": "2.0.1"
-			}
-		},
-		"parse-passwd": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-			"integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-			"dev": true
-		},
-		"parse-semver": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-			"integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-			"dev": true,
-			"requires": {
-				"semver": "5.4.1"
-			},
-			"dependencies": {
-				"semver": {
-					"version": "5.4.1",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-					"dev": true
-				}
-			}
-		},
-		"parse5": {
-			"version": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
-			"integrity": "sha1-BC95L/3TaFFVHPTp4Gazh0q0W1w=",
-			"dev": true,
-			"requires": {
-				"@types/node": "6.0.92"
-			}
-		},
-		"path-dirname": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-			"integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-			"dev": true
-		},
-		"path-is-absolute": {
-			"version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
-		},
-		"path-is-inside": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-			"integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-			"dev": true
-		},
-		"path-parse": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
-			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
-			"dev": true
-		},
-		"path-root": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-			"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-			"dev": true,
-			"requires": {
-				"path-root-regex": "0.1.2"
-			}
-		},
-		"path-root-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-			"integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-			"dev": true
-		},
-		"pause-stream": {
-			"version": "0.0.11",
-			"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-			"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-			"dev": true,
-			"requires": {
-				"through": "2.3.8"
-			}
-		},
-		"pend": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-			"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-			"dev": true
-		},
-		"performance-now": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-			"integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-			"dev": true
-		},
-		"pify": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-			"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-			"dev": true
-		},
-		"pinkie": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-			"integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-			"dev": true
-		},
-		"pinkie-promise": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-			"dev": true,
-			"requires": {
-				"pinkie": "2.0.4"
-			}
-		},
-		"preserve": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
-			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-			"dev": true
-		},
-		"pretty-hrtime": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-			"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-			"dev": true
-		},
-		"process-nextick-args": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-			"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
-			"dev": true
-		},
-		"punycode": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-			"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-			"dev": true
-		},
-		"q": {
-			"version": "1.5.1",
-			"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-			"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-			"dev": true
-		},
-		"qs": {
-			"version": "6.3.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-			"integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-			"dev": true
-		},
-		"querystringify": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
-			"integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=",
-			"dev": true
-		},
-		"queue": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz",
-			"integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=",
-			"dev": true,
-			"requires": {
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-			}
-		},
-		"randomatic": {
-			"version": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-			"integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
-			"dev": true,
-			"requires": {
-				"is-number": "3.0.0",
-				"kind-of": "4.0.0"
-			},
-			"dependencies": {
-				"is-number": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-					"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-					"dev": true,
-					"requires": {
-						"kind-of": "3.2.2"
-					},
-					"dependencies": {
-						"kind-of": {
-							"version": "3.2.2",
-							"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-							"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-							"dev": true,
-							"requires": {
-								"is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
-							}
-						}
-					}
-				},
-				"kind-of": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-					"dev": true,
-					"requires": {
-						"is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
-					}
-				}
-			}
-		},
-		"read": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-			"integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-			"dev": true,
-			"requires": {
-				"mute-stream": "0.0.7"
-			}
-		},
-		"readable-stream": {
-			"version": "1.1.14",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-			"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-			"dev": true,
-			"requires": {
-				"core-util-is": "1.0.2",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-				"isarray": "0.0.1",
-				"string_decoder": "0.10.31"
-			}
-		},
-		"rechoir": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-			"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-			"dev": true,
-			"requires": {
-				"resolve": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz"
-			}
-		},
-		"regex-cache": {
-			"version": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-			"integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
-			"dev": true,
-			"requires": {
-				"is-equal-shallow": "0.1.3"
-			}
-		},
-		"remove-trailing-separator": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-			"integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-			"dev": true
-		},
-		"repeat-element": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-			"integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-			"dev": true
-		},
-		"repeat-string": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-			"integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-			"dev": true
-		},
-		"replace-ext": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
-			"integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
-			"dev": true
-		},
-		"request": {
-			"version": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-			"integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=",
-			"dev": true,
-			"requires": {
-				"aws-sign2": "0.7.0",
-				"aws4": "1.6.0",
-				"caseless": "0.12.0",
-				"combined-stream": "1.0.5",
-				"extend": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-				"forever-agent": "0.6.1",
-				"form-data": "2.3.1",
-				"har-validator": "5.0.3",
-				"hawk": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-				"http-signature": "1.2.0",
-				"is-typedarray": "1.0.0",
-				"isstream": "0.1.2",
-				"json-stringify-safe": "5.0.1",
-				"mime-types": "2.1.17",
-				"oauth-sign": "0.8.2",
-				"performance-now": "2.1.0",
-				"qs": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-				"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-				"stringstream": "0.0.5",
-				"tough-cookie": "2.3.3",
-				"tunnel-agent": "0.6.0",
-				"uuid": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				},
-				"aws-sign2": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-					"integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-					"dev": true
-				},
-				"boom": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-					"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"
-					}
-				},
-				"caseless": {
-					"version": "0.12.0",
-					"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-					"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-					"dev": true
-				},
-				"cryptiles": {
-					"version": "3.1.2",
-					"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-					"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-					"dev": true,
-					"requires": {
-						"boom": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz"
-					},
-					"dependencies": {
-						"boom": {
-							"version": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-							"integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-							"dev": true,
-							"requires": {
-								"hoek": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"
-							}
-						}
-					}
-				},
-				"form-data": {
-					"version": "2.3.1",
-					"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-					"integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
-					"dev": true,
-					"requires": {
-						"asynckit": "0.4.0",
-						"combined-stream": "1.0.5",
-						"mime-types": "2.1.17"
-					}
-				},
-				"har-validator": {
-					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-					"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-					"dev": true,
-					"requires": {
-						"ajv": "5.5.0",
-						"har-schema": "2.0.0"
-					}
-				},
-				"hawk": {
-					"version": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-					"integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-					"dev": true,
-					"requires": {
-						"boom": "4.3.1",
-						"cryptiles": "3.1.2",
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-						"sntp": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz"
-					}
-				},
-				"hoek": {
-					"version": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-					"integrity": "sha1-ctnQdU9/4lyi0BrY+PmpRJqJUm0=",
-					"dev": true
-				},
-				"http-signature": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-					"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-					"dev": true,
-					"requires": {
-						"assert-plus": "1.0.0",
-						"jsprim": "1.4.1",
-						"sshpk": "1.13.1"
-					}
-				},
-				"qs": {
-					"version": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-					"integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg=",
-					"dev": true
-				},
-				"sntp": {
-					"version": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-					"integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=",
-					"dev": true,
-					"requires": {
-						"hoek": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz"
-					}
-				},
-				"tunnel-agent": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-					"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"request-light": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/request-light/-/request-light-0.1.0.tgz",
-			"integrity": "sha1-/mXd/7suh5RPDMr9hcuDnpE4U0U=",
-			"requires": {
-				"http-proxy-agent": "0.2.7",
-				"https-proxy-agent": "0.3.6",
-				"vscode-nls": "1.0.7"
-			},
-			"dependencies": {
-				"vscode-nls": {
-					"version": "1.0.7",
-					"resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz",
-					"integrity": "sha1-KYwB/Oh4AsZEwKFe9SajPGLA1Y4="
-				}
-			}
-		},
-		"requires-port": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-			"integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-			"dev": true
-		},
-		"resolve": {
-			"version": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-			"integrity": "sha1-HwmsznlsmnYlefMbLBzEw83fnzY=",
-			"dev": true,
-			"requires": {
-				"path-parse": "1.0.5"
-			}
-		},
-		"resolve-dir": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-			"integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "1.2.2",
-				"global-modules": "0.2.3"
-			}
-		},
-		"resolve-url": {
-			"version": "0.2.1",
-			"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-			"integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-			"dev": true
-		},
-		"rimraf": {
-			"version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-			"integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-			"dev": true,
-			"requires": {
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
-			}
-		},
-		"run-sequence": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/run-sequence/-/run-sequence-1.2.2.tgz",
-			"integrity": "sha1-UJWgvr6YczsBQL0I3YDsAw3azes=",
-			"dev": true,
-			"requires": {
-				"chalk": "1.1.3",
-				"gulp-util": "3.0.8"
-			}
-		},
-		"safe-buffer": {
-			"version": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-			"integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-			"dev": true
-		},
-		"sax": {
-			"version": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-			"integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
-			"dev": true
-		},
-		"semver": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-			"integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-			"dev": true
-		},
-		"sequencify": {
-			"version": "0.0.7",
-			"resolved": "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz",
-			"integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
-			"dev": true
-		},
-		"sigmund": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-			"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-			"dev": true
-		},
-		"sntp": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-			"integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-			"dev": true,
-			"requires": {
-				"hoek": "2.16.3"
-			}
-		},
-		"source-map": {
-			"version": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-			"integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI="
-		},
-		"source-map-resolve": {
-			"version": "0.3.1",
-			"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.3.1.tgz",
-			"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
-			"dev": true,
-			"requires": {
-				"atob": "1.1.3",
-				"resolve-url": "0.2.1",
-				"source-map-url": "0.3.0",
-				"urix": "0.1.0"
-			}
-		},
-		"source-map-support": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.0.tgz",
-			"integrity": "sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q==",
-			"dev": true,
-			"requires": {
-				"source-map": "0.6.1"
-			},
-			"dependencies": {
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-					"dev": true
-				}
-			}
-		},
-		"source-map-url": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.3.0.tgz",
-			"integrity": "sha1-fsrxO1e80J2opAxdJp2zN5nUqvk=",
-			"dev": true
-		},
-		"sparkles": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
-			"integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
-			"dev": true
-		},
-		"split": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-			"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
-			"dev": true,
-			"requires": {
-				"through": "2.3.8"
-			}
-		},
-		"sprintf-js": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-			"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-			"dev": true
-		},
-		"sshpk": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
-			"integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-			"dev": true,
-			"requires": {
-				"asn1": "0.2.3",
-				"assert-plus": "1.0.0",
-				"bcrypt-pbkdf": "1.0.1",
-				"dashdash": "1.14.1",
-				"ecc-jsbn": "0.1.1",
-				"getpass": "0.1.7",
-				"jsbn": "0.1.1",
-				"tweetnacl": "0.14.5"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"stat-mode": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
-			"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
-			"dev": true
-		},
-		"stream-combiner": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-			"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
-			"dev": true,
-			"requires": {
-				"duplexer": "0.1.1"
-			}
-		},
-		"stream-consume": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-			"integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
-			"dev": true
-		},
-		"stream-shift": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-			"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-			"dev": true
-		},
-		"streamfilter": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.5.tgz",
-			"integrity": "sha1-h1BxEb644phFFxe1Ec/tjwAqv1M=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"streamifier": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz",
-			"integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=",
-			"dev": true
-		},
-		"string-width": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-			"dev": true,
-			"requires": {
-				"code-point-at": "1.1.0",
-				"is-fullwidth-code-point": "1.0.0",
-				"strip-ansi": "3.0.1"
-			}
-		},
-		"string_decoder": {
-			"version": "0.10.31",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-			"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-			"dev": true
-		},
-		"stringstream": {
-			"version": "0.0.5",
-			"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-			"integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-			"dev": true
-		},
-		"strip-ansi": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-			"dev": true,
-			"requires": {
-				"ansi-regex": "2.1.1"
-			}
-		},
-		"strip-bom": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-			"integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
-			"dev": true,
-			"requires": {
-				"first-chunk-stream": "1.0.0",
-				"is-utf8": "0.2.1"
-			}
-		},
-		"strip-bom-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz",
-			"integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=",
-			"dev": true,
-			"requires": {
-				"first-chunk-stream": "1.0.0",
-				"strip-bom": "2.0.0"
-			},
-			"dependencies": {
-				"strip-bom": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-					"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				}
-			}
-		},
-		"strip-bom-string": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
-			"integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=",
-			"dev": true
-		},
-		"supports-color": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-			"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-			"dev": true
-		},
-		"tar": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-			"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-			"dev": true,
-			"requires": {
-				"block-stream": "0.0.9",
-				"fstream": "1.0.11",
-				"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-			}
-		},
-		"through": {
-			"version": "2.3.8",
-			"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-			"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-			"dev": true
-		},
-		"through2": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-			"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-			"dev": true,
-			"requires": {
-				"readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-				"xtend": "4.0.1"
-			},
-			"dependencies": {
-				"isarray": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-					"integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "1.0.0",
-						"process-nextick-args": "1.0.7",
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-						"string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-						"util-deprecate": "1.0.2"
-					}
-				},
-				"string_decoder": {
-					"version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-					"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"
-					}
-				}
-			}
-		},
-		"through2-filter": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
-			"integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
-			"dev": true,
-			"requires": {
-				"through2": "2.0.3",
-				"xtend": "4.0.1"
-			}
-		},
-		"tildify": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
-			"integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
-			"dev": true,
-			"requires": {
-				"os-homedir": "1.0.2"
-			}
-		},
-		"time-stamp": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-			"integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-			"dev": true
-		},
-		"timers-ext": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.2.tgz",
-			"integrity": "sha1-YcxHp2wavTGV8UUn+XjViulMUgQ=",
-			"dev": true,
-			"requires": {
-				"es5-ext": "0.10.37",
-				"next-tick": "1.0.0"
-			}
-		},
-		"tmp": {
-			"version": "0.0.29",
-			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
-			"integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
-			"dev": true,
-			"requires": {
-				"os-tmpdir": "1.0.2"
-			}
-		},
-		"to-absolute-glob": {
-			"version": "0.1.1",
-			"resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz",
-			"integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=",
-			"dev": true,
-			"requires": {
-				"extend-shallow": "2.0.1"
-			}
-		},
-		"tough-cookie": {
-			"version": "2.3.3",
-			"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
-			"integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-			"dev": true,
-			"requires": {
-				"punycode": "1.4.1"
-			}
-		},
-		"tslib": {
-			"version": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
-			"integrity": "sha1-3GBOutZLy/aW1hPabJVKoOfqHrY=",
-			"dev": true
-		},
-		"tslint": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.8.0.tgz",
-			"integrity": "sha1-H0mtWy53x2w69N3K5VKuTjYS6xM=",
-			"dev": true,
-			"requires": {
-				"babel-code-frame": "6.26.0",
-				"builtin-modules": "1.1.1",
-				"chalk": "2.3.0",
-				"commander": "2.9.0",
-				"diff": "3.2.0",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"resolve": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-				"tslib": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz",
-				"tsutils": "2.12.2"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-					"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
-					"dev": true,
-					"requires": {
-						"color-convert": "1.9.1"
-					}
-				},
-				"chalk": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-					"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "3.2.0",
-						"escape-string-regexp": "1.0.5",
-						"supports-color": "4.5.0"
-					}
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"semver": {
-					"version": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-					"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"tsutils": {
-			"version": "2.12.2",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",
-			"integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",
-			"dev": true,
-			"requires": {
-				"tslib": "https://registry.npmjs.org/tslib/-/tslib-1.8.0.tgz"
-			}
-		},
-		"tunnel": {
-			"version": "0.0.4",
-			"resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
-			"integrity": "sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM=",
-			"dev": true
-		},
-		"tunnel-agent": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-			"integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-			"dev": true
-		},
-		"tweetnacl": {
-			"version": "0.14.5",
-			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-			"dev": true,
-			"optional": true
-		},
-		"typed-rest-client": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-0.9.0.tgz",
-			"integrity": "sha1-92jMDcP06VDwbgSCXDaz54NKofI=",
-			"dev": true,
-			"requires": {
-				"tunnel": "0.0.4",
-				"underscore": "1.8.3"
-			}
-		},
-		"typescript": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",
-			"integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",
-			"dev": true
-		},
-		"uc.micro": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz",
-			"integrity": "sha1-ftUNXg+an7ClczeSWfKndFjVAZI=",
-			"dev": true
-		},
-		"ultron": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
-			"integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po="
-		},
-		"unc-path-regex": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-			"dev": true
-		},
-		"underscore": {
-			"version": "1.8.3",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
-			"integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
-			"dev": true
-		},
-		"unique-stream": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-			"integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
-			"dev": true
-		},
-		"urix": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-			"integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-			"dev": true
-		},
-		"url-join": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-			"integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=",
-			"dev": true
-		},
-		"url-parse": {
-			"version": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-			"integrity": "sha1-OhnoqqbQI93SfcxEy0/I9/7COYY=",
-			"dev": true,
-			"requires": {
-				"querystringify": "1.0.0",
-				"requires-port": "1.0.0"
-			}
-		},
-		"user-home": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
-			"integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
-			"dev": true
-		},
-		"util-deprecate": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-			"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-			"dev": true
-		},
-		"uuid": {
-			"version": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-			"integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
-			"dev": true
-		},
-		"v8flags": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-			"integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
-			"dev": true,
-			"requires": {
-				"user-home": "1.1.1"
-			}
-		},
-		"vali-date": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz",
-			"integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=",
-			"dev": true
-		},
-		"verror": {
-			"version": "1.10.0",
-			"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-			"dev": true,
-			"requires": {
-				"assert-plus": "1.0.0",
-				"core-util-is": "1.0.2",
-				"extsprintf": "1.3.0"
-			},
-			"dependencies": {
-				"assert-plus": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-					"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-					"dev": true
-				}
-			}
-		},
-		"vinyl": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
-			"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3",
-				"clone-stats": "0.0.1",
-				"replace-ext": "0.0.1"
-			}
-		},
-		"vinyl-fs": {
-			"version": "0.3.14",
-			"resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-			"integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
-			"dev": true,
-			"requires": {
-				"defaults": "1.0.3",
-				"glob-stream": "3.1.18",
-				"glob-watcher": "0.0.6",
-				"graceful-fs": "3.0.11",
-				"mkdirp": "0.5.1",
-				"strip-bom": "1.0.0",
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"vinyl-source-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.0.tgz",
-			"integrity": "sha1-RMvlEIIFJ53rDFZTwJSiiHk4sas=",
-			"dev": true,
-			"requires": {
-				"through2": "0.6.5",
-				"vinyl": "0.4.6"
-			},
-			"dependencies": {
-				"clone": {
-					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-					"integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
-					"dev": true
-				},
-				"readable-stream": {
-					"version": "1.0.34",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-					"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-					"dev": true,
-					"requires": {
-						"core-util-is": "1.0.2",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"isarray": "0.0.1",
-						"string_decoder": "0.10.31"
-					}
-				},
-				"through2": {
-					"version": "0.6.5",
-					"resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-					"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
-					"dev": true,
-					"requires": {
-						"readable-stream": "1.0.34",
-						"xtend": "4.0.1"
-					}
-				},
-				"vinyl": {
-					"version": "0.4.6",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-					"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
-					"dev": true,
-					"requires": {
-						"clone": "0.2.0",
-						"clone-stats": "0.0.1"
-					}
-				}
-			}
-		},
-		"vsce": {
-			"version": "1.33.2",
-			"resolved": "https://registry.npmjs.org/vsce/-/vsce-1.33.2.tgz",
-			"integrity": "sha1-NkX2mq+YTiL3TqSdNfON0Y1m/18=",
-			"dev": true,
-			"requires": {
-				"cheerio": "1.0.0-rc.2",
-				"commander": "2.9.0",
-				"denodeify": "1.2.1",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"lodash": "4.17.4",
-				"markdown-it": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.0.tgz",
-				"mime": "1.6.0",
-				"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-				"osenv": "0.1.4",
-				"parse-semver": "1.1.1",
-				"read": "1.0.7",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-				"tmp": "0.0.29",
-				"url-join": "1.1.0",
-				"vso-node-api": "6.1.2-preview",
-				"yauzl": "2.9.1",
-				"yazl": "2.4.3"
-			},
-			"dependencies": {
-				"lodash": {
-					"version": "4.17.4",
-					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-					"integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-					"dev": true
-				},
-				"semver": {
-					"version": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
-					"dev": true
-				}
-			}
-		},
-		"vscode": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.8.tgz",
-			"integrity": "sha512-kT6sIA1AEKR5M+us2fXk5dxwV9SR/IEdLHNmVW4/dl1wNBHoEvgIo1qMQwHNxPVTQmw70KTGZ9UVeVb8FbpNFA==",
-			"dev": true,
-			"requires": {
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"gulp-chmod": "2.0.0",
-				"gulp-filter": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.0.1.tgz",
-				"gulp-gunzip": "1.0.0",
-				"gulp-remote-src": "0.4.3",
-				"gulp-symdest": "1.1.0",
-				"gulp-untar": "0.0.6",
-				"gulp-vinyl-zip": "2.1.0",
-				"mocha": "4.0.1",
-				"request": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-				"semver": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-				"source-map-support": "0.5.0",
-				"url-parse": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz",
-				"vinyl-source-stream": "1.1.0"
-			},
-			"dependencies": {
-				"commander": {
-					"version": "2.11.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-					"integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-					"dev": true
-				},
-				"debug": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-					"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-					"dev": true,
-					"requires": {
-						"ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-					}
-				},
-				"diff": {
-					"version": "3.3.1",
-					"resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
-					"integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
-					"dev": true
-				},
-				"growl": {
-					"version": "1.10.3",
-					"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
-					"integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
-					"dev": true
-				},
-				"has-flag": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-					"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
-					"dev": true
-				},
-				"mocha": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",
-					"integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",
-					"dev": true,
-					"requires": {
-						"browser-stdout": "1.3.0",
-						"commander": "2.11.0",
-						"debug": "3.1.0",
-						"diff": "3.3.1",
-						"escape-string-regexp": "1.0.5",
-						"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-						"growl": "1.10.3",
-						"he": "1.1.1",
-						"mkdirp": "0.5.1",
-						"supports-color": "4.4.0"
-					}
-				},
-				"semver": {
-					"version": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-					"integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
-					"dev": true
-				},
-				"supports-color": {
-					"version": "4.4.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-					"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
-					"dev": true,
-					"requires": {
-						"has-flag": "2.0.0"
-					}
-				}
-			}
-		},
-		"vscode-chrome-debug-core": {
-			"version": "3.19.0",
-			"resolved": "https://registry.npmjs.org/vscode-chrome-debug-core/-/vscode-chrome-debug-core-3.19.0.tgz",
-			"integrity": "sha1-70aLFweJqQhC+2wsQVS7OsZXvvc=",
-			"requires": {
-				"@types/source-map": "https://registry.npmjs.org/@types/source-map/-/source-map-0.1.29.tgz",
-				"glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-				"noice-json-rpc": "1.0.1",
-				"request-light": "0.1.0",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"vscode-debugadapter": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.24.0.tgz",
-				"vscode-debugprotocol": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz",
-				"vscode-nls": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-				"ws": "1.1.5"
-			}
-		},
-		"vscode-chrome-debug-core-testsupport": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/vscode-chrome-debug-core-testsupport/-/vscode-chrome-debug-core-testsupport-3.17.1.tgz",
-			"integrity": "sha1-DUazMXWZooWLSkz+QgzDUuQZiBw=",
-			"dev": true,
-			"requires": {
-				"vscode-debugadapter-testsupport": "1.24.0"
-			},
-			"dependencies": {
-				"vscode-debugadapter-testsupport": {
-					"version": "1.24.0",
-					"resolved": "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.24.0.tgz",
-					"integrity": "sha1-rDZ1scU/wW+1JMvSt+znEhtiXng=",
-					"dev": true,
-					"requires": {
-						"vscode-debugprotocol": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz"
-					}
-				}
-			}
-		},
-		"vscode-debugadapter": {
-			"version": "https://registry.npmjs.org/vscode-debugadapter/-/vscode-debugadapter-1.24.0.tgz",
-			"integrity": "sha1-KAY7AcyorB5fehPRGOMgem6If/0=",
-			"requires": {
-				"vscode-debugprotocol": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz"
-			}
-		},
-		"vscode-debugadapter-testsupport": {
-			"version": "1.23.0",
-			"resolved": "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.23.0.tgz",
-			"integrity": "sha1-pItd5CrYChckDZxRHDeGA41pbRs=",
-			"dev": true,
-			"requires": {
-				"vscode-debugprotocol": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz"
-			}
-		},
-		"vscode-debugprotocol": {
-			"version": "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.24.0.tgz",
-			"integrity": "sha1-28EOjX2VsQJyehmvPw/O9+JSsI4="
-		},
-		"vscode-nls": {
-			"version": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz",
-			"integrity": "sha1-gIUiOAhEuK0VNJmvXDsDkhrqAto="
-		},
-		"vscode-nls-dev": {
-			"version": "2.1.6",
-			"resolved": "https://registry.npmjs.org/vscode-nls-dev/-/vscode-nls-dev-2.1.6.tgz",
-			"integrity": "sha512-1IylC/ekENYqz1vEItfrzrMXS8LW9aZQnNTU6BfdwT0Jddzed+l+nvU8amgVKFFmC1/GoiMFk5wtC20zWBbEbw==",
-			"dev": true,
-			"requires": {
-				"clone": "1.0.3",
-				"event-stream": "3.3.4",
-				"glob": "6.0.4",
-				"gulp-util": "3.0.8",
-				"iconv-lite": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-				"is": "3.2.1",
-				"source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-				"typescript": "2.6.1",
-				"vinyl": "1.2.0",
-				"xml2js": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-				"yargs": "3.32.0"
-			},
-			"dependencies": {
-				"glob": {
-					"version": "6.0.4",
-					"resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-					"integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-					"dev": true,
-					"requires": {
-						"inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-						"inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-						"minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-						"once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-						"path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-					}
-				},
-				"vinyl": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz",
-					"integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=",
-					"dev": true,
-					"requires": {
-						"clone": "1.0.3",
-						"clone-stats": "0.0.1",
-						"replace-ext": "0.0.1"
-					}
-				}
-			}
-		},
-		"vso-node-api": {
-			"version": "6.1.2-preview",
-			"resolved": "https://registry.npmjs.org/vso-node-api/-/vso-node-api-6.1.2-preview.tgz",
-			"integrity": "sha1-qrNUbfJFHs2JTgcbuZtd8Zxfp48=",
-			"dev": true,
-			"requires": {
-				"q": "1.5.1",
-				"tunnel": "0.0.4",
-				"typed-rest-client": "0.9.0",
-				"underscore": "1.8.3"
-			}
-		},
-		"which": {
-			"version": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-			"integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-			"dev": true,
-			"requires": {
-				"isexe": "2.0.0"
-			}
-		},
-		"window-size": {
-			"version": "0.1.4",
-			"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
-			"integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=",
-			"dev": true
-		},
-		"wrap-ansi": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-			"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-			"dev": true,
-			"requires": {
-				"string-width": "1.0.2",
-				"strip-ansi": "3.0.1"
-			}
-		},
-		"wrappy": {
-			"version": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-		},
-		"ws": {
-			"version": "1.1.5",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
-			"integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
-			"requires": {
-				"options": "0.0.6",
-				"ultron": "1.0.2"
-			}
-		},
-		"xml2js": {
-			"version": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-			"integrity": "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c=",
-			"dev": true,
-			"requires": {
-				"sax": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-				"xmlbuilder": "9.0.4"
-			}
-		},
-		"xmlbuilder": {
-			"version": "9.0.4",
-			"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
-			"integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8=",
-			"dev": true
-		},
-		"xtend": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-			"dev": true
-		},
-		"y18n": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-			"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-			"dev": true
-		},
-		"yargs": {
-			"version": "3.32.0",
-			"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
-			"integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
-			"dev": true,
-			"requires": {
-				"camelcase": "2.1.1",
-				"cliui": "3.2.0",
-				"decamelize": "1.2.0",
-				"os-locale": "1.4.0",
-				"string-width": "1.0.2",
-				"window-size": "0.1.4",
-				"y18n": "3.2.1"
-			}
-		},
-		"yauzl": {
-			"version": "2.9.1",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
-			"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "0.2.13",
-				"fd-slicer": "1.0.1"
-			}
-		},
-		"yazl": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz",
-			"integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=",
-			"dev": true,
-			"requires": {
-				"buffer-crc32": "0.2.13"
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/extensions/ms-vscode.node-debug2/package.json b/extensions/ms-vscode.node-debug2/package.json
deleted file mode 100644
index 96c454263b3..00000000000
--- a/extensions/ms-vscode.node-debug2/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "node-debug2",
-	"version": "0.0.3",
-	"publisher": "ms-vscode",
-	"engines": {
-		"vscode": "1.6.x"
-	}
-}
\ No newline at end of file

From 6fe6061960dee368c052c388842666c5b53090ca Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 17:59:09 +0100
Subject: [PATCH 573/710] #39574 Revert extension changs

---
 src/vs/workbench/api/electron-browser/mainThreadLogService.ts | 4 ++--
 src/vs/workbench/api/node/extHost.protocol.ts                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadLogService.ts b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
index c24b24c619a..17bd91b65f9 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
@@ -5,7 +5,7 @@
 
 'use strict';
 
-import { ExtHostContext, IExtHostContext } from '../node/extHost.protocol';
+import { IExtHostContext } from '../node/extHost.protocol';
 import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -18,7 +18,7 @@ export class MainThreadLogLevelManagementChannel extends Disposable {
 		@ILogService logService: ILogService,
 	) {
 		super();
-		this._register(logService.onDidChangeLogLevel(level => extHostContext.getProxy(ExtHostContext.ExtHostLogService).$setLogLevel(level)));
+		// this._register(logService.onDidChangeLogLevel(level => extHostContext.getProxy(ExtHostContext.ExtHostLogService).$setLogLevel(level)));
 	}
 
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 955e29ee3fc..a72f7b6d570 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -799,7 +799,7 @@ export const ExtHostContext = {
 	ExtHostLanguageFeatures: createExtId('ExtHostLanguageFeatures'),
 	ExtHostQuickOpen: createExtId('ExtHostQuickOpen'),
 	ExtHostExtensionService: createExtId('ExtHostExtensionService'),
-	ExtHostLogService: createExtId('ExtHostLogService'),
+	// ExtHostLogService: createExtId('ExtHostLogService'),
 	ExtHostTerminalService: createExtId('ExtHostTerminalService'),
 	ExtHostSCM: createExtId('ExtHostSCM'),
 	ExtHostTask: createExtId('ExtHostTask', ProxyType.CustomMarshaller),

From 2fe2829517f3d877514a0ec63708e25908c0dcd6 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Tue, 23 Jan 2018 08:46:57 -0800
Subject: [PATCH 574/710] vscode-xterm@3.1.0-beta8

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

diff --git a/package.json b/package.json
index 744c612172f..1d8d44d2a1b 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.0",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.1.0-beta7",
+    "vscode-xterm": "3.1.0-beta8",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
@@ -129,4 +129,4 @@
     "windows-mutex": "^0.2.0",
     "windows-process-tree": "0.1.6"
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 91fc8617773..bcc807feb45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.1.0-beta7:
-  version "3.1.0-beta7"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta7.tgz#10b0162baf8ddbf8454ba3ccb723c8808f8803af"
+vscode-xterm@3.1.0-beta8:
+  version "3.1.0-beta8"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta8.tgz#cc0d7016dfe486566fd835bcf3e8503884dde09b"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"

From 8b3b72d1d9dee042f7aff06aefddd7a8e5796d02 Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Tue, 23 Jan 2018 09:01:07 -0800
Subject: [PATCH 575/710] Add fontWeight/fontWeightBold terminal settings,
 remove enableBold

Fixes #29887
---
 src/typings/vscode-xterm.d.ts                     | 15 +++++++++++++++
 .../workbench/parts/terminal/common/terminal.ts   |  5 ++++-
 .../electron-browser/terminal.contribution.ts     | 15 +++++++++++----
 .../terminal/electron-browser/terminalInstance.ts | 10 +++++++---
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/typings/vscode-xterm.d.ts b/src/typings/vscode-xterm.d.ts
index 5e76f2033ee..df8bf449cea 100644
--- a/src/typings/vscode-xterm.d.ts
+++ b/src/typings/vscode-xterm.d.ts
@@ -8,6 +8,11 @@
  */
 
 declare module 'vscode-xterm' {
+	/**
+	 * A string representing text font weight.
+	 */
+	export type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
+
 	/**
 	 * An object containing start up options for the terminal.
 	 */
@@ -57,6 +62,16 @@ declare module 'vscode-xterm' {
 		 */
 		fontFamily?: string;
 
+		/**
+		 * The font weight used to render non-bold text.
+		 */
+		fontWeight?: FontWeight;
+
+		/**
+		 * The font weight used to render bold text.
+		 */
+		fontWeightBold?: FontWeight;
+
 		/**
 		 * The spacing in whole pixels between characters..
 		 */
diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts
index 59e4747ed75..3ad222245eb 100644
--- a/src/vs/workbench/parts/terminal/common/terminal.ts
+++ b/src/vs/workbench/parts/terminal/common/terminal.ts
@@ -49,6 +49,8 @@ export const TerminalCursorStyle = {
 
 export const TERMINAL_CONFIG_SECTION = 'terminal.integrated';
 
+export type FontWeight = 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900';
+
 export interface ITerminalConfiguration {
 	shell: {
 		linux: string;
@@ -60,12 +62,13 @@ export interface ITerminalConfiguration {
 		osx: string[];
 		windows: string[];
 	};
-	enableBold: boolean;
 	macOptionIsMeta: boolean;
 	rightClickCopyPaste: boolean;
 	cursorBlinking: boolean;
 	cursorStyle: string;
 	fontFamily: string;
+	fontWeight: FontWeight;
+	fontWeightBold: FontWeight;
 	// fontLigatures: boolean;
 	fontSize: number;
 	lineHeight: number;
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 98e2a2357b8..99e9d1d4b49 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
@@ -150,10 +150,17 @@ configurationRegistry.registerConfiguration({
 			'type': 'number',
 			'default': 1
 		},
-		'terminal.integrated.enableBold': {
-			'type': 'boolean',
-			'description': nls.localize('terminal.integrated.enableBold', "Whether to enable bold text within the terminal, note that this requires support from the terminal shell."),
-			'default': true
+		'terminal.integrated.fontWeight': {
+			'type': 'string',
+			'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
+			'description': nls.localize('terminal.integrated.fontWeight', "The font weight to use within the termianl for non-bold text."),
+			'default': 'normal'
+		},
+		'terminal.integrated.fontWeightBold': {
+			'type': 'string',
+			'enum': ['normal', 'bold', '100', '200', '300', '400', '500', '600', '700', '800', '900'],
+			'description': nls.localize('terminal.integrated.fontWeightBold', "The font weight to use within the termianl for bold text."),
+			'default': 'bold'
 		},
 		'terminal.integrated.cursorBlinking': {
 			'description': nls.localize('terminal.integrated.cursorBlinking', "Controls whether the terminal cursor blinks."),
diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
index 46bdcaefbca..035f619324c 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
@@ -278,9 +278,10 @@ export class TerminalInstance implements ITerminalInstance {
 			scrollback: this._configHelper.config.scrollback,
 			theme: this._getXtermTheme(),
 			fontFamily: font.fontFamily,
+			fontWeight: this._configHelper.config.fontWeight,
+			fontWeightBold: this._configHelper.config.fontWeightBold,
 			fontSize: font.fontSize,
 			lineHeight: font.lineHeight,
-			enableBold: this._configHelper.config.enableBold,
 			bellStyle: this._configHelper.config.enableBell ? 'sound' : 'none',
 			screenReaderMode: accessibilitySupport === 'on',
 			macOptionIsMeta: this._configHelper.config.macOptionIsMeta
@@ -1056,8 +1057,11 @@ export class TerminalInstance implements ITerminalInstance {
 				if (this._xterm.getOption('fontFamily') !== font.fontFamily) {
 					this._xterm.setOption('fontFamily', font.fontFamily);
 				}
-				if (this._xterm.getOption('enableBold') !== this._configHelper.config.enableBold) {
-					this._xterm.setOption('enableBold', this._configHelper.config.enableBold);
+				if (this._xterm.getOption('fontWeight') !== this._configHelper.config.fontWeight) {
+					this._xterm.setOption('fontWeight', this._configHelper.config.fontWeight);
+				}
+				if (this._xterm.getOption('fontWeightBold') !== this._configHelper.config.fontWeightBold) {
+					this._xterm.setOption('fontWeightBold', this._configHelper.config.fontWeightBold);
 				}
 			}
 

From dd56a283a8a9137f96f6c0feed4c3568a771d4e4 Mon Sep 17 00:00:00 2001
From: isidor 
Date: Tue, 23 Jan 2018 18:14:09 +0100
Subject: [PATCH 576/710] debug: schema for  compound configurations names

---
 src/vs/workbench/parts/debug/common/debug.ts  |  2 +-
 .../debugConfigurationManager.ts              | 21 ++++++++++++++++---
 .../debug/electron-browser/debugService.ts    |  9 +++-----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts
index 8356f23b448..598c69684af 100644
--- a/src/vs/workbench/parts/debug/common/debug.ts
+++ b/src/vs/workbench/parts/debug/common/debug.ts
@@ -460,7 +460,7 @@ export interface ILaunch {
 	 * Returns the names of all configurations and compounds.
 	 * Ignores configurations which are invalid.
 	 */
-	getConfigurationNames(): string[];
+	getConfigurationNames(includeCompounds?: boolean): string[];
 
 	/**
 	 * Returns the resolved configuration.
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
index c7351052731..a9a6226e949 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts
@@ -187,7 +187,12 @@ const schema: IJSONSchema = {
 						type: 'array',
 						default: [],
 						items: {
-							type: 'string'
+							oneOf: [{
+								enum: [],
+								description: nls.localize('useUniqueNames', "Please use unique configuration names.")
+							}, {
+								type: 'object'
+							}]
 						},
 						description: nls.localize('app.launch.json.compounds.configurations', "Names of configurations that will be started as part of this compound.")
 					}
@@ -311,6 +316,8 @@ export class ConfigurationManager implements IConfigurationManager {
 					items.defaultSnippets.push(...configurationSnippets);
 				}
 			});
+
+			this.setCompoundSchemaValues();
 		});
 
 		breakpointsExtPoint.setHandler(extensions => {
@@ -328,6 +335,7 @@ export class ConfigurationManager implements IConfigurationManager {
 		this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectsConfiguration('launch')) {
 				this.selectConfiguration();
+				this.setCompoundSchemaValues();
 			}
 		}));
 
@@ -345,6 +353,13 @@ export class ConfigurationManager implements IConfigurationManager {
 		}
 	}
 
+	private setCompoundSchemaValues(): void {
+		const compoundConfigurationsSchema = (schema.properties['compounds'].items).properties['configurations'];
+		(compoundConfigurationsSchema.items).oneOf[0].enum = this.launches.map(l =>
+			l.getConfigurationNames(false)).reduce((first, second) => first.concat(second), []);
+		jsonRegistry.registerSchema(launchSchemaId, schema);
+	}
+
 	public getLaunches(): ILaunch[] {
 		return this.launches;
 	}
@@ -495,13 +510,13 @@ class Launch implements ILaunch {
 		return config.compounds.filter(compound => compound.name === name).pop();
 	}
 
-	public getConfigurationNames(): string[] {
+	public getConfigurationNames(includeCompounds = true): string[] {
 		const config = this.getConfig();
 		if (!config || !config.configurations || !Array.isArray(config.configurations)) {
 			return [];
 		} else {
 			const names = config.configurations.filter(cfg => cfg && typeof cfg.name === 'string').map(cfg => cfg.name);
-			if (names.length > 0 && config.compounds) {
+			if (includeCompounds && names.length > 0 && config.compounds) {
 				if (config.compounds) {
 					names.push(...config.compounds.filter(compound => typeof compound.name === 'string' && compound.configurations && compound.configurations.length)
 						.map(compound => compound.name));
diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
index b42ea9956db..462d8d630a2 100644
--- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts
+++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts
@@ -699,12 +699,9 @@ export class DebugService implements debug.IDebugService {
 						}
 
 						let rootForName = root;
-						if (launch === this.configurationManager.getWorkspaceLaunch()) {
-							// For workspace launches allow comound referencing configurations across folder
-							const launchContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name)).pop();
-							if (launchContainingName) {
-								rootForName = launchContainingName.workspace;
-							}
+						const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name));
+						if (launchesContainingName && launchesContainingName.length === 1) {
+							rootForName = launchesContainingName[0].workspace;
 						}
 
 						return this.startDebugging(rootForName, name, noDebug, topCompoundName || compound.name);

From 7155f39d031980c1f00b645a82a1ec3a4cadde93 Mon Sep 17 00:00:00 2001
From: Nicolas Ramz 
Date: Tue, 23 Jan 2018 18:37:15 +0100
Subject: [PATCH 577/710] FIXED: issue window opened as child, fixes #42024

---
 build/gulpfile.hygiene.js                           | 2 +-
 src/vs/platform/issue/electron-main/issueService.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
index f766cfaca0f..eecc080ad1d 100644
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@@ -198,7 +198,7 @@ const hygiene = exports.hygiene = (some, options) => {
 		tsfmt.processString(file.path, file.contents.toString('utf8'), {
 			verify: true,
 			tsfmt: true,
-			// verbose: true
+			verbose: true
 		}).then(result => {
 			if (result.error) {
 				console.error(result.message);
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index 26ba9c5f6bd..ba398e53b21 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -40,7 +40,7 @@ export class IssueService implements IIssueService {
 			width: 800,
 			height: 900,
 			title: 'Issue Reporter',
-			alwaysOnTop: true
+			parent: BrowserWindow.getFocusedWindow()
 		});
 
 		this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented

From f2b303f3ccbe3451d462417d660da33b430ce5fd Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 18:50:45 +0100
Subject: [PATCH 578/710] #39574 Define interface ILogLevelSetter

---
 .../sharedProcess/sharedProcessMain.ts        |  4 +--
 src/vs/code/electron-main/app.ts              |  4 +--
 src/vs/platform/log/common/log.ts             | 26 +++++++++++++------
 src/vs/platform/log/common/logIpc.ts          | 18 ++++++-------
 src/vs/workbench/electron-browser/main.ts     |  4 +--
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 17fdc47c3e7..08d4961b251 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -39,7 +39,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ILogService, FollowerLogService } from 'vs/platform/log/common/log';
-import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannelClient } from 'vs/platform/log/common/logIpc';
 
 export interface ISharedProcessConfiguration {
 	readonly machineId: string;
@@ -82,7 +82,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	const services = new ServiceCollection();
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
-	const logLevelClient = new LogLevelChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
+	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
 	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', environmentService));
 	process.once('exit', () => logService.dispose());
 
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index eec6c2bae9b..c23a0587ca0 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -57,7 +57,7 @@ import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateServ
 import { IIssueService } from 'vs/platform/issue/common/issue';
 import { IssueChannel } from 'vs/platform/issue/common/issueIpc';
 import { IssueService } from 'vs/platform/issue/electron-main/issueService';
-import { LogLevelChannel } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannel } from 'vs/platform/log/common/logIpc';
 
 export class CodeApplication {
 
@@ -380,7 +380,7 @@ export class CodeApplication {
 		this.sharedProcessClient.done(client => client.registerChannel('windows', windowsChannel));
 
 		// Log level management
-		const logLevelChannel = new LogLevelChannel(accessor.get(ILogService));
+		const logLevelChannel = new LogLevelSetterChannel(accessor.get(ILogService));
 		this.electronIpcServer.registerChannel('loglevel', logLevelChannel);
 		this.sharedProcessClient.done(client => client.registerChannel('loglevel', logLevelChannel));
 
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index f7019d95418..615070982ec 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -10,7 +10,6 @@ import { createDecorator as createServiceDecorator } from 'vs/platform/instantia
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { isWindows } from 'vs/base/common/platform';
 import Event, { Emitter } from 'vs/base/common/event';
-import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
 
 export const ILogService = createServiceDecorator('logService');
 
@@ -24,11 +23,14 @@ export enum LogLevel {
 	Off
 }
 
-export interface ILogService extends IDisposable {
-	_serviceBrand: any;
-
+export interface ILogLevelSetter {
 	onDidChangeLogLevel: Event;
 	setLevel(level: LogLevel): void;
+}
+
+export interface ILogService extends ILogLevelSetter, IDisposable {
+	_serviceBrand: any;
+
 	getLevel(): LogLevel;
 	trace(message: string, ...args: any[]): void;
 	debug(message: string, ...args: any[]): void;
@@ -237,16 +239,24 @@ export class MultiplexLogService extends AbstractLogService implements ILogServi
 	}
 }
 
-export class FollowerLogService extends AbstractLogService implements ILogService {
+export class FollowerLogService extends Disposable implements ILogService {
 	_serviceBrand: any;
 
-	constructor(private client: LogLevelChannelClient, private logService: ILogService) {
+	constructor(private master: ILogLevelSetter, private logService: ILogService) {
 		super();
-		this._register(client.onDidChangeLogLevel(level => logService.setLevel(level)));
+		this._register(master.onDidChangeLogLevel(level => logService.setLevel(level)));
+	}
+
+	get onDidChangeLogLevel(): Event {
+		return this.logService.onDidChangeLogLevel;
 	}
 
 	setLevel(level: LogLevel): void {
-		this.client.setLogLevel(level);
+		this.master.setLevel(level);
+	}
+
+	getLevel(): LogLevel {
+		return this.logService.getLevel();
 	}
 
 	trace(message: string, ...args: any[]): void {
diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts
index 9eb0764c54e..e8c10a8416d 100644
--- a/src/vs/platform/log/common/logIpc.ts
+++ b/src/vs/platform/log/common/logIpc.ts
@@ -5,15 +5,15 @@
 
 import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { LogLevel, ILogService } from 'vs/platform/log/common/log';
+import { LogLevel, ILogService, ILogLevelSetter } from 'vs/platform/log/common/log';
 import Event, { buffer } from 'vs/base/common/event';
 
-export interface ILogLevelManagementChannel extends IChannel {
+export interface ILogLevelSetterChannel extends IChannel {
 	call(command: 'event:onDidChangeLogLevel'): TPromise;
-	call(command: 'setLogLevel', logLevel: LogLevel): TPromise;
+	call(command: 'setLevel', logLevel: LogLevel): TPromise;
 }
 
-export class LogLevelChannel implements ILogLevelManagementChannel {
+export class LogLevelSetterChannel implements ILogLevelSetterChannel {
 
 	onDidChangeLogLevel: Event;
 
@@ -24,20 +24,20 @@ export class LogLevelChannel implements ILogLevelManagementChannel {
 	call(command: string, arg?: any): TPromise {
 		switch (command) {
 			case 'event:onDidChangeLogLevel': return eventToCall(this.onDidChangeLogLevel);
-			case 'setLogLevel': this.service.setLevel(arg); return TPromise.as(null);
+			case 'setLevel': this.service.setLevel(arg); return TPromise.as(null);
 		}
 		return undefined;
 	}
 }
 
-export class LogLevelChannelClient {
+export class LogLevelSetterChannelClient implements ILogLevelSetter {
 
-	constructor(private channel: ILogLevelManagementChannel) { }
+	constructor(private channel: ILogLevelSetterChannel) { }
 
 	private _onDidChangeLogLevel = eventFromCall(this.channel, 'event:onDidChangeLogLevel');
 	get onDidChangeLogLevel(): Event { return this._onDidChangeLogLevel; }
 
-	setLogLevel(level: LogLevel): TPromise {
-		return this.channel.call('setLogLevel', level);
+	setLevel(level: LogLevel): TPromise {
+		return this.channel.call('setLevel', level);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index f40edbae3fc..315865aef12 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -46,7 +46,7 @@ import fs = require('fs');
 import { ConsoleLogService, MultiplexLogService, ILogService, FollowerLogService } from 'vs/platform/log/common/log';
 import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc';
 import { IIssueService } from 'vs/platform/issue/common/issue';
-import { LogLevelChannelClient } from 'vs/platform/log/common/logIpc';
+import { LogLevelSetterChannelClient } from 'vs/platform/log/common/logIpc';
 gracefulFs.gracefulify(fs); // enable gracefulFs
 
 export function startup(configuration: IWindowConfiguration): TPromise {
@@ -202,7 +202,7 @@ function createLogService(mainProcessClient: ElectronIPCClient, configuration: I
 	const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, environmentService);
 	const consoleLogService = new ConsoleLogService(environmentService);
 	const logService = new MultiplexLogService([consoleLogService, spdlogService]);
-	const logLevelClient = new LogLevelChannelClient(mainProcessClient.getChannel('loglevel'));
+	const logLevelClient = new LogLevelSetterChannelClient(mainProcessClient.getChannel('loglevel'));
 	return new FollowerLogService(logLevelClient, logService);
 }
 

From c9b291978cae610aebfc4d434802b34d1901bff0 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 19:30:44 +0100
Subject: [PATCH 579/710] #39574 Implement log level transmission to extension
 host

---
 src/vs/platform/log/common/log.ts             | 20 +++++++++++++++----
 .../extensionHost.contribution.ts             |  1 +
 .../electron-browser/mainThreadLogService.ts  |  6 +++---
 src/vs/workbench/api/node/extHost.api.impl.ts | 11 +++++-----
 src/vs/workbench/api/node/extHost.protocol.ts |  4 ++--
 .../api/node/extHostExtensionService.ts       | 16 +++++++--------
 .../workbench/api/node/extHostLogService.ts   | 19 +++++++++---------
 src/vs/workbench/node/extensionHostMain.ts    | 17 ++++++++--------
 8 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index 615070982ec..176320014a7 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -239,12 +239,11 @@ export class MultiplexLogService extends AbstractLogService implements ILogServi
 	}
 }
 
-export class FollowerLogService extends Disposable implements ILogService {
+export class DelegatedLogService extends Disposable implements ILogService {
 	_serviceBrand: any;
 
-	constructor(private master: ILogLevelSetter, private logService: ILogService) {
+	constructor(private logService: ILogService) {
 		super();
-		this._register(master.onDidChangeLogLevel(level => logService.setLevel(level)));
 	}
 
 	get onDidChangeLogLevel(): Event {
@@ -252,7 +251,7 @@ export class FollowerLogService extends Disposable implements ILogService {
 	}
 
 	setLevel(level: LogLevel): void {
-		this.master.setLevel(level);
+		this.logService.setLevel(level);
 	}
 
 	getLevel(): LogLevel {
@@ -288,6 +287,19 @@ export class FollowerLogService extends Disposable implements ILogService {
 	}
 }
 
+export class FollowerLogService extends DelegatedLogService implements ILogService {
+	_serviceBrand: any;
+
+	constructor(private master: ILogLevelSetter, logService: ILogService) {
+		super(logService);
+		this._register(master.onDidChangeLogLevel(level => logService.setLevel(level)));
+	}
+
+	setLevel(level: LogLevel): void {
+		this.master.setLevel(level);
+	}
+}
+
 export class NullLogService implements ILogService {
 	_serviceBrand: any;
 	readonly onDidChangeLogLevel: Event = new Emitter().event;
diff --git a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
index 6217b1dadcd..d610ada2b88 100644
--- a/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
+++ b/src/vs/workbench/api/electron-browser/extensionHost.contribution.ts
@@ -46,6 +46,7 @@ import './mainThreadTask';
 import './mainThreadTelemetry';
 import './mainThreadTerminalService';
 import './mainThreadTreeViews';
+import './mainThreadLogService';
 import './mainThreadWindow';
 import './mainThreadWorkspace';
 
diff --git a/src/vs/workbench/api/electron-browser/mainThreadLogService.ts b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
index 17bd91b65f9..213ad68da8b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadLogService.ts
@@ -5,20 +5,20 @@
 
 'use strict';
 
-import { IExtHostContext } from '../node/extHost.protocol';
 import { extHostCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
 import { ILogService } from 'vs/platform/log/common/log';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { IExtHostContext, ExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
 
 @extHostCustomer
-export class MainThreadLogLevelManagementChannel extends Disposable {
+export class MainThreadLogService extends Disposable {
 
 	constructor(
 		extHostContext: IExtHostContext,
 		@ILogService logService: ILogService,
 	) {
 		super();
-		// this._register(logService.onDidChangeLogLevel(level => extHostContext.getProxy(ExtHostContext.ExtHostLogService).$setLogLevel(level)));
+		this._register(logService.onDidChangeLogLevel(level => extHostContext.getProxy(ExtHostContext.ExtHostLogService).$setLevel(level)));
 	}
 
 }
\ No newline at end of file
diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts
index cc7aafe634b..39b0905b90e 100644
--- a/src/vs/workbench/api/node/extHost.api.impl.ts
+++ b/src/vs/workbench/api/node/extHost.api.impl.ts
@@ -55,8 +55,8 @@ import { ExtHostDecorations } from 'vs/workbench/api/node/extHostDecorations';
 import { toGlobPattern, toLanguageSelector } from 'vs/workbench/api/node/extHostTypeConverters';
 import { ExtensionActivatedByAPI } from 'vs/workbench/api/node/extHostExtensionActivator';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { ILogService } from 'vs/platform/log/common/log';
 import { OverviewRulerLane } from 'vs/editor/common/model';
+import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
 
 export interface IExtensionApiFactory {
 	(extension: IExtensionDescription): typeof vscode;
@@ -89,18 +89,19 @@ export function createApiFactory(
 	extHostWorkspace: ExtHostWorkspace,
 	extHostConfiguration: ExtHostConfiguration,
 	extensionService: ExtHostExtensionService,
-	logService: ILogService
+	extHostLogService: ExtHostLogService
 ): IExtensionApiFactory {
 
 	// Addressable instances
+	rpcProtocol.set(ExtHostContext.ExtHostLogService, extHostLogService);
 	const extHostHeapService = rpcProtocol.set(ExtHostContext.ExtHostHeapService, new ExtHostHeapService());
 	const extHostDecorations = rpcProtocol.set(ExtHostContext.ExtHostDecorations, new ExtHostDecorations(rpcProtocol));
 	const extHostDocumentsAndEditors = rpcProtocol.set(ExtHostContext.ExtHostDocumentsAndEditors, new ExtHostDocumentsAndEditors(rpcProtocol));
 	const extHostDocuments = rpcProtocol.set(ExtHostContext.ExtHostDocuments, new ExtHostDocuments(rpcProtocol, extHostDocumentsAndEditors));
 	const extHostDocumentContentProviders = rpcProtocol.set(ExtHostContext.ExtHostDocumentContentProviders, new ExtHostDocumentContentProvider(rpcProtocol, extHostDocumentsAndEditors));
-	const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, new ExtHostDocumentSaveParticipant(logService, extHostDocuments, rpcProtocol.getProxy(MainContext.MainThreadEditors)));
+	const extHostDocumentSaveParticipant = rpcProtocol.set(ExtHostContext.ExtHostDocumentSaveParticipant, new ExtHostDocumentSaveParticipant(extHostLogService, extHostDocuments, rpcProtocol.getProxy(MainContext.MainThreadEditors)));
 	const extHostEditors = rpcProtocol.set(ExtHostContext.ExtHostEditors, new ExtHostEditors(rpcProtocol, extHostDocumentsAndEditors));
-	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostHeapService, logService));
+	const extHostCommands = rpcProtocol.set(ExtHostContext.ExtHostCommands, new ExtHostCommands(rpcProtocol, extHostHeapService, extHostLogService));
 	const extHostTreeViews = rpcProtocol.set(ExtHostContext.ExtHostTreeViews, new ExtHostTreeViews(rpcProtocol.getProxy(MainContext.MainThreadTreeViews), extHostCommands));
 	rpcProtocol.set(ExtHostContext.ExtHostWorkspace, extHostWorkspace);
 	const extHostDebugService = rpcProtocol.set(ExtHostContext.ExtHostDebugService, new ExtHostDebugService(rpcProtocol, extHostWorkspace));
@@ -111,7 +112,7 @@ export function createApiFactory(
 	const extHostFileSystemEvent = rpcProtocol.set(ExtHostContext.ExtHostFileSystemEventService, new ExtHostFileSystemEventService());
 	const extHostQuickOpen = rpcProtocol.set(ExtHostContext.ExtHostQuickOpen, new ExtHostQuickOpen(rpcProtocol, extHostWorkspace, extHostCommands));
 	const extHostTerminalService = rpcProtocol.set(ExtHostContext.ExtHostTerminalService, new ExtHostTerminalService(rpcProtocol));
-	const extHostSCM = rpcProtocol.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(rpcProtocol, extHostCommands, logService));
+	const extHostSCM = rpcProtocol.set(ExtHostContext.ExtHostSCM, new ExtHostSCM(rpcProtocol, extHostCommands, extHostLogService));
 	const extHostTask = rpcProtocol.set(ExtHostContext.ExtHostTask, new ExtHostTask(rpcProtocol, extHostWorkspace));
 	const extHostWindow = rpcProtocol.set(ExtHostContext.ExtHostWindow, new ExtHostWindow(rpcProtocol));
 	rpcProtocol.set(ExtHostContext.ExtHostExtensionService, extensionService);
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index a72f7b6d570..e8d27c90b2c 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -746,7 +746,7 @@ export interface ExtHostWindowShape {
 }
 
 export interface ExtHostLogServiceShape {
-	$setLogLevel(level: LogLevel);
+	$setLevel(level: LogLevel);
 }
 
 // --- proxy identifiers
@@ -799,7 +799,7 @@ export const ExtHostContext = {
 	ExtHostLanguageFeatures: createExtId('ExtHostLanguageFeatures'),
 	ExtHostQuickOpen: createExtId('ExtHostQuickOpen'),
 	ExtHostExtensionService: createExtId('ExtHostExtensionService'),
-	// ExtHostLogService: createExtId('ExtHostLogService'),
+	ExtHostLogService: createExtId('ExtHostLogService'),
 	ExtHostTerminalService: createExtId('ExtHostTerminalService'),
 	ExtHostSCM: createExtId('ExtHostSCM'),
 	ExtHostTask: createExtId('ExtHostTask', ProxyType.CustomMarshaller),
diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts
index fb50ec716d8..2ea4f37ba86 100644
--- a/src/vs/workbench/api/node/extHostExtensionService.ts
+++ b/src/vs/workbench/api/node/extHostExtensionService.ts
@@ -128,7 +128,6 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 	private readonly _storage: ExtHostStorage;
 	private readonly _storagePath: ExtensionStoragePath;
 	private readonly _proxy: MainThreadExtensionServiceShape;
-	private readonly _logService: ILogService;
 	private readonly _extHostLogService: ExtHostLogService;
 	private _activator: ExtensionsActivator;
 	private _extensionPathIndex: TPromise>;
@@ -139,21 +138,20 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		extHostContext: IExtHostContext,
 		extHostWorkspace: ExtHostWorkspace,
 		extHostConfiguration: ExtHostConfiguration,
-		logService: ILogService,
+		extHostLogService: ExtHostLogService,
 		environmentService: IEnvironmentService
 	) {
 		this._barrier = new Barrier();
 		this._registry = new ExtensionDescriptionRegistry(initData.extensions);
-		this._logService = logService;
+		this._extHostLogService = extHostLogService;
 		this._mainThreadTelemetry = extHostContext.getProxy(MainContext.MainThreadTelemetry);
 		this._storage = new ExtHostStorage(extHostContext);
 		this._storagePath = new ExtensionStoragePath(initData.workspace, initData.environment);
 		this._proxy = extHostContext.getProxy(MainContext.MainThreadExtensionService);
 		this._activator = null;
-		this._extHostLogService = new ExtHostLogService(environmentService, this._logService);
 
 		// initialize API first (i.e. do not release barrier until the API is initialized)
-		const apiFactory = createApiFactory(initData, extHostContext, extHostWorkspace, extHostConfiguration, this, logService);
+		const apiFactory = createApiFactory(initData, extHostContext, extHostWorkspace, extHostConfiguration, this, this._extHostLogService);
 
 		initializeExtensionApi(this, apiFactory).then(() => {
 
@@ -314,14 +312,14 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 			return TPromise.as(new EmptyExtension(ExtensionActivationTimes.NONE));
 		}
 
-		this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.id} ${JSON.stringify(reason)}`);
+		this._extHostLogService.info(`ExtensionService#_doActivateExtension ${extensionDescription.id} ${JSON.stringify(reason)}`);
 
 		const activationTimesBuilder = new ExtensionActivationTimesBuilder(reason.startup);
 		return TPromise.join([
-			loadCommonJSModule(this._logService, extensionDescription.main, activationTimesBuilder),
+			loadCommonJSModule(this._extHostLogService, extensionDescription.main, activationTimesBuilder),
 			this._loadExtensionContext(extensionDescription)
 		]).then(values => {
-			return ExtHostExtensionService._callActivate(this._logService, extensionDescription.id, values[0], values[1], activationTimesBuilder);
+			return ExtHostExtensionService._callActivate(this._extHostLogService, extensionDescription.id, values[0], values[1], activationTimesBuilder);
 		}, (errors: any[]) => {
 			// Avoid failing with an array of errors, fail with a single error
 			if (errors[0]) {
@@ -339,7 +337,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape {
 		let globalState = new ExtensionMemento(extensionDescription.id, true, this._storage);
 		let workspaceState = new ExtensionMemento(extensionDescription.id, false, this._storage);
 
-		this._logService.trace(`ExtensionService#loadExtensionContext ${extensionDescription.id}`);
+		this._extHostLogService.trace(`ExtensionService#loadExtensionContext ${extensionDescription.id}`);
 		return TPromise.join([
 			globalState.whenReady,
 			workspaceState.whenReady,
diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts
index 4689e038ae8..60b000101e1 100644
--- a/src/vs/workbench/api/node/extHostLogService.ts
+++ b/src/vs/workbench/api/node/extHostLogService.ts
@@ -10,25 +10,26 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { mkdirp, dirExists } from 'vs/base/node/pfs';
 import Event from 'vs/base/common/event';
 import { LogLevel } from 'vs/workbench/api/node/extHostTypes';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ILogService, DelegatedLogService } from 'vs/platform/log/common/log';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { memoize } from 'vs/base/common/decorators';
 import { ExtHostLogServiceShape } from 'vs/workbench/api/node/extHost.protocol';
-import { Disposable } from 'vs/base/common/lifecycle';
 
-export class ExtHostLogService extends Disposable implements ExtHostLogServiceShape {
+
+export class ExtHostLogService extends DelegatedLogService implements ILogService, ExtHostLogServiceShape {
+
 	private _loggers: Map = new Map();
 
 	constructor(
-		private _environmentService: IEnvironmentService,
-		private _logService: ILogService
+		windowId: number,
+		private _environmentService: IEnvironmentService
 	) {
-		super();
+		super(createSpdLogService(`exthost${windowId}`, _environmentService));
 	}
 
-	$setLogLevel(level: LogLevel) {
-		this._logService.setLevel(level);
+	$setLevel(level: LogLevel): void {
+		this.setLevel(level);
 	}
 
 	getExtLogger(extensionID: string): ExtHostLogger {
@@ -43,7 +44,7 @@ export class ExtHostLogService extends Disposable implements ExtHostLogServiceSh
 	private createLogger(extensionID: string): ExtHostLogger {
 		const logService = createSpdLogService(extensionID, this._environmentService, extensionID);
 		const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
-		this._register(this._logService.onDidChangeLogLevel(level => logService.setLevel(level)));
+		this._register(this.onDidChangeLogLevel(level => logService.setLevel(level)));
 		return new ExtHostLogger(logService, logsDirPath);
 	}
 }
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 7af498132c5..60314f50234 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -21,12 +21,11 @@ import * as watchdog from 'native-watchdog';
 import * as glob from 'vs/base/common/glob';
 import { ExtensionActivatedByEvent } from 'vs/workbench/api/node/extHostExtensionActivator';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
-import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { ILogService } from 'vs/platform/log/common/log';
 import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
 import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
 import URI from 'vs/base/common/uri';
+import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService';
 
 // const nativeExit = process.exit.bind(process);
 function patchProcess(allowExit: boolean) {
@@ -78,7 +77,7 @@ export class ExtensionHostMain {
 	private _environment: IEnvironment;
 	private _extensionService: ExtHostExtensionService;
 	private _extHostConfiguration: ExtHostConfiguration;
-	private _logService: ILogService;
+	private _extHostLogService: ExtHostLogService;
 	private disposables: IDisposable[] = [];
 
 	constructor(protocol: IMessagePassingProtocol, initData: IInitData) {
@@ -92,14 +91,14 @@ export class ExtensionHostMain {
 		const rpcProtocol = new RPCProtocol(protocol);
 		const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace);
 		const environmentService = new EnvironmentService(initData.args, initData.execPath);
-		this._logService = createSpdLogService(`exthost${initData.windowId}`, environmentService);
-		this.disposables.push(this._logService);
+		this._extHostLogService = new ExtHostLogService(initData.windowId, environmentService);
+		this.disposables.push(this._extHostLogService);
 
-		this._logService.info('extension host started');
-		this._logService.trace('initData', initData);
+		this._extHostLogService.info('extension host started');
+		this._extHostLogService.trace('initData', initData);
 
 		this._extHostConfiguration = new ExtHostConfiguration(rpcProtocol.getProxy(MainContext.MainThreadConfiguration), extHostWorkspace, initData.configuration);
-		this._extensionService = new ExtHostExtensionService(initData, rpcProtocol, extHostWorkspace, this._extHostConfiguration, this._logService, environmentService);
+		this._extensionService = new ExtHostExtensionService(initData, rpcProtocol, extHostWorkspace, this._extHostConfiguration, this._extHostLogService, environmentService);
 
 		// error forwarding and stack trace scanning
 		const extensionErrors = new WeakMap();
@@ -143,7 +142,7 @@ export class ExtensionHostMain {
 			.then(() => this.handleEagerExtensions())
 			.then(() => this.handleExtensionTests())
 			.then(() => {
-				this._logService.info(`eager extensions activated`);
+				this._extHostLogService.info(`eager extensions activated`);
 			});
 	}
 

From d260ccffecefd809ca81d856e857a0441522417e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero 
Date: Tue, 23 Jan 2018 19:33:07 +0100
Subject: [PATCH 580/710] workaround #41987

---
 .../browser/parts/quickopen/quickOpenController.ts  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
index 935b7d8bed5..1da92a9404f 100644
--- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
+++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts
@@ -55,6 +55,7 @@ import { FileKind, IFileService } from 'vs/platform/files/common/files';
 import { scoreItem, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { WorkbenchTree } from 'vs/platform/list/browser/listService';
+import { dirname } from 'vs/base/common/paths';
 
 const HELP_PREFIX = '?';
 
@@ -1259,7 +1260,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 			const resourceInput = input as IResourceInput;
 			this.resource = resourceInput.resource;
 			this.label = getBaseLabel(resourceInput.resource);
-			this.description = labels.getPathLabel(resources.dirname(this.resource), contextService, environmentService);
+			this.description = labels.getPathLabel(this.safeDirname(this.resource), contextService, environmentService);
 			this.dirty = this.resource && this.textFileService.isDirty(this.resource);
 
 			if (this.dirty && this.textFileService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY) {
@@ -1268,6 +1269,16 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry {
 		}
 	}
 
+	private safeDirname(resource: URI): string | URI {
+		try {
+			return resources.dirname(resource); // workaround for https://github.com/Microsoft/vscode/issues/41987
+		} catch (error) {
+			console.warn(`Unable to resolve to parent resource: ${resource.toString()}`, resource, error);
+
+			return dirname(resource.fsPath);
+		}
+	}
+
 	public getIcon(): string {
 		return this.dirty ? 'dirty' : '';
 	}

From 013fff3f9e1702948c3d209e29f48f703a1ed524 Mon Sep 17 00:00:00 2001
From: Steven Van Impe 
Date: Tue, 23 Jan 2018 19:57:01 +0100
Subject: [PATCH 581/710] Update Swift snippets (#42048)

---
 extensions/swift/snippets/swift.json | 174 +++++++++++++++++----------
 1 file changed, 108 insertions(+), 66 deletions(-)

diff --git a/extensions/swift/snippets/swift.json b/extensions/swift/snippets/swift.json
index 43591d13a7b..08161d1c825 100644
--- a/extensions/swift/snippets/swift.json
+++ b/extensions/swift/snippets/swift.json
@@ -1,133 +1,175 @@
 {
-	"print(\"...\")": {
-		"prefix": "pr",
-		"body": "print(\"$1\")$0"
+	"print": {
+		"prefix": "print",
+		"body": "print(\"$1\")\n$0",
+		"description": "print(\"...\")"
 	},
-	"print(\"\\(...)\")": {
-		"prefix": "po",
-		"body": "print(\"\\($1)\")$0"
+	"print value": {
+		"prefix": "printv",
+		"body": "print(\"\\($1)\")\n$0",
+		"description": "print(\"\\(...)\")"
 	},
-	"repeat...while loop": {
+	"while": {
+		"prefix": "while",
+		"body": [
+			"while ${1:condition} {",
+			"\t$0",
+			"}"
+		],
+		"description": "while statement"
+	},
+	"repeat-while": {
 		"prefix": "repeat",
 		"body": [
 			"repeat {",
 			"\t$0",
-			"} while ${1:true}"
+			"} while ${1:condition}"
 		],
-		"description": "repeat...while loop"
+		"description": "repeat-while statement"
 	},
-	"While loop": {
-		"prefix": "while",
-		"body": [
-			"while ${1:true} {",
-			"\t$0",
-			"}"
-		],
-		"description": "While loop"
-	},
-	"For-In statement": {
-		"prefix": "forin",
+	"for": {
+		"prefix": "for",
 		"body": [
 			"for ${1:item} in ${2:collection} {",
 			"\t$0",
 			"}"
 		],
-		"description": "For-In statement"
+		"description": "for-in statement"
 	},
-	"Reverse for loop": {
-		"prefix": "forr",
-		"body": [
-			"for var ${1:i} = ${2:length} - 1; ${1:i} >= 0; ${1:i}-- {",
-			"\t$0",
-			"}"
-		],
-		"description": "Reverse for loop"
-	},
-	"for loop": {
-		"prefix": "for",
-		"body": [
-			"for var ${1:i} = 0; ${1:i} < ${2:length}; ${1:i}++ {",
-			"\t$0",
-			"}"
-		],
-		"description": "for loop"
-	},
-	"if statement": {
+	"if": {
 		"prefix": "if",
 		"body": [
-			"if ${1:true} {",
+			"if ${1:condition} {",
 			"\t$0",
 			"}"
 		],
 		"description": "if statement"
 	},
-	"else-if statement": {
+	"else if": {
 		"prefix": "elif",
 		"body": [
-			"else if ${1:true} {",
+			"else if ${1:condition} {",
 			"\t$0",
 			"}"
 		],
-		"description": "if statement"
+		"description": "else clause with a nested if statement"
 	},
-	"Else statement": {
+	"else": {
 		"prefix": "else",
 		"body": [
 			"else {",
 			"\t$0",
 			"}"
 		],
-		"description": "Else statement"
+		"description": "else clause"
 	},
-	"Guard statement": {
+	"if let": {
+		"prefix": "iflet",
+		"body": [
+			"if let ${1:value} = ${2:optional} {",
+			"\t$0",
+			"}"
+		],
+		"description": "if statement with optional binding"
+	},
+	"guard": {
 		"prefix": "guard",
 		"body": [
-			"guard let ${1:a} = ${2:optional} else {",
+			"guard ${1:condition} else {",
 			"\t$0",
 			"}"
 		],
-		"description": "Guard statement"
+		"description": "guard statement"
 	},
-	"Optional Binding statement": {
-		"prefix": "ifnil",
+	"guard let": {
+		"prefix": "guardlet",
 		"body": [
-			"if let ${1:a} = ${2:optional} {",
+			"guard let ${1:value} = ${2:optional} else {",
 			"\t$0",
 			"}"
 		],
-		"description": "Optional Binding statement"
+		"description": "guard statement with optional binding"
 	},
-	"Switch statement": {
+	"switch": {
 		"prefix": "switch",
 		"body": [
-			"switch ${1:switch_on} {",
-			"case ${2:a}:",
+			"switch ${1:value} {",
+			"case ${2:pattern}:",
 			"\t$0",
 			"default:",
-			"\t$1",
+			"\t",
 			"}"
 		],
-		"description": "Switch statement"
+		"description": "switch statement"
 	},
-	"Do catch": {
-		"prefix": "docatch",
+	"do": {
+		"prefix": "do",
 		"body": [
 			"do {",
-			"\ttry ${1:function that throws}",
-			"} catch ${2:pattern} {",
+			"\t$0",
+			"} catch ${1:error} {",
+			"\t$2",
+			"}"
+		],
+		"description": "do statement"
+	},
+	"func": {
+		"prefix": "func",
+		"body": [
+			"func ${1:name}(${2:parameters}) -> ${3:Type} {",
 			"\t$0",
 			"}"
 		],
-		"description": "Try catch"
+		"description": "function declaration"
 	},
-	"Enum": {
+	"struct": {
+		"prefix": "struct",
+		"body": [
+			"struct ${1:Name} {",
+			"",
+			"\t$0",
+			"}"
+		],
+		"description": "struct declaration"
+	},
+	"enum": {
 		"prefix": "enum",
 		"body": [
 			"enum ${1:Name} {",
+			"",
 			"\tcase $0",
 			"}"
 		],
-		"description": "Enum"
+		"description": "enum declaration"
+	},
+	"class": {
+		"prefix": "class",
+		"body": [
+			"class ${1:Name} {",
+			"",
+			"\t$0",
+			"}"
+		],
+		"description": "class declaration"
+	},
+	"protocol": {
+		"prefix": "protocol",
+		"body": [
+			"protocol ${1:Name} {",
+			"",
+			"\t$0",
+			"}"
+		],
+		"description": "protocol declaration"
+	},
+	"extension": {
+		"prefix": "extension",
+		"body": [
+			"extension ${1:Type} {",
+			"",
+			"\t$0",
+			"}"
+		],
+		"description": "extension declaration"
 	}
 }
-

From 087899f428f50df61f4ebacdce1d433f59cfb94e Mon Sep 17 00:00:00 2001
From: Daniel Imms 
Date: Tue, 23 Jan 2018 10:42:49 -0800
Subject: [PATCH 582/710] Place terminal textarea below rows, fix nav mode
 reading wrong item

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

diff --git a/package.json b/package.json
index 1d8d44d2a1b..38c1c1a8342 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "vscode-debugprotocol": "1.25.0",
     "vscode-ripgrep": "^0.7.1-patch.0",
     "vscode-textmate": "^3.2.0",
-    "vscode-xterm": "3.1.0-beta8",
+    "vscode-xterm": "3.1.0-beta10",
     "yauzl": "2.8.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index bcc807feb45..71dafbf80d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0:
     fast-plist "^0.1.2"
     oniguruma "^6.0.1"
 
-vscode-xterm@3.1.0-beta8:
-  version "3.1.0-beta8"
-  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta8.tgz#cc0d7016dfe486566fd835bcf3e8503884dde09b"
+vscode-xterm@3.1.0-beta10:
+  version "3.1.0-beta10"
+  resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta10.tgz#274ab2f41c0417f477c4fe4488788a8be740784e"
 
 vso-node-api@^6.1.2-preview:
   version "6.1.2-preview"

From 07d50ff62e6a4a4049d4ad0fe0f8a268f8f6f817 Mon Sep 17 00:00:00 2001
From: Sandeep Somavarapu 
Date: Tue, 23 Jan 2018 20:30:48 +0100
Subject: [PATCH 583/710] Fix #39574

---
 .../sharedProcess/sharedProcessMain.ts        |  5 ++-
 src/vs/code/electron-main/app.ts              |  2 +-
 src/vs/code/electron-main/main.ts             |  6 +--
 src/vs/code/electron-main/sharedProcess.ts    |  7 +++-
 src/vs/code/electron-main/window.ts           |  3 +-
 src/vs/code/node/cliProcessMain.ts            |  4 +-
 .../electron-main/backupMainService.test.ts   |  2 +-
 .../environment/common/environment.ts         |  2 -
 .../environment/node/environmentService.ts    | 28 -------------
 src/vs/platform/log/common/log.ts             | 40 ++++++++++++++++---
 src/vs/platform/log/node/spdlogService.ts     |  9 ++---
 src/vs/platform/windows/common/windows.ts     |  2 +
 .../workspacesMainService.test.ts             |  2 +-
 src/vs/workbench/api/node/extHost.protocol.ts |  1 +
 .../workbench/api/node/extHostLogService.ts   |  5 ++-
 src/vs/workbench/electron-browser/main.ts     |  4 +-
 src/vs/workbench/node/extensionHostMain.ts    |  2 +-
 .../electron-browser/extensionHost.ts         |  7 +++-
 18 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
index 08d4961b251..335f01d17fe 100644
--- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
+++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
@@ -38,7 +38,7 @@ import { ipcRenderer } from 'electron';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-import { ILogService, FollowerLogService } from 'vs/platform/log/common/log';
+import { ILogService, FollowerLogService, LogLevel } from 'vs/platform/log/common/log';
 import { LogLevelSetterChannelClient } from 'vs/platform/log/common/logIpc';
 
 export interface ISharedProcessConfiguration {
@@ -52,6 +52,7 @@ export function startup(configuration: ISharedProcessConfiguration) {
 interface ISharedProcessInitData {
 	sharedIPCHandle: string;
 	args: ParsedArgs;
+	logLevel: LogLevel;
 }
 
 class ActiveWindowManager implements IDisposable {
@@ -83,7 +84,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 
 	const environmentService = new EnvironmentService(initData.args, process.execPath);
 	const logLevelClient = new LogLevelSetterChannelClient(server.getChannel('loglevel', { route: () => 'main' }));
-	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', environmentService));
+	const logService = new FollowerLogService(logLevelClient, createSpdLogService('sharedprocess', initData.logLevel, environmentService.logsPath));
 	process.once('exit', () => logService.dispose());
 
 	logService.info('main', JSON.stringify(configuration));
diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index c23a0587ca0..64c73d5b91c 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -273,7 +273,7 @@ export class CodeApplication {
 			this.logService.trace(`Resolved machine identifier: ${machineId}`);
 
 			// Spawn shared process
-			this.sharedProcess = new SharedProcess(this.environmentService, machineId, this.userEnv);
+			this.sharedProcess = new SharedProcess(this.environmentService, machineId, this.userEnv, this.logService);
 			this.toDispose.push(this.sharedProcess);
 			this.sharedProcessClient = this.sharedProcess.whenReady().then(() => connect(this.environmentService.sharedIPCHandle, 'main'));
 
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 8ba25df359b..276db5a62ae 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -21,7 +21,7 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
-import { ILogService, ConsoleLogMainService, MultiplexLogService } from 'vs/platform/log/common/log';
+import { ILogService, ConsoleLogMainService, MultiplexLogService, getLogLevel } from 'vs/platform/log/common/log';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { IStateService } from 'vs/platform/state/common/state';
 import { IBackupMainService } from 'vs/platform/backup/common/backup';
@@ -51,7 +51,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	const services = new ServiceCollection();
 
 	const environmentService = new EnvironmentService(args, process.execPath);
-	const consoleLogService = new ConsoleLogMainService(environmentService);
+	const consoleLogService = new ConsoleLogMainService(getLogLevel(environmentService));
 	const logService = new MultiplexLogService([consoleLogService, bufferLogService]);
 
 	process.once('exit', () => logService.dispose());
@@ -320,7 +320,7 @@ function main() {
 		return instantiationService.invokeFunction(a => createPaths(a.get(IEnvironmentService)))
 			.then(() => instantiationService.invokeFunction(setupIPC))
 			.then(mainIpcServer => {
-				bufferLogService.logger = createSpdLogService('main', environmentService);
+				bufferLogService.logger = createSpdLogService('main', bufferLogService.getLevel(), environmentService.logsPath);
 				return instantiationService.createInstance(CodeApplication, mainIpcServer, instanceEnv).startup();
 			});
 	}).done(null, err => instantiationService.invokeFunction(quit, err));
diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
index ff9f904cb68..e402ec33a5d 100644
--- a/src/vs/code/electron-main/sharedProcess.ts
+++ b/src/vs/code/electron-main/sharedProcess.ts
@@ -12,6 +12,7 @@ import { IProcessEnvironment } from 'vs/base/common/platform';
 import { BrowserWindow, ipcMain } from 'electron';
 import { ISharedProcess } from 'vs/platform/windows/electron-main/windows';
 import { Barrier } from 'vs/base/common/async';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class SharedProcess implements ISharedProcess {
 
@@ -23,7 +24,8 @@ export class SharedProcess implements ISharedProcess {
 	constructor(
 		private environmentService: IEnvironmentService,
 		private readonly machineId: string,
-		private readonly userEnv: IProcessEnvironment
+		private readonly userEnv: IProcessEnvironment,
+		private readonly logService: ILogService
 	) { }
 
 	@memoize
@@ -75,7 +77,8 @@ export class SharedProcess implements ISharedProcess {
 			ipcMain.once('handshake:hello', ({ sender }: { sender: any }) => {
 				sender.send('handshake:hey there', {
 					sharedIPCHandle: this.environmentService.sharedIPCHandle,
-					args: this.environmentService.args
+					args: this.environmentService.args,
+					logLevel: this.logService.getLevel()
 				});
 
 				ipcMain.once('handshake:im ready', () => c(null));
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index e79a7400e20..dbe69eb291e 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -565,6 +565,7 @@ export class CodeWindow implements ICodeWindow {
 
 		// Set window ID
 		windowConfiguration.windowId = this._win.id;
+		windowConfiguration.logLevel = this.logService.getLevel();
 
 		// Set zoomlevel
 		const windowConfig = this.configurationService.getValue('window');
@@ -593,7 +594,7 @@ export class CodeWindow implements ICodeWindow {
 		const environment = parseArgs(process.argv);
 		const config = objects.assign(environment, windowConfiguration);
 		for (let key in config) {
-			if (!config[key]) {
+			if (config[key] === void 0 || config[key] === null || config[key] === '') {
 				delete config[key]; // only send over properties that have a true value
 			}
 		}
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index 0d99eadec4f..a01bebe6cf7 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -36,7 +36,7 @@ import { getBaseLabel } from 'vs/base/common/labels';
 import { IStateService } from 'vs/platform/state/common/state';
 import { StateService } from 'vs/platform/state/node/stateService';
 import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
@@ -196,7 +196,7 @@ export function main(argv: ParsedArgs): TPromise {
 	const services = new ServiceCollection();
 
 	const environmentService = new EnvironmentService(argv, process.execPath);
-	const logService = createSpdLogService('cli', environmentService);
+	const logService = createSpdLogService('cli', getLogLevel(environmentService), environmentService.logsPath);
 	process.once('exit', () => logService.dispose());
 
 	logService.info('main', argv);
diff --git a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
index 0fae04bac59..60c83ef1746 100644
--- a/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
+++ b/src/vs/platform/backup/test/electron-main/backupMainService.test.ts
@@ -34,7 +34,7 @@ suite('BackupMainService', () => {
 	class TestBackupMainService extends BackupMainService {
 
 		constructor(backupHome: string, backupWorkspacesPath: string, configService: TestConfigurationService) {
-			super(environmentService, configService, new ConsoleLogMainService(environmentService));
+			super(environmentService, configService, new ConsoleLogMainService());
 
 			this.backupHome = backupHome;
 			this.workspacesJsonPath = backupWorkspacesPath;
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 3296b628490..7bd8700a868 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { LogLevel } from 'vs/platform/log/common/log';
 
 export interface ParsedArgs {
 	[arg: string]: any;
@@ -117,7 +116,6 @@ export interface IEnvironmentService {
 	// logging
 	logsPath: string;
 	verbose: boolean;
-	logLevel: LogLevel;
 
 	skipGettingStarted: boolean | undefined;
 	skipReleaseNotes: boolean | undefined;
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index f50aa30396f..fcc62b80c75 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -12,7 +12,6 @@ import URI from 'vs/base/common/uri';
 import { memoize } from 'vs/base/common/decorators';
 import pkg from 'vs/platform/node/package';
 import product from 'vs/platform/node/product';
-import { LogLevel } from 'vs/platform/log/common/log';
 import { toLocalISOString } from 'vs/base/common/date';
 import { isWindows, isLinux } from 'vs/base/common/platform';
 
@@ -152,33 +151,6 @@ export class EnvironmentService implements IEnvironmentService {
 	get isBuilt(): boolean { return !process.env['VSCODE_DEV']; }
 	get verbose(): boolean { return this._args.verbose; }
 
-	@memoize
-	get logLevel(): LogLevel {
-		if (this.verbose) {
-			return LogLevel.Trace;
-		}
-		if (typeof this._args.log === 'string') {
-			const logLevel = this._args.log.toLowerCase();
-			switch (logLevel) {
-				case 'trace':
-					return LogLevel.Trace;
-				case 'debug':
-					return LogLevel.Debug;
-				case 'info':
-					return LogLevel.Info;
-				case 'warn':
-					return LogLevel.Warning;
-				case 'error':
-					return LogLevel.Error;
-				case 'critical':
-					return LogLevel.Critical;
-				case 'off':
-					return LogLevel.Off;
-			}
-		}
-		return LogLevel.Info;
-	}
-
 	get wait(): boolean { return this._args.wait; }
 	get logExtensionHostCommunication(): boolean { return this._args.logExtensionHostCommunication; }
 
diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts
index 176320014a7..5617bff5eb3 100644
--- a/src/vs/platform/log/common/log.ts
+++ b/src/vs/platform/log/common/log.ts
@@ -5,11 +5,11 @@
 
 'use strict';
 
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { createDecorator as createServiceDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { isWindows } from 'vs/base/common/platform';
 import Event, { Emitter } from 'vs/base/common/event';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
 export const ILogService = createServiceDecorator('logService');
 
@@ -63,9 +63,9 @@ export class ConsoleLogMainService extends AbstractLogService implements ILogSer
 	_serviceBrand: any;
 	private useColors: boolean;
 
-	constructor( @IEnvironmentService environmentService: IEnvironmentService) {
+	constructor(logLevel: LogLevel = LogLevel.Error) {
 		super();
-		this.setLevel(environmentService.logLevel);
+		this.setLevel(logLevel);
 		this.useColors = !isWindows;
 	}
 
@@ -138,9 +138,9 @@ export class ConsoleLogService extends AbstractLogService implements ILogService
 
 	_serviceBrand: any;
 
-	constructor( @IEnvironmentService environmentService: IEnvironmentService) {
+	constructor(logLevel: LogLevel = LogLevel.Error) {
 		super();
-		this.setLevel(environmentService.logLevel);
+		this.setLevel(logLevel);
 	}
 
 	trace(message: string, ...args: any[]): void {
@@ -187,6 +187,9 @@ export class MultiplexLogService extends AbstractLogService implements ILogServi
 
 	constructor(private logServices: ILogService[]) {
 		super();
+		if (logServices.length) {
+			this.setLevel(logServices[0].getLevel());
+		}
 	}
 
 	setLevel(level: LogLevel): void {
@@ -313,3 +316,30 @@ export class NullLogService implements ILogService {
 	critical(message: string | Error, ...args: any[]): void { }
 	dispose(): void { }
 }
+
+
+export function getLogLevel(environmentService: IEnvironmentService): LogLevel {
+	if (environmentService.verbose) {
+		return LogLevel.Trace;
+	}
+	if (typeof environmentService.args.log === 'string') {
+		const logLevel = environmentService.args.log.toLowerCase();
+		switch (logLevel) {
+			case 'trace':
+				return LogLevel.Trace;
+			case 'debug':
+				return LogLevel.Debug;
+			case 'info':
+				return LogLevel.Info;
+			case 'warn':
+				return LogLevel.Warning;
+			case 'error':
+				return LogLevel.Error;
+			case 'critical':
+				return LogLevel.Critical;
+			case 'off':
+				return LogLevel.Off;
+		}
+	}
+	return LogLevel.Info;
+}
\ No newline at end of file
diff --git a/src/vs/platform/log/node/spdlogService.ts b/src/vs/platform/log/node/spdlogService.ts
index 9df00ce99f6..8627fc959ee 100644
--- a/src/vs/platform/log/node/spdlogService.ts
+++ b/src/vs/platform/log/node/spdlogService.ts
@@ -7,18 +7,17 @@
 
 import * as path from 'path';
 import { ILogService, LogLevel, NullLogService, AbstractLogService } from 'vs/platform/log/common/log';
-import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { RotatingLogger, setAsyncMode } from 'spdlog';
 
-export function createSpdLogService(processName: string, environmentService: IEnvironmentService, logsSubfolder?: string): ILogService {
+export function createSpdLogService(processName: string, logLevel: LogLevel, logsFolder: string, logsSubfolder?: string): ILogService {
 	try {
 		setAsyncMode(8192, 2000);
-		const logsDirPath = logsSubfolder ? path.join(environmentService.logsPath, logsSubfolder) : environmentService.logsPath;
+		const logsDirPath = logsSubfolder ? path.join(logsFolder, logsSubfolder) : logsFolder;
 		const logfilePath = path.join(logsDirPath, `${processName}.log`);
 		const logger = new RotatingLogger(processName, logfilePath, 1024 * 1024 * 5, 6);
 		logger.setLevel(0);
 
-		return new SpdLogService(logger, environmentService.logLevel);
+		return new SpdLogService(logger, logLevel);
 	} catch (e) {
 		console.error(e);
 	}
@@ -31,7 +30,7 @@ class SpdLogService extends AbstractLogService implements ILogService {
 
 	constructor(
 		private readonly logger: RotatingLogger,
-		level: LogLevel
+		level: LogLevel = LogLevel.Error
 	) {
 		super();
 		this.setLevel(level);
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
index c20b1900988..3a2cabf156a 100644
--- a/src/vs/platform/windows/common/windows.ts
+++ b/src/vs/platform/windows/common/windows.ts
@@ -15,6 +15,7 @@ import { IWorkspaceIdentifier, IWorkspaceFolderCreationData } from 'vs/platform/
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
 import { ICommandAction } from 'vs/platform/actions/common/actions';
 import { PerformanceEntry } from 'vs/base/common/performance';
+import { LogLevel } from 'vs/platform/log/common/log';
 
 export const IWindowsService = createDecorator('windowsService');
 
@@ -297,6 +298,7 @@ export interface IAddFoldersRequest {
 export interface IWindowConfiguration extends ParsedArgs, IOpenFileRequest {
 	machineId: string;
 	windowId: number;
+	logLevel: LogLevel;
 
 	appRoot: string;
 	execPath: string;
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
index 7031cb06470..ff060086c77 100644
--- a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
+++ b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
@@ -48,7 +48,7 @@ suite('WorkspacesMainService', () => {
 	}
 
 	const environmentService = new TestEnvironmentService(parseArgs(process.argv), process.execPath);
-	const logService = new ConsoleLogMainService(environmentService);
+	const logService = new ConsoleLogMainService();
 
 	let service: TestWorkspacesMainService;
 
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index e8d27c90b2c..9df097ce6ef 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -84,6 +84,7 @@ export interface IInitData {
 	windowId: number;
 	args: ParsedArgs;
 	execPath: string;
+	logLevel: LogLevel;
 }
 
 export interface IConfigurationInitData extends IConfigurationData {
diff --git a/src/vs/workbench/api/node/extHostLogService.ts b/src/vs/workbench/api/node/extHostLogService.ts
index 60b000101e1..9e5dd3f93c0 100644
--- a/src/vs/workbench/api/node/extHostLogService.ts
+++ b/src/vs/workbench/api/node/extHostLogService.ts
@@ -23,9 +23,10 @@ export class ExtHostLogService extends DelegatedLogService implements ILogServic
 
 	constructor(
 		windowId: number,
+		logLevel: LogLevel,
 		private _environmentService: IEnvironmentService
 	) {
-		super(createSpdLogService(`exthost${windowId}`, _environmentService));
+		super(createSpdLogService(`exthost${windowId}`, logLevel, _environmentService.logsPath));
 	}
 
 	$setLevel(level: LogLevel): void {
@@ -42,7 +43,7 @@ export class ExtHostLogService extends DelegatedLogService implements ILogServic
 	}
 
 	private createLogger(extensionID: string): ExtHostLogger {
-		const logService = createSpdLogService(extensionID, this._environmentService, extensionID);
+		const logService = createSpdLogService(extensionID, this.getLevel(), this._environmentService.logsPath, extensionID);
 		const logsDirPath = path.join(this._environmentService.logsPath, extensionID);
 		this._register(this.onDidChangeLogLevel(level => logService.setLevel(level)));
 		return new ExtHostLogger(logService, logsDirPath);
diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts
index 315865aef12..50deed29769 100644
--- a/src/vs/workbench/electron-browser/main.ts
+++ b/src/vs/workbench/electron-browser/main.ts
@@ -199,8 +199,8 @@ function createStorageService(workspaceService: IWorkspaceContextService, enviro
 }
 
 function createLogService(mainProcessClient: ElectronIPCClient, configuration: IWindowConfiguration, environmentService: IEnvironmentService): ILogService {
-	const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, environmentService);
-	const consoleLogService = new ConsoleLogService(environmentService);
+	const spdlogService = createSpdLogService(`renderer${configuration.windowId}`, configuration.logLevel, environmentService.logsPath);
+	const consoleLogService = new ConsoleLogService(configuration.logLevel);
 	const logService = new MultiplexLogService([consoleLogService, spdlogService]);
 	const logLevelClient = new LogLevelSetterChannelClient(mainProcessClient.getChannel('loglevel'));
 	return new FollowerLogService(logLevelClient, logService);
diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts
index 60314f50234..1a37fc04768 100644
--- a/src/vs/workbench/node/extensionHostMain.ts
+++ b/src/vs/workbench/node/extensionHostMain.ts
@@ -91,7 +91,7 @@ export class ExtensionHostMain {
 		const rpcProtocol = new RPCProtocol(protocol);
 		const extHostWorkspace = new ExtHostWorkspace(rpcProtocol, initData.workspace);
 		const environmentService = new EnvironmentService(initData.args, initData.execPath);
-		this._extHostLogService = new ExtHostLogService(initData.windowId, environmentService);
+		this._extHostLogService = new ExtHostLogService(initData.windowId, initData.logLevel, environmentService);
 		this.disposables.push(this._extHostLogService);
 
 		this._extHostLogService.info('extension host started');
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index 62474f4acbc..ee35a4980f5 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -35,6 +35,7 @@ import { EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_C
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
 import { getScopes } from 'vs/platform/configuration/common/configurationRegistry';
+import { ILogService } from 'vs/platform/log/common/log';
 
 export class ExtensionHostProcessWorker {
 
@@ -70,7 +71,8 @@ export class ExtensionHostProcessWorker {
 		@IEnvironmentService private readonly _environmentService: IEnvironmentService,
 		@IWorkspaceConfigurationService private readonly _configurationService: IWorkspaceConfigurationService,
 		@ITelemetryService private readonly _telemetryService: ITelemetryService,
-		@ICrashReporterService private readonly _crashReporterService: ICrashReporterService
+		@ICrashReporterService private readonly _crashReporterService: ICrashReporterService,
+		@ILogService private readonly _logService: ILogService
 	) {
 		// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
 		this._isExtensionDevHost = this._environmentService.isExtensionDevelopment;
@@ -377,7 +379,8 @@ export class ExtensionHostProcessWorker {
 				telemetryInfo,
 				args: this._environmentService.args,
 				execPath: this._environmentService.execPath,
-				windowId: this._windowService.getCurrentWindowId()
+				windowId: this._windowService.getCurrentWindowId(),
+				logLevel: this._logService.getLevel()
 			};
 			return r;
 		});

From 1e9acc4bb0aacd169e97e1f2a80b15d2a4713b93 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Tue, 23 Jan 2018 12:13:00 -0800
Subject: [PATCH 584/710] New property for OSVersion with possible PII from
 self compiled linux kernels stripped

---
 src/vs/platform/telemetry/node/commonProperties.ts             | 2 ++
 src/vs/platform/telemetry/node/workbenchCommonProperties.ts    | 3 ---
 .../telemetry/test/electron-browser/commonProperties.test.ts   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index 0d232325091..a9e9ecf1705 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -21,6 +21,8 @@ export function resolveCommonProperties(commit: string, version: string, machine
 	result['version'] = version;
 	// __GDPR__COMMON__ "common.osVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.osVersion'] = os.release();
+	// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platform'] = Platform.Platform[Platform.platform];
 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
diff --git a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts
index 41a7901dffb..a7688ef16ba 100644
--- a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts
+++ b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts
@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as os from 'os';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as uuid from 'vs/base/common/uuid';
 import { IStorageService } from 'vs/platform/storage/common/storage';
@@ -15,8 +14,6 @@ export function resolveWorkbenchCommonProperties(storageService: IStorageService
 		result['common.version.shell'] = process.versions && (process).versions['electron'];
 		// __GDPR__COMMON__ "common.version.renderer" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 		result['common.version.renderer'] = process.versions && (process).versions['chrome'];
-		// __GDPR__COMMON__ "common.osVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-		result['common.osVersion'] = os.release();
 
 		const lastSessionDate = storageService.get('telemetry.lastSessionDate');
 		const firstSessionDate = storageService.get('telemetry.firstSessionDate') || new Date().toUTCString();
diff --git a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts b/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
index 725718f20bc..fb89055b500 100644
--- a/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
+++ b/src/vs/platform/telemetry/test/electron-browser/commonProperties.test.ts
@@ -49,6 +49,7 @@ suite('Telemetry - common properties', function () {
 				// assert.ok('common.version.shell' in first.data); // only when running on electron
 				// assert.ok('common.version.renderer' in first.data);
 				assert.ok('common.osVersion' in props, 'osVersion');
+				assert.ok('common.platformVersion' in props, 'platformVersion');
 				assert.ok('version' in props);
 				assert.equal(props['common.source'], 'my.install.source');
 

From 6957fb22dc168e3863ad384743e155e37d24a378 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Tue, 23 Jan 2018 12:21:11 -0800
Subject: [PATCH 585/710] Sanitize OSVersion

---
 src/vs/platform/telemetry/node/commonProperties.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/platform/telemetry/node/commonProperties.ts b/src/vs/platform/telemetry/node/commonProperties.ts
index a9e9ecf1705..c0e152aa53c 100644
--- a/src/vs/platform/telemetry/node/commonProperties.ts
+++ b/src/vs/platform/telemetry/node/commonProperties.ts
@@ -19,10 +19,10 @@ export function resolveCommonProperties(commit: string, version: string, machine
 	result['commitHash'] = commit;
 	// __GDPR__COMMON__ "version" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['version'] = version;
-	// __GDPR__COMMON__ "common.osVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
-	result['common.osVersion'] = os.release();
 	// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
+	// __GDPR__COMMON__ "common.osVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
+	result['common.osVersion'] = result['common.platformVersion']; // TODO: Drop this after the move to Nova
 	// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
 	result['common.platform'] = Platform.Platform[Platform.platform];
 	// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }

From c398a079e7e7d7156810e86b2903ff6ce19058f3 Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Tue, 23 Jan 2018 12:32:39 -0800
Subject: [PATCH 586/710] Localize issue reporter and fix flickering on load,
 fixes #41995

* Fix flickering on load

* Localize issue reporter

* Remove duplicated text
---
 .../electron-browser/issue/issueReporter.html | 106 ++----------------
 .../electron-browser/issue/issueReporter.js   |  26 ++++-
 .../issue/issueReporterMain.ts                |  30 +++--
 .../issue/issueReporterPage.ts                |  98 ++++++++++++++++
 .../issue/media/issueReporter.css             |   1 -
 .../issue/electron-main/issueService.ts       |   8 +-
 6 files changed, 160 insertions(+), 109 deletions(-)
 create mode 100644 src/vs/code/electron-browser/issue/issueReporterPage.ts

diff --git a/src/vs/code/electron-browser/issue/issueReporter.html b/src/vs/code/electron-browser/issue/issueReporter.html
index ad3010252ec..629aab5ea44 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -1,102 +1,18 @@
 
 
 
-	
-		
-		
-	
-	
-		
    
 
-			
    
-				
-				
-			
    
+
+	
+	
+	
+
 
-			
    
-				
-				
-				
-				
-					
-				
-			
    
+
+	Issue Reporter
+
 
-			
    
-				
    
-					
-					
-				
    
-				
    
-					
-					
-				
    
-			
    
+
+
 
-			
    
-				
    
-					
    
-						My System Info
-							
-								
-							
-						
-						
    
-							
-						
    
-					
    
-				
    
-				
    
-					
    
-						Currently Running Processes
-							
-								
-							
-						
-						
    
-							
-						
    
-					
    
-				
    
-				
    
-					
    
-						My Workspace Stats
-							
-								
-							
-						
-						
    -							
-								
-							
-						
    
-					
    
-				
    
-				
    
-					
-					
-						
-					
-					
    
-						
-								We support GitHub-flavored Markdown.
-								You will still be able to edit your issue when we preview it on GitHub.
-							
-						
-						
-					
    
-				
    
-			
    
-
-			
-		
    
-	
-
-	
-
\ No newline at end of file
+
diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js
index 31dc101872f..ac9730d0d58 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.js
+++ b/src/vs/code/electron-browser/issue/issueReporter.js
@@ -65,6 +65,25 @@ function main() {
 	// Load the loader and start loading the workbench
 	const rootUrl = uriFromPath(configuration.appRoot) + '/out';
 
+	// Get the nls configuration into the process.env as early as possible.
+	var nlsConfig = { availableLanguages: {} };
+	const config = process.env['VSCODE_NLS_CONFIG'];
+	if (config) {
+		process.env['VSCODE_NLS_CONFIG'] = config;
+		try {
+			nlsConfig = JSON.parse(config);
+		} catch (e) { /*noop*/ }
+	}
+
+	var locale = nlsConfig.availableLanguages['*'] || 'en';
+	if (locale === 'zh-tw') {
+		locale = 'zh-Hant';
+	} else if (locale === 'zh-cn') {
+		locale = 'zh-Hans';
+	}
+
+	window.document.documentElement.setAttribute('lang', locale);
+
 	// In the bundled version the nls plugin is packaged with the loader so the NLS Plugins
 	// loads as soon as the loader loads. To be able to have pseudo translation
 	createScript(rootUrl + '/vs/loader.js', function () {
@@ -72,7 +91,6 @@ function main() {
 
 		window.MonacoEnvironment = {};
 
-		var nlsConfig = { availableLanguages: {} };
 		require.config({
 			baseUrl: rootUrl,
 			'vs/nls': nlsConfig,
@@ -80,6 +98,12 @@ function main() {
 			nodeModules: [/*BUILD->INSERT_NODE_MODULES*/]
 		});
 
+		if (nlsConfig.pseudo) {
+			require(['vs/nls'], function (nlsPlugin) {
+				nlsPlugin.setPseudoTranslation(nlsConfig.pseudo);
+			});
+		}
+
 		require(['vs/code/electron-browser/issue/issueReporterMain'], (issueReporter) => {
 			issueReporter.startup(configuration);
 		});
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 0b8148580cc..8ba1dd95e00 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -7,6 +7,7 @@
 
 import 'vs/css!./media/issueReporter';
 import { shell, ipcRenderer, webFrame, remote } from 'electron';
+import { localize } from 'vs/nls';
 import { $ } from 'vs/base/browser/dom';
 import * as browser from 'vs/base/browser/browser';
 import product from 'vs/platform/node/product';
@@ -28,10 +29,17 @@ import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
 import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
 import { IssueReporterModel, IssueReporterData } from 'vs/code/electron-browser/issue/issueReporterModel';
 import { IssueReporterStyles } from 'vs/platform/issue/common/issue';
+import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
 
 export function startup(configuration: IWindowConfiguration) {
+	document.body.innerHTML = BaseHtml();
 	const issueReporter = new IssueReporter(configuration);
-	issueReporter.render();
+
+	// workaround for flickering on page load as css is applied
+	setTimeout(() => {
+		issueReporter.render();
+		document.body.style.display = 'block';
+	}, 10);
 }
 
 export class IssueReporter extends Disposable {
@@ -61,7 +69,7 @@ export class IssueReporter extends Disposable {
 
 			const submitButton = document.getElementById('github-submit-btn');
 			submitButton.disabled = false;
-			submitButton.textContent = 'Preview on GitHub';
+			submitButton.textContent = localize('previewOnGitHub', "Preview on GitHub");
 		});
 
 		ipcRenderer.send('issueInfoRequest');
@@ -69,6 +77,10 @@ export class IssueReporter extends Disposable {
 
 		this.initServices(configuration);
 		this.setEventHandlers();
+
+		if (window.document.documentElement.lang !== 'en') {
+			show(document.getElementById('english'));
+		}
 	}
 
 	render(): void {
@@ -132,8 +144,6 @@ export class IssueReporter extends Disposable {
 
 		styleTag.innerHTML = content.join('\n');
 		document.head.appendChild(styleTag);
-
-		document.body.style.backgroundColor = styles.backgroundColor;
 		document.body.style.color = styles.color;
 	}
 
@@ -215,7 +225,7 @@ export class IssueReporter extends Disposable {
 						if (result.items.length) {
 							const issues = $('ul');
 							const issuesText = $('div.list-title');
-							issuesText.textContent = 'Similar issues:';
+							issuesText.textContent = localize('similarIssues', "Similar issues");
 							addIssuesToList(issues, result.items);
 							similarIssues.appendChild(issuesText);
 							similarIssues.appendChild(issues);
@@ -255,9 +265,9 @@ export class IssueReporter extends Disposable {
 			hide(processBlock);
 			hide(workspaceBlock);
 
-			descriptionTitle.innerHTML = 'Steps to Reproduce *';
+			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} *`;
 			show(descriptionSubtitle);
-			descriptionSubtitle.innerHTML = 'How did you encounter this problem? Please provide clear steps to reproduce the problem during our investigation. What did you expect to happen and what actually did happen?';
+			descriptionSubtitle.innerHTML = localize('bugDescription', "How did you encounter this problem? Please provide clear steps to reproduce the problem during our investigation. What did you expect to happen and what actually did happen?");
 		}
 		// 2 - Perf Issue
 		else if (issueType === 1) {
@@ -265,9 +275,9 @@ export class IssueReporter extends Disposable {
 			show(processBlock);
 			show(workspaceBlock);
 
-			descriptionTitle.innerHTML = 'Steps to Reproduce *';
+			descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} *`;
 			show(descriptionSubtitle);
-			descriptionSubtitle.innerHTML = 'When did this performance issue happen? For example, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.';
+			descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? For example, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation.");
 		}
 		// 3 - Feature Request
 		else {
@@ -275,7 +285,7 @@ export class IssueReporter extends Disposable {
 			hide(processBlock);
 			hide(workspaceBlock);
 
-			descriptionTitle.innerHTML = 'Description *';
+			descriptionTitle.innerHTML = `${localize('description', "Description")} *`;
 			hide(descriptionSubtitle);
 		}
 	}
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
new file mode 100644
index 00000000000..2551db67e31
--- /dev/null
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 { escape } from 'vs/base/common/strings';
+import { localize } from 'vs/nls';
+
+export default (): string => `
+
    
+	
+
+	
    
+		
+		
+	
    
+
+	
    
+		
+		
+		
+		
+			
+		
+	
    
+
+	
    
+		
    
+			
+			
+		
    
+		
    
+			
+			
+		
    
+	
    
+
+	
    
+		
    
+			
    
+				${escape(localize('systemInfo', "My System Info"))}
+					
+						
+					
+				
+				
    
+					
+				
    
+			
    
+		
    
+		
    
+			
    
+				${escape(localize('processes', "Currently Running Processes"))}
+					
+						
+					
+				
+				
    
+					
+				
    
+			
    
+		
    
+		
    
+			
    
+				${escape(localize('workspaceStats', "My Workspace Stats"))}
+					
+						
+					
+				
+				
    +					
+						
+					
+				
    
+			
    
+		
    
+		
    
+			
+			
+				
+			
+			
    
+				${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue when we preview it on GitHub."))}
+				
+				
+			
    
+		
    
+	
    
+
+	
+
    `;
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index e4ca54e35b5..d7e3c8ec2d8 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -97,7 +97,6 @@ html {
 
 body {
 	margin: 0;
-	background-color: #1E1E1E;
 }
 
 .hidden {
diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts
index ba398e53b21..096aec418c8 100644
--- a/src/vs/platform/issue/electron-main/issueService.ts
+++ b/src/vs/platform/issue/electron-main/issueService.ts
@@ -6,12 +6,15 @@
 'use strict';
 
 import { TPromise, Promise } from 'vs/base/common/winjs.base';
+import { localize } from 'vs/nls';
 import { IIssueService, IssueReporterStyles } from 'vs/platform/issue/common/issue';
 import { BrowserWindow, ipcMain } from 'electron';
 import { ILaunchService } from 'vs/code/electron-main/launch';
 import { buildDiagnostics, DiagnosticInfo } from 'vs/code/electron-main/diagnostics';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 
+const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
+
 export class IssueService implements IIssueService {
 	_serviceBrand: any;
 	_issueWindow: BrowserWindow;
@@ -39,8 +42,9 @@ export class IssueService implements IIssueService {
 		this._issueWindow = new BrowserWindow({
 			width: 800,
 			height: 900,
-			title: 'Issue Reporter',
-			parent: BrowserWindow.getFocusedWindow()
+			title: localize('issueReporter', "Issue Reporter"),
+			parent: BrowserWindow.getFocusedWindow(),
+			backgroundColor: theme && theme.backgroundColor || DEFAULT_BACKGROUND_COLOR
 		});
 
 		this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented

From 1e117f4168408132500b134a5ce3c70f162cd4c0 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Mon, 22 Jan 2018 21:47:56 -0800
Subject: [PATCH 587/710] Revert "Revert "Use special prefix to tell TS that a
 resource is in-memory only (#42001)""

This reverts commit 200e4013571881949f3c7196088c61f3752b1716.
---
 .../src/features/bufferSyncSupport.ts         |  5 +--
 .../typescript/src/typescriptServiceClient.ts | 37 +++++++++++++------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/extensions/typescript/src/features/bufferSyncSupport.ts b/extensions/typescript/src/features/bufferSyncSupport.ts
index 63f0bdfbc86..186cd02ba6b 100644
--- a/extensions/typescript/src/features/bufferSyncSupport.ts
+++ b/extensions/typescript/src/features/bufferSyncSupport.ts
@@ -48,10 +48,7 @@ class SyncedBuffer {
 		}
 
 		if (this.client.apiVersion.has230Features()) {
-			const root = this.client.getWorkspaceRootForResource(this.document.uri);
-			if (root) {
-				args.projectRootPath = root;
-			}
+			args.projectRootPath = this.client.getWorkspaceRootForResource(this.document.uri);
 		}
 
 		if (this.client.apiVersion.has240Features()) {
diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts
index 2901d184ba1..a36818b3905 100644
--- a/extensions/typescript/src/typescriptServiceClient.ts
+++ b/extensions/typescript/src/typescriptServiceClient.ts
@@ -578,12 +578,12 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 	}
 
 	public normalizePath(resource: Uri): string | null {
-		if (resource.scheme === fileSchemes.walkThroughSnippet) {
-			return resource.toString();
-		}
-
-		if (resource.scheme === fileSchemes.untitled && this._apiVersion.has213Features()) {
-			return resource.toString();
+		if (this._apiVersion.has213Features()) {
+			if (resource.scheme === fileSchemes.walkThroughSnippet || resource.scheme === fileSchemes.untitled) {
+				const dirName = path.dirname(resource.path);
+				const fileName = this.inMemoryResourcePrefix + path.basename(resource.path);
+				return resource.with({ path: path.join(dirName, fileName) }).toString(true);
+			}
 		}
 
 		if (resource.scheme !== fileSchemes.file) {
@@ -599,11 +599,24 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 		return result.replace(new RegExp('\\' + this.pathSeparator, 'g'), '/');
 	}
 
+	private get inMemoryResourcePrefix(): string {
+		return this._apiVersion.has270Features() ? '^' : '';
+	}
+
 	public asUrl(filepath: string): Uri {
-		if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON)
-			|| (filepath.startsWith(fileSchemes.untitled + ':') && this._apiVersion.has213Features())
-		) {
-			return Uri.parse(filepath);
+		if (this._apiVersion.has213Features()) {
+			if (filepath.startsWith(TypeScriptServiceClient.WALK_THROUGH_SNIPPET_SCHEME_COLON) || (filepath.startsWith(fileSchemes.untitled + ':'))
+			) {
+				let resource = Uri.parse(filepath);
+				if (this.inMemoryResourcePrefix) {
+					const dirName = path.dirname(resource.path);
+					const fileName = path.basename(resource.path);
+					if (fileName.startsWith(this.inMemoryResourcePrefix)) {
+						resource = resource.with({ path: path.join(dirName, fileName.slice(this.inMemoryResourcePrefix.length)) });
+					}
+				}
+				return resource;
+			}
 		}
 		return Uri.file(filepath);
 	}
@@ -620,8 +633,10 @@ export default class TypeScriptServiceClient implements ITypeScriptServiceClient
 					return root.uri.fsPath;
 				}
 			}
+			return roots[0].uri.fsPath;
 		}
-		return roots[0].uri.fsPath;
+
+		return undefined;
 	}
 
 	public execute(command: string, args: any, expectsResultOrToken?: boolean | CancellationToken): Promise {

From 34d370a0af10894716911e7f69f2271bb00be35a Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Tue, 23 Jan 2018 13:10:06 -0800
Subject: [PATCH 588/710] check log uploader result type

---
 src/vs/code/electron-main/logUploader.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index bbcc8a6a76a..e6d6b81f20c 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -101,8 +101,14 @@ async function postLogs(
 
 		result.stream.on('end', () => {
 			try {
-				const result = Buffer.concat(parts).toString('utf-8');
-				res(JSON.parse(result));
+				const response = Buffer.concat(parts).toString('utf-8');
+				if (result.res.statusCode === 200) {
+					res(JSON.parse(response));
+				} else {
+					const errorMessage = localize('responseError', 'Error posting logs. Got {0}', result.res.statusCode);
+					console.log(errorMessage);
+					reject(new Error(errorMessage));
+				}
 			} catch (e) {
 				console.log(localize('parseError', 'Error parsing response'));
 				reject(e);

From 1ced6adf3d7a0b5227986f64847d9b51ea1280a4 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Tue, 23 Jan 2018 14:10:11 -0800
Subject: [PATCH 589/710] make BASE64_MARKER static constant

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

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index 86ac9fbeee4..65c67397ddc 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -156,6 +156,7 @@ export class ResourceViewer {
 
 class ImageView {
 	private static readonly MAX_IMAGE_SIZE = BinarySize.MB; // showing images inline is memory intense, so we have a limit
+	private static readonly BASE64_MARKER = 'base64,';
 
 	public static create(
 		container: Builder,
@@ -177,9 +178,8 @@ class ImageView {
 
 		// Data URI
 		if (descriptor.resource.scheme === Schemas.data) {
-			const BASE64_MARKER = 'base64,';
-			const base64MarkerIndex = descriptor.resource.path.indexOf(BASE64_MARKER);
-			const hasData = base64MarkerIndex >= 0 && descriptor.resource.path.substring(base64MarkerIndex + BASE64_MARKER.length).length > 0;
+			const base64MarkerIndex = descriptor.resource.path.indexOf(ImageView.BASE64_MARKER);
+			const hasData = base64MarkerIndex >= 0 && descriptor.resource.path.substring(base64MarkerIndex + ImageView.BASE64_MARKER.length).length > 0;
 
 			skipInlineImage = !hasData || descriptor.size > ImageView.MAX_IMAGE_SIZE || descriptor.resource.path.length > ImageView.MAX_IMAGE_SIZE;
 		}

From 92eb582302a035f8a1c5f7a549aa0c809813265d Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Tue, 23 Jan 2018 14:11:13 -0800
Subject: [PATCH 590/710] Settings search result message -> match>found

---
 .../workbench/parts/preferences/browser/preferencesEditor.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 054e0266e42..6bb0a8d1a70 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -285,9 +285,9 @@ export class PreferencesEditor extends BaseEditor {
 			if (count === 0) {
 				this.searchWidget.showMessage(nls.localize('noSettingsFound', "No Results"), count);
 			} else if (count === 1) {
-				this.searchWidget.showMessage(nls.localize('oneSettingFound', "1 Setting matched"), count);
+				this.searchWidget.showMessage(nls.localize('oneSettingFound', "1 Setting Found"), count);
 			} else {
-				this.searchWidget.showMessage(nls.localize('settingsFound', "{0} Settings matched", count), count);
+				this.searchWidget.showMessage(nls.localize('settingsFound', "{0} Settings Found", count), count);
 			}
 		} else {
 			this.searchWidget.showMessage(nls.localize('totalSettingsMessage', "Total {0} Settings", count), count);

From 621aca2fe51439da71d914a950717eb587021247 Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Tue, 23 Jan 2018 14:28:47 -0800
Subject: [PATCH 591/710] Used pixelated scaling when image is zoomed more than
 300%

---
 .../browser/ui/resourceviewer/resourceViewer.ts   | 15 ++++++++++-----
 .../browser/ui/resourceviewer/resourceviewer.css  |  1 -
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
index 65c67397ddc..1cc85d0ae29 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
+++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts
@@ -241,7 +241,11 @@ class InlineImageView {
 	private static readonly SCALE_FACTOR = 1.5;
 	private static readonly MAX_SCALE = 20;
 	private static readonly MIN_SCALE = 0.1;
-	private static readonly PIXELATION_THRESHOLD = 64; // enable image-rendering: pixelated for images less than this
+
+	/**
+	 * Enable image-rendering: pixelated for images scaled by more than this.
+	 */
+	private static readonly PIXELATION_THRESHOLD = 3;
 
 	/**
 	 * Chrome is caching images very aggressively and so we use the ETag information to find out if
@@ -279,16 +283,17 @@ class InlineImageView {
 					img.removeClass('untouched');
 					updateScale(scale);
 				}
-				if (imgElement.naturalWidth < InlineImageView.PIXELATION_THRESHOLD
-					|| imgElement.naturalHeight < InlineImageView.PIXELATION_THRESHOLD) {
-					img.addClass('pixelated');
-				}
 				function setImageWidth(width) {
 					img.style('width', `${width}px`);
 					img.style('height', 'auto');
 				}
 				function updateScale(newScale) {
 					scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE);
+					if (scale >= InlineImageView.PIXELATION_THRESHOLD) {
+						img.addClass('pixelated');
+					} else {
+						img.removeClass('pixelated');
+					}
 					setImageWidth(Math.floor(imgElement.naturalWidth * scale));
 					InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale);
 					scrollbar.scanDomNode();
diff --git a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
index 054159a1281..1f7b897d6b8 100644
--- a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
+++ b/src/vs/base/browser/ui/resourceviewer/resourceviewer.css
@@ -42,7 +42,6 @@
 .monaco-resource-viewer img.untouched {
 	max-width: 100%;
 	object-fit: contain;
-	image-rendering: auto;
 }
 
 .monaco-resource-viewer img {

From d16baaaa1a63d9b0dbad5c869dcf8b79c660d8bd Mon Sep 17 00:00:00 2001
From: Matt Bierner 
Date: Tue, 23 Jan 2018 15:07:06 -0800
Subject: [PATCH 592/710] Use choice server for log uploader

---
 src/vs/code/electron-main/logUploader.ts | 35 ++++++++++++------------
 src/vs/code/electron-main/main.ts        |  6 +++-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts
index e6d6b81f20c..94280c83dcb 100644
--- a/src/vs/code/electron-main/logUploader.ts
+++ b/src/vs/code/electron-main/logUploader.ts
@@ -9,7 +9,6 @@ import * as os from 'os';
 import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as readline from 'readline';
 
 import { localize } from 'vs/nls';
 import { ILaunchChannel } from 'vs/code/electron-main/launch';
@@ -17,6 +16,8 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import product from 'vs/platform/node/product';
 import { IRequestService } from 'vs/platform/request/node/request';
 import { IRequestContext } from 'vs/base/node/request';
+import { IChoiceService } from 'vs/platform/message/common/message';
+import Severity from 'vs/base/common/severity';
 
 interface PostResult {
 	readonly blob_id: string;
@@ -35,7 +36,8 @@ class Endpoint {
 
 export async function uploadLogs(
 	channel: ILaunchChannel,
-	requestService: IRequestService
+	requestService: IRequestService,
+	choiceService: IChoiceService
 ): TPromise {
 	const endpoint = Endpoint.getFromProduct();
 	if (!endpoint) {
@@ -45,7 +47,8 @@ export async function uploadLogs(
 
 	const logsPath = await channel.call('get-logs-path', null);
 
-	if (await promptUserToConfirmLogUpload(logsPath)) {
+	if (await promptUserToConfirmLogUpload(logsPath, choiceService)) {
+		console.log(localize('beginUploading', 'Uploading...'));
 		const outZip = await zipLogs(logsPath);
 		const result = await postLogs(endpoint, outZip, requestService);
 		console.log(localize('didUploadLogs', 'Uploaded logs ID: {0}', result.blob_id));
@@ -55,22 +58,18 @@ export async function uploadLogs(
 }
 
 async function promptUserToConfirmLogUpload(
-	logsPath: string
+	logsPath: string,
+	choiceService: IChoiceService
 ): Promise {
-	const rl = readline.createInterface({
-		input: process.stdin,
-		output: process.stdout
-	});
-
-	return new TPromise(resolve =>
-		rl.question(
-			localize('logUploadPromptHeader', 'Upload session logs to secure endpoint?')
-			+ '\n\n' + localize('logUploadPromptBody', 'Please review your log files: \'{0}\'', logsPath)
-			+ '\n\n' + localize('logUploadPromptKey', 'Enter \'y\' to confirm upload...'),
-			(answer: string) => {
-				rl.close();
-				resolve(answer && answer.trim()[0].toLowerCase() === 'y');
-			}));
+	const message = localize('logUploadPromptHeader', 'Upload session logs to secure endpoint?')
+		+ '\n\n' + localize('logUploadPromptBody', 'Please review your log files here: \'{0}\'', logsPath)
+		+ '\n\n' + localize('logUploadPromptBodyDetails', 'Logs may contain personal information such as full paths and file contents.')
+		+ '\n\n';
+	const choice = await choiceService.choose(Severity.Info, message, [
+		localize('logUploadPromptKey', 'I have reviewed my logs. Proceed with upload...'),
+		localize('logUploadPromptCancel', 'Cancel'),
+	], 1);
+	return choice === 0;
 }
 
 async function postLogs(
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 276db5a62ae..4cde51e4de3 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -46,6 +46,8 @@ import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
 import { printDiagnostics } from 'vs/code/electron-main/diagnostics';
 import { BufferLogService } from 'vs/platform/log/common/bufferLog';
 import { uploadLogs } from 'vs/code/electron-main/logUploader';
+import { IChoiceService } from 'vs/platform/message/common/message';
+import { ChoiceCliService } from 'vs/platform/message/node/messageCli';
 
 function createServices(args: ParsedArgs, bufferLogService: BufferLogService): IInstantiationService {
 	const services = new ServiceCollection();
@@ -69,6 +71,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	services.set(IRequestService, new SyncDescriptor(RequestService));
 	services.set(IURLService, new SyncDescriptor(URLService, args['open-url'] ? args._urls : []));
 	services.set(IBackupMainService, new SyncDescriptor(BackupMainService));
+	services.set(IChoiceService, new SyncDescriptor(ChoiceCliService));
 
 	return new InstantiationService(services, true);
 }
@@ -106,6 +109,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise {
 	const logService = accessor.get(ILogService);
 	const environmentService = accessor.get(IEnvironmentService);
 	const requestService = accessor.get(IRequestService);
+	const choiceService = accessor.get(IChoiceService);
 
 	function allowSetForegroundWindow(service: LaunchChannelClient): TPromise {
 		let promise = TPromise.wrap(void 0);
@@ -199,7 +203,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise {
 
 					// Log uploader
 					if (environmentService.args['upload-logs']) {
-						return uploadLogs(channel, requestService)
+						return uploadLogs(channel, requestService, choiceService)
 							.then(() => TPromise.wrapError(new ExpectedError()));
 					}
 

From 560f5de0fafabfde8c0db2dc4d82989d184bd1a8 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao 
Date: Tue, 23 Jan 2018 15:28:39 -0800
Subject: [PATCH 593/710] Name InstallCountWidget correctly

---
 src/vs/workbench/parts/extensions/browser/extensionEditor.ts  | 4 ++--
 src/vs/workbench/parts/extensions/browser/extensionsList.ts   | 4 ++--
 .../workbench/parts/extensions/browser/extensionsWidgets.ts   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
index 84e9f9c800e..dd66df55fde 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts
@@ -30,7 +30,7 @@ import { ResolvedKeybinding, KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput';
 import { IExtensionsWorkbenchService, IExtensionsViewlet, VIEWLET_ID, IExtension, IExtensionDependencies } from 'vs/workbench/parts/extensions/common/extensions';
 import { Renderer, DataSource, Controller } from 'vs/workbench/parts/extensions/browser/dependenciesViewer';
-import { RatingsWidget, InstallWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
+import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, BuiltinStatusLabelAction, ReloadAction } from 'vs/workbench/parts/extensions/browser/extensionsActions';
@@ -337,7 +337,7 @@ export class ExtensionEditor extends BaseEditor {
 			this.repository.style.display = 'none';
 		}
 
-		const install = this.instantiationService.createInstance(InstallWidget, this.installCount, { extension });
+		const install = this.instantiationService.createInstance(InstallCountWidget, this.installCount, { extension });
 		this.transientDisposables.push(install);
 
 		const ratings = this.instantiationService.createInstance(RatingsWidget, this.rating, { extension });
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
index 2179edff031..0b588e8353c 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsList.ts
@@ -18,7 +18,7 @@ import { domEvent } from 'vs/base/browser/event';
 import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions';
 import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground } from 'vs/workbench/parts/extensions/browser/extensionsActions';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
-import { Label, RatingsWidget, InstallWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
+import { Label, RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
 import { IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
@@ -93,7 +93,7 @@ export class Renderer implements IPagedRenderer {
 		actionbar.onDidRun(({ error }) => error && this.messageService.show(Severity.Error, error));
 
 		const versionWidget = this.instantiationService.createInstance(Label, version, (e: IExtension) => e.version);
-		const installCountWidget = this.instantiationService.createInstance(InstallWidget, installCount, { small: true });
+		const installCountWidget = this.instantiationService.createInstance(InstallCountWidget, installCount, { small: true });
 		const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true });
 
 		const builtinStatusAction = this.instantiationService.createInstance(BuiltinStatusLabelAction);
diff --git a/src/vs/workbench/parts/extensions/browser/extensionsWidgets.ts b/src/vs/workbench/parts/extensions/browser/extensionsWidgets.ts
index 3167b710f49..f8e86e08d88 100644
--- a/src/vs/workbench/parts/extensions/browser/extensionsWidgets.ts
+++ b/src/vs/workbench/parts/extensions/browser/extensionsWidgets.ts
@@ -42,7 +42,7 @@ export class Label implements IDisposable {
 	}
 }
 
-export class InstallWidget implements IDisposable {
+export class InstallCountWidget implements IDisposable {
 
 	private disposables: IDisposable[] = [];
 	private _extension: IExtension;

From 7ce2824069c035fa63f31e7d7b3c2fc73eefdce7 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Tue, 23 Jan 2018 15:39:50 -0800
Subject: [PATCH 594/710] Settings search - fix JSON-encoded default values
 from remote search

---
 .../parts/preferences/electron-browser/preferencesSearch.ts  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
index 7614813e29f..3366eafe38d 100644
--- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
+++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts
@@ -215,6 +215,9 @@ class RemoteSearchProvider implements ISearchProvider {
 						const packageId = r['packageid'];
 						const id = getSettingKey(key, packageId);
 
+						const value = r['value'];
+						const defaultValue = value ? JSON.parse(value) : value;
+
 						const packageName = r['packagename'];
 						let extensionName: string;
 						let extensionPublisher: string;
@@ -225,7 +228,7 @@ class RemoteSearchProvider implements ISearchProvider {
 						return {
 							key,
 							id,
-							defaultValue: r['value'],
+							defaultValue,
 							score: r['@search.score'],
 							description: JSON.parse(r['details']),
 							packageId,

From ea09c48688307607452c89ae0cd0c56bd05b9d13 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Tue, 23 Jan 2018 15:40:31 -0800
Subject: [PATCH 595/710] Settings search - tweak labels

---
 src/vs/workbench/parts/preferences/browser/preferencesEditor.ts | 2 +-
 .../workbench/parts/preferences/browser/preferencesRenderers.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
index 6bb0a8d1a70..88c601b8200 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -434,7 +434,7 @@ class PreferencesRenderersController extends Disposable {
 		this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true);
 
 		this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1)
-			.then(result => this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Other Extension Results"), 2));
+			.then(result => this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Marketplace Extension Results"), 2));
 
 		return this._remoteFilterInProgress.then(() => {
 			this._remoteFilterInProgress = null;
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
index b467aa4b539..24c071bd5ff 100644
--- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
+++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts
@@ -877,7 +877,7 @@ export class ExtensionCodelensRenderer extends Disposable implements CodeLensPro
 				const extId = s.extensionPublisher + '.' + s.extensionName;
 				return {
 					command: {
-						title: nls.localize('newExtensionLabel', "View \"{0}\"", extId),
+						title: nls.localize('newExtensionLabel', "Show Extension \"{0}\"", extId),
 						id: 'workbench.extensions.action.showExtensionsWithId',
 						arguments: [extId.toLowerCase()]
 					},

From 9265607eee84e9481ded55c2d6f5f458da44f217 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Tue, 23 Jan 2018 13:19:58 -0800
Subject: [PATCH 596/710] update find results limit comment.

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

diff --git a/src/vs/editor/contrib/find/findModel.ts b/src/vs/editor/contrib/find/findModel.ts
index deacb765f44..7f0a8ac7ab4 100644
--- a/src/vs/editor/contrib/find/findModel.ts
+++ b/src/vs/editor/contrib/find/findModel.ts
@@ -396,7 +396,7 @@ export class FindModelBoundToEditorModel {
 		const findScope = this._decorations.getFindScope();
 
 		if (findScope === null && this._state.matchesCount >= MATCHES_LIMIT) {
-			// Doing a replace on the entire file that is over 1k matches
+			// Doing a replace on the entire file that is over ${MATCHES_LIMIT} matches
 			this._largeReplaceAll();
 		} else {
 			this._regularReplaceAll(findScope);

From 08046c3aa4f827b66567207be8556b267c52fd49 Mon Sep 17 00:00:00 2001
From: Peng Lyu 
Date: Tue, 23 Jan 2018 14:17:00 -0800
Subject: [PATCH 597/710] piece tree perf is propotional to edit cnt so 10/100
 edits are not necessary.

---
 .../model/benchmark/operations.benchmark.ts   | 156 +++++++++---------
 1 file changed, 77 insertions(+), 79 deletions(-)

diff --git a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
index 5a83e5f29e9..286fd3531e7 100644
--- a/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
+++ b/src/vs/editor/test/common/model/benchmark/operations.benchmark.ts
@@ -42,38 +42,66 @@ for (let fileSize of fileSizes) {
 			iterations: 10
 		});
 
-		for (let i of [10, 100, 1000]) {
-			editsSuite.add({
-				name: `apply ${i} edits`,
-				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
-					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
-					return textBufferBuilder.finish();
-				},
-				preCycle: (textBuffer) => {
-					return textBuffer;
-				},
-				fn: (textBuffer) => {
-					// for line model, this loop doesn't reflect the real situation.
-					for (let k = 0; k < edits.length && k < i; k++) {
-						textBuffer.applyEdits([edits[k]], false);
-					}
+		editsSuite.add({
+			name: `apply 1000 edits`,
+			buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+				chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+				return textBufferBuilder.finish();
+			},
+			preCycle: (textBuffer) => {
+				return textBuffer;
+			},
+			fn: (textBuffer) => {
+				// for line model, this loop doesn't reflect the real situation.
+				for (let k = 0; k < edits.length; k++) {
+					textBuffer.applyEdits([edits[k]], false);
 				}
-			});
+			}
+		});
 
-			editsSuite.add({
-				name: `Read all lines after ${i} edits`,
-				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
-					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
-					return textBufferBuilder.finish();
-				},
-				preCycle: (textBuffer) => {
-					for (let k = 0; k < edits.length && k < i; k++) {
-						textBuffer.applyEdits([edits[k]], false);
-					}
-					return textBuffer;
-				},
-				fn: (textBuffer) => {
-					for (let j = 0, len = textBuffer.getLineCount(); j < len; j++) {
+		editsSuite.add({
+			name: `Read all lines after 1000 edits`,
+			buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+				chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+				return textBufferBuilder.finish();
+			},
+			preCycle: (textBuffer) => {
+				for (let k = 0; k < edits.length; k++) {
+					textBuffer.applyEdits([edits[k]], false);
+				}
+				return textBuffer;
+			},
+			fn: (textBuffer) => {
+				for (let j = 0, len = textBuffer.getLineCount(); j < len; j++) {
+					var str = textBuffer.getLineContent(j + 1);
+					let firstChar = str.charCodeAt(0);
+					let lastChar = str.charCodeAt(str.length - 1);
+					firstChar = firstChar - lastChar;
+					lastChar = firstChar + lastChar;
+					firstChar = lastChar - firstChar;
+				}
+			}
+		});
+
+		editsSuite.add({
+			name: `Read 10 random windows after 1000 edits`,
+			buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+				chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+				return textBufferBuilder.finish();
+			},
+			preCycle: (textBuffer) => {
+				for (let k = 0; k < edits.length; k++) {
+					textBuffer.applyEdits([edits[k]], false);
+				}
+				return textBuffer;
+			},
+			fn: (textBuffer) => {
+				for (let i = 0; i < 10; i++) {
+					let minLine = 1;
+					let maxLine = textBuffer.getLineCount();
+					let startLine = getRandomInt(minLine, Math.max(minLine, maxLine - 100));
+					let endLine = Math.min(maxLine, startLine + 100);
+					for (let j = startLine; j < endLine; j++) {
 						var str = textBuffer.getLineContent(j + 1);
 						let firstChar = str.charCodeAt(0);
 						let lastChar = str.charCodeAt(str.length - 1);
@@ -82,57 +110,27 @@ for (let fileSize of fileSizes) {
 						firstChar = lastChar - firstChar;
 					}
 				}
-			});
+			}
+		});
 
-			editsSuite.add({
-				name: `Read 10 random windows after ${i} edits`,
-				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
-					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
-					return textBufferBuilder.finish();
-				},
-				preCycle: (textBuffer) => {
-					for (let k = 0; k < edits.length && k < i; k++) {
-						textBuffer.applyEdits([edits[k]], false);
-					}
-					return textBuffer;
-				},
-				fn: (textBuffer) => {
-					for (let i = 0; i < 10; i++) {
-						let minLine = 1;
-						let maxLine = textBuffer.getLineCount();
-						let startLine = getRandomInt(minLine, Math.max(minLine, maxLine - 100));
-						let endLine = Math.min(maxLine, startLine + 100);
-						for (let j = startLine; j < endLine; j++) {
-							var str = textBuffer.getLineContent(j + 1);
-							let firstChar = str.charCodeAt(0);
-							let lastChar = str.charCodeAt(str.length - 1);
-							firstChar = firstChar - lastChar;
-							lastChar = firstChar + lastChar;
-							firstChar = lastChar - firstChar;
-						}
-					}
+		editsSuite.add({
+			name: `save file after 1000 edits`,
+			buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
+				chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
+				return textBufferBuilder.finish();
+			},
+			preCycle: (textBuffer) => {
+				for (let k = 0; k < edits.length; k++) {
+					textBuffer.applyEdits([edits[k]], false);
 				}
-			});
-
-			editsSuite.add({
-				name: `save file after ${i} edits`,
-				buildBuffer: (textBufferBuilder: ITextBufferBuilder) => {
-					chunks.forEach(ck => textBufferBuilder.acceptChunk(ck));
-					return textBufferBuilder.finish();
-				},
-				preCycle: (textBuffer) => {
-					for (let k = 0; k < edits.length && k < i; k++) {
-						textBuffer.applyEdits([edits[k]], false);
-					}
-					return textBuffer;
-				},
-				fn: (textBuffer) => {
-					const lineCount = textBuffer.getLineCount();
-					const fullModelRange = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
-					textBuffer.getValueInRange(fullModelRange, EndOfLinePreference.LF);
-				}
-			});
-		}
+				return textBuffer;
+			},
+			fn: (textBuffer) => {
+				const lineCount = textBuffer.getLineCount();
+				const fullModelRange = new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1);
+				textBuffer.getValueInRange(fullModelRange, EndOfLinePreference.LF);
+			}
+		});
 
 		editsSuite.run();
 	}

From c74962497616d0dacd89fd11cc25db4fbbe60637 Mon Sep 17 00:00:00 2001
From: Rob Lourens 
Date: Tue, 23 Jan 2018 16:51:31 -0800
Subject: [PATCH 598/710] Install builtInExtensions on windows too

---
 scripts/code.bat | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/code.bat b/scripts/code.bat
index 3b403b1c64c..5a98f590c01 100644
--- a/scripts/code.bat
+++ b/scripts/code.bat
@@ -17,6 +17,9 @@ set CODE=".build\electron\%NAMESHORT%"
 node build\lib\electron.js
 if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron
 
+:: Get built-in extensions
+node build\lib\builtInExtensions.js || .\node_modules\.bin\gulp builtInExtensions
+
 :: Build
 if not exist out node .\node_modules\gulp\bin\gulp.js compile
 

From 6ae8a18cf42b746319b570c392970c5a544487bc Mon Sep 17 00:00:00 2001
From: Rachel Macfarlane 
Date: Tue, 23 Jan 2018 16:54:56 -0800
Subject: [PATCH 599/710] CSS tweaks to issue reporter, fixes #42064, #41993,
 and #42054

---
 .../electron-browser/issue/issueReporter.html |  3 +--
 .../issue/issueReporterMain.ts                |  7 ++---
 .../issue/issueReporterPage.ts                | 27 ++++++++++---------
 .../issue/media/issueReporter.css             | 19 +++++++------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/vs/code/electron-browser/issue/issueReporter.html b/src/vs/code/electron-browser/issue/issueReporter.html
index 629aab5ea44..695de78a4cb 100644
--- a/src/vs/code/electron-browser/issue/issueReporter.html
+++ b/src/vs/code/electron-browser/issue/issueReporter.html
@@ -8,8 +8,7 @@
 	
 
 
-
-	Issue Reporter
+
 
 
 
diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 8ba1dd95e00..93be7de5db0 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -115,7 +115,8 @@ export class IssueReporter extends Disposable {
 		}
 
 		if (styles.inputErrorBorder) {
-			content.push(`.invalid-input, .invalid-input:focus { border: 1px solid ${styles.inputErrorBorder}; }`);
+			content.push(`.invalid-input, .invalid-input:focus { border: 1px solid ${styles.inputErrorBorder} !important; }`);
+			content.push(`.validation-error { color: ${styles.inputErrorBorder}; }`);
 		}
 
 		if (styles.inputActiveBorder) {
@@ -256,8 +257,8 @@ export class IssueReporter extends Disposable {
 		const processBlock = document.querySelector('.block-process');
 		const workspaceBlock = document.querySelector('.block-workspace');
 
-		const descriptionTitle = document.querySelector('.block-description .block-title');
-		const descriptionSubtitle = document.querySelector('.block-description .block-subtitle');
+		const descriptionTitle = document.getElementById('issue-description-label');
+		const descriptionSubtitle = document.getElementById('issue-description-subtitle');
 
 		// 1 - Bug
 		if (issueType === 0) {
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index 2551db67e31..5836f45bd10 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -40,7 +40,7 @@ export default (): string => `
 		
    
 	
    
 
-	
    
+	
    
 		
    
 			
    
 				${escape(localize('systemInfo', "My System Info"))}
@@ -79,18 +79,19 @@ export default (): string => `
    -
    - - - - -
    - ${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue when we preview it on GitHub."))} - - -
    +
    + +
    + + + + +
    + ${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue when we preview it on GitHub."))} + +
    diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css index d7e3c8ec2d8..1444e6cd944 100644 --- a/src/vs/code/electron-browser/issue/media/issueReporter.css +++ b/src/vs/code/electron-browser/issue/media/issueReporter.css @@ -104,14 +104,7 @@ body { } #block-container { - margin-top: 20px; -} - -.block { - margin-bottom: 20px; -} -.block summary { - margin-bottom: 16px; + margin-top: 1em; } .block .block-info { @@ -170,23 +163,29 @@ select, input, textarea { summary { border: 1px solid transparent; + padding: 10px; + margin-bottom: 5px; } .validation-error { font-size: 12px; - font-weight: bold; margin-top: 1em; } .caption { display: inline-block; font-size: 12px; + vertical-align: middle; + height: 18px; } input[type="checkbox"] { margin-left: 1em; + height: 18px; width: auto; display: inline-block; + margin-top: 0; + vertical-align: middle; } input:disabled { @@ -213,7 +212,7 @@ a { border: 1px solid #be1100; } -.required-input { +.required-input, .validation-error { color: #be1100; } From d57363041c9f70e05932229724044aa039766b6f Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 23 Jan 2018 17:42:41 -0800 Subject: [PATCH 600/710] Settings search - fix feedback and telemetry to handle extension setting results --- .../preferences/browser/preferencesEditor.ts | 16 ++++--- .../browser/preferencesRenderers.ts | 43 +++++++++++-------- .../parts/preferences/common/preferences.ts | 6 ++- .../preferences/common/preferencesModels.ts | 26 ++++++++--- .../electron-browser/preferencesSearch.ts | 5 ++- 5 files changed, 63 insertions(+), 33 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 88c601b8200..d24e70fcd8e 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -294,20 +294,24 @@ export class PreferencesEditor extends BaseEditor { } } - private reportFilteringUsed(filter: string, counts: IStringDictionary, metadata?: IFilterMetadata): void { + private reportFilteringUsed(filter: string, counts: IStringDictionary, metadata?: IStringDictionary): void { if (filter && filter !== this._lastReportedFilter) { + let durations: any; + if (metadata) { + durations = Object.create(null); + Object.keys(metadata).forEach(key => durations[key] = metadata[key].duration); + } + let data = { filter, - duration: metadata ? metadata.duration : undefined, - context: metadata ? metadata.context : undefined, + durations, counts }; /* __GDPR__ "defaultSettings.filter" : { "filter": { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "context" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, + "durations" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "counts" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ @@ -352,7 +356,7 @@ class SettingsNavigator implements INavigator { interface IFilterOrSearchResult { defaultSettingsGroupCounts: IStringDictionary; - metadata: IFilterMetadata; + metadata: IStringDictionary; } class PreferencesRenderersController extends Disposable { diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 24c071bd5ff..4a9efa1869d 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -113,7 +113,6 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend if (this.filterResult) { data['query'] = this.filterResult.query; - data['duration'] = this.filterResult.metadata && this.filterResult.metadata.duration; data['index'] = source.index; data['groupId'] = source.groupId; data['editableSide'] = !!fromEditableSettings; @@ -123,9 +122,8 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend "defaultSettingsActions.copySetting" : { "userConfigurationKeys" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "query" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "groupId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "index" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, + "groupId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "editableSide" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ @@ -622,31 +620,35 @@ export class FeedbackWidgetRenderer extends Disposable { } const result = this._currentResult; - const actualResults = result.metadata.scoredResults; + const metadata = result.metadata['nlpResult']; // Feedback only on nlpResult set for now + const marketplaceExtensionsResults = result.metadata['newExtensionsResult'] && result.metadata['newExtensionsResult'].scoredResults; + const actualResults = metadata ? metadata.scoredResults : {}; const actualResultIds = Object.keys(actualResults); const feedbackQuery: any = {}; feedbackQuery['comment'] = FeedbackWidgetRenderer.DEFAULT_COMMENT_TEXT; feedbackQuery['queryString'] = result.query; - feedbackQuery['resultScores'] = {}; + feedbackQuery['resultScores'] = []; actualResultIds.forEach(settingId => { - const outputKey = actualResults[settingId].key; - feedbackQuery['resultScores'][outputKey] = 10; + feedbackQuery['resultScores'].push({ + packageID: actualResults[settingId].packageId, + key: actualResults[settingId].key, + score: 10 + }); }); feedbackQuery['alts'] = []; const contents = FeedbackWidgetRenderer.INSTRUCTION_TEXT + '\n' + JSON.stringify(feedbackQuery, undefined, ' ') + '\n\n' + - actualResultIds.map(name => { - return `// ${actualResults[name].key}: ${actualResults[name].score}`; - }).join('\n'); + this.getScoreText(actualResults) + '\n\n' + + this.getScoreText(marketplaceExtensionsResults) + '\n'; this.editorService.openEditor({ contents, language: 'jsonc' }, /*sideBySide=*/true).then(feedbackEditor => { const sendFeedbackWidget = this._register(this.instantiationService.createInstance(FloatingClickWidget, feedbackEditor.getControl(), 'Send feedback', null)); sendFeedbackWidget.render(); this._register(sendFeedbackWidget.onClick(() => { - this.sendFeedback(feedbackEditor.getControl() as ICodeEditor, result, result.metadata.scoredResults).then(() => { + this.sendFeedback(feedbackEditor.getControl() as ICodeEditor, result, metadata.scoredResults).then(() => { sendFeedbackWidget.dispose(); this.messageService.show(Severity.Info, 'Feedback sent successfully'); }, err => { @@ -656,6 +658,17 @@ export class FeedbackWidgetRenderer extends Disposable { }); } + private getScoreText(results?: IScoredResults): string { + if (!results) { + return ''; + } + + return Object.keys(results) + .map(name => { + return `// ${results[name].key}: ${results[name].score}`; + }).join('\n'); + } + private sendFeedback(feedbackEditor: ICodeEditor, result: IFilterResult, actualResults: IScoredResults): TPromise { const model = feedbackEditor.getModel(); const expectedQueryLines = model.getLinesContent() @@ -685,11 +698,9 @@ export class FeedbackWidgetRenderer extends Disposable { "settingsSearchResultFeedback" : { "query" : { "classification": "CustomContent", "purpose": "FeatureInsight" }, "userComment" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }, - "actualResults" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "expectedResults" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "url" : { "classification": "CustomerContent", "purpose": "FeatureInsight" }, + "actualResults" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, "duration" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }, - "timestamp" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ return this.telemetryService.publicLog('settingsSearchResultFeedback', { @@ -697,9 +708,7 @@ export class FeedbackWidgetRenderer extends Disposable { userComment, actualResults, expectedResults: expectedQuery.resultScores, - url: result.metadata.remoteUrl, - duration: result.metadata.duration, - timestamp: result.metadata.timestamp, + duration: result.metadata['nlpResult'].duration, buildNumber: this.environmentService.settingsSearchBuildId, alts, autoIngest diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 5157b9cefb8..519887d8e01 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -16,6 +16,7 @@ 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'; export interface IWorkbenchSettingsConfiguration { workbench: { @@ -79,7 +80,7 @@ export interface IFilterResult { filteredGroups: ISettingsGroup[]; allGroups: ISettingsGroup[]; matches: IRange[]; - metadata?: IFilterMetadata; + metadata?: IStringDictionary; } export interface ISettingMatch { @@ -104,7 +105,8 @@ export interface IRemoteSetting { } export interface IFilterMetadata { - remoteUrl: string; + requestUrl: string; + requestBody: string; timestamp: number; duration: number; scoredResults: IScoredResults; diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index 95c7d255962..af64f644416 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import { assign } from 'vs/base/common/objects'; import * as map from 'vs/base/common/map'; -import { tail, flatten, first } from 'vs/base/common/arrays'; +import { tail, flatten } from 'vs/base/common/arrays'; import URI from 'vs/base/common/uri'; import { IReference, Disposable } from 'vs/base/common/lifecycle'; import Event, { Emitter } from 'vs/base/common/event'; @@ -15,12 +15,13 @@ 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 } from 'vs/workbench/parts/preferences/common/preferences'; +import { ISettingsEditorModel, IKeybindingsEditorModel, ISettingsGroup, ISetting, IFilterResult, IGroupFilter, ISettingMatcher, ISettingMatch, ISearchResultGroup, IFilterMetadata } from 'vs/workbench/parts/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'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { Selection } from 'vs/editor/common/core/selection'; +import { IStringDictionary } from 'vs/base/common/collections'; export abstract class AbstractSettingsModel extends EditorModel { @@ -114,6 +115,19 @@ export abstract class AbstractSettingsModel extends EditorModel { }; } + protected collectMetadata(groups: ISearchResultGroup[]): IStringDictionary { + const metadata = Object.create(null); + let hasMetadata = false; + groups.forEach(g => { + if (g.result.metadata) { + metadata[g.id] = g.result.metadata; + hasMetadata = true; + } + }); + + return hasMetadata ? metadata : null; + } + protected get filterGroups(): ISettingsGroup[] { return this.settingsGroups; @@ -205,12 +219,12 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti }; } - const groupWithMetadata = first(resultGroups, group => !!group.result.metadata); + const metadata = this.collectMetadata(resultGroups); return { allGroups: this.settingsGroups, filteredGroups: filteredGroup ? [filteredGroup] : [], matches, - metadata: groupWithMetadata && groupWithMetadata.result.metadata + metadata }; } } @@ -648,13 +662,13 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements const startLine = tail(this.settingsGroups).range.endLineNumber + 2; const { settingsGroups: filteredGroups, matches } = this.writeResultGroups(nonEmptyResultGroups, startLine); - const groupWithMetadata = first(resultGroups, group => !!group.result.metadata); + const metadata = this.collectMetadata(resultGroups); return resultGroups.length ? { allGroups: this.settingsGroups, filteredGroups, matches, - metadata: groupWithMetadata && groupWithMetadata.result.metadata + metadata } : null; } diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index 3366eafe38d..ac34222b586 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -243,7 +243,8 @@ class RemoteSearchProvider implements ISearchProvider { }); return { - remoteUrl: details.url, // telemetry for filter text? + requestUrl: details.url, + requestBody: details.body, duration, timestamp, scoredResults, @@ -337,7 +338,7 @@ class RemoteSearchProvider implements ISearchProvider { function getSettingKey(name: string, packageId?: string): string { return packageId ? - packageId + '_' + name : + packageId + '##' + name : name; } From 8eae654dd46d0a184353f8062d013279a73053a8 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 23 Jan 2018 20:41:05 -0800 Subject: [PATCH 601/710] Fix code.bat builtInExtensions fallback --- scripts/code.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/code.bat b/scripts/code.bat index 5a98f590c01..4917d3b9a8b 100644 --- a/scripts/code.bat +++ b/scripts/code.bat @@ -18,7 +18,8 @@ node build\lib\electron.js if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron :: Get built-in extensions -node build\lib\builtInExtensions.js || .\node_modules\.bin\gulp builtInExtensions +node build\lib\builtInExtensions.js +if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js builtInExtensions :: Build if not exist out node .\node_modules\gulp\bin\gulp.js compile From 6bfe9bbe8a910b8c57bb0c0a6e0557d46ebd64ba Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 23 Jan 2018 21:57:06 -0800 Subject: [PATCH 602/710] Bump distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38c1c1a8342..5079c68d462 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.20.0", - "distro": "e14a5a3afaae557ff651b344462ed39e776435a2", + "distro": "d41bd1b8193403ffe9849b49fc37153e3d5b5a49", "author": { "name": "Microsoft Corporation" }, From 1b54bafade7ea995ed1340fbaf88f3cd26f9782f Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 24 Jan 2018 08:25:23 +0100 Subject: [PATCH 603/710] :lipstick: --- .../sharedProcess/sharedProcessMain.ts | 4 ++-- src/vs/platform/log/common/log.ts | 22 +++---------------- src/vs/platform/log/common/logIpc.ts | 17 ++++++++++++-- src/vs/workbench/electron-browser/main.ts | 4 ++-- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts index 335f01d17fe..f13a6d2c95f 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts @@ -38,8 +38,8 @@ import { ipcRenderer } from 'electron'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; -import { ILogService, FollowerLogService, LogLevel } from 'vs/platform/log/common/log'; -import { LogLevelSetterChannelClient } from 'vs/platform/log/common/logIpc'; +import { ILogService, LogLevel } from 'vs/platform/log/common/log'; +import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc'; export interface ISharedProcessConfiguration { readonly machineId: string; diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts index 5617bff5eb3..09d85742184 100644 --- a/src/vs/platform/log/common/log.ts +++ b/src/vs/platform/log/common/log.ts @@ -23,15 +23,12 @@ export enum LogLevel { Off } -export interface ILogLevelSetter { - onDidChangeLogLevel: Event; - setLevel(level: LogLevel): void; -} - -export interface ILogService extends ILogLevelSetter, IDisposable { +export interface ILogService extends IDisposable { _serviceBrand: any; + onDidChangeLogLevel: Event; getLevel(): LogLevel; + setLevel(level: LogLevel): void; trace(message: string, ...args: any[]): void; debug(message: string, ...args: any[]): void; info(message: string, ...args: any[]): void; @@ -290,19 +287,6 @@ export class DelegatedLogService extends Disposable implements ILogService { } } -export class FollowerLogService extends DelegatedLogService implements ILogService { - _serviceBrand: any; - - constructor(private master: ILogLevelSetter, logService: ILogService) { - super(logService); - this._register(master.onDidChangeLogLevel(level => logService.setLevel(level))); - } - - setLevel(level: LogLevel): void { - this.master.setLevel(level); - } -} - export class NullLogService implements ILogService { _serviceBrand: any; readonly onDidChangeLogLevel: Event = new Emitter().event; diff --git a/src/vs/platform/log/common/logIpc.ts b/src/vs/platform/log/common/logIpc.ts index e8c10a8416d..b792dc83329 100644 --- a/src/vs/platform/log/common/logIpc.ts +++ b/src/vs/platform/log/common/logIpc.ts @@ -5,7 +5,7 @@ import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc'; import { TPromise } from 'vs/base/common/winjs.base'; -import { LogLevel, ILogService, ILogLevelSetter } from 'vs/platform/log/common/log'; +import { LogLevel, ILogService, DelegatedLogService } from 'vs/platform/log/common/log'; import Event, { buffer } from 'vs/base/common/event'; export interface ILogLevelSetterChannel extends IChannel { @@ -30,7 +30,7 @@ export class LogLevelSetterChannel implements ILogLevelSetterChannel { } } -export class LogLevelSetterChannelClient implements ILogLevelSetter { +export class LogLevelSetterChannelClient { constructor(private channel: ILogLevelSetterChannel) { } @@ -40,4 +40,17 @@ export class LogLevelSetterChannelClient implements ILogLevelSetter { setLevel(level: LogLevel): TPromise { return this.channel.call('setLevel', level); } +} + +export class FollowerLogService extends DelegatedLogService implements ILogService { + _serviceBrand: any; + + constructor(private master: LogLevelSetterChannelClient, logService: ILogService) { + super(logService); + this._register(master.onDidChangeLogLevel(level => logService.setLevel(level))); + } + + setLevel(level: LogLevel): void { + this.master.setLevel(level); + } } \ No newline at end of file diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index 50deed29769..6c93107c6cc 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -43,10 +43,10 @@ import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; import { createSpdLogService } from 'vs/platform/log/node/spdlogService'; import fs = require('fs'); -import { ConsoleLogService, MultiplexLogService, ILogService, FollowerLogService } from 'vs/platform/log/common/log'; +import { ConsoleLogService, MultiplexLogService, ILogService } from 'vs/platform/log/common/log'; import { IssueChannelClient } from 'vs/platform/issue/common/issueIpc'; import { IIssueService } from 'vs/platform/issue/common/issue'; -import { LogLevelSetterChannelClient } from 'vs/platform/log/common/logIpc'; +import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc'; gracefulFs.gracefulify(fs); // enable gracefulFs export function startup(configuration: IWindowConfiguration): TPromise { From 8c81274edbe0bfcbbd259c077a4d3b44fd00b6c5 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 09:15:30 +0100 Subject: [PATCH 604/710] Fix color registration --- .../contrib/bracketMatching/bracketMatching.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts index 0ce6d4667cf..5b602985086 100644 --- a/src/vs/editor/contrib/bracketMatching/bracketMatching.ts +++ b/src/vs/editor/contrib/bracketMatching/bracketMatching.ts @@ -20,14 +20,10 @@ import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/ import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/view/editorColorRegistry'; import { ModelDecorationOptions } from 'vs/editor/common/model/textModel'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; -import { registerColor, overviewRulerSelectionHighlightForeground } from 'vs/platform/theme/common/colorRegistry'; +import { registerColor } from 'vs/platform/theme/common/colorRegistry'; import { TrackedRangeStickiness, IModelDeltaDecoration, OverviewRulerLane } from 'vs/editor/common/model'; -export const editorWordHighlight = registerColor('editor.wordHighlightBackground', { dark: '#575757B8', light: '#57575740', hc: null }, nls.localize('wordHighlight', 'Background color of a symbol during read-access, like reading a variable.')); -export const editorWordHighlightStrong = registerColor('editor.wordHighlightStrongBackground', { dark: '#004972B8', light: '#0e639c40', hc: null }, nls.localize('wordHighlightStrong', 'Background color of a symbol during write-access, like writing to a variable.')); - -export const overviewRulerWordHighlightForeground = registerColor('editorOverviewRuler.wordHighlightForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerWordHighlightForeground', 'Overview ruler marker color for symbol highlights.')); -export const overviewRulerWordHighlightStrongForeground = registerColor('editorOverviewRuler.wordHighlightStrongForeground', { dark: '#C0A0C0', light: '#C0A0C0', hc: '#C0A0C0' }, nls.localize('overviewRulerWordHighlightStrongForeground', 'Overview ruler marker color for write-access symbol highlights.')); +const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hc: '#A0A0A0' }, nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.')); class JumpToBracketAction extends EditorAction { constructor() { @@ -223,8 +219,8 @@ export class BracketMatchingController extends Disposable implements editorCommo stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'bracket-match', overviewRuler: { - color: themeColorFromId(overviewRulerSelectionHighlightForeground), - darkColor: themeColorFromId(overviewRulerSelectionHighlightForeground), + color: themeColorFromId(overviewRulerBracketMatchForeground), + darkColor: themeColorFromId(overviewRulerBracketMatchForeground), position: OverviewRulerLane.Center } }); From bddc5d69c4cf4f1df90231973bee2798a14427fc Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Wed, 24 Jan 2018 09:19:14 +0100 Subject: [PATCH 605/710] add IJSONContributionRegistry.notifySchemaChanged --- .../configuration/common/configurationRegistry.ts | 2 +- .../jsonschemas/common/jsonContributionRegistry.ts | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/vs/platform/configuration/common/configurationRegistry.ts b/src/vs/platform/configuration/common/configurationRegistry.ts index 033f4501766..518898d9d85 100644 --- a/src/vs/platform/configuration/common/configurationRegistry.ts +++ b/src/vs/platform/configuration/common/configurationRegistry.ts @@ -143,7 +143,7 @@ class ConfigurationRegistry implements IConfigurationRegistry { } public notifyConfigurationSchemaUpdated(configuration: IConfigurationNode) { - contributionRegistry.registerSchema(editorConfigurationSchemaId, this.editorConfigurationSchema); + contributionRegistry.notifySchemaChanged(editorConfigurationSchemaId); } public registerOverrideIdentifiers(overrideIdentifiers: string[]): void { diff --git a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts index b9c921d4505..94fcaf68949 100644 --- a/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts +++ b/src/vs/platform/jsonschemas/common/jsonContributionRegistry.ts @@ -25,6 +25,13 @@ export interface IJSONContributionRegistry { */ registerSchema(uri: string, unresolvedSchemaContent: IJSONSchema): void; + + /** + * Notifies all listeneres that the content of the given schema has changed. + * @param uri The id of the schema + */ + notifySchemaChanged(uri: string): void; + /** * Get all schemas */ @@ -60,6 +67,10 @@ class JSONContributionRegistry implements IJSONContributionRegistry { this._onDidChangeSchema.fire(uri); } + public notifySchemaChanged(uri: string): void { + this._onDidChangeSchema.fire(uri); + } + public getSchemaContributions(): ISchemaContributions { return { schemas: this.schemasById, From b5e2d0a6bcbae4f71099715dc813239d21975eb5 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 09:34:33 +0100 Subject: [PATCH 606/710] some more jsdoc, #10659 --- src/vs/vscode.d.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 7b80ea7ab95..60976131c02 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -2495,7 +2495,8 @@ declare module 'vscode' { } /** - * A workspace edit represents textual changes for many documents. + * A workspace edit represents textual and files changes for + * multiple resources and documents. */ export class WorkspaceEdit { @@ -2556,7 +2557,7 @@ declare module 'vscode' { /** * Get all text edits grouped by resource. * - * @return An array of `[Uri, TextEdit[]]`-tuples. + * @return A shallow copy of `[Uri, TextEdit[]]`-tuples. */ entries(): [Uri, TextEdit[]][]; @@ -2585,14 +2586,18 @@ declare module 'vscode' { /** * Get the resource edits for this workspace edit. * - * @returns A array of uri-tuples in which a rename-edit + * @returns A shallow copy of uri-tuples in which a rename-edit * is represented as `[from, to]`, a delete-operation as `[from, null]`, * and a create-operation as `[null, to]`; */ resourceEdits(): [Uri, Uri][]; /** + * Get all edits, textual changes and file changes. The order is the order + * in which edits have been added to this workspace edits. Textuals edits + * are grouped and the first textual edit for a resource matters. * + * @returns A shallow copy of all changes. */ allEntries(): ([Uri, TextEdit[]] | [Uri, Uri])[]; } From 1d106e5afe0cb08ed7fb8998aba673d0cd4282c4 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 09:38:09 +0100 Subject: [PATCH 607/710] rename gulp tasks --- build/gulpfile.vscode.js | 11 ++++------- scripts/code.bat | 2 +- scripts/code.sh | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index b0ff0a2a732..9ac087e38d4 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -585,18 +585,15 @@ gulp.task('generate-vscode-configuration', () => { }); //#region Built-In Extensions -gulp.task('clean-builtInExtensions', util.rimraf('.build/builtInExtensions')); - -gulp.task('builtInExtensions', ['clean-builtInExtensions'], function() { +gulp.task('clean-builtin-extensions', util.rimraf('.build/builtInExtensions')); +gulp.task('download-builtin-extensions', ['clean-builtin-extensions'], function () { const marketplaceExtensions = es.merge(...builtInExtensions.map(extension => { return ext.fromMarketplace(extension.name, extension.version) .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`)); })); - return ( - marketplaceExtensions + return marketplaceExtensions .pipe(util.setExecutableBit(['**/*.sh'])) - .pipe(vfs.dest('.build/builtInExtensions')) - ); + .pipe(vfs.dest('.build/builtInExtensions')); }); //#endregion diff --git a/scripts/code.bat b/scripts/code.bat index 4917d3b9a8b..b23ee223546 100644 --- a/scripts/code.bat +++ b/scripts/code.bat @@ -19,7 +19,7 @@ if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js electron :: Get built-in extensions node build\lib\builtInExtensions.js -if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js builtInExtensions +if %errorlevel% neq 0 node .\node_modules\gulp\bin\gulp.js download-builtin-extensions :: Build if not exist out node .\node_modules\gulp\bin\gulp.js compile diff --git a/scripts/code.sh b/scripts/code.sh index 089d380c1b5..7f52ded6fe5 100755 --- a/scripts/code.sh +++ b/scripts/code.sh @@ -25,7 +25,7 @@ function code() { node build/lib/electron.js || ./node_modules/.bin/gulp electron # Get built-in extensions - node build/lib/builtInExtensions.js || ./node_modules/.bin/gulp builtInExtensions + node build/lib/builtInExtensions.js || ./node_modules/.bin/gulp download-builtin-extensions # Build test -d out || ./node_modules/.bin/gulp compile From 4fde7a37737b5ff2735568116f8ffa59084da509 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 09:50:57 +0100 Subject: [PATCH 608/710] add main-side logging for save participants, #42013 --- .../api/electron-browser/mainThreadSaveParticipant.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts index ad20179ae9b..8bd469c9f82 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts @@ -27,6 +27,7 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress'; import { localize } from 'vs/nls'; import { isFalsyOrEmpty } from 'vs/base/common/arrays'; +import { ILogService } from 'vs/platform/log/common/log'; export interface ISaveParticipantParticipant extends ISaveParticipant { // progressMessage: string; @@ -279,8 +280,9 @@ export class SaveParticipant implements ISaveParticipant { constructor( extHostContext: IExtHostContext, + @IInstantiationService instantiationService: IInstantiationService, @IProgressService2 private _progressService: IProgressService2, - @IInstantiationService instantiationService: IInstantiationService + @ILogService private _logService: ILogService ) { this._saveParticipants = [ instantiationService.createInstance(TrimWhitespaceParticipant), @@ -303,7 +305,7 @@ export class SaveParticipant implements ISaveParticipant { const promiseFactory = this._saveParticipants.map(p => () => { return Promise.resolve(p.participate(model, env)); }); - return sequence(promiseFactory).then(() => { }); + return sequence(promiseFactory).then(() => { }, err => this._logService.error(err)); }); } } From acf50ea95a837828b4f0569bdc9fa5cff6f04fc0 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 09:54:15 +0100 Subject: [PATCH 609/710] Revert "Revert "add 'configuration' (read uri/path) of workspace config file, #41408"" This reverts commit 1cacde34962c0c03cfa2de5eb72b3dbbc772e992. --- src/vs/platform/workspace/common/workspace.ts | 2 +- src/vs/workbench/api/node/extHost.protocol.ts | 1 + src/vs/workbench/api/node/extHostExtensionService.ts | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index af594644bae..1493935a013 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -198,7 +198,7 @@ export class Workspace implements IWorkspace { } public toJSON(): IWorkspace { - return { id: this.id, folders: this.folders, name: this.name }; + return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration }; } } diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 332a2ee8940..1380aed2b40 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -72,6 +72,7 @@ export interface IWorkspaceData { id: string; name: string; folders: { uri: UriComponents, name: string, index: number }[]; + configuration: UriComponents; } export interface IInitData { diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 2ea4f37ba86..b80f02c986f 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -22,6 +22,7 @@ import { Barrier } from 'vs/base/common/async'; import { ILogService } from 'vs/platform/log/common/log'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService'; +import URI from 'vs/base/common/uri'; class ExtensionMemento implements IExtensionMemento { @@ -108,6 +109,7 @@ class ExtensionStoragePath { join(storagePath, 'meta.json'), JSON.stringify({ id: this._workspace.id, + configuration: URI.revive(this._workspace.configuration).toString(), name: this._workspace.name }, undefined, 2) ); From 3dd2035b13b3395f55afd5070ba875bcc230e464 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 09:55:50 +0100 Subject: [PATCH 610/710] another try, #41408 --- src/vs/workbench/api/node/extHost.protocol.ts | 2 +- src/vs/workbench/api/node/extHostExtensionService.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 1380aed2b40..84db14dbf9d 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -72,7 +72,7 @@ export interface IWorkspaceData { id: string; name: string; folders: { uri: UriComponents, name: string, index: number }[]; - configuration: UriComponents; + configuration?: UriComponents; } export interface IInitData { diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index b80f02c986f..c3972702415 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -109,7 +109,7 @@ class ExtensionStoragePath { join(storagePath, 'meta.json'), JSON.stringify({ id: this._workspace.id, - configuration: URI.revive(this._workspace.configuration).toString(), + configuration: this._workspace.configuration && URI.revive(this._workspace.configuration).toString(), name: this._workspace.name }, undefined, 2) ); From 2d01d1c4b1bce99babd2a7638d00696ed65aa385 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 09:59:25 +0100 Subject: [PATCH 611/710] fix #41987 --- src/vs/base/common/resources.ts | 7 ++++++- src/vs/base/test/common/resources.test.ts | 12 +++++++++++- .../browser/parts/quickopen/quickOpenController.ts | 13 +------------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts index 3012d4a5b15..bbc5c6ca223 100644 --- a/src/vs/base/common/resources.ts +++ b/src/vs/base/common/resources.ts @@ -38,8 +38,13 @@ export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean } export function dirname(resource: uri): uri { + const dirname = paths.dirname(resource.path); + if (resource.authority && dirname && !paths.isAbsolute(dirname)) { + return null; // If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character + } + return resource.with({ - path: paths.dirname(resource.path) + path: dirname }); } diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts index f9275777a53..c0940975c3c 100644 --- a/src/vs/base/test/common/resources.test.ts +++ b/src/vs/base/test/common/resources.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import URI from 'vs/base/common/uri'; -import { distinctParents } from 'vs/base/common/resources'; +import { distinctParents, dirname } from 'vs/base/common/resources'; suite('Resources', () => { @@ -40,4 +40,14 @@ suite('Resources', () => { assert.equal(distinct[1].toString(), resources[3].toString()); assert.equal(distinct[2].toString(), resources[4].toString()); }); + + test('dirname', (done) => { + const f = URI.file('/some/file/test.txt'); + const d = dirname(f); + assert.equal(d.fsPath, '/some/file'); + + // does not explode (https://github.com/Microsoft/vscode/issues/41987) + URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }); + done(); + }); }); \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 1da92a9404f..935b7d8bed5 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -55,7 +55,6 @@ import { FileKind, IFileService } from 'vs/platform/files/common/files'; import { scoreItem, ScorerCache, compareItemsByScore, prepareQuery } from 'vs/base/parts/quickopen/common/quickOpenScorer'; import { getBaseLabel } from 'vs/base/common/labels'; import { WorkbenchTree } from 'vs/platform/list/browser/listService'; -import { dirname } from 'vs/base/common/paths'; const HELP_PREFIX = '?'; @@ -1260,7 +1259,7 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { const resourceInput = input as IResourceInput; this.resource = resourceInput.resource; this.label = getBaseLabel(resourceInput.resource); - this.description = labels.getPathLabel(this.safeDirname(this.resource), contextService, environmentService); + this.description = labels.getPathLabel(resources.dirname(this.resource), contextService, environmentService); this.dirty = this.resource && this.textFileService.isDirty(this.resource); if (this.dirty && this.textFileService.getAutoSaveMode() === AutoSaveMode.AFTER_SHORT_DELAY) { @@ -1269,16 +1268,6 @@ export class EditorHistoryEntry extends EditorQuickOpenEntry { } } - private safeDirname(resource: URI): string | URI { - try { - return resources.dirname(resource); // workaround for https://github.com/Microsoft/vscode/issues/41987 - } catch (error) { - console.warn(`Unable to resolve to parent resource: ${resource.toString()}`, resource, error); - - return dirname(resource.fsPath); - } - } - public getIcon(): string { return this.dirty ? 'dirty' : ''; } From d43d978b6334294b3ab893d5b1a0c7cea0036cb2 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 24 Jan 2018 09:53:24 +0100 Subject: [PATCH 612/710] :lipstick: --- src/vs/platform/log/common/log.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vs/platform/log/common/log.ts b/src/vs/platform/log/common/log.ts index 09d85742184..97418ed6f9a 100644 --- a/src/vs/platform/log/common/log.ts +++ b/src/vs/platform/log/common/log.ts @@ -244,6 +244,7 @@ export class DelegatedLogService extends Disposable implements ILogService { constructor(private logService: ILogService) { super(); + this._register(logService); } get onDidChangeLogLevel(): Event { @@ -281,10 +282,6 @@ export class DelegatedLogService extends Disposable implements ILogService { critical(message: string | Error, ...args: any[]): void { this.logService.critical(message, ...args); } - - dispose(): void { - this.logService.dispose(); - } } export class NullLogService implements ILogService { From d14d66d1e2dde65efe972c3092e322dc2e9c546b Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 24 Jan 2018 10:13:50 +0100 Subject: [PATCH 613/710] Show progress while searching for settings --- .../parts/preferences/browser/preferencesEditor.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index d24e70fcd8e..5f6d1157f43 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -58,6 +58,7 @@ import { ConfigurationTarget } from 'vs/platform/configuration/common/configurat 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'; export class PreferencesEditorInput extends SideBySideEditorInput { public static ID: string = 'workbench.editorinputs.preferencesEditorInput'; @@ -123,7 +124,8 @@ export class PreferencesEditor extends BaseEditor { @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IContextKeyService private contextKeyService: IContextKeyService, @IInstantiationService private instantiationService: IInstantiationService, - @IThemeService themeService: IThemeService + @IThemeService themeService: IThemeService, + @IProgressService private progressService: IProgressService ) { super(PreferencesEditor.ID, telemetryService, themeService); this.defaultSettingsEditorContextKey = CONTEXT_SETTINGS_EDITOR.bindTo(this.contextKeyService); @@ -240,10 +242,10 @@ export class PreferencesEditor extends BaseEditor { private onInputChanged(): void { const query = this.searchWidget.getValue().trim(); this.delayedFilterLogging.cancel(); - TPromise.join([ + this.progressService.showWhile(TPromise.join([ this.preferencesRenderers.localFilterPreferences(query), this.triggerThrottledSearch(query) - ]).then(() => { + ]), 250).then(() => { const result = this.preferencesRenderers.lastFilterResult; if (result) { this.delayedFilterLogging.trigger(() => this.reportFilteringUsed( From 93f3fc711b0a3afb80bfcb639e85ed2f1f858f9e Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 11:18:44 +0100 Subject: [PATCH 614/710] avoid loading entire backup content for hot exit fixes #41986 --- src/vs/editor/common/model/textModel.ts | 6 +++- .../parts/editor/editorAreaDropHandler.ts | 18 ++++++++-- .../common/editor/untitledEditorModel.ts | 26 +++++++++------ .../services/backup/common/backup.ts | 9 +++-- .../services/backup/node/backupFileService.ts | 33 ++++++++++++++----- .../test/node/backupFileService.test.ts | 31 ++++++++++++++--- .../textfile/common/textFileEditorModel.ts | 10 +++--- .../workbench/test/workbenchTestServices.ts | 4 +++ 8 files changed, 98 insertions(+), 39 deletions(-) diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 5a05edb5ccc..d64c382f47e 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -57,12 +57,16 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory return builder.finish(); } -export function createTextBufferFactoryFromStream(stream: IStringStream): TPromise { +export function createTextBufferFactoryFromStream(stream: IStringStream, filter?: (chunk: string) => string): TPromise { return new TPromise((c, e, p) => { let done = false; let builder = createTextBufferBuilder(); stream.on('data', (chunk) => { + if (filter) { + chunk = filter(chunk); + } + builder.acceptChunk(chunk); }); diff --git a/src/vs/workbench/browser/parts/editor/editorAreaDropHandler.ts b/src/vs/workbench/browser/parts/editor/editorAreaDropHandler.ts index 587ceeb9128..17920141664 100644 --- a/src/vs/workbench/browser/parts/editor/editorAreaDropHandler.ts +++ b/src/vs/workbench/browser/parts/editor/editorAreaDropHandler.ts @@ -12,7 +12,7 @@ import { IFileService } from 'vs/platform/files/common/files'; import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows'; import URI from 'vs/base/common/uri'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; -import { BACKUP_FILE_RESOLVE_OPTIONS, IBackupFileService } from 'vs/workbench/services/backup/common/backup'; +import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; import { TPromise } from 'vs/base/common/winjs.base'; import { Schemas } from 'vs/base/common/network'; @@ -20,6 +20,8 @@ import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/un import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Position } from 'vs/platform/editor/common/editor'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { DefaultEndOfLine } from 'vs/editor/common/model'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; /** * Shared function across some editor components to handle drag & drop of external resources. E.g. of folders and workspace files @@ -37,6 +39,7 @@ export class EditorAreaDropHandler { @IEditorGroupService private groupService: IEditorGroupService, @IUntitledEditorService private untitledEditorService: IUntitledEditorService, @IWorkbenchEditorService private editorService: IWorkbenchEditorService, + @IConfigurationService private configurationService: IConfigurationService ) { } @@ -107,13 +110,22 @@ export class EditorAreaDropHandler { } // Resolve the contents of the dropped dirty resource from source - return this.textFileService.resolveTextContent(droppedDirtyEditor.backupResource, BACKUP_FILE_RESOLVE_OPTIONS).then(content => { + return this.backupFileService.resolveBackupContent(droppedDirtyEditor.backupResource).then(content => { // Set the contents of to the resource to the target - return this.backupFileService.backupResource(droppedDirtyEditor.resource, this.backupFileService.parseBackupContent(content.value)); + return this.backupFileService.backupResource(droppedDirtyEditor.resource, content.create(this.getDefaultEOL()).createSnapshot(true)); }).then(() => false, () => false /* ignore any error */); } + private getDefaultEOL(): DefaultEndOfLine { + const eol = this.configurationService.getValue('files.eol'); + if (eol === '\r\n') { + return DefaultEndOfLine.CRLF; + } + + return DefaultEndOfLine.LF; + } + private handleWorkspaceFileDrop(resources: (IDraggedResource | IDraggedEditor)[]): TPromise { const externalResources = resources.filter(d => d.isExternal).map(d => d.resource); diff --git a/src/vs/workbench/common/editor/untitledEditorModel.ts b/src/vs/workbench/common/editor/untitledEditorModel.ts index c7dcee066bd..ee33d7720af 100644 --- a/src/vs/workbench/common/editor/untitledEditorModel.ts +++ b/src/vs/workbench/common/editor/untitledEditorModel.ts @@ -16,9 +16,10 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { IMode } from 'vs/editor/common/modes'; import Event, { Emitter } from 'vs/base/common/event'; import { RunOnceScheduler } from 'vs/base/common/async'; -import { IBackupFileService, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; -import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; +import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { ITextResourceConfigurationService } from 'vs/editor/common/services/resourceConfiguration'; +import { ITextBufferFactory } from 'vs/editor/common/model'; +import { createTextBufferFactory } from 'vs/editor/common/model/textModel'; export class UntitledEditorModel extends BaseTextEditorModel implements IEncodingSupport { @@ -46,7 +47,6 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin @IModeService modeService: IModeService, @IModelService modelService: IModelService, @IBackupFileService private backupFileService: IBackupFileService, - @ITextFileService private textFileService: ITextFileService, @ITextResourceConfigurationService private configurationService: ITextResourceConfigurationService ) { super(modelService, modeService); @@ -163,18 +163,24 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin // Check for backups first return this.backupFileService.loadBackupResource(this.resource).then(backupResource => { if (backupResource) { - return this.textFileService.resolveTextContent(backupResource, BACKUP_FILE_RESOLVE_OPTIONS).then(rawTextContent => { - return this.backupFileService.parseBackupContent(rawTextContent.value); - }); + return this.backupFileService.resolveBackupContent(backupResource); } return null; - }).then(backupContent => { + }).then(backupTextBufferFactory => { + const hasBackup = !!backupTextBufferFactory; // untitled associated to file path are dirty right away as well as untitled with content - this.setDirty(this.hasAssociatedFilePath || !!backupContent); + this.setDirty(this.hasAssociatedFilePath || hasBackup); - return this.doLoad(backupContent || this.initialValue || '').then(model => { + let untitledContents: ITextBufferFactory; + if (backupTextBufferFactory) { + untitledContents = backupTextBufferFactory; + } else { + untitledContents = createTextBufferFactory(this.initialValue || ''); + } + + return this.doLoad(untitledContents).then(model => { // Encoding this.configuredEncoding = this.configurationService.getValue(this.resource, 'files.encoding'); @@ -189,7 +195,7 @@ export class UntitledEditorModel extends BaseTextEditorModel implements IEncodin }); } - private doLoad(content: string): TPromise { + private doLoad(content: ITextBufferFactory): TPromise { // Create text editor model if not yet done if (!this.textEditorModel) { diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts index 0b4d35f5d0c..d398e7bdde8 100644 --- a/src/vs/workbench/services/backup/common/backup.ts +++ b/src/vs/workbench/services/backup/common/backup.ts @@ -65,13 +65,12 @@ export interface IBackupFileService { getWorkspaceFileBackups(): TPromise; /** - * Parses backup raw text content into the content, removing the metadata that is also stored - * in the file. + * Resolves the backup for the given resource. * - * @param textBufferFactory The ITextBufferFactory from a backup resource. - * @return The backup file's backed up content. + * @param value The contents from a backup resource as stream. + * @return The backup file's backed up content as text buffer factory. */ - parseBackupContent(textBufferFactory: ITextBufferFactory): string; + resolveBackupContent(backup: Uri): TPromise; /** * Discards the backup associated with a resource if it exists.. diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts index 18c4e2a7b50..c0873744d49 100644 --- a/src/vs/workbench/services/backup/node/backupFileService.ts +++ b/src/vs/workbench/services/backup/node/backupFileService.ts @@ -10,12 +10,12 @@ import * as crypto from 'crypto'; import * as pfs from 'vs/base/node/pfs'; import Uri from 'vs/base/common/uri'; import { ResourceQueue } from 'vs/base/common/async'; -import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; +import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; import { IFileService, ITextSnapshot, IFileStat } from 'vs/platform/files/common/files'; import { TPromise } from 'vs/base/common/winjs.base'; import { readToMatchingString } from 'vs/base/node/stream'; -import { Range } from 'vs/editor/common/core/range'; -import { DefaultEndOfLine, ITextBufferFactory, EndOfLinePreference } from 'vs/editor/common/model'; +import { ITextBufferFactory } from 'vs/editor/common/model'; +import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel'; export interface IBackupFilesModel { resolve(backupRoot: string): TPromise; @@ -245,12 +245,27 @@ export class BackupFileService implements IBackupFileService { }); } - public parseBackupContent(textBufferFactory: ITextBufferFactory): string { - // The first line of a backup text file is the file name - const textBuffer = textBufferFactory.create(DefaultEndOfLine.LF); - const lineCount = textBuffer.getLineCount(); - const range = new Range(2, 1, lineCount, textBuffer.getLineLength(lineCount) + 1); - return textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined); + public resolveBackupContent(backup: Uri): TPromise { + return this.fileService.resolveStreamContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(content => { + + // Add a filter method to filter out everything until the meta marker + let metaFound = false; + const metaPreambleFilter = (chunk: string) => { + if (!metaFound && chunk) { + const metaIndex = chunk.indexOf(BackupFileService.META_MARKER); + if (metaIndex === -1) { + return ''; // meta not yet found, return empty string + } + + metaFound = true; + return chunk.substr(metaIndex + 1); // meta found, return everything after + } + + return chunk; + }; + + return createTextBufferFactoryFromStream(content.value, metaPreambleFilter); + }); } public toBackupResource(resource: Uri): Uri { diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts index ff58403e381..e59a370b922 100644 --- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts +++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts @@ -16,10 +16,12 @@ import pfs = require('vs/base/node/pfs'); import Uri from 'vs/base/common/uri'; import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService'; import { FileService } from 'vs/workbench/services/files/node/fileService'; -import { createTextBufferFactory, TextModel } from 'vs/editor/common/model/textModel'; +import { TextModel } from 'vs/editor/common/model/textModel'; import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices'; import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; +import { DefaultEndOfLine } from 'vs/editor/common/model'; +import { snapshotToString } from 'vs/platform/files/common/files'; const parentDir = getRandomTestPath(os.tmpdir(), 'vsctests', 'backupfileservice'); const backupHome = path.join(parentDir, 'Backups'); @@ -268,10 +270,29 @@ suite('BackupFileService', () => { }); }); - test('parseBackupContent', () => { - test('should separate metadata from content', () => { - const textBufferFactory = createTextBufferFactory('metadata\ncontent'); - assert.equal(service.parseBackupContent(textBufferFactory), 'content'); + test('resolveBackupContent', () => { + test('should restore the original contents (untitled file)', () => { + const contents = 'test\nand more stuff'; + service.backupResource(untitledFile, contents).then(() => { + service.resolveBackupContent(service.toBackupResource(untitledFile)).then(factory => { + assert.equal(contents, snapshotToString(factory.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true))); + }); + }); + }); + + test('should restore the original contents (text file)', () => { + const contents = [ + 'Lorem ipsum ', + 'dolor öäü sit amet ', + 'consectetur ', + 'adipiscing ßß elit', + ].join(''); + + service.backupResource(fooFile, contents).then(() => { + service.resolveBackupContent(service.toBackupResource(untitledFile)).then(factory => { + assert.equal(contents, snapshotToString(factory.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true))); + }); + }); }); }); }); diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index 88197be4a82..887cb059464 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -22,7 +22,7 @@ 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 { EncodingMode } from 'vs/workbench/common/editor'; import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel'; -import { IBackupFileService, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; +import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IFileService, IFileStat, FileOperationError, FileOperationResult, IContent, CONTENT_CHANGE_EVENT_BUFFER_DELAY, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; @@ -444,7 +444,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil diag('load() - created text editor model', this.resource, new Date()); this.createTextEditorModelPromise = this.doLoadBackup(backup).then(backupContent => { - const hasBackupContent = (typeof backupContent === 'string'); + const hasBackupContent = !!backupContent; return this.createTextEditorModel(hasBackupContent ? backupContent : value, resource).then(() => { this.createTextEditorModelPromise = null; @@ -488,14 +488,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil this.toDispose.push(this.textEditorModel.onDidChangeContent(() => this.onModelContentChanged())); } - private doLoadBackup(backup: URI): TPromise { + private doLoadBackup(backup: URI): TPromise { if (!backup) { return TPromise.as(null); } - return this.textFileService.resolveTextContent(backup, BACKUP_FILE_RESOLVE_OPTIONS).then(backup => { - return this.backupFileService.parseBackupContent(backup.value); - }, error => null /* ignore errors */); + return this.backupFileService.resolveBackupContent(backup).then(backupContent => backupContent, error => null /* ignore errors */); } protected getOrCreateMode(modeService: IModeService, preferredModeIds: string, firstLineText?: string): TPromise { diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index e5db572cc91..d4d3fbd6c25 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -872,6 +872,10 @@ export class TestBackupFileService implements IBackupFileService { return textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined); } + public resolveBackupContent(backup: URI): TPromise { + return TPromise.as(null); + } + public discardResourceBackup(resource: URI): TPromise { return TPromise.as(void 0); } From 45967cd09dae4431adc6202c88dea2538f5155c8 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 11:46:04 +0100 Subject: [PATCH 615/710] fix tests on windows --- src/vs/base/test/common/resources.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts index c0940975c3c..4c0925bcf14 100644 --- a/src/vs/base/test/common/resources.test.ts +++ b/src/vs/base/test/common/resources.test.ts @@ -7,6 +7,7 @@ import * as assert from 'assert'; import URI from 'vs/base/common/uri'; import { distinctParents, dirname } from 'vs/base/common/resources'; +import { normalize } from 'vs/base/common/paths'; suite('Resources', () => { @@ -44,7 +45,7 @@ suite('Resources', () => { test('dirname', (done) => { const f = URI.file('/some/file/test.txt'); const d = dirname(f); - assert.equal(d.fsPath, '/some/file'); + assert.equal(d.fsPath, normalize('/some/file', true)); // does not explode (https://github.com/Microsoft/vscode/issues/41987) URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }); From fb1d21936ba117f7147b923971cb0063467ec235 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Wed, 24 Jan 2018 11:46:54 +0100 Subject: [PATCH 616/710] #41071 Update the view quickpick list and add open view in views menu --- src/vs/code/electron-main/menus.ts | 2 ++ .../quickopen/browser/viewPickerHandler.ts | 35 ++++++------------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 7e389c63729..76be406fa4e 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -683,6 +683,7 @@ export class CodeMenu { } const commands = this.createMenuItem(nls.localize({ key: 'miCommandPalette', comment: ['&& denotes a mnemonic'] }, "&&Command Palette..."), 'workbench.action.showCommands'); + const openView = this.createMenuItem(nls.localize({ key: 'miOpenView', comment: ['&& denotes a mnemonic'] }, "&&Open View..."), 'workbench.action.openView'); const fullscreen = new MenuItem(this.withKeybinding('workbench.action.toggleFullScreen', { label: this.mnemonicLabel(nls.localize({ key: 'miToggleFullScreen', comment: ['&& denotes a mnemonic'] }, "Toggle &&Full Screen")), click: () => this.windowsMainService.getLastActiveWindow().toggleFullScreen(), enabled: this.windowsMainService.getWindowCount() > 0 })); const toggleZenMode = this.createMenuItem(nls.localize('miToggleZenMode', "Toggle Zen Mode"), 'workbench.action.toggleZenMode'); @@ -729,6 +730,7 @@ export class CodeMenu { arrays.coalesce([ commands, + openView, __separator__(), explorer, search, diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index 2c1c4186639..6157b6eb26f 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -138,40 +138,27 @@ export class ViewPickerHandler extends QuickOpenHandler { // Viewlets const viewlets = this.viewletService.getViewlets(); + viewlets.forEach((viewlet, index) => viewEntries.push(new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError)))); + + // Panels + const panels = this.panelService.getPanels(); + panels.forEach((panel, index) => viewEntries.push(new ViewEntry(panel.name, nls.localize('panels', "Panels"), () => this.panelService.openPanel(panel.id, true).done(null, errors.onUnexpectedError)))); + + // Views viewlets.forEach((viewlet, index) => { const viewLocation: ViewLocation = viewlet.id === EXPLORER_VIEWLET_ID ? ViewLocation.Explorer : viewlet.id === DEBUG_VIEWLET_ID ? ViewLocation.Debug : viewlet.id === EXTENSIONS_VIEWLET_ID ? ViewLocation.Extensions : null; - const viewEntriesForViewlet: ViewEntry[] = viewLocation ? getViewEntriesForViewlet(viewlet, viewLocation) - : [new ViewEntry(viewlet.name, nls.localize('views', "Views"), () => this.viewletService.openViewlet(viewlet.id, true).done(null, errors.onUnexpectedError))]; - - viewEntries.push(...viewEntriesForViewlet); - }); - - const terminals = this.terminalService.terminalInstances; - - // Panels - const panels = this.panelService.getPanels().filter(p => { - if (p.id === OUTPUT_PANEL_ID) { - return false; // since we already show output channels below + if (viewLocation) { + const viewEntriesForViewlet: ViewEntry[] = getViewEntriesForViewlet(viewlet, viewLocation); + viewEntries.push(...viewEntriesForViewlet); } - - if (p.id === TERMINAL_PANEL_ID && terminals.length > 0) { - return false; // since we already show terminal instances below - } - - return true; - }); - panels.forEach((panel, index) => { - const panelsCategory = nls.localize('panels', "Panels"); - const entry = new ViewEntry(panel.name, panelsCategory, () => this.panelService.openPanel(panel.id, true).done(null, errors.onUnexpectedError)); - - viewEntries.push(entry); }); // Terminals + const terminals = this.terminalService.terminalInstances; terminals.forEach((terminal, index) => { const terminalsCategory = nls.localize('terminals', "Terminal"); const entry = new ViewEntry(nls.localize('terminalTitle', "{0}: {1}", index + 1, terminal.title), terminalsCategory, () => { From d536410f161fb3eeac25cc0e2388d3eba77339e3 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 11:51:44 +0100 Subject: [PATCH 617/710] extension report cache and load --- .../common/extensionManagement.ts | 2 +- .../common/extensionManagementIpc.ts | 8 ++- .../node/extensionGalleryService.ts | 6 -- .../node/extensionManagementService.ts | 60 +++++++++++++++++-- 4 files changed, 62 insertions(+), 14 deletions(-) diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts index 6512e977822..5eb1cb408ab 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts @@ -232,7 +232,6 @@ export enum StatisticType { export interface IReportedExtension { id: IExtensionIdentifier; malicious: boolean; - slow: boolean; } export interface IExtensionGalleryService { @@ -280,6 +279,7 @@ export interface IExtensionManagementService { installFromGallery(extension: IGalleryExtension): TPromise; uninstall(extension: ILocalExtension, force?: boolean): TPromise; getInstalled(type?: LocalExtensionType): TPromise; + getExtensionsReport(): TPromise; updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise; } diff --git a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts index 15bb2aa58df..9cb9488880e 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementIpc.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IChannel, eventToCall, eventFromCall } from 'vs/base/parts/ipc/common/ipc'; -import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata } from './extensionManagement'; +import { IExtensionManagementService, ILocalExtension, InstallExtensionEvent, DidInstallExtensionEvent, IGalleryExtension, LocalExtensionType, DidUninstallExtensionEvent, IExtensionIdentifier, IGalleryMetadata, IReportedExtension } from './extensionManagement'; import Event, { buffer } from 'vs/base/common/event'; export interface IExtensionManagementChannel extends IChannel { @@ -19,6 +19,7 @@ export interface IExtensionManagementChannel extends IChannel { call(command: 'installFromGallery', extension: IGalleryExtension): TPromise; call(command: 'uninstall', args: [ILocalExtension, boolean]): TPromise; call(command: 'getInstalled'): TPromise; + call(command: 'getExtensionsReport'): TPromise; call(command: string, arg?: any): TPromise; } @@ -47,6 +48,7 @@ export class ExtensionManagementChannel implements IExtensionManagementChannel { case 'uninstall': return this.service.uninstall(arg[0], arg[1]); case 'getInstalled': return this.service.getInstalled(arg); case 'updateMetadata': return this.service.updateMetadata(arg[0], arg[1]); + case 'getExtensionsReport': return this.service.getExtensionsReport(); } return undefined; } @@ -89,4 +91,8 @@ export class ExtensionManagementChannelClient implements IExtensionManagementSer updateMetadata(local: ILocalExtension, metadata: IGalleryMetadata): TPromise { return this.channel.call('updateMetadata', [local, metadata]); } + + getExtensionsReport(): TPromise { + return this.channel.call('getExtensionsReport'); + } } \ No newline at end of file diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index ae9aa3ca924..81b8e3cc744 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -743,12 +743,6 @@ export class ExtensionGalleryService implements IExtensionGalleryService { map.set(id, ext); } - for (const id of result.slow) { - const ext = map.get(id) || { id: { id }, malicious: false, slow: true }; - ext.slow = true; - map.set(id, ext); - } - return TPromise.as(values(map)); }); }); diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 84ab67e438e..7adb4f33231 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -19,7 +19,8 @@ import { IGalleryExtension, IExtensionManifest, IGalleryMetadata, InstallExtensionEvent, DidInstallExtensionEvent, DidUninstallExtensionEvent, LocalExtensionType, StatisticType, - IExtensionIdentifier + IExtensionIdentifier, + IReportedExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { localizeManifest } from '../common/extensionNls'; @@ -103,8 +104,9 @@ export class ExtensionManagementService implements IExtensionManagementService { private extensionsPath: string; private uninstalledPath: string; - private userDataPath: string; + private reportedPath: string; private uninstalledFileLimiter: Limiter; + private reportedExtensions: TPromise; private disposables: IDisposable[] = []; private readonly _onInstallExtension = new Emitter(); @@ -122,20 +124,24 @@ export class ExtensionManagementService implements IExtensionManagementService { onDidUninstallExtension: Event = this._onDidUninstallExtension.event; constructor( - @IEnvironmentService environmentService: IEnvironmentService, + @IEnvironmentService private environmentService: IEnvironmentService, @IChoiceService private choiceService: IChoiceService, @IExtensionGalleryService private galleryService: IExtensionGalleryService, - @ILogService private logService: ILogService, + @ILogService private logService: ILogService ) { this.extensionsPath = environmentService.extensionsPath; this.uninstalledPath = path.join(this.extensionsPath, '.obsolete'); - this.userDataPath = environmentService.userDataPath; this.uninstalledFileLimiter = new Limiter(1); this.disposables.push(toDisposable(() => this.installingExtensions.clear())); + + this.reportedPath = path.join(this.extensionsPath, '.reported'); + this.reportedExtensions = this.loadReportFromCache(); + + setTimeout(() => this.loopRefreshReportCache(), 1000 * 10); // 10 seconds after boot } private deleteExtensionsManifestCache(): void { - const cacheFolder = path.join(this.userDataPath, MANIFEST_CACHE_FOLDER); + const cacheFolder = path.join(this.environmentService.userDataPath, MANIFEST_CACHE_FOLDER); const cacheFile = path.join(cacheFolder, USER_MANIFEST_CACHE_FILE); pfs.del(cacheFile).done(() => { }, () => { }); @@ -776,6 +782,48 @@ export class ExtensionManagementService implements IExtensionManagementService { }); } + getExtensionsReport(): TPromise { + return this.reportedExtensions; + } + + private loadReportFromCache(): TPromise { + this.logService.trace('ExtensionManagementService.loadReportedFromCache'); + + return pfs.readFile(this.reportedPath, 'utf8') + .then(raw => JSON.parse(raw)) + .then(result => { + this.logService.trace(`ExtensionManagementService.loadReportedFromCache - loaded ${result.length} reported extensions from cache`); + return result; + }, () => { + this.logService.trace(`ExtensionManagementService.loadReportedFromCache - no cache found`); + }); + } + + private loopRefreshReportCache(): void { + this.refreshReportCache() + .then(() => TPromise.timeout(1000 * 60 * 5)) // every five minutes + .then(() => this.loopRefreshReportCache()); + } + + private refreshReportCache(): TPromise { + this.logService.trace('ExtensionManagementService.refreshReportedCache'); + + return this.reportedExtensions = this.galleryService.getExtensionsReport() + .then(null, err => { + this.logService.trace('ExtensionManagementService.refreshReportedCache - failed to get extension report'); + return []; + }) + .then(result => { + this.logService.trace(`ExtensionManagementService.refreshReportedCache - got ${result.length} reported extensions from service`); + + return pfs.writeFile(this.reportedPath, JSON.stringify(result)) + .then(() => result, err => { + this.logService.trace('ExtensionManagementService.refreshReportedCache - failed to cache extension report'); + return result; + }); + }); + } + dispose() { this.disposables = dispose(this.disposables); } From 4644b60d31b03dc52827e81187cb937f6734bb6f Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 12:02:09 +0100 Subject: [PATCH 618/710] remove internal API for accessing the value of a model directly --- .../common/editor/textEditorModel.ts | 39 ++++++++----------- .../services/backup/common/backup.ts | 4 +- .../services/backup/node/backupFileService.ts | 16 ++------ .../test/node/backupFileService.test.ts | 30 +++++++------- .../textfile/common/textFileEditorModel.ts | 15 +++---- .../test/common/editor/editorModel.test.ts | 13 +++++-- .../workbench/test/workbenchTestServices.ts | 2 +- 7 files changed, 56 insertions(+), 63 deletions(-) diff --git a/src/vs/workbench/common/editor/textEditorModel.ts b/src/vs/workbench/common/editor/textEditorModel.ts index 8c10065dfcc..63f9d2e6ba9 100644 --- a/src/vs/workbench/common/editor/textEditorModel.ts +++ b/src/vs/workbench/common/editor/textEditorModel.ts @@ -67,13 +67,13 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd /** * Creates the text editor model with the provided value, modeId (can be comma separated for multiple values) and optional resource URL. */ - protected createTextEditorModel(value: string | ITextBufferFactory, resource?: URI, modeId?: string): TPromise { + protected createTextEditorModel(value: ITextBufferFactory, resource?: URI, modeId?: string): TPromise { const firstLineText = this.getFirstLineText(value); const mode = this.getOrCreateMode(this.modeService, modeId, firstLineText); return TPromise.as(this.doCreateTextEditorModel(value, mode, resource)); } - private doCreateTextEditorModel(value: string | ITextBufferFactory, mode: TPromise, resource: URI): EditorModel { + private doCreateTextEditorModel(value: ITextBufferFactory, mode: TPromise, resource: URI): EditorModel { let model = resource && this.modelService.getModel(resource); if (!model) { model = this.modelService.createModel(value, mode, resource); @@ -91,24 +91,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd return this; } - protected getFirstLineText(value: string | ITextBufferFactory | ITextSnapshot): string { - - // string - if (typeof value === 'string') { - const firstLineText = value.substr(0, 100); - - let crIndex = firstLineText.indexOf('\r'); - if (crIndex < 0) { - crIndex = firstLineText.length; - } - - let lfIndex = firstLineText.indexOf('\n'); - if (lfIndex < 0) { - lfIndex = firstLineText.length; - } - - return firstLineText.substr(0, Math.min(crIndex, lfIndex)); - } + protected getFirstLineText(value: ITextBufferFactory | ITextSnapshot): string { // text buffer factory const textBufferFactory = value as ITextBufferFactory; @@ -118,7 +101,19 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd // text snapshot const textSnapshot = value as ITextSnapshot; - return this.getFirstLineText(textSnapshot.read() || ''); + const firstLineText = textSnapshot.read().substr(0, 100); + + let crIndex = firstLineText.indexOf('\r'); + if (crIndex < 0) { + crIndex = firstLineText.length; + } + + let lfIndex = firstLineText.indexOf('\n'); + if (lfIndex < 0) { + lfIndex = firstLineText.length; + } + + return firstLineText.substr(0, Math.min(crIndex, lfIndex)); } /** @@ -133,7 +128,7 @@ export abstract class BaseTextEditorModel extends EditorModel implements ITextEd /** * Updates the text editor model with the provided value. If the value is the same as the model has, this is a no-op. */ - protected updateTextEditorModel(newValue: string | ITextBufferFactory): void { + protected updateTextEditorModel(newValue: ITextBufferFactory): void { if (!this.textEditorModel) { return; } diff --git a/src/vs/workbench/services/backup/common/backup.ts b/src/vs/workbench/services/backup/common/backup.ts index d398e7bdde8..86d5326107e 100644 --- a/src/vs/workbench/services/backup/common/backup.ts +++ b/src/vs/workbench/services/backup/common/backup.ts @@ -52,10 +52,10 @@ export interface IBackupFileService { * Backs up a resource. * * @param resource The resource to back up. - * @param content The content of the resource as value or snapshot. + * @param content The content of the resource as snapshot. * @param versionId The version id of the resource to backup. */ - backupResource(resource: Uri, content: string | ITextSnapshot, versionId?: number): TPromise; + backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise; /** * Gets a list of file backups for the current workspace. diff --git a/src/vs/workbench/services/backup/node/backupFileService.ts b/src/vs/workbench/services/backup/node/backupFileService.ts index c0873744d49..fdeea689752 100644 --- a/src/vs/workbench/services/backup/node/backupFileService.ts +++ b/src/vs/workbench/services/backup/node/backupFileService.ts @@ -11,7 +11,7 @@ import * as pfs from 'vs/base/node/pfs'; import Uri from 'vs/base/common/uri'; import { ResourceQueue } from 'vs/base/common/async'; import { IBackupFileService, BACKUP_FILE_UPDATE_OPTIONS, BACKUP_FILE_RESOLVE_OPTIONS } from 'vs/workbench/services/backup/common/backup'; -import { IFileService, ITextSnapshot, IFileStat } from 'vs/platform/files/common/files'; +import { IFileService, ITextSnapshot } from 'vs/platform/files/common/files'; import { TPromise } from 'vs/base/common/winjs.base'; import { readToMatchingString } from 'vs/base/node/stream'; import { ITextBufferFactory } from 'vs/editor/common/model'; @@ -171,7 +171,7 @@ export class BackupFileService implements IBackupFileService { }); } - public backupResource(resource: Uri, content: string | ITextSnapshot, versionId?: number): TPromise { + public backupResource(resource: Uri, content: ITextSnapshot, versionId?: number): TPromise { if (this.isShuttingDown) { return TPromise.as(void 0); } @@ -190,17 +190,7 @@ export class BackupFileService implements IBackupFileService { const preamble = `${resource.toString()}${BackupFileService.META_MARKER}`; // Update content with value - let updateContentPromise: TPromise; - if (typeof content === 'string') { - updateContentPromise = this.fileService.updateContent(backupResource, `${preamble}${content}`, BACKUP_FILE_UPDATE_OPTIONS); - } - - // Update content with snapshot - else { - updateContentPromise = this.fileService.updateContent(backupResource, new BackupSnapshot(content, preamble), BACKUP_FILE_UPDATE_OPTIONS); - } - - return updateContentPromise.then(() => model.add(backupResource, versionId)); + return this.fileService.updateContent(backupResource, new BackupSnapshot(content, preamble), BACKUP_FILE_UPDATE_OPTIONS).then(() => model.add(backupResource, versionId)); }); }); } diff --git a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts index e59a370b922..2b9552200f4 100644 --- a/src/vs/workbench/services/backup/test/node/backupFileService.test.ts +++ b/src/vs/workbench/services/backup/test/node/backupFileService.test.ts @@ -16,7 +16,7 @@ import pfs = require('vs/base/node/pfs'); import Uri from 'vs/base/common/uri'; import { BackupFileService, BackupFilesModel } from 'vs/workbench/services/backup/node/backupFileService'; import { FileService } from 'vs/workbench/services/files/node/fileService'; -import { TextModel } from 'vs/editor/common/model/textModel'; +import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel'; import { TestContextService, TestTextResourceConfigurationService, getRandomTestPath, TestLifecycleService } from 'vs/workbench/test/workbenchTestServices'; import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; @@ -107,7 +107,7 @@ suite('BackupFileService', () => { suite('backupResource', () => { test('text file', function (done: () => void) { - service.backupResource(fooFile, 'test').then(() => { + service.backupResource(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1); assert.equal(fs.existsSync(fooBackupPath), true); assert.equal(fs.readFileSync(fooBackupPath), `${fooFile.toString()}\ntest`); @@ -116,7 +116,7 @@ suite('BackupFileService', () => { }); test('untitled file', function (done: () => void) { - service.backupResource(untitledFile, 'test').then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1); assert.equal(fs.existsSync(untitledBackupPath), true); assert.equal(fs.readFileSync(untitledBackupPath), `${untitledFile.toString()}\ntest`); @@ -177,7 +177,7 @@ suite('BackupFileService', () => { suite('discardResourceBackup', () => { test('text file', function (done: () => void) { - service.backupResource(fooFile, 'test').then(() => { + service.backupResource(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1); service.discardResourceBackup(fooFile).then(() => { assert.equal(fs.existsSync(fooBackupPath), false); @@ -188,7 +188,7 @@ suite('BackupFileService', () => { }); test('untitled file', function (done: () => void) { - service.backupResource(untitledFile, 'test').then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1); service.discardResourceBackup(untitledFile).then(() => { assert.equal(fs.existsSync(untitledBackupPath), false); @@ -201,9 +201,9 @@ suite('BackupFileService', () => { suite('discardAllWorkspaceBackups', () => { test('text file', function (done: () => void) { - service.backupResource(fooFile, 'test').then(() => { + service.backupResource(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 1); - service.backupResource(barFile, 'test').then(() => { + service.backupResource(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'file')).length, 2); service.discardAllWorkspaceBackups().then(() => { assert.equal(fs.existsSync(fooBackupPath), false); @@ -216,7 +216,7 @@ suite('BackupFileService', () => { }); test('untitled file', function (done: () => void) { - service.backupResource(untitledFile, 'test').then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.readdirSync(path.join(workspaceBackupPath, 'untitled')).length, 1); service.discardAllWorkspaceBackups().then(() => { assert.equal(fs.existsSync(untitledBackupPath), false); @@ -228,7 +228,7 @@ suite('BackupFileService', () => { test('should disable further backups', function (done: () => void) { service.discardAllWorkspaceBackups().then(() => { - service.backupResource(untitledFile, 'test').then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { assert.equal(fs.existsSync(workspaceBackupPath), false); done(); }); @@ -238,10 +238,10 @@ suite('BackupFileService', () => { suite('getWorkspaceFileBackups', () => { test('("file") - text file', done => { - service.backupResource(fooFile, `test`).then(() => { + service.backupResource(fooFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.getWorkspaceFileBackups().then(textFiles => { assert.deepEqual(textFiles.map(f => f.fsPath), [fooFile.fsPath]); - service.backupResource(barFile, `test`).then(() => { + service.backupResource(barFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.getWorkspaceFileBackups().then(textFiles => { assert.deepEqual(textFiles.map(f => f.fsPath), [fooFile.fsPath, barFile.fsPath]); done(); @@ -252,7 +252,7 @@ suite('BackupFileService', () => { }); test('("file") - untitled file', done => { - service.backupResource(untitledFile, `test`).then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.getWorkspaceFileBackups().then(textFiles => { assert.deepEqual(textFiles.map(f => f.fsPath), [untitledFile.fsPath]); done(); @@ -261,7 +261,7 @@ suite('BackupFileService', () => { }); test('("untitled") - untitled file', done => { - service.backupResource(untitledFile, `test`).then(() => { + service.backupResource(untitledFile, createTextBufferFactory('test').create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.getWorkspaceFileBackups().then(textFiles => { assert.deepEqual(textFiles.map(f => f.fsPath), ['Untitled-1']); done(); @@ -273,7 +273,7 @@ suite('BackupFileService', () => { test('resolveBackupContent', () => { test('should restore the original contents (untitled file)', () => { const contents = 'test\nand more stuff'; - service.backupResource(untitledFile, contents).then(() => { + service.backupResource(untitledFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.resolveBackupContent(service.toBackupResource(untitledFile)).then(factory => { assert.equal(contents, snapshotToString(factory.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true))); }); @@ -288,7 +288,7 @@ suite('BackupFileService', () => { 'adipiscing ßß elit', ].join(''); - service.backupResource(fooFile, contents).then(() => { + service.backupResource(fooFile, createTextBufferFactory(contents).create(DefaultEndOfLine.LF).createSnapshot(false)).then(() => { service.resolveBackupContent(service.toBackupResource(untitledFile)).then(factory => { assert.equal(contents, snapshotToString(factory.create(platform.isWindows ? DefaultEndOfLine.CRLF : DefaultEndOfLine.LF).createSnapshot(true))); }); diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index 887cb059464..981d07eaca2 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -23,7 +23,7 @@ import { ITextFileService, IAutoSaveConfiguration, ModelState, ITextFileEditorMo import { EncodingMode } from 'vs/workbench/common/editor'; import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; -import { IFileService, IFileStat, FileOperationError, FileOperationResult, IContent, CONTENT_CHANGE_EVENT_BUFFER_DELAY, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files'; +import { IFileService, IFileStat, FileOperationError, FileOperationResult, CONTENT_CHANGE_EVENT_BUFFER_DELAY, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService, Severity } from 'vs/platform/message/common/message'; import { IModeService } from 'vs/editor/common/services/modeService'; @@ -32,6 +32,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { RunOnceScheduler } from 'vs/base/common/async'; import { ITextBufferFactory } from 'vs/editor/common/model'; import { IHashService } from 'vs/workbench/services/hash/common/hashService'; +import { createTextBufferFactory } from 'vs/editor/common/model/textModel'; /** * The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk. @@ -290,12 +291,12 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil // If we have a backup, continue loading with it if (!!backup) { - const content: IContent = { + const content: IRawTextContent = { resource: this.resource, name: paths.basename(this.resource.fsPath), mtime: Date.now(), etag: void 0, - value: '', /* will be filled later from backup */ + value: createTextBufferFactory(''), /* will be filled later from backup */ encoding: this.fileService.getEncoding(this.resource, this.preferredEncoding) }; @@ -355,7 +356,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil return TPromise.wrapError(error); } - private loadWithContent(content: IRawTextContent | IContent, backup?: URI): TPromise { + private loadWithContent(content: IRawTextContent, backup?: URI): TPromise { return this.doLoadWithContent(content, backup).then(model => { // Telemetry: We log the fileGet telemetry event after the model has been loaded to ensure a good mimetype @@ -379,7 +380,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil }); } - private doLoadWithContent(content: IRawTextContent | IContent, backup?: URI): TPromise { + private doLoadWithContent(content: IRawTextContent, backup?: URI): TPromise { diag('load() - resolved content', this.resource, new Date()); // Update our resolved disk stat model @@ -420,7 +421,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil return this.doCreateTextModel(content.resource, content.value, backup); } - private doUpdateTextModel(value: string | ITextBufferFactory): TPromise { + private doUpdateTextModel(value: ITextBufferFactory): TPromise { diag('load() - updated text editor model', this.resource, new Date()); // Ensure we are not tracking a stale state @@ -440,7 +441,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil return TPromise.as(this); } - private doCreateTextModel(resource: URI, value: string | ITextBufferFactory, backup: URI): TPromise { + private doCreateTextModel(resource: URI, value: ITextBufferFactory, backup: URI): TPromise { diag('load() - created text editor model', this.resource, new Date()); this.createTextEditorModelPromise = this.doLoadBackup(backup).then(backupContent => { diff --git a/src/vs/workbench/test/common/editor/editorModel.test.ts b/src/vs/workbench/test/common/editor/editorModel.test.ts index b0c237b73bb..843e19701a6 100644 --- a/src/vs/workbench/test/common/editor/editorModel.test.ts +++ b/src/vs/workbench/test/common/editor/editorModel.test.ts @@ -15,9 +15,16 @@ import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; +import { ITextBufferFactory } from 'vs/editor/common/model'; +import URI from 'vs/base/common/uri'; +import { createTextBufferFactory } from 'vs/editor/common/model/textModel'; class MyEditorModel extends EditorModel { } -class MyTextEditorModel extends BaseTextEditorModel { } +class MyTextEditorModel extends BaseTextEditorModel { + public createTextEditorModel(value: ITextBufferFactory, resource?: URI, modeId?: string) { + return super.createTextEditorModel(value, resource, modeId); + } +} suite('Workbench - EditorModel', () => { @@ -51,9 +58,9 @@ suite('Workbench - EditorModel', () => { let modelService = stubModelService(instantiationService); let m = new MyTextEditorModel(modelService, modeService); - m.load().then((model: any) => { + m.load().then((model: MyTextEditorModel) => { assert(model === m); - return model.createTextEditorModel('foo', null, 'text/plain').then(() => { + return model.createTextEditorModel(createTextBufferFactory('foo'), null, 'text/plain').then(() => { assert.strictEqual(m.isResolved(), true); }); }).done(() => { diff --git a/src/vs/workbench/test/workbenchTestServices.ts b/src/vs/workbench/test/workbenchTestServices.ts index d4d3fbd6c25..0b7031c62fa 100644 --- a/src/vs/workbench/test/workbenchTestServices.ts +++ b/src/vs/workbench/test/workbenchTestServices.ts @@ -857,7 +857,7 @@ export class TestBackupFileService implements IBackupFileService { return null; } - public backupResource(resource: URI, content: string | ITextSnapshot): TPromise { + public backupResource(resource: URI, content: ITextSnapshot): TPromise { return TPromise.as(void 0); } From 386f31a1afa195d231e6ab73a84dd0ec8bc6ae37 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 12:23:29 +0100 Subject: [PATCH 619/710] malicious in UI --- .../node/extensionManagementService.ts | 2 + .../extensions/browser/extensionEditor.ts | 8 +- .../extensions/browser/extensionsActions.ts | 28 +++++++ .../extensions/browser/extensionsList.ts | 8 +- .../browser/media/extensionActions.css | 9 +- .../parts/extensions/common/extensions.ts | 1 + .../node/extensionsWorkbenchService.ts | 83 +++++++++++++------ 7 files changed, 105 insertions(+), 34 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 7adb4f33231..d7569e94619 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -373,6 +373,8 @@ export class ExtensionManagementService implements IExtensionManagementService { } private installExtension(installableExtension: InstallableExtension): TPromise { + // BLOCK REPORTED EXTENSIONS HERE? + return this.unsetUninstalledAndGetLocal(installableExtension.id) .then( local => { diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index dd66df55fde..f101cbd65d6 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -33,7 +33,7 @@ import { Renderer, DataSource, Controller } from 'vs/workbench/parts/extensions/ import { RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets'; import { EditorOptions } from 'vs/workbench/common/editor'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; -import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, BuiltinStatusLabelAction, ReloadAction } from 'vs/workbench/parts/extensions/browser/extensionsActions'; +import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, BuiltinStatusLabelAction, ReloadAction, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions'; import WebView from 'vs/workbench/parts/html/browser/webview'; import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; @@ -344,6 +344,7 @@ export class ExtensionEditor extends BaseEditor { this.transientDisposables.push(ratings); const builtinStatusAction = this.instantiationService.createInstance(BuiltinStatusLabelAction); + const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, true); const installAction = this.instantiationService.createInstance(CombinedInstallAction); const updateAction = this.instantiationService.createInstance(UpdateAction); const enableAction = this.instantiationService.createInstance(EnableAction); @@ -352,14 +353,15 @@ export class ExtensionEditor extends BaseEditor { installAction.extension = extension; builtinStatusAction.extension = extension; + maliciousStatusAction.extension = extension; updateAction.extension = extension; enableAction.extension = extension; disableAction.extension = extension; reloadAction.extension = extension; this.extensionActionBar.clear(); - this.extensionActionBar.push([reloadAction, updateAction, enableAction, disableAction, installAction, builtinStatusAction], { icon: true, label: true }); - this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, builtinStatusAction); + this.extensionActionBar.push([reloadAction, updateAction, enableAction, disableAction, installAction, builtinStatusAction, maliciousStatusAction], { icon: true, label: true }); + this.transientDisposables.push(enableAction, updateAction, reloadAction, disableAction, installAction, builtinStatusAction, maliciousStatusAction); this.navbar.clear(); this.navbar.onChange(this.onNavbarChange.bind(this, extension), this, this.transientDisposables); diff --git a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts index 0b244b693db..84f9afb3ff8 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsActions.ts @@ -1555,6 +1555,34 @@ export class BuiltinStatusLabelAction extends Action { } } +export class MaliciousStatusLabelAction extends Action { + + private static readonly Class = 'malicious-status'; + + private _extension: IExtension; + get extension(): IExtension { return this._extension; } + set extension(extension: IExtension) { this._extension = extension; this.update(); } + + constructor(long: boolean) { + const tooltip = localize('malicious tooltip', "This extension was reported to be malicious."); + const label = long ? tooltip : localize('malicious', "Malicious"); + super('extensions.install', label, '', false); + this.tooltip = localize('malicious tooltip', "This extension was reported to be malicious."); + } + + private update(): void { + if (this.extension && this.extension.isMalicious) { + this.class = `${MaliciousStatusLabelAction.Class} malicious`; + } else { + this.class = `${MaliciousStatusLabelAction.Class} not-malicious`; + } + } + + run(): TPromise { + return TPromise.as(null); + } +} + export class DisableAllAction extends Action { static readonly ID = 'workbench.extensions.action.disableAll'; diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts index 0b588e8353c..fbe2e45ff31 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsList.ts @@ -16,7 +16,7 @@ import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging'; import { once } from 'vs/base/common/event'; import { domEvent } from 'vs/base/browser/event'; import { IExtension, IExtensionsWorkbenchService } from 'vs/workbench/parts/extensions/common/extensions'; -import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground } from 'vs/workbench/parts/extensions/browser/extensionsActions'; +import { InstallAction, UpdateAction, BuiltinStatusLabelAction, ManageExtensionAction, ReloadAction, extensionButtonProminentBackground, extensionButtonProminentForeground, MaliciousStatusLabelAction } from 'vs/workbench/parts/extensions/browser/extensionsActions'; import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { Label, RatingsWidget, InstallCountWidget } from 'vs/workbench/parts/extensions/browser/extensionsWidgets'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; @@ -97,13 +97,14 @@ export class Renderer implements IPagedRenderer { const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true }); const builtinStatusAction = this.instantiationService.createInstance(BuiltinStatusLabelAction); + const maliciousStatusAction = this.instantiationService.createInstance(MaliciousStatusLabelAction, false); const installAction = this.instantiationService.createInstance(InstallAction); const updateAction = this.instantiationService.createInstance(UpdateAction); const reloadAction = this.instantiationService.createInstance(ReloadAction); const manageAction = this.instantiationService.createInstance(ManageExtensionAction); - actionbar.push([reloadAction, updateAction, installAction, builtinStatusAction, manageAction], actionOptions); - const disposables = [versionWidget, installCountWidget, ratingsWidget, builtinStatusAction, updateAction, reloadAction, manageAction, actionbar, bookmarkStyler]; + actionbar.push([reloadAction, updateAction, installAction, builtinStatusAction, maliciousStatusAction, manageAction], actionOptions); + const disposables = [versionWidget, installCountWidget, ratingsWidget, builtinStatusAction, maliciousStatusAction, updateAction, reloadAction, manageAction, actionbar, bookmarkStyler]; return { root, element, icon, name, installCount, ratings, author, description, disposables, @@ -113,6 +114,7 @@ export class Renderer implements IPagedRenderer { installCountWidget.extension = extension; ratingsWidget.extension = extension; builtinStatusAction.extension = extension; + maliciousStatusAction.extension = extension; installAction.extension = extension; updateAction.extension = extension; reloadAction.extension = extension; diff --git a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css b/src/vs/workbench/parts/extensions/browser/media/extensionActions.css index 8314dddb331..9ff9876d7e5 100644 --- a/src/vs/workbench/parts/extensions/browser/media/extensionActions.css +++ b/src/vs/workbench/parts/extensions/browser/media/extensionActions.css @@ -30,11 +30,13 @@ .monaco-action-bar .action-item.disabled .action-label.extension-action.enable, .monaco-action-bar .action-item.disabled .action-label.extension-action.disable, .monaco-action-bar .action-item.disabled .action-label.extension-action.reload, -.monaco-action-bar .action-item.disabled .action-label.built-in-status.user { +.monaco-action-bar .action-item.disabled .action-label.built-in-status.user, +.monaco-action-bar .action-item.disabled .action-label.malicious-status.not-malicious { display: none; } -.monaco-action-bar .action-item .action-label.built-in-status { +.monaco-action-bar .action-item .action-label.built-in-status +.monaco-action-bar .action-item .action-label.malicious-status { border-radius: 4px; color: inherit; background-color: transparent; @@ -44,7 +46,8 @@ line-height: initial; } -.extension-editor>.header>.details>.actions>.monaco-action-bar .action-item .action-label.built-in-status { +.extension-editor>.header>.details>.actions>.monaco-action-bar .action-item .action-label.built-in-status, +.extension-editor>.header>.details>.actions>.monaco-action-bar .action-item .action-label.malicious-status { font-weight: normal; } diff --git a/src/vs/workbench/parts/extensions/common/extensions.ts b/src/vs/workbench/parts/extensions/common/extensions.ts index d90719c48f0..d26c46d117b 100644 --- a/src/vs/workbench/parts/extensions/common/extensions.ts +++ b/src/vs/workbench/parts/extensions/common/extensions.ts @@ -52,6 +52,7 @@ export interface IExtension { getReadme(): TPromise; getChangelog(): TPromise; local?: ILocalExtension; + isMalicious: boolean; } export interface IExtensionDependencies { diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 566a87e56c3..41a05ee79d1 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -37,8 +37,8 @@ import product from 'vs/platform/node/product'; import { ILogService } from 'vs/platform/log/common/log'; import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress'; -interface IExtensionStateProvider { - (extension: Extension): ExtensionState; +interface IExtensionStateProvider { + (extension: Extension): T; } class Extension implements IExtension { @@ -47,7 +47,8 @@ class Extension implements IExtension { constructor( private galleryService: IExtensionGalleryService, - private stateProvider: IExtensionStateProvider, + private stateProvider: IExtensionStateProvider, + private maliciousStateProvider: IExtensionStateProvider, public local: ILocalExtension, public gallery: IGalleryExtension, private telemetryService: ITelemetryService @@ -153,6 +154,10 @@ class Extension implements IExtension { return this.stateProvider(this); } + get isMalicious(): boolean { + return this.maliciousStateProvider(this); + } + get installCount(): number { return this.gallery ? this.gallery.installCount : null; } @@ -321,7 +326,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private static readonly SyncPeriod = 1000 * 60 * 60 * 12; // 12 hours _serviceBrand: any; - private stateProvider: IExtensionStateProvider; + private stateProvider: IExtensionStateProvider; private installing: IActiveExtension[] = []; private uninstalling: IActiveExtension[] = []; private installed: Extension[] = []; @@ -332,6 +337,9 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private _onChange: Emitter = new Emitter(); get onChange(): Event { return this._onChange.event; } + private maliciousExtensions = new Set(); + private maliciousStateProvider: IExtensionStateProvider; + private _extensionAllowedBadgeProviders: string[]; constructor( @@ -350,6 +358,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { @IProgressService2 private progressService: IProgressService2 ) { this.stateProvider = ext => this.getExtensionState(ext); + this.maliciousStateProvider = ext => this.maliciousExtensions.has(ext.id); extensionService.onInstallExtension(this.onInstallExtension, this, this.disposables); extensionService.onDidInstallExtension(this.onDidInstallExtension, this, this.disposables); @@ -384,30 +393,34 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { } queryLocal(): TPromise { - return this.extensionService.getInstalled().then(result => { - const installedById = index(this.installed, e => e.local.identifier.id); - this.installed = result.map(local => { - const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService); - extension.local = local; - extension.enablementState = this.extensionEnablementService.getEnablementState({ id: extension.id, uuid: extension.uuid }); - return extension; - }); + return this.updateExtensionsReport().then(() => { + return this.extensionService.getInstalled().then(result => { + const installedById = index(this.installed, e => e.local.identifier.id); + this.installed = result.map(local => { + const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, local, null, this.telemetryService); + extension.local = local; + extension.enablementState = this.extensionEnablementService.getEnablementState({ id: extension.id, uuid: extension.uuid }); + return extension; + }); - this._onChange.fire(); - return this.local; + this._onChange.fire(); + return this.local; + }); }); } queryGallery(options: IQueryOptions = {}): TPromise> { - return this.galleryService.query(options) - .then(result => mapPager(result, gallery => this.fromGallery(gallery))) - .then(null, err => { - if (/No extension gallery service configured/.test(err.message)) { - return TPromise.as(singlePagePager([])); - } + return this.updateExtensionsReport().then(() => { + return this.galleryService.query(options) + .then(result => mapPager(result, gallery => this.fromGallery(gallery))) + .then(null, err => { + if (/No extension gallery service configured/.test(err.message)) { + return TPromise.as(singlePagePager([])); + } - return TPromise.wrapError>(err); - }); + return TPromise.wrapError>(err); + }); + }); } loadDependencies(extension: IExtension): TPromise { @@ -446,7 +459,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return installed; } - return new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService); + return new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, gallery, this.telemetryService); } private getInstalledExtensionMatchingGallery(gallery: IGalleryExtension): Extension { @@ -533,6 +546,10 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return false; } + if (this.maliciousStateProvider(extension)) { + return false; + } + return !!(extension as Extension).gallery; } @@ -549,6 +566,10 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return undefined; } + if (this.maliciousStateProvider(extension)) { + return TPromise.wrapError(new Error(nls.localize('malicious', "This extension is reported to be malicious."))); + } + const ext = extension as Extension; const gallery = ext.gallery; @@ -742,7 +763,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { let extension = this.installed.filter(e => areSameExtensions(e, gallery.identifier))[0]; if (!extension) { - extension = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService); + extension = new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, gallery, this.telemetryService); } extension.gallery = gallery; @@ -757,7 +778,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private onDidInstallExtension(event: DidInstallExtensionEvent): void { const { local, zipPath, error, gallery } = event; const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e.extension, gallery.identifier))[0] : null; - const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null; + const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, null, this.telemetryService) : null; if (extension) { this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing; @@ -942,6 +963,18 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { }).done(undefined, error => this.onError(error)); } + private updateExtensionsReport(): TPromise { + return this.extensionService.getExtensionsReport().then(report => { + this.maliciousExtensions.clear(); + + for (const extension of report) { + if (extension.malicious) { + this.maliciousExtensions.add(extension.id.id); + } + } + }); + } + dispose(): void { this.syncDelayer.cancel(); this.disposables = dispose(this.disposables); From e77cd91a23b6aef028a80bd8abb4651879b347d4 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 12:24:10 +0100 Subject: [PATCH 620/710] some message telemetry (for #22388) --- .../services/message/browser/messageList.ts | 16 +++++++- .../electron-browser/messageService.ts | 40 +++++++++---------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts index a882703c7ae..76db707f70b 100644 --- a/src/vs/workbench/services/message/browser/messageList.ts +++ b/src/vs/workbench/services/message/browser/messageList.ts @@ -190,6 +190,18 @@ export class MessageList { private doShowMessage(id: Error, message: string, severity: Severity, onHide: () => void): () => void; private doShowMessage(id: IMessageWithAction, message: string, severity: Severity, onHide: () => void): () => void; private doShowMessage(id: any, message: string, severity: Severity, onHide: () => void): () => void { + const actions = (id).actions; + const source = (id).source; + + // Telemetry (TODO@Ben remove me later) + /* __GDPR__ + "showMessage" : { + "message" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + "source" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + "buttons" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + this.telemetryService.publicLog('showMessage', { message, source, buttons: actions ? actions.map(a => a.label) : void 0 }); // Trigger Auto-Purge of messages to keep list small this.purgeMessages(); @@ -200,8 +212,8 @@ export class MessageList { text: message, severity: severity, time: Date.now(), - actions: (id).actions, - source: (id).source, + actions, + source, onHide }); diff --git a/src/vs/workbench/services/message/electron-browser/messageService.ts b/src/vs/workbench/services/message/electron-browser/messageService.ts index 0c04c556de5..6e7a376cd96 100644 --- a/src/vs/workbench/services/message/electron-browser/messageService.ts +++ b/src/vs/workbench/services/message/electron-browser/messageService.ts @@ -13,7 +13,7 @@ import { IConfirmation, Severity, IChoiceService, IConfirmationResult } from 'vs import { isLinux } from 'vs/base/common/platform'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Action } from 'vs/base/common/actions'; -import { IWindowService, IMessageBoxResult } from 'vs/platform/windows/common/windows'; +import { IWindowService } from 'vs/platform/windows/common/windows'; import { mnemonicButtonLabel } from 'vs/base/common/labels'; export class MessageService extends WorkbenchMessageService implements IChoiceService { @@ -27,31 +27,22 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe } public confirmWithCheckbox(confirmation: IConfirmation): TPromise { - const opts = this.getConfirmOptions(confirmation); - - return this.showMessageBoxWithCheckbox(opts).then(result => { - return { - confirmed: result.button === 0 ? true : false, - checkboxChecked: result.checkboxChecked - } as IConfirmationResult; - }); - } - - private showMessageBoxWithCheckbox(opts: Electron.MessageBoxOptions): TPromise { - opts = this.massageMessageBoxOptions(opts); + const opts = this.massageMessageBoxOptions(this.getConfirmOptions(confirmation)); return this.windowService.showMessageBox(opts).then(result => { + const button = isLinux ? opts.buttons.length - result.button - 1 : result.button; + return { - button: isLinux ? opts.buttons.length - result.button - 1 : result.button, + confirmed: button === 0 ? true : false, checkboxChecked: result.checkboxChecked - } as IMessageBoxResult; + } as IConfirmationResult; }); } public confirm(confirmation: IConfirmation): TPromise { const opts = this.getConfirmOptions(confirmation); - return this.showMessageBox(opts).then(result => result === 0 ? true : false); + return this.doShowMessageBox(opts).then(result => result === 0 ? true : false); } private getConfirmOptions(confirmation: IConfirmation): Electron.MessageBoxOptions { @@ -94,16 +85,25 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe public choose(severity: Severity, message: string, options: string[], cancelId: number, modal: boolean = false): TPromise { if (modal) { - const type: 'none' | 'info' | 'error' | 'question' | 'warning' = severity === Severity.Info ? 'question' : severity === Severity.Error ? 'error' : severity === Severity.Warning ? 'warning' : 'none'; - - return this.showMessageBox({ message, buttons: options, type, cancelId }); + return this.doChooseModal(severity, message, options, cancelId); } + return this.doChooseWithMessage(severity, message, options); + } + + private doChooseModal(severity: Severity, message: string, options: string[], cancelId: number): TPromise { + const type: 'none' | 'info' | 'error' | 'question' | 'warning' = severity === Severity.Info ? 'question' : severity === Severity.Error ? 'error' : severity === Severity.Warning ? 'warning' : 'none'; + + return this.doShowMessageBox({ message, buttons: options, type, cancelId }); + } + + private doChooseWithMessage(severity: Severity, message: string, options: string[]): TPromise { let onCancel: () => void = null; const promise = new TPromise((c, e) => { const callback = (index: number) => () => { c(index); + return TPromise.as(true); }; @@ -115,7 +115,7 @@ export class MessageService extends WorkbenchMessageService implements IChoiceSe return promise; } - private showMessageBox(opts: Electron.MessageBoxOptions): TPromise { + private doShowMessageBox(opts: Electron.MessageBoxOptions): TPromise { opts = this.massageMessageBoxOptions(opts); return this.windowService.showMessageBox(opts).then(result => isLinux ? opts.buttons.length - result.button - 1 : result.button); From 10d26e14d3e5dd39c68528462a3bf41db7eabee3 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 13:22:42 +0100 Subject: [PATCH 621/710] fix warnings --- src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts index 6157b6eb26f..7b41004a587 100644 --- a/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/viewPickerHandler.ts @@ -11,8 +11,8 @@ import { Mode, IEntryRunContext, IAutoFocus, IQuickNavigateConfiguration, IModel import { QuickOpenModel, QuickOpenEntryGroup, QuickOpenEntry } from 'vs/base/parts/quickopen/browser/quickOpenModel'; import { QuickOpenHandler, QuickOpenAction } from 'vs/workbench/browser/quickopen'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; -import { IOutputService, OUTPUT_PANEL_ID } from 'vs/workbench/parts/output/common/output'; -import { ITerminalService, TERMINAL_PANEL_ID } from 'vs/workbench/parts/terminal/common/terminal'; +import { IOutputService } from 'vs/workbench/parts/output/common/output'; +import { ITerminalService } from 'vs/workbench/parts/terminal/common/terminal'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { Action } from 'vs/base/common/actions'; From 7c58871104a92afa424bc8c44254adb3e679dc6e Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 13:51:50 +0100 Subject: [PATCH 622/710] improve isMalicious ext attribute --- .../node/extensionManagementService.ts | 30 +++++++- .../extensions/browser/extensionsQuickOpen.ts | 7 +- .../node/extensionsWorkbenchService.ts | 74 ++++++++++--------- 3 files changed, 71 insertions(+), 40 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index d7569e94619..5ce332a1fde 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -275,9 +275,21 @@ export class ExtensionManagementService implements IExtensionManagementService { private downloadAndInstallExtension(extension: IGalleryExtension): TPromise { let installingExtension = this.installingExtensions.get(extension.identifier.id); if (!installingExtension) { - installingExtension = this.downloadInstallableExtension(extension).then(installableExtension => this.installExtension(installableExtension)); + installingExtension = this.getMaliciousExtensionSet().then(maliciousSet => { + if (maliciousSet.has(extension.identifier.id)) { + throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be malicious.")); + } else { + return extension; + } + }) + .then(extension => this.downloadInstallableExtension(extension)) + .then(installableExtension => this.installExtension(installableExtension)); + this.installingExtensions.set(extension.identifier.id, installingExtension); - installingExtension.then(local => { this.installingExtensions.delete(extension.identifier.id); return local; }, e => { this.installingExtensions.delete(extension.identifier.id); return TPromise.wrapError(e); }); + installingExtension.then( + local => { this.installingExtensions.delete(extension.identifier.id); return local; }, + e => { this.installingExtensions.delete(extension.identifier.id); return TPromise.wrapError(e); } + ); } return installingExtension; } @@ -826,6 +838,20 @@ export class ExtensionManagementService implements IExtensionManagementService { }); } + private getMaliciousExtensionSet(): TPromise> { + return this.reportedExtensions.then(report => { + const result = new Set(); + + for (const extension of report) { + if (extension.malicious) { + result.add(extension.id.id); + } + } + + return result; + }); + } + dispose() { this.disposables = dispose(this.disposables); } diff --git a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts index e2af2e4e734..cf4aebc302c 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsQuickOpen.ts @@ -11,6 +11,7 @@ import { QuickOpenHandler } from 'vs/workbench/browser/quickopen'; import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/parts/extensions/common/extensions'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IExtensionGalleryService, IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { IMessageService, Severity } from 'vs/platform/message/common/message'; class SimpleEntry extends QuickOpenEntry { @@ -75,7 +76,8 @@ export class GalleryExtensionsHandler extends QuickOpenHandler { constructor( @IViewletService private viewletService: IViewletService, @IExtensionGalleryService private galleryService: IExtensionGalleryService, - @IExtensionManagementService private extensionsService: IExtensionManagementService + @IExtensionManagementService private extensionsService: IExtensionManagementService, + @IMessageService private messageService: IMessageService ) { super(); } @@ -97,7 +99,8 @@ export class GalleryExtensionsHandler extends QuickOpenHandler { return this.viewletService.openViewlet(VIEWLET_ID, true) .then(viewlet => viewlet as IExtensionsViewlet) .then(viewlet => viewlet.search(`@id:${text}`)) - .done(() => this.extensionsService.installFromGallery(galleryExtension)); + .then(() => this.extensionsService.installFromGallery(galleryExtension)) + .done(null, err => this.messageService.show(Severity.Error, err)); }; entries.push(new SimpleEntry(label, action)); diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 41a05ee79d1..e253a6c86be 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -48,7 +48,6 @@ class Extension implements IExtension { constructor( private galleryService: IExtensionGalleryService, private stateProvider: IExtensionStateProvider, - private maliciousStateProvider: IExtensionStateProvider, public local: ILocalExtension, public gallery: IGalleryExtension, private telemetryService: ITelemetryService @@ -154,9 +153,7 @@ class Extension implements IExtension { return this.stateProvider(this); } - get isMalicious(): boolean { - return this.maliciousStateProvider(this); - } + public isMalicious: boolean = false; get installCount(): number { return this.gallery ? this.gallery.installCount : null; @@ -337,9 +334,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private _onChange: Emitter = new Emitter(); get onChange(): Event { return this._onChange.event; } - private maliciousExtensions = new Set(); - private maliciousStateProvider: IExtensionStateProvider; - private _extensionAllowedBadgeProviders: string[]; constructor( @@ -358,7 +352,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { @IProgressService2 private progressService: IProgressService2 ) { this.stateProvider = ext => this.getExtensionState(ext); - this.maliciousStateProvider = ext => this.maliciousExtensions.has(ext.id); extensionService.onInstallExtension(this.onInstallExtension, this, this.disposables); extensionService.onDidInstallExtension(this.onDidInstallExtension, this, this.disposables); @@ -393,11 +386,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { } queryLocal(): TPromise { - return this.updateExtensionsReport().then(() => { + return this.getMaliciousExtensionSet().then(() => { return this.extensionService.getInstalled().then(result => { const installedById = index(this.installed, e => e.local.identifier.id); this.installed = result.map(local => { - const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, local, null, this.telemetryService); + const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService); extension.local = local; extension.enablementState = this.extensionEnablementService.getEnablementState({ id: extension.id, uuid: extension.uuid }); return extension; @@ -410,9 +403,9 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { } queryGallery(options: IQueryOptions = {}): TPromise> { - return this.updateExtensionsReport().then(() => { + return this.getMaliciousExtensionSet().then(maliciousSet => { return this.galleryService.query(options) - .then(result => mapPager(result, gallery => this.fromGallery(gallery))) + .then(result => mapPager(result, gallery => this.fromGallery(gallery, maliciousSet))) .then(null, err => { if (/No extension gallery service configured/.test(err.message)) { return TPromise.as(singlePagePager([])); @@ -428,38 +421,45 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return TPromise.wrap(null); } - return this.galleryService.loadAllDependencies((extension).dependencies.map(id => { id })) - .then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension))) - .then(extensions => [...this.local, ...extensions]) - .then(extensions => { - const map = new Map(); - for (const extension of extensions) { - map.set(extension.id, extension); - } - return new ExtensionDependencies(extension, extension.id, map); - }); + return this.getMaliciousExtensionSet().then(maliciousSet => { + return this.galleryService.loadAllDependencies((extension).dependencies.map(id => { id })) + .then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension, maliciousSet))) + .then(extensions => [...this.local, ...extensions]) + .then(extensions => { + const map = new Map(); + for (const extension of extensions) { + map.set(extension.id, extension); + } + return new ExtensionDependencies(extension, extension.id, map); + }); + }); } open(extension: IExtension, sideByside: boolean = false): TPromise { return this.editorService.openEditor(this.instantiationService.createInstance(ExtensionsInput, extension), null, sideByside); } - private fromGallery(gallery: IGalleryExtension): Extension { - const installed = this.getInstalledExtensionMatchingGallery(gallery); + private fromGallery(gallery: IGalleryExtension, maliciousExtensionSet: Set): Extension { + let result = this.getInstalledExtensionMatchingGallery(gallery); - if (installed) { + if (result) { // Loading the compatible version only there is an engine property // Otherwise falling back to old way so that we will not make many roundtrips if (gallery.properties.engine) { this.galleryService.loadCompatibleVersion(gallery) - .then(compatible => compatible ? this.syncLocalWithGalleryExtension(installed, compatible) : null); + .then(compatible => compatible ? this.syncLocalWithGalleryExtension(result, compatible) : null); } else { - this.syncLocalWithGalleryExtension(installed, gallery); + this.syncLocalWithGalleryExtension(result, gallery); } - return installed; + } else { + result = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService); } - return new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, gallery, this.telemetryService); + if (maliciousExtensionSet.has(result.id)) { + result.isMalicious = true; + } + + return result; } private getInstalledExtensionMatchingGallery(gallery: IGalleryExtension): Extension { @@ -546,7 +546,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return false; } - if (this.maliciousStateProvider(extension)) { + if (extension.isMalicious) { return false; } @@ -566,7 +566,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return undefined; } - if (this.maliciousStateProvider(extension)) { + if (extension.isMalicious) { return TPromise.wrapError(new Error(nls.localize('malicious', "This extension is reported to be malicious."))); } @@ -763,7 +763,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { let extension = this.installed.filter(e => areSameExtensions(e, gallery.identifier))[0]; if (!extension) { - extension = new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, gallery, this.telemetryService); + extension = new Extension(this.galleryService, this.stateProvider, null, gallery, this.telemetryService); } extension.gallery = gallery; @@ -778,7 +778,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { private onDidInstallExtension(event: DidInstallExtensionEvent): void { const { local, zipPath, error, gallery } = event; const installingExtension = gallery ? this.installing.filter(e => areSameExtensions(e.extension, gallery.identifier))[0] : null; - const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, this.maliciousStateProvider, null, null, this.telemetryService) : null; + const extension: Extension = installingExtension ? installingExtension.extension : zipPath ? new Extension(this.galleryService, this.stateProvider, null, null, this.telemetryService) : null; if (extension) { this.installing = installingExtension ? this.installing.filter(e => e !== installingExtension) : this.installing; @@ -963,15 +963,17 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { }).done(undefined, error => this.onError(error)); } - private updateExtensionsReport(): TPromise { + private getMaliciousExtensionSet(): TPromise> { return this.extensionService.getExtensionsReport().then(report => { - this.maliciousExtensions.clear(); + const result = new Set(); for (const extension of report) { if (extension.malicious) { - this.maliciousExtensions.add(extension.id.id); + result.add(extension.id.id); } } + + return result; }); } From d5fda42ecc3ca3bc08a09c05f229f20106203c94 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 15:21:23 +0100 Subject: [PATCH 623/710] :lipstick: --- src/vs/workbench/services/message/browser/messageList.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts index 76db707f70b..25819ba5062 100644 --- a/src/vs/workbench/services/message/browser/messageList.ts +++ b/src/vs/workbench/services/message/browser/messageList.ts @@ -191,7 +191,7 @@ export class MessageList { private doShowMessage(id: IMessageWithAction, message: string, severity: Severity, onHide: () => void): () => void; private doShowMessage(id: any, message: string, severity: Severity, onHide: () => void): () => void { const actions = (id).actions; - const source = (id).source; + const source = (id).source || 'vscode'; // Telemetry (TODO@Ben remove me later) /* __GDPR__ From 2cb843bce421f3bbd04537a429888fadc413c1b3 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 15:32:19 +0100 Subject: [PATCH 624/710] refine regexp value, #26044 --- .../platform/contextkey/common/contextkey.ts | 51 +++++++++++++------ .../contextkey/test/common/contextkey.test.ts | 11 ++-- 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/vs/platform/contextkey/common/contextkey.ts b/src/vs/platform/contextkey/common/contextkey.ts index 6a3155f7aad..f40bd669a54 100644 --- a/src/vs/platform/contextkey/common/contextkey.ts +++ b/src/vs/platform/contextkey/common/contextkey.ts @@ -6,6 +6,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import Event from 'vs/base/common/event'; +import { isFalsyOrWhitespace } from 'vs/base/common/strings'; export enum ContextKeyExprType { Defined = 1, @@ -30,7 +31,7 @@ export abstract class ContextKeyExpr { return new ContextKeyNotEqualsExpr(key, value); } - public static regex(key: string, value: string): ContextKeyExpr { + public static regex(key: string, value: RegExp): ContextKeyExpr { return new ContextKeyRegexExpr(key, value); } @@ -67,7 +68,7 @@ export abstract class ContextKeyExpr { if (serializedOne.indexOf('=~') >= 0) { let pieces = serializedOne.split('=~'); - return new ContextKeyRegexExpr(pieces[0].trim(), this._deserializeValue(pieces[1])); + return new ContextKeyRegexExpr(pieces[0].trim(), this._deserializeRegexValue(pieces[1])); } if (/^\!\s*/.test(serializedOne)) { @@ -96,6 +97,29 @@ export abstract class ContextKeyExpr { return serializedValue; } + private static _deserializeRegexValue(serializedValue: string): RegExp { + + if (isFalsyOrWhitespace(serializedValue)) { + console.warn('missing regexp-value for =~-expression'); + return null; + } + + let start = serializedValue.indexOf('/'); + let end = serializedValue.lastIndexOf('/'); + if (start === end || start < 0 /* || to < 0 */) { + console.warn(`bad regexp-value '${serializedValue}', missing /-enclosure`); + return null; + } + + let value = serializedValue.slice(start + 1, end); + try { + return new RegExp(value); + } catch (e) { + console.warn(`bad regexp-value '${serializedValue}', parse error: ${e}`); + return null; + } + } + public abstract getType(): ContextKeyExprType; public abstract equals(other: ContextKeyExpr): boolean; public abstract evaluate(context: IContext): boolean; @@ -334,15 +358,8 @@ export class ContextKeyNotExpr implements ContextKeyExpr { export class ContextKeyRegexExpr implements ContextKeyExpr { - private regexp: { source: string, test(s: string): boolean }; - - constructor(private key: string, value: any) { - try { - this.regexp = new RegExp(value); - } catch (e) { - this.regexp = { source: '', test() { return false; } }; - console.warn(`Bad value for glob-context key expression: ${value}`); - } + constructor(private key: string, private regexp: RegExp) { + // } public getType(): ContextKeyExprType { @@ -356,10 +373,11 @@ export class ContextKeyRegexExpr implements ContextKeyExpr { if (this.key > other.key) { return 1; } - if (this.regexp.source < other.regexp.source) { + const source = this.regexp ? this.regexp.source : undefined; + if (source < other.regexp.source) { return -1; } - if (this.regexp.source > other.regexp.source) { + if (source > other.regexp.source) { return 1; } return 0; @@ -367,13 +385,14 @@ export class ContextKeyRegexExpr implements ContextKeyExpr { public equals(other: ContextKeyExpr): boolean { if (other instanceof ContextKeyRegexExpr) { - return (this.key === other.key && this.regexp.source === other.regexp.source); + const source = this.regexp ? this.regexp.source : undefined; + return (this.key === other.key && source === other.regexp.source); } return false; } public evaluate(context: IContext): boolean { - return this.regexp.test(context.getValue(this.key)); + return this.regexp ? this.regexp.test(context.getValue(this.key)) : false; } public normalize(): ContextKeyExpr { @@ -381,7 +400,7 @@ export class ContextKeyRegexExpr implements ContextKeyExpr { } public serialize(): string { - return this.key + ' =~ \'' + this.regexp.source + '\''; + return `${this.keys} =~ /${this.regexp ? this.regexp.source : ''}/`; } public keys(): string[] { diff --git a/src/vs/platform/contextkey/test/common/contextkey.test.ts b/src/vs/platform/contextkey/test/common/contextkey.test.ts index 9433bf7ca02..beafc373f80 100644 --- a/src/vs/platform/contextkey/test/common/contextkey.test.ts +++ b/src/vs/platform/contextkey/test/common/contextkey.test.ts @@ -21,8 +21,8 @@ suite('ContextKeyExpr', () => { ContextKeyExpr.has('a1'), ContextKeyExpr.and(ContextKeyExpr.has('and.a')), ContextKeyExpr.has('a2'), - ContextKeyExpr.regex('d3', 'd.*'), - ContextKeyExpr.regex('d4', '\\*\\*/3*'), + ContextKeyExpr.regex('d3', /d.*/), + ContextKeyExpr.regex('d4', /\*\*3*/), ContextKeyExpr.equals('b1', 'bb1'), ContextKeyExpr.equals('b2', 'bb2'), ContextKeyExpr.notEquals('c1', 'cc1'), @@ -34,11 +34,11 @@ suite('ContextKeyExpr', () => { ContextKeyExpr.equals('b2', 'bb2'), ContextKeyExpr.notEquals('c1', 'cc1'), ContextKeyExpr.not('d1'), - ContextKeyExpr.regex('d4', '\\*\\*/3*'), + ContextKeyExpr.regex('d4', /\*\*3*/), ContextKeyExpr.notEquals('c2', 'cc2'), ContextKeyExpr.has('a2'), ContextKeyExpr.equals('b1', 'bb1'), - ContextKeyExpr.regex('d3', 'd.*'), + ContextKeyExpr.regex('d3', /d.*/), ContextKeyExpr.has('a1'), ContextKeyExpr.and(ContextKeyExpr.equals('and.a', true)), ContextKeyExpr.not('d2') @@ -80,7 +80,7 @@ suite('ContextKeyExpr', () => { testExpression(expr + ' == 5', value == '5'); testExpression(expr + ' != 5', value != '5'); testExpression('!' + expr, !value); - testExpression(expr + ' =~ d.*', /d.*/.test(value)); + testExpression(expr + ' =~ /d.*/', /d.*/.test(value)); } testBatch('a', true); @@ -92,6 +92,7 @@ suite('ContextKeyExpr', () => { testExpression('a && !b', true && !false); testExpression('a && b', true && false); testExpression('a && !b && c == 5', true && !false && '5' == '5'); + testExpression('dddd =~ d.*', false); /* tslint:enable:triple-equals */ }); }); From fabd8a57ec55d5de8e2c45c4be2752407c77f4e8 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 15:42:08 +0100 Subject: [PATCH 625/710] Remove custom marshaller in tasks extension host communication (#40169) --- .../api/electron-browser/mainThreadTask.ts | 5 +++-- src/vs/workbench/api/node/extHost.protocol.ts | 16 +++++----------- src/vs/workbench/api/node/extHostTask.ts | 6 +++--- src/vs/workbench/parts/tasks/common/tasks.ts | 4 ++-- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadTask.ts b/src/vs/workbench/api/electron-browser/mainThreadTask.ts index f85ee2a039a..9980e755deb 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTask.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTask.ts @@ -13,6 +13,7 @@ import { ITaskService } from 'vs/workbench/parts/tasks/common/taskService'; import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext, IExtHostContext } from '../node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; +import URI from 'vs/base/common/uri'; @extHostNamedCustomer(MainContext.MainThreadTask) export class MainThreadTask implements MainThreadTaskShape { @@ -45,7 +46,7 @@ export class MainThreadTask implements MainThreadTaskShape { let uri = (task._source as any as ExtensionTaskSourceTransfer).__workspaceFolder; if (uri) { delete (task._source as any as ExtensionTaskSourceTransfer).__workspaceFolder; - (task._source as any).workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(uri); + (task._source as any).workspaceFolder = this._workspaceContextServer.getWorkspaceFolder(URI.revive(uri)); } } } @@ -57,7 +58,7 @@ export class MainThreadTask implements MainThreadTaskShape { return TPromise.wrap(undefined); } - public $unregisterTaskProvider(handle: number): TPromise { + public $unregisterTaskProvider(handle: number): TPromise { this._taskService.unregisterTaskProvider(handle); delete this._activeHandles[handle]; return TPromise.wrap(undefined); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 84db14dbf9d..bbf64eded98 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -4,13 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { - createMainContextProxyIdentifier as createMainId, - createExtHostContextProxyIdentifier as createExtId, - ProxyIdentifier, - IRPCProtocol, - ProxyType -} from 'vs/workbench/services/extensions/node/proxyIdentifier'; +import { createMainContextProxyIdentifier as createMainId, createExtHostContextProxyIdentifier as createExtId, ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier'; import * as vscode from 'vscode'; @@ -374,8 +368,8 @@ export interface MainThreadFileSystemShape extends IDisposable { } export interface MainThreadTaskShape extends IDisposable { - $registerTaskProvider(handle: number): TPromise; - $unregisterTaskProvider(handle: number): TPromise; + $registerTaskProvider(handle: number): TPromise; + $unregisterTaskProvider(handle: number): TPromise; } export interface MainThreadExtensionServiceShape extends IDisposable { @@ -788,7 +782,7 @@ export const MainContext = { MainThreadFileSystem: createMainId('MainThreadFileSystem'), MainThreadExtensionService: createMainId('MainThreadExtensionService'), MainThreadSCM: createMainId('MainThreadSCM'), - MainThreadTask: createMainId('MainThreadTask', ProxyType.CustomMarshaller), + MainThreadTask: createMainId('MainThreadTask'), MainThreadWindow: createMainId('MainThreadWindow'), }; @@ -813,7 +807,7 @@ export const ExtHostContext = { ExtHostLogService: createExtId('ExtHostLogService'), ExtHostTerminalService: createExtId('ExtHostTerminalService'), ExtHostSCM: createExtId('ExtHostSCM'), - ExtHostTask: createExtId('ExtHostTask', ProxyType.CustomMarshaller), + ExtHostTask: createExtId('ExtHostTask'), ExtHostWorkspace: createExtId('ExtHostWorkspace'), ExtHostWindow: createExtId('ExtHostWindow'), }; diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 41cb0357367..58357c83862 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -294,11 +294,11 @@ namespace ShellConfiguration { namespace Tasks { - export function from(tasks: vscode.Task[], rootFolder: vscode.WorkspaceFolder, extension: IExtensionDescription): TaskSystem.Task[] { + export function from(tasks: vscode.Task[], rootFolder: vscode.WorkspaceFolder, extension: IExtensionDescription): TaskSystem.ContributedTask[] { if (tasks === void 0 || tasks === null) { return []; } - let result: TaskSystem.Task[] = []; + let result: TaskSystem.ContributedTask[] = []; for (let task of tasks) { let converted = fromSingle(task, rootFolder, extension); if (converted) { @@ -351,7 +351,7 @@ namespace Tasks { // We can't transfer a workspace folder object from the extension host to main since they differ // in shape and we don't have backwards converting function. So transfer the URI and resolve the // workspace folder on the main side. - (source as any).__workspaceFolder = workspaceFolder ? workspaceFolder.uri as URI : undefined; + (source as any as TaskSystem.ExtensionTaskSourceTransfer).__workspaceFolder = workspaceFolder ? workspaceFolder.uri as URI : undefined; let label = nls.localize('task.label', '{0}: {1}', source.label, task.name); let key = (task as types.Task).definitionKey; let kind = (task as types.Task).definition; diff --git a/src/vs/workbench/parts/tasks/common/tasks.ts b/src/vs/workbench/parts/tasks/common/tasks.ts index 1aebf6b4018..4d29f195584 100644 --- a/src/vs/workbench/parts/tasks/common/tasks.ts +++ b/src/vs/workbench/parts/tasks/common/tasks.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import URI from 'vs/base/common/uri'; +import { UriComponents } from 'vs/base/common/uri'; import * as Types from 'vs/base/common/types'; import { IJSONSchemaMap } from 'vs/base/common/jsonSchema'; import * as Objects from 'vs/base/common/objects'; @@ -246,7 +246,7 @@ export interface ExtensionTaskSource { } export interface ExtensionTaskSourceTransfer { - __workspaceFolder: URI; + __workspaceFolder: UriComponents; } export interface InMemoryTaskSource { From 42c8e8634a100c91f797f5b2ea71b2899ad09464 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 15:45:20 +0100 Subject: [PATCH 626/710] periodically check for installed malicious extensions --- .../node/extensionManagementService.ts | 54 +++++----------- .../extensions.contribution.ts | 3 +- .../electron-browser/extensionsViewlet.ts | 61 +++++++++++++++++++ 3 files changed, 79 insertions(+), 39 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 5ce332a1fde..1b49044448a 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -104,9 +104,8 @@ export class ExtensionManagementService implements IExtensionManagementService { private extensionsPath: string; private uninstalledPath: string; - private reportedPath: string; private uninstalledFileLimiter: Limiter; - private reportedExtensions: TPromise; + private reportedExtensions: TPromise | undefined; private disposables: IDisposable[] = []; private readonly _onInstallExtension = new Emitter(); @@ -133,11 +132,6 @@ export class ExtensionManagementService implements IExtensionManagementService { this.uninstalledPath = path.join(this.extensionsPath, '.obsolete'); this.uninstalledFileLimiter = new Limiter(1); this.disposables.push(toDisposable(() => this.installingExtensions.clear())); - - this.reportedPath = path.join(this.extensionsPath, '.reported'); - this.reportedExtensions = this.loadReportFromCache(); - - setTimeout(() => this.loopRefreshReportCache(), 1000 * 10); // 10 seconds after boot } private deleteExtensionsManifestCache(): void { @@ -796,45 +790,29 @@ export class ExtensionManagementService implements IExtensionManagementService { }); } + private lastReportTimestamp = 0; + getExtensionsReport(): TPromise { + const now = new Date().getTime(); + + if (!this.reportedExtensions || now - this.lastReportTimestamp > 1000 * 60 * 5) { // 5 minute cache freshness + this.reportedExtensions = this.updateReportCache(); + this.lastReportTimestamp = now; + } + return this.reportedExtensions; } - private loadReportFromCache(): TPromise { - this.logService.trace('ExtensionManagementService.loadReportedFromCache'); - - return pfs.readFile(this.reportedPath, 'utf8') - .then(raw => JSON.parse(raw)) - .then(result => { - this.logService.trace(`ExtensionManagementService.loadReportedFromCache - loaded ${result.length} reported extensions from cache`); - return result; - }, () => { - this.logService.trace(`ExtensionManagementService.loadReportedFromCache - no cache found`); - }); - } - - private loopRefreshReportCache(): void { - this.refreshReportCache() - .then(() => TPromise.timeout(1000 * 60 * 5)) // every five minutes - .then(() => this.loopRefreshReportCache()); - } - - private refreshReportCache(): TPromise { + private updateReportCache(): TPromise { this.logService.trace('ExtensionManagementService.refreshReportedCache'); - return this.reportedExtensions = this.galleryService.getExtensionsReport() - .then(null, err => { - this.logService.trace('ExtensionManagementService.refreshReportedCache - failed to get extension report'); - return []; - }) + return this.galleryService.getExtensionsReport() .then(result => { this.logService.trace(`ExtensionManagementService.refreshReportedCache - got ${result.length} reported extensions from service`); - - return pfs.writeFile(this.reportedPath, JSON.stringify(result)) - .then(() => result, err => { - this.logService.trace('ExtensionManagementService.refreshReportedCache - failed to cache extension report'); - return result; - }); + return result; + }, err => { + this.logService.trace('ExtensionManagementService.refreshReportedCache - failed to get extension report'); + return []; }); } 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 c5e6add7d77..178a39a6886 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts @@ -28,7 +28,7 @@ import { OpenExtensionsFolderAction, InstallVSIXAction } from 'vs/workbench/part import { ExtensionsInput } from 'vs/workbench/parts/extensions/common/extensionsInput'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet'; import { ExtensionEditor } from 'vs/workbench/parts/extensions/browser/extensionEditor'; -import { StatusUpdater, ExtensionsViewlet } from 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; +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 jsonContributionRegistry = require('vs/platform/jsonschemas/common/jsonContributionRegistry'); @@ -52,6 +52,7 @@ registerSingleton(IExtensionHostProfileService, ExtensionHostProfileService); const workbenchRegistry = Registry.as(WorkbenchExtensions.Workbench); workbenchRegistry.registerWorkbenchContribution(StatusUpdater, LifecyclePhase.Running); +workbenchRegistry.registerWorkbenchContribution(MaliciousExtensionChecker, LifecyclePhase.Eventually); workbenchRegistry.registerWorkbenchContribution(ConfigureRecommendedExtensionsCommandsContributor, LifecyclePhase.Eventually); workbenchRegistry.registerWorkbenchContribution(KeymapExtensions, LifecyclePhase.Running); workbenchRegistry.registerWorkbenchContribution(BetterMergeDisabled, LifecyclePhase.Running); diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index ac4d9aafbc7..4227e2b6972 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -51,6 +51,9 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; +import { getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { ILogService } from 'vs/platform/log/common/log'; +import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions'; interface SearchInputEvent extends Event { target: HTMLInputElement; @@ -452,3 +455,61 @@ export class StatusUpdater implements IWorkbenchContribution { dispose(this.badgeHandle); } } + +export class MaliciousExtensionChecker implements IWorkbenchContribution { + + private disposables: IDisposable[]; + + constructor( + @IExtensionManagementService private extensionsManagementService: IExtensionManagementService, + @IInstantiationService private instantiationService: IInstantiationService, + @ILogService private logService: ILogService, + @IMessageService private messageService: IMessageService + ) { + this.loopCheckForMaliciousExtensions(); + } + + private loopCheckForMaliciousExtensions(): void { + this.checkForMaliciousExtensions() + .then(() => TPromise.timeout(1000 * 60 * 5)) // every five minutes + .then(() => this.loopCheckForMaliciousExtensions()); + } + + private checkForMaliciousExtensions(): TPromise { + return this.getMaliciousExtensionSet().then(maliciousSet => { + return this.extensionsManagementService.getInstalled(LocalExtensionType.User).then(installed => { + const maliciousExtensions = installed + .filter(e => maliciousSet.has(getGalleryExtensionIdFromLocal(e))); + + if (maliciousExtensions.length) { + return TPromise.join(maliciousExtensions.map(e => this.extensionsManagementService.uninstall(e, true).then(() => { + this.messageService.show(Severity.Warning, { + message: localize('malicious warning', "We have uninstalled '{0}' which was reported to be malicious.", getGalleryExtensionIdFromLocal(e)), + actions: [this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, localize('reloadNow', "Reload Now"))] + }); + }))); + } else { + return TPromise.as(null); + } + }); + }, err => this.logService.error(err)); + } + + private getMaliciousExtensionSet(): TPromise> { + return this.extensionsManagementService.getExtensionsReport().then(report => { + const result = new Set(); + + for (const extension of report) { + if (extension.malicious) { + result.add(extension.id.id); + } + } + + return result; + }); + } + + dispose(): void { + this.disposables = dispose(this.disposables); + } +} \ No newline at end of file From cb5d51bb21c81fe7d969ca0ea0786619d3f11969 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 15:51:31 +0100 Subject: [PATCH 627/710] :lipstick: --- .../common/extensionManagementUtil.ts | 16 ++++++- .../node/extensionManagementService.ts | 31 ++++--------- .../electron-browser/extensionsViewlet.ts | 20 ++------ .../node/extensionsWorkbenchService.ts | 46 +++++++------------ 4 files changed, 44 insertions(+), 69 deletions(-) diff --git a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts index 3b60c27a367..73519179b53 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagementUtil.ts @@ -5,7 +5,7 @@ 'use strict'; -import { ILocalExtension, IGalleryExtension, EXTENSION_IDENTIFIER_REGEX, IExtensionIdentifier } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { ILocalExtension, IGalleryExtension, EXTENSION_IDENTIFIER_REGEX, IExtensionIdentifier, IReportedExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifier): boolean { if (a.uuid && b.uuid) { @@ -101,4 +101,16 @@ export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): } export const BetterMergeDisabledNowKey = 'extensions/bettermergedisablednow'; -export const BetterMergeId = 'pprice.better-merge'; \ No newline at end of file +export const BetterMergeId = 'pprice.better-merge'; + +export function getMaliciousExtensionsSet(report: IReportedExtension[]): Set { + const result = new Set(); + + for (const extension of report) { + if (extension.malicious) { + result.add(extension.id.id); + } + } + + return result; +} \ No newline at end of file diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 1b49044448a..2a0895a6655 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 } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { getGalleryExtensionIdFromLocal, adoptToGalleryExtensionId, areSameExtensions, getGalleryExtensionId, groupByExtension, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { localizeManifest } from '../common/extensionNls'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { Limiter } from 'vs/base/common/async'; @@ -269,13 +269,14 @@ export class ExtensionManagementService implements IExtensionManagementService { private downloadAndInstallExtension(extension: IGalleryExtension): TPromise { let installingExtension = this.installingExtensions.get(extension.identifier.id); if (!installingExtension) { - installingExtension = this.getMaliciousExtensionSet().then(maliciousSet => { - if (maliciousSet.has(extension.identifier.id)) { - throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be malicious.")); - } else { - return extension; - } - }) + installingExtension = this.reportedExtensions + .then(report => { + if (getMaliciousExtensionsSet(report).has(extension.identifier.id)) { + throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be malicious.")); + } else { + return extension; + } + }) .then(extension => this.downloadInstallableExtension(extension)) .then(installableExtension => this.installExtension(installableExtension)); @@ -816,20 +817,6 @@ export class ExtensionManagementService implements IExtensionManagementService { }); } - private getMaliciousExtensionSet(): TPromise> { - return this.reportedExtensions.then(report => { - const result = new Set(); - - for (const extension of report) { - if (extension.malicious) { - result.add(extension.id.id); - } - } - - return result; - }); - } - dispose() { this.disposables = dispose(this.disposables); } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index 4227e2b6972..59a354f9f39 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -51,7 +51,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace'; import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { getGalleryExtensionIdFromLocal } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { getGalleryExtensionIdFromLocal, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { ILogService } from 'vs/platform/log/common/log'; import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions'; @@ -476,7 +476,9 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution { } private checkForMaliciousExtensions(): TPromise { - return this.getMaliciousExtensionSet().then(maliciousSet => { + return this.extensionsManagementService.getExtensionsReport().then(report => { + const maliciousSet = getMaliciousExtensionsSet(report); + return this.extensionsManagementService.getInstalled(LocalExtensionType.User).then(installed => { const maliciousExtensions = installed .filter(e => maliciousSet.has(getGalleryExtensionIdFromLocal(e))); @@ -495,20 +497,6 @@ export class MaliciousExtensionChecker implements IWorkbenchContribution { }, err => this.logService.error(err)); } - private getMaliciousExtensionSet(): TPromise> { - return this.extensionsManagementService.getExtensionsReport().then(report => { - const result = new Set(); - - for (const extension of report) { - if (extension.malicious) { - result.add(extension.id.id); - } - } - - return result; - }); - } - dispose(): void { this.disposables = dispose(this.disposables); } diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index e253a6c86be..23944c6caad 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -22,7 +22,7 @@ import { IExtensionManagementService, IExtensionGalleryService, ILocalExtension, IGalleryExtension, IQueryOptions, IExtensionManifest, InstallExtensionEvent, DidInstallExtensionEvent, LocalExtensionType, DidUninstallExtensionEvent, IExtensionEnablementService, IExtensionIdentifier, EnablementState } from 'vs/platform/extensionManagement/common/extensionManagement'; -import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; +import { getGalleryExtensionIdFromLocal, getGalleryExtensionTelemetryData, getLocalExtensionTelemetryData, areSameExtensions, getMaliciousExtensionsSet } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IWindowService } from 'vs/platform/windows/common/windows'; @@ -386,24 +386,24 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { } queryLocal(): TPromise { - return this.getMaliciousExtensionSet().then(() => { - return this.extensionService.getInstalled().then(result => { - const installedById = index(this.installed, e => e.local.identifier.id); - this.installed = result.map(local => { - const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService); - extension.local = local; - extension.enablementState = this.extensionEnablementService.getEnablementState({ id: extension.id, uuid: extension.uuid }); - return extension; - }); - - this._onChange.fire(); - return this.local; + return this.extensionService.getInstalled().then(result => { + const installedById = index(this.installed, e => e.local.identifier.id); + this.installed = result.map(local => { + const extension = installedById[local.identifier.id] || new Extension(this.galleryService, this.stateProvider, local, null, this.telemetryService); + extension.local = local; + extension.enablementState = this.extensionEnablementService.getEnablementState({ id: extension.id, uuid: extension.uuid }); + return extension; }); + + this._onChange.fire(); + return this.local; }); } queryGallery(options: IQueryOptions = {}): TPromise> { - return this.getMaliciousExtensionSet().then(maliciousSet => { + return this.extensionService.getExtensionsReport().then(report => { + const maliciousSet = getMaliciousExtensionsSet(report); + return this.galleryService.query(options) .then(result => mapPager(result, gallery => this.fromGallery(gallery, maliciousSet))) .then(null, err => { @@ -421,7 +421,9 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { return TPromise.wrap(null); } - return this.getMaliciousExtensionSet().then(maliciousSet => { + return this.extensionService.getExtensionsReport().then(report => { + const maliciousSet = getMaliciousExtensionsSet(report); + return this.galleryService.loadAllDependencies((extension).dependencies.map(id => { id })) .then(galleryExtensions => galleryExtensions.map(galleryExtension => this.fromGallery(galleryExtension, maliciousSet))) .then(extensions => [...this.local, ...extensions]) @@ -963,20 +965,6 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService { }).done(undefined, error => this.onError(error)); } - private getMaliciousExtensionSet(): TPromise> { - return this.extensionService.getExtensionsReport().then(report => { - const result = new Set(); - - for (const extension of report) { - if (extension.malicious) { - result.add(extension.id.id); - } - } - - return result; - }); - } - dispose(): void { this.syncDelayer.cancel(); this.disposables = dispose(this.disposables); From f2e07e14b90dfe98d517b6ff70c79fbf1089ca7a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 15:51:48 +0100 Subject: [PATCH 628/710] Remove support for custom marshaller (#40169) --- .../extensions/node/proxyIdentifier.ts | 17 ++--- .../services/extensions/node/rpcProtocol.ts | 67 ++++--------------- .../electron-browser/api/testRPCProtocol.ts | 21 +++--- 3 files changed, 25 insertions(+), 80 deletions(-) diff --git a/src/vs/workbench/services/extensions/node/proxyIdentifier.ts b/src/vs/workbench/services/extensions/node/proxyIdentifier.ts index 5d2c7484abd..3447bd4255f 100644 --- a/src/vs/workbench/services/extensions/node/proxyIdentifier.ts +++ b/src/vs/workbench/services/extensions/node/proxyIdentifier.ts @@ -27,29 +27,22 @@ export class ProxyIdentifier { public readonly isMain: boolean; public readonly id: string; - public readonly isFancy: boolean; - constructor(isMain: boolean, id: string, isFancy: boolean) { + constructor(isMain: boolean, id: string) { this.isMain = isMain; this.id = id; - this.isFancy = isFancy; } } -export const enum ProxyType { - NativeJSON = 0, - CustomMarshaller = 1 -} - /** * Using `isFancy` indicates that arguments or results of type `URI` or `RegExp` * will be serialized/deserialized automatically, but this has a performance cost, * as each argument/result must be visited. */ -export function createMainContextProxyIdentifier(identifier: string, type: ProxyType = ProxyType.NativeJSON): ProxyIdentifier { - return new ProxyIdentifier(true, 'm' + identifier, type === ProxyType.CustomMarshaller); +export function createMainContextProxyIdentifier(identifier: string): ProxyIdentifier { + return new ProxyIdentifier(true, 'm' + identifier); } -export function createExtHostContextProxyIdentifier(identifier: string, type: ProxyType = ProxyType.NativeJSON): ProxyIdentifier { - return new ProxyIdentifier(false, 'e' + identifier, type === ProxyType.CustomMarshaller); +export function createExtHostContextProxyIdentifier(identifier: string): ProxyIdentifier { + return new ProxyIdentifier(false, 'e' + identifier); } diff --git a/src/vs/workbench/services/extensions/node/rpcProtocol.ts b/src/vs/workbench/services/extensions/node/rpcProtocol.ts index d738ab50737..2e1ae6d2ee8 100644 --- a/src/vs/workbench/services/extensions/node/rpcProtocol.ts +++ b/src/vs/workbench/services/extensions/node/rpcProtocol.ts @@ -5,7 +5,6 @@ 'use strict'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as marshalling from 'vs/base/common/marshalling'; import * as errors from 'vs/base/common/errors'; import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc'; import { LazyPromise } from 'vs/workbench/services/extensions/node/lazyPromise'; @@ -46,17 +45,17 @@ export class RPCProtocol implements IRPCProtocol { public getProxy(identifier: ProxyIdentifier): T { if (!this._proxies[identifier.id]) { - this._proxies[identifier.id] = this._createProxy(identifier.id, identifier.isFancy); + this._proxies[identifier.id] = this._createProxy(identifier.id); } return this._proxies[identifier.id]; } - private _createProxy(proxyId: string, isFancy: boolean): T { + private _createProxy(proxyId: string): T { let handler = { get: (target, name: string) => { if (!target[name] && name.charCodeAt(0) === CharCode.DollarSign) { target[name] = (...myArgs: any[]) => { - return this._remoteCall(proxyId, name, myArgs, isFancy); + return this._remoteCall(proxyId, name, myArgs); }; } return target[name]; @@ -90,38 +89,27 @@ export class RPCProtocol implements IRPCProtocol { case MessageType.Request: this._receiveRequest(msg); break; - case MessageType.FancyRequest: - this._receiveRequest(marshalling.revive(msg, 0)); - break; case MessageType.Cancel: this._receiveCancel(msg); break; case MessageType.Reply: this._receiveReply(msg); break; - case MessageType.FancyReply: - this._receiveReply(marshalling.revive(msg, 0)); - break; case MessageType.ReplyErr: this._receiveReplyErr(msg); break; } } - private _receiveRequest(msg: RequestMessage | FancyRequestMessage): void { + private _receiveRequest(msg: RequestMessage): void { const callId = msg.id; const proxyId = msg.proxyId; - const isFancy = (msg.type === MessageType.FancyRequest); // a fancy request gets a fancy reply this._invokedHandlers[callId] = this._invokeHandler(proxyId, msg.method, msg.args); this._invokedHandlers[callId].then((r) => { delete this._invokedHandlers[callId]; - if (isFancy) { - this._multiplexor.send(MessageFactory.fancyReplyOK(callId, r)); - } else { - this._multiplexor.send(MessageFactory.replyOK(callId, r)); - } + this._multiplexor.send(MessageFactory.replyOK(callId, r)); }, (err) => { delete this._invokedHandlers[callId]; this._multiplexor.send(MessageFactory.replyErr(callId, err)); @@ -135,7 +123,7 @@ export class RPCProtocol implements IRPCProtocol { } } - private _receiveReply(msg: ReplyMessage | FancyReplyMessage): void { + private _receiveReply(msg: ReplyMessage): void { const callId = msg.id; if (!this._pendingRPCReplies.hasOwnProperty(callId)) { return; @@ -186,7 +174,7 @@ export class RPCProtocol implements IRPCProtocol { return method.apply(actor, args); } - private _remoteCall(proxyId: string, methodName: string, args: any[], isFancy: boolean): TPromise { + private _remoteCall(proxyId: string, methodName: string, args: any[]): TPromise { if (this._isDisposed) { return TPromise.wrapError(errors.canceled()); } @@ -197,13 +185,7 @@ export class RPCProtocol implements IRPCProtocol { }); this._pendingRPCReplies[callId] = result; - - if (isFancy) { - this._multiplexor.send(MessageFactory.fancyRequest(callId, proxyId, methodName, args)); - } else { - this._multiplexor.send(MessageFactory.request(callId, proxyId, methodName, args)); - } - + this._multiplexor.send(MessageFactory.request(callId, proxyId, methodName, args)); return result; } } @@ -256,10 +238,6 @@ class MessageFactory { return `{"type":${MessageType.Request},"id":"${req}","proxyId":"${rpcId}","method":"${method}","args":${JSON.stringify(args)}}`; } - public static fancyRequest(req: string, rpcId: string, method: string, args: any[]): string { - return `{"type":${MessageType.FancyRequest},"id":"${req}","proxyId":"${rpcId}","method":"${method}","args":${marshalling.stringify(args)}}`; - } - public static replyOK(req: string, res: any): string { if (typeof res === 'undefined') { return `{"type":${MessageType.Reply},"id":"${req}"}`; @@ -267,13 +245,6 @@ class MessageFactory { return `{"type":${MessageType.Reply},"id":"${req}","res":${JSON.stringify(res)}}`; } - public static fancyReplyOK(req: string, res: any): string { - if (typeof res === 'undefined') { - return `{"type":${MessageType.Reply},"id":"${req}"}`; - } - return `{"type":${MessageType.FancyReply},"id":"${req}","res":${marshalling.stringify(res)}}`; - } - public static replyErr(req: string, err: any): string { if (err instanceof Error) { return `{"type":${MessageType.ReplyErr},"id":"${req}","err":${JSON.stringify(errors.transformErrorForSerialization(err))}}`; @@ -284,11 +255,9 @@ class MessageFactory { const enum MessageType { Request = 1, - FancyRequest = 2, - Cancel = 3, - Reply = 4, - FancyReply = 5, - ReplyErr = 6 + Cancel = 2, + Reply = 3, + ReplyErr = 4 } class RequestMessage { @@ -298,13 +267,6 @@ class RequestMessage { method: string; args: any[]; } -class FancyRequestMessage { - type: MessageType.FancyRequest; - id: string; - proxyId: string; - method: string; - args: any[]; -} class CancelMessage { type: MessageType.Cancel; id: string; @@ -314,15 +276,10 @@ class ReplyMessage { id: string; res: any; } -class FancyReplyMessage { - type: MessageType.FancyReply; - id: string; - res: any; -} class ReplyErrMessage { type: MessageType.ReplyErr; id: string; err: errors.SerializedError; } -type RPCMessage = RequestMessage | FancyRequestMessage | CancelMessage | ReplyMessage | FancyReplyMessage | ReplyErrMessage; +type RPCMessage = RequestMessage | CancelMessage | ReplyMessage | ReplyErrMessage; diff --git a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts index f2effd9e861..12a3f397b04 100644 --- a/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts +++ b/src/vs/workbench/test/electron-browser/api/testRPCProtocol.ts @@ -8,7 +8,6 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { ProxyIdentifier, IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier'; import { CharCode } from 'vs/base/common/charCode'; -import * as marshalling from 'vs/base/common/marshalling'; export function SingleProxyRPCProtocol(thing: any): IRPCProtocol { return { @@ -70,17 +69,17 @@ export class TestRPCProtocol implements IRPCProtocol { public getProxy(identifier: ProxyIdentifier): T { if (!this._proxies[identifier.id]) { - this._proxies[identifier.id] = this._createProxy(identifier.id, identifier.isFancy); + this._proxies[identifier.id] = this._createProxy(identifier.id); } return this._proxies[identifier.id]; } - private _createProxy(proxyId: string, isFancy: boolean): T { + private _createProxy(proxyId: string): T { let handler = { get: (target, name: string) => { if (!target[name] && name.charCodeAt(0) === CharCode.DollarSign) { target[name] = (...myArgs: any[]) => { - return this._remoteCall(proxyId, name, myArgs, isFancy); + return this._remoteCall(proxyId, name, myArgs); }; } return target[name]; @@ -94,7 +93,7 @@ export class TestRPCProtocol implements IRPCProtocol { return value; } - protected _remoteCall(proxyId: string, path: string, args: any[], isFancy: boolean): TPromise { + protected _remoteCall(proxyId: string, path: string, args: any[]): TPromise { this._callCount++; return new TPromise((c) => { @@ -102,7 +101,7 @@ export class TestRPCProtocol implements IRPCProtocol { }).then(() => { const instance = this._locals[proxyId]; // pretend the args went over the wire... (invoke .toJSON on objects...) - const wireArgs = simulateWireTransfer(args, isFancy); + const wireArgs = simulateWireTransfer(args); let p: Thenable; try { let result = (instance[path]).apply(instance, wireArgs); @@ -114,7 +113,7 @@ export class TestRPCProtocol implements IRPCProtocol { return p.then(result => { this._callCount--; // pretend the result went over the wire... (invoke .toJSON on objects...) - const wireResult = simulateWireTransfer(result, isFancy); + const wireResult = simulateWireTransfer(result); return wireResult; }, err => { this._callCount--; @@ -128,13 +127,9 @@ export class TestRPCProtocol implements IRPCProtocol { } } -function simulateWireTransfer(obj: T, isFancy: boolean): T { +function simulateWireTransfer(obj: T): T { if (!obj) { return obj; } - return ( - isFancy - ? marshalling.parse(marshalling.stringify(obj)) - : JSON.parse(JSON.stringify(obj)) - ); + return JSON.parse(JSON.stringify(obj)); } From a6c8b82ceb2fcb0e5bed8167d2384aaaf5721486 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 24 Jan 2018 11:10:10 +0100 Subject: [PATCH 629/710] debug: compound configuration name error handling --- .../parts/debug/electron-browser/debugService.ts | 10 ++++++++-- 1 file changed, 8 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 462d8d630a2..ebe3ccf93d6 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -698,10 +698,16 @@ export class DebugService implements debug.IDebugService { return TPromise.as(null); } - let rootForName = root; + let rootForName: IWorkspaceFolder; const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name)); - if (launchesContainingName && launchesContainingName.length === 1) { + if (launchesContainingName.length === 1) { rootForName = launchesContainingName[0].workspace; + } else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) { + // If there are multiple launches containing the configuration give priority to the configuration in the current launch + rootForName = launch.workspace; + } else { + return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name) + : nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurates `{0}` in the workspace. Use folder name to qualify the configuration.", name))); } return this.startDebugging(rootForName, name, noDebug, topCompoundName || compound.name); From 1a5bcafe58648259f7dcb25fad7f0ee11358bcfc Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 24 Jan 2018 16:15:23 +0100 Subject: [PATCH 630/710] configuration resolver service: introduce VariableResolver --- .../configurationResolverService.ts | 316 ++++++++---------- .../configurationResolverService.test.ts | 88 ++--- 2 files changed, 155 insertions(+), 249 deletions(-) diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index 1a98e4493eb..ca6fbef8a4f 100644 --- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -20,92 +20,90 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { relative } from 'path'; import { IProcessEnvironment, isWindows } from 'vs/base/common/platform'; -export class ConfigurationResolverService implements IConfigurationResolverService { - _serviceBrand: any; - private _execPath: string; - private _lastWorkspaceFolder: IWorkspaceFolder; +class VariableResolver { + static VARIABLE_REGEXP = /\$\{(.*?)\}/g; + static ENV_PREFIX = 'env:'; + static CONFIG_PREFIX = 'config:'; + private envVariables: IProcessEnvironment; constructor( envVariables: IProcessEnvironment, - @IWorkbenchEditorService private editorService: IWorkbenchEditorService, - @IEnvironmentService environmentService: IEnvironmentService, - @IConfigurationService private configurationService: IConfigurationService, - @ICommandService private commandService: ICommandService, + private configurationService: IConfigurationService, + private editorService: IWorkbenchEditorService, + private environmentService: IEnvironmentService, ) { - this._execPath = environmentService.execPath; - Object.keys(envVariables).forEach(key => { - const name = isWindows ? key.toLowerCase() : key; - this[`env:${name}`] = envVariables[key]; + if (isWindows) { + Object.keys(envVariables).forEach(key => { + this.envVariables[key.toLowerCase()] = envVariables[key]; + }); + } else { + this.envVariables = envVariables; + } + } + + resolve(context: IWorkspaceFolder, value: string): string { + const filePath = this.getFilePath(); + return value.replace(VariableResolver.VARIABLE_REGEXP, (match: string, variable: string) => { + switch (variable) { + case 'workspaceRoot': + case 'workspaceFolder': + return context ? context.uri.fsPath : match; + case 'cwd': + return context ? context.uri.fsPath : process.cwd(); + case 'workspaceRootFolderName': + case 'workspaceFolderBasename': + return context ? paths.basename(context.uri.fsPath) : match; + case 'lineNumber': + return this.getLineNumber() || match; + case 'selectedText': + return this.getSelectedText() || match; + case 'file': + return filePath || match; + case 'relativeFile': + return context ? paths.normalize(relative(context.uri.fsPath, filePath)) : filePath || match; + case 'fileDirname': + return filePath ? paths.dirname(filePath) : match; + case 'fileExtname': + return filePath ? paths.extname(filePath) : match; + case 'fileBasename': + return filePath ? paths.basename(filePath) : match; + case 'fileBasenameNoExtension': { + if (!filePath) { + return match; + } + + const basename = paths.basename(filePath); + return basename.slice(0, basename.length - paths.extname(basename).length); + } + case 'execPath': + return this.environmentService.execPath; + default: { + if (variable.indexOf(VariableResolver.ENV_PREFIX) >= 0) { + let key = variable.substr(VariableResolver.ENV_PREFIX.length); + if (isWindows) { + key = key.toLowerCase(); + } + + const env = this.envVariables[key]; + if (types.isString(env)) { + return env; + } + } + if (variable.indexOf(VariableResolver.CONFIG_PREFIX) >= 0) { + let key = variable.substr(VariableResolver.CONFIG_PREFIX.length); + const config = this.configurationService.getValue(key, context ? { resource: context.uri } : undefined); + if (!types.isUndefinedOrNull(config) && !types.isObject(config)) { + return config; + } + } + + return match; + } + } }); } - private get execPath(): string { - return this._execPath; - } - - private get cwd(): string { - if (this.workspaceRoot) { - return this.workspaceRoot; - } else { - return process.cwd(); - } - } - - private get workspaceRoot(): string { - return this._lastWorkspaceFolder ? this._lastWorkspaceFolder.uri.fsPath : undefined; - } - - private get workspaceFolder(): string { - return this.workspaceRoot; - } - - private get workspaceRootFolderName(): string { - return this.workspaceFolderBasename; - } - - private get workspaceFolderBasename(): string { - return this.workspaceRoot ? paths.basename(this.workspaceRoot) : ''; - } - - private get file(): string { - return this.getFilePath(); - } - - private get relativeFile(): string { - return (this.workspaceRoot) ? paths.normalize(relative(this.workspaceRoot, this.file)) : this.file; - } - - private get fileBasename(): string { - return paths.basename(this.getFilePath()); - } - - private get fileBasenameNoExtension(): string { - const basename = this.fileBasename; - return basename.slice(0, basename.length - paths.extname(basename).length); - } - - private get fileDirname(): string { - return paths.dirname(this.getFilePath()); - } - - private get fileExtname(): string { - return paths.extname(this.getFilePath()); - } - - private get lineNumber(): string { - const activeEditor = this.editorService.getActiveEditor(); - if (activeEditor) { - const editorControl = (activeEditor.getControl()); - if (editorControl) { - const lineNumber = editorControl.getSelection().positionLineNumber; - return String(lineNumber); - } - } - - return ''; - } - - private get selectedText(): string { + private getSelectedText(): string { const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { const editorControl = (activeEditor.getControl()); @@ -118,7 +116,7 @@ export class ConfigurationResolverService implements IConfigurationResolverServi } } - return ''; + return undefined; } private getFilePath(): string { @@ -126,126 +124,76 @@ export class ConfigurationResolverService implements IConfigurationResolverServi if (input instanceof DiffEditorInput) { input = input.modifiedInput; } - if (!input) { - return ''; - } const fileResource = toResource(input, { filter: 'file' }); if (!fileResource) { - return ''; + return undefined; } + return paths.normalize(fileResource.fsPath, true); } + private getLineNumber(): string { + const activeEditor = this.editorService.getActiveEditor(); + if (activeEditor) { + const editorControl = (activeEditor.getControl()); + if (editorControl) { + const lineNumber = editorControl.getSelection().positionLineNumber; + return String(lineNumber); + } + } + + return undefined; + } +} + +export class ConfigurationResolverService implements IConfigurationResolverService { + _serviceBrand: any; + private resolver: VariableResolver; + + constructor( + envVariables: IProcessEnvironment, + @IWorkbenchEditorService editorService: IWorkbenchEditorService, + @IEnvironmentService environmentService: IEnvironmentService, + @IConfigurationService configurationService: IConfigurationService, + @ICommandService private commandService: ICommandService, + ) { + this.resolver = new VariableResolver(envVariables, configurationService, editorService, environmentService); + } + public resolve(root: IWorkspaceFolder, value: string): string; public resolve(root: IWorkspaceFolder, value: string[]): string[]; public resolve(root: IWorkspaceFolder, value: IStringDictionary): IStringDictionary; public resolve(root: IWorkspaceFolder, value: any): any { - try { - this._lastWorkspaceFolder = root; - if (types.isString(value)) { - return this.resolveString(root, value); - } else if (types.isArray(value)) { - return this.resolveArray(root, value); - } else if (types.isObject(value)) { - return this.resolveLiteral(root, value); - } - return value; - } finally { - this._lastWorkspaceFolder = undefined; + if (types.isString(value)) { + return this.resolver.resolve(root, value); + } else if (types.isArray(value)) { + return value.map(s => this.resolver.resolve(root, s)); + } else if (types.isObject(value)) { + let result: IStringDictionary | string[]> = Object.create(null); + Object.keys(value).forEach(key => { + result[key] = this.resolve(root, value[key]); + }); + + return result; } + return value; } - public resolveAny(root: IWorkspaceFolder, value: T): T; public resolveAny(root: IWorkspaceFolder, value: any): any { - try { - this._lastWorkspaceFolder = root; - if (types.isString(value)) { - return this.resolveString(root, value); - } else if (types.isArray(value)) { - return this.resolveAnyArray(root, value); - } else if (types.isObject(value)) { - return this.resolveAnyLiteral(root, value); - } - return value; - } finally { - this._lastWorkspaceFolder = undefined; + if (types.isString(value)) { + return this.resolver.resolve(root, value); + } else if (types.isArray(value)) { + return value.map(s => this.resolveAny(root, s)); + } else if (types.isObject(value)) { + let result: IStringDictionary | string[]> = Object.create(null); + Object.keys(value).forEach(key => { + result[key] = this.resolveAny(root, value[key]); + }); + + return result; } - } - - private resolveString(root: IWorkspaceFolder, value: string): string { - let regexp = /\$\{(.*?)\}/g; - const originalValue = value; - const resolvedString = value.replace(regexp, (match: string, name: string) => { - const key = (isWindows && match.indexOf('env:') > 0) ? name.toLowerCase() : name; - let newValue = (this)[key]; - if (types.isString(newValue)) { - return newValue; - } else { - return match && match.indexOf('env:') > 0 ? '' : match; - } - }); - - return this.resolveConfigVariable(root, resolvedString, originalValue); - } - - private resolveConfigVariable(root: IWorkspaceFolder, value: string, originalValue: string): string { - const replacer = (match: string, name: string) => { - let config = this.configurationService.getValue({ resource: root.uri }); - let newValue: any; - try { - const keys: string[] = name.split('.'); - if (!keys || keys.length <= 0) { - return ''; - } - while (keys.length > 1) { - const key = keys.shift(); - if (!config || !config.hasOwnProperty(key)) { - return ''; - } - config = config[key]; - } - newValue = config && config.hasOwnProperty(keys[0]) ? config[keys[0]] : ''; - } catch (e) { - return ''; - } - if (types.isString(newValue)) { - // Prevent infinite recursion and also support nested references (or tokens) - return newValue === originalValue ? '' : this.resolveString(root, newValue); - } else { - return this.resolve(root, newValue) + ''; - } - }; - - return value.replace(/\$\{config:(.+?)\}/g, replacer); - } - - private resolveLiteral(root: IWorkspaceFolder, values: IStringDictionary | string[]>): IStringDictionary | string[]> { - let result: IStringDictionary | string[]> = Object.create(null); - Object.keys(values).forEach(key => { - let value = values[key]; - result[key] = this.resolve(root, value); - }); - return result; - } - - private resolveAnyLiteral(root: IWorkspaceFolder, values: T): T; - private resolveAnyLiteral(root: IWorkspaceFolder, values: any): any { - let result: IStringDictionary | string[]> = Object.create(null); - Object.keys(values).forEach(key => { - let value = values[key]; - result[key] = this.resolveAny(root, value); - }); - return result; - } - - private resolveArray(root: IWorkspaceFolder, value: string[]): string[] { - return value.map(s => this.resolveString(root, s)); - } - - private resolveAnyArray(root: IWorkspaceFolder, value: T[]): T[]; - private resolveAnyArray(root: IWorkspaceFolder, value: any[]): any[] { - return value.map(s => this.resolveAny(root, s)); + return value; } /** diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts index b77215ea758..42692e441eb 100644 --- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts @@ -22,7 +22,6 @@ suite('Configuration Resolver Service', () => { let editorService: TestEditorService; let workspace: IWorkspaceFolder; - setup(() => { mockCommandService = new MockCommandService(); editorService = new TestEditorService(); @@ -39,7 +38,6 @@ suite('Configuration Resolver Service', () => { configurationResolverService = null; }); - test('substitute one', () => { if (platform.isWindows) { assert.strictEqual(configurationResolverService.resolve(workspace, 'abc ${workspaceFolder} xyz'), 'abc \\VSCode\\workspaceLocation xyz'); @@ -88,7 +86,7 @@ suite('Configuration Resolver Service', () => { if (platform.isWindows) { assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - Value for key1'); } else { - assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - '); + assert.strictEqual(configurationResolverService.resolve(workspace, '${env:key1} - ${env:Key1}'), 'Value for key1 - ${env:Key1}'); } }); @@ -126,48 +124,6 @@ suite('Configuration Resolver Service', () => { assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo bar xyz'); }); - test('substitute nested configuration variables', () => { - let configurationService: IConfigurationService; - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo ${workspaceFolder} ${config:terminal.integrated.fontFamily}' - }, - terminal: { - integrated: { - fontFamily: 'bar' - } - } - }); - - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); - if (platform.isWindows) { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo \\VSCode\\workspaceLocation bar bar xyz'); - } else { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo /VSCode/workspaceLocation bar bar xyz'); - } - }); - - test('substitute accidental self referenced configuration variables', () => { - let configurationService: IConfigurationService; - configurationService = new MockConfigurationService({ - editor: { - fontFamily: 'foo ${workspaceFolder} ${config:terminal.integrated.fontFamily} ${config:editor.fontFamily}' - }, - terminal: { - integrated: { - fontFamily: 'bar' - } - } - }); - - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); - if (platform.isWindows) { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo \\VSCode\\workspaceLocation bar bar xyz'); - } else { - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo /VSCode/workspaceLocation bar bar xyz'); - } - }); - test('substitute one env variable and a configuration variable', () => { let configurationService: IConfigurationService; configurationService = new MockConfigurationService({ @@ -249,31 +205,20 @@ suite('Configuration Resolver Service', () => { }); let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor[\'abc\'.substr(0)]} xyz'), 'abc xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor[\'abc\'.substr(0)]} xyz'), 'abc ${config:editor[\'abc\'.substr(0)]} xyz'); }); - test('uses empty string as fallback', () => { + test('uses original variable as fallback', () => { let configurationService: IConfigurationService; configurationService = new MockConfigurationService({ editor: {} }); let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.abc} xyz'), 'abc xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.abc.def} xyz'), 'abc xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:panel} xyz'), 'abc xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:panel.abc} xyz'), 'abc xyz'); - }); - - test('is restricted to own properties', () => { - let configurationService: IConfigurationService; - configurationService = new MockConfigurationService({ - editor: {} - }); - - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.__proto__} xyz'), 'abc xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.toString} xyz'), 'abc xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${invalidVariable} xyz'), 'abc ${invalidVariable} xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${env:invalidVariable} xyz'), 'abc ${env:invalidVariable} xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.abc.def} xyz'), 'abc ${config:editor.abc.def} xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:panel.abc} xyz'), 'abc ${config:panel.abc} xyz'); }); test('configuration variables with invalid accessor', () => { @@ -286,8 +231,8 @@ suite('Configuration Resolver Service', () => { let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); assert.strictEqual(service.resolve(workspace, 'abc ${config:} xyz'), 'abc ${config:} xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor..fontFamily} xyz'), 'abc xyz'); - assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'), 'abc xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor..fontFamily} xyz'), 'abc ${config:editor..fontFamily} xyz'); + assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'), 'abc ${config:editor.none.none2} xyz'); }); test('interactive variable simple', () => { @@ -362,7 +307,20 @@ class MockConfigurationService implements IConfigurationService { public constructor(private configuration: any = {}) { } public inspect(key: string, overrides?: IConfigurationOverrides): any { return { value: getConfigurationValue(this.getValue(), key), default: getConfigurationValue(this.getValue(), key), user: getConfigurationValue(this.getValue(), key), workspaceFolder: void 0, folder: void 0 }; } public keys() { return { default: [], user: [], workspace: [], workspaceFolder: [] }; } - public getValue(): any { return this.configuration; } + public getValue(): any; + public getValue(value: string): any; + public getValue(value?: any): any { + if (!value) { + return this.configuration; + } + const valuePath = (value).split('.'); + let object = this.configuration; + while (valuePath.length && object) { + object = object[valuePath.shift()]; + } + + return object; + } public updateValue(): TPromise { return null; } public getConfigurationData(): any { return null; } public onDidChangeConfiguration() { return { dispose() { } }; } From 8e96d2a36efc2d0b29976bcbb42589b182c0a522 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 24 Jan 2018 16:49:54 +0100 Subject: [PATCH 631/710] configuration resolver service: allow to reference a worspace folder by name --- .../configurationResolverService.ts | 107 +++++++++++------- .../configurationResolverService.test.ts | 22 ++-- 2 files changed, 75 insertions(+), 54 deletions(-) diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index ca6fbef8a4f..9863b0dbfad 100644 --- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -12,7 +12,7 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; +import { IWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { toResource } from 'vs/workbench/common/editor'; import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; @@ -31,6 +31,7 @@ class VariableResolver { private configurationService: IConfigurationService, private editorService: IWorkbenchEditorService, private environmentService: IEnvironmentService, + private workspaceContextService: IWorkspaceContextService ) { if (isWindows) { Object.keys(envVariables).forEach(key => { @@ -44,60 +45,79 @@ class VariableResolver { resolve(context: IWorkspaceFolder, value: string): string { const filePath = this.getFilePath(); return value.replace(VariableResolver.VARIABLE_REGEXP, (match: string, variable: string) => { - switch (variable) { - case 'workspaceRoot': - case 'workspaceFolder': - return context ? context.uri.fsPath : match; - case 'cwd': - return context ? context.uri.fsPath : process.cwd(); - case 'workspaceRootFolderName': - case 'workspaceFolderBasename': - return context ? paths.basename(context.uri.fsPath) : match; - case 'lineNumber': - return this.getLineNumber() || match; - case 'selectedText': - return this.getSelectedText() || match; - case 'file': - return filePath || match; - case 'relativeFile': - return context ? paths.normalize(relative(context.uri.fsPath, filePath)) : filePath || match; - case 'fileDirname': - return filePath ? paths.dirname(filePath) : match; - case 'fileExtname': - return filePath ? paths.extname(filePath) : match; - case 'fileBasename': - return filePath ? paths.basename(filePath) : match; - case 'fileBasenameNoExtension': { - if (!filePath) { - return match; - } + const parts = variable.split(':'); + let sufix: string; + if (parts && parts.length > 1) { + variable = parts[0]; + sufix = parts[1]; + } - const basename = paths.basename(filePath); - return basename.slice(0, basename.length - paths.extname(basename).length); - } - case 'execPath': - return this.environmentService.execPath; - default: { - if (variable.indexOf(VariableResolver.ENV_PREFIX) >= 0) { - let key = variable.substr(VariableResolver.ENV_PREFIX.length); + switch (variable) { + case 'env': { + if (sufix) { if (isWindows) { - key = key.toLowerCase(); + sufix = sufix.toLowerCase(); } - const env = this.envVariables[key]; + const env = this.envVariables[sufix]; if (types.isString(env)) { return env; } } - if (variable.indexOf(VariableResolver.CONFIG_PREFIX) >= 0) { - let key = variable.substr(VariableResolver.CONFIG_PREFIX.length); - const config = this.configurationService.getValue(key, context ? { resource: context.uri } : undefined); + } + case 'config': { + if (sufix) { + const config = this.configurationService.getValue(sufix, context ? { resource: context.uri } : undefined); if (!types.isUndefinedOrNull(config) && !types.isObject(config)) { return config; } } + } + default: { + if (sufix) { + const folder = this.workspaceContextService.getWorkspace().folders.filter(f => f.name === sufix).pop(); + if (folder) { + context = folder; + } + } - return match; + switch (variable) { + case 'workspaceRoot': + case 'workspaceFolder': + return context ? context.uri.fsPath : match; + case 'cwd': + return context ? context.uri.fsPath : process.cwd(); + case 'workspaceRootFolderName': + case 'workspaceFolderBasename': + return context ? paths.basename(context.uri.fsPath) : match; + case 'lineNumber': + return this.getLineNumber() || match; + case 'selectedText': + return this.getSelectedText() || match; + case 'file': + return filePath || match; + case 'relativeFile': + return context ? paths.normalize(relative(context.uri.fsPath, filePath)) : filePath || match; + case 'fileDirname': + return filePath ? paths.dirname(filePath) : match; + case 'fileExtname': + return filePath ? paths.extname(filePath) : match; + case 'fileBasename': + return filePath ? paths.basename(filePath) : match; + case 'fileBasenameNoExtension': { + if (!filePath) { + return match; + } + + const basename = paths.basename(filePath); + return basename.slice(0, basename.length - paths.extname(basename).length); + } + case 'execPath': + return this.environmentService.execPath; + + default: + return match; + } } } }); @@ -157,8 +177,9 @@ export class ConfigurationResolverService implements IConfigurationResolverServi @IEnvironmentService environmentService: IEnvironmentService, @IConfigurationService configurationService: IConfigurationService, @ICommandService private commandService: ICommandService, + @IWorkspaceContextService workspaceContextService: IWorkspaceContextService ) { - this.resolver = new VariableResolver(envVariables, configurationService, editorService, environmentService); + this.resolver = new VariableResolver(envVariables, configurationService, editorService, environmentService, workspaceContextService); } public resolve(root: IWorkspaceFolder, value: string): string; diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts index 42692e441eb..7c0564f7c85 100644 --- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts @@ -12,10 +12,10 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver'; import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/electron-browser/configurationResolverService'; import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; -import { TestEnvironmentService, TestEditorService } from 'vs/workbench/test/workbenchTestServices'; +import { TestEnvironmentService, TestEditorService, TestContextService } from 'vs/workbench/test/workbenchTestServices'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; -suite('Configuration Resolver Service', () => { +suite.only('Configuration Resolver Service', () => { let configurationResolverService: IConfigurationResolverService; let envVariables: { [key: string]: string } = { key1: 'Value for key1', key2: 'Value for key2' }; let mockCommandService: MockCommandService; @@ -31,7 +31,7 @@ suite('Configuration Resolver Service', () => { index: 0, toResource: () => null }; - configurationResolverService = new ConfigurationResolverService(envVariables, editorService, TestEnvironmentService, new TestConfigurationService(), mockCommandService); + configurationResolverService = new ConfigurationResolverService(envVariables, editorService, TestEnvironmentService, new TestConfigurationService(), mockCommandService, new TestContextService()); }); teardown(() => { @@ -103,7 +103,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} xyz'), 'abc foo xyz'); }); @@ -120,7 +120,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} xyz'), 'abc foo bar xyz'); }); @@ -137,7 +137,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); if (platform.isWindows) { assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${workspaceFolder} ${env:key1} xyz'), 'abc foo \\VSCode\\workspaceLocation Value for key1 xyz'); } else { @@ -158,7 +158,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); if (platform.isWindows) { assert.strictEqual(service.resolve(workspace, '${config:editor.fontFamily} ${config:terminal.integrated.fontFamily} ${workspaceFolder} - ${workspaceFolder} ${env:key1} - ${env:key2}'), 'foo bar \\VSCode\\workspaceLocation - \\VSCode\\workspaceLocation Value for key1 - Value for key2'); } else { @@ -192,7 +192,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.fontFamily} ${config:editor.lineNumbers} ${config:editor.insertSpaces} xyz'), 'abc foo 123 false xyz'); }); @@ -204,7 +204,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor[\'abc\'.substr(0)]} xyz'), 'abc ${config:editor[\'abc\'.substr(0)]} xyz'); }); @@ -214,7 +214,7 @@ suite('Configuration Resolver Service', () => { editor: {} }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${invalidVariable} xyz'), 'abc ${invalidVariable} xyz'); assert.strictEqual(service.resolve(workspace, 'abc ${env:invalidVariable} xyz'), 'abc ${env:invalidVariable} xyz'); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.abc.def} xyz'), 'abc ${config:editor.abc.def} xyz'); @@ -229,7 +229,7 @@ suite('Configuration Resolver Service', () => { } }); - let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService); + let service = new ConfigurationResolverService(envVariables, new TestEditorService(), TestEnvironmentService, configurationService, mockCommandService, new TestContextService()); assert.strictEqual(service.resolve(workspace, 'abc ${config:} xyz'), 'abc ${config:} xyz'); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor..fontFamily} xyz'), 'abc ${config:editor..fontFamily} xyz'); assert.strictEqual(service.resolve(workspace, 'abc ${config:editor.none.none2} xyz'), 'abc ${config:editor.none.none2} xyz'); From 6cdee10a65ce8fc59e1d4824dad5672f6a651a21 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 24 Jan 2018 16:56:48 +0100 Subject: [PATCH 632/710] actually implement test properly --- src/vs/base/test/common/resources.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts index 4c0925bcf14..e29e625f4c7 100644 --- a/src/vs/base/test/common/resources.test.ts +++ b/src/vs/base/test/common/resources.test.ts @@ -48,7 +48,7 @@ suite('Resources', () => { assert.equal(d.fsPath, normalize('/some/file', true)); // does not explode (https://github.com/Microsoft/vscode/issues/41987) - URI.from({ scheme: 'file', authority: '/users/someone/portal.h' }); + dirname(URI.from({ scheme: 'file', authority: '/users/someone/portal.h' })); done(); }); }); \ No newline at end of file From a71dc7dce74c2fdc8e159f3ab44bdfd2d540a3f2 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 17:04:40 +0100 Subject: [PATCH 633/710] Fix mouse target around margin when having the minimap to the left --- src/vs/editor/browser/controller/mouseTarget.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vs/editor/browser/controller/mouseTarget.ts b/src/vs/editor/browser/controller/mouseTarget.ts index 0e21b9588b5..436f7a96967 100644 --- a/src/vs/editor/browser/controller/mouseTarget.ts +++ b/src/vs/editor/browser/controller/mouseTarget.ts @@ -364,7 +364,7 @@ abstract class BareHitTestRequest { this.mouseVerticalOffset = Math.max(0, ctx.getCurrentScrollTop() + pos.y - editorPos.y); this.mouseContentHorizontalOffset = ctx.getCurrentScrollLeft() + pos.x - editorPos.x - ctx.layoutInfo.contentLeft; - this.isInMarginArea = (pos.x - editorPos.x < ctx.layoutInfo.contentLeft); + this.isInMarginArea = (pos.x - editorPos.x < ctx.layoutInfo.contentLeft && pos.x - editorPos.x >= ctx.layoutInfo.glyphMarginLeft); this.isInContentArea = !this.isInMarginArea; this.mouseColumn = Math.max(0, MouseTargetFactory._getMouseColumn(this.mouseContentHorizontalOffset, ctx.typicalHalfwidthCharacterWidth)); } @@ -587,6 +587,8 @@ export class MouseTargetFactory { offsetX: offset }; + offset -= ctx.layoutInfo.glyphMarginLeft; + if (offset <= ctx.layoutInfo.glyphMarginWidth) { // On the glyph margin return request.fulfill(MouseTargetType.GUTTER_GLYPH_MARGIN, pos, res.range, detail); From 5069af739dfcc773ead62ebd4fcb892b164fba4e Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 17:07:25 +0100 Subject: [PATCH 634/710] Simplify code --- src/vs/editor/common/config/editorOptions.ts | 31 +++++++------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 040556408a9..95f1995fc67 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -2013,7 +2013,7 @@ export class EditorLayoutProvider { const lineDecorationsWidth = _opts.lineDecorationsWidth | 0; const typicalHalfwidthCharacterWidth = _opts.typicalHalfwidthCharacterWidth; const maxDigitWidth = _opts.maxDigitWidth; - let verticalScrollbarWidth = _opts.verticalScrollbarWidth | 0; + const verticalScrollbarWidth = _opts.verticalScrollbarWidth | 0; const verticalScrollbarHasArrows = _opts.verticalScrollbarHasArrows; const scrollbarArrowSize = _opts.scrollbarArrowSize | 0; const horizontalScrollbarHeight = _opts.horizontalScrollbarHeight | 0; @@ -2034,22 +2034,17 @@ export class EditorLayoutProvider { glyphMarginWidth = lineHeight; } + let glyphMarginLeft = 0; + let lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; + let decorationsLeft = lineNumbersLeft + lineNumbersWidth; + let contentLeft = decorationsLeft + lineDecorationsWidth; + const remainingWidth = outerWidth - glyphMarginWidth - lineNumbersWidth - lineDecorationsWidth; let renderMinimap: RenderMinimap; let minimapWidth: number; let contentWidth: number; - let contentLeft: number; - let glyphMarginLeft: number; - let lineNumbersLeft: number; - let decorationsLeft: number; - - glyphMarginLeft = 0; if (!minimap) { - lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; - decorationsLeft = lineNumbersLeft + lineNumbersWidth; - - contentLeft = decorationsLeft + lineDecorationsWidth; minimapWidth = 0; renderMinimap = RenderMinimap.None; contentWidth = remainingWidth; @@ -2082,16 +2077,12 @@ export class EditorLayoutProvider { } contentWidth = remainingWidth - minimapWidth; - if (typeof minimapSide === 'string') { - if (minimapSide === 'left') { - glyphMarginLeft = minimapWidth; - } + if (minimapSide === 'left') { + glyphMarginLeft += minimapWidth; + lineNumbersLeft += minimapWidth; + decorationsLeft += minimapWidth; + contentLeft += minimapWidth; } - - lineNumbersLeft = glyphMarginLeft + glyphMarginWidth; - decorationsLeft = lineNumbersLeft + lineNumbersWidth; - contentLeft = decorationsLeft + lineDecorationsWidth; - } const viewportColumn = Math.max(1, Math.floor((contentWidth - verticalScrollbarWidth) / typicalHalfwidthCharacterWidth)); From fedcd8648b9583fbfb2933b5013fcf2c61ff6339 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 24 Jan 2018 17:14:06 +0100 Subject: [PATCH 635/710] debug: allow scoping of configurations inside compounds fixes #38134 --- src/vs/workbench/parts/debug/common/debug.ts | 2 +- .../debugConfigurationManager.ts | 13 +++++++- .../debug/electron-browser/debugService.ts | 30 ++++++++++++------- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index 598c69684af..2abec2b2d2a 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -363,7 +363,7 @@ export interface IConfig extends IEnvConfig { export interface ICompound { name: string; - configurations: string[]; + configurations: (string | { name: string, folder: string })[]; } export interface IAdapterExecutable { diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts index a9a6226e949..34b56d52c49 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts @@ -191,7 +191,18 @@ const schema: IJSONSchema = { enum: [], description: nls.localize('useUniqueNames', "Please use unique configuration names.") }, { - type: 'object' + type: 'object', + required: ['name'], + properties: { + name: { + type: 'string', + description: nls.localize('app.launch.json.compound.name', "Name of compound. Appears in the launch configuration drop down menu.") + }, + folder: { + type: 'string', + description: nls.localize('app.launch.json.compound.folder', "Name of folder in which the compound is located.") + } + } }] }, description: nls.localize('app.launch.json.compounds.configurations', "Names of configurations that will be started as part of this compound.") diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index ebe3ccf93d6..28815b8c5d0 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -693,21 +693,31 @@ export class DebugService implements debug.IDebugService { "Compound must have \"configurations\" attribute set in order to start multiple configurations."))); } - return sequence(compound.configurations.map(name => () => { + return TPromise.join(compound.configurations.map(configData => { + const name = typeof configData === 'string' ? configData : configData.name; if (name === compound.name) { return TPromise.as(null); } let rootForName: IWorkspaceFolder; - const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name)); - if (launchesContainingName.length === 1) { - rootForName = launchesContainingName[0].workspace; - } else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) { - // If there are multiple launches containing the configuration give priority to the configuration in the current launch - rootForName = launch.workspace; - } else { - return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name) - : nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurates `{0}` in the workspace. Use folder name to qualify the configuration.", name))); + if (typeof configData === 'string') { + const launchesContainingName = this.configurationManager.getLaunches().filter(l => !!l.getConfiguration(name)); + if (launchesContainingName.length === 1) { + rootForName = launchesContainingName[0].workspace; + } else if (launchesContainingName.length > 1 && launchesContainingName.indexOf(launch) >= 0) { + // If there are multiple launches containing the configuration give priority to the configuration in the current launch + rootForName = launch.workspace; + } else { + return TPromise.wrapError(new Error(launchesContainingName.length === 0 ? nls.localize('noConfigurationNameInWorkspace', "Could not find launch configuration '{0}' in the workspace.", name) + : nls.localize('multipleConfigurationNamesInWorkspace', "There are multiple launch configurates `{0}` in the workspace. Use folder name to qualify the configuration.", name))); + } + } else if (configData.folder) { + const root = this.contextService.getWorkspace().folders.filter(f => f.name === configData.folder).pop(); + if (root) { + rootForName = root; + } else { + return TPromise.wrapError(new Error(nls.localize('noFolderWithName', "Can not find folder with name '{0}' for configuration '{1}' in compound '{2}'.", configData.folder, configData.name, compound.name))); + } } return this.startDebugging(rootForName, name, noDebug, topCompoundName || compound.name); From 0e25fa2ad13b57cfc23832e660554cdce93470bf Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 17:15:58 +0100 Subject: [PATCH 636/710] fix bad NPE --- .../extensionManagement/node/extensionManagementService.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 2a0895a6655..aa2cc058595 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -106,6 +106,7 @@ export class ExtensionManagementService implements IExtensionManagementService { private uninstalledPath: string; private uninstalledFileLimiter: Limiter; private reportedExtensions: TPromise | undefined; + private lastReportTimestamp = 0; private disposables: IDisposable[] = []; private readonly _onInstallExtension = new Emitter(); @@ -269,7 +270,7 @@ export class ExtensionManagementService implements IExtensionManagementService { private downloadAndInstallExtension(extension: IGalleryExtension): TPromise { let installingExtension = this.installingExtensions.get(extension.identifier.id); if (!installingExtension) { - installingExtension = this.reportedExtensions + installingExtension = this.getExtensionsReport() .then(report => { if (getMaliciousExtensionsSet(report).has(extension.identifier.id)) { throw new Error(nls.localize('malicious extension', "Can't install extension since it was reported to be malicious.")); @@ -791,8 +792,6 @@ export class ExtensionManagementService implements IExtensionManagementService { }); } - private lastReportTimestamp = 0; - getExtensionsReport(): TPromise { const now = new Date().getTime(); From 4347b51e0f612d07f16c390a2a94589b99863d37 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 17:21:08 +0100 Subject: [PATCH 637/710] Make it possible to change the minimap position setting dynamically --- .../editor/browser/viewParts/minimap/minimap.ts | 16 +++++++--------- src/vs/editor/common/config/editorOptions.ts | 11 +++++++++++ .../viewLayout/editorLayoutProvider.test.ts | 14 ++++++++++++++ src/vs/monaco.d.ts | 4 ++++ 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/vs/editor/browser/viewParts/minimap/minimap.ts b/src/vs/editor/browser/viewParts/minimap/minimap.ts index 353e5165ffa..b1da0a53ed6 100644 --- a/src/vs/editor/browser/viewParts/minimap/minimap.ts +++ b/src/vs/editor/browser/viewParts/minimap/minimap.ts @@ -76,14 +76,16 @@ class MinimapOptions { public readonly showSlider: 'always' | 'mouseover'; - public readonly side: 'right' | 'left'; - public readonly pixelRatio: number; public readonly typicalHalfwidthCharacterWidth: number; public readonly lineHeight: number; + /** + * container dom node left position (in CSS px) + */ + public readonly minimapLeft: number; /** * container dom node width (in CSS px) */ @@ -120,10 +122,10 @@ class MinimapOptions { this.renderMinimap = layoutInfo.renderMinimap | 0; this.scrollBeyondLastLine = viewInfo.scrollBeyondLastLine; this.showSlider = viewInfo.minimap.showSlider; - this.side = viewInfo.minimap.side; this.pixelRatio = pixelRatio; this.typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth; this.lineHeight = configuration.editor.lineHeight; + this.minimapLeft = layoutInfo.minimapLeft; this.minimapWidth = layoutInfo.minimapWidth; this.minimapHeight = layoutInfo.height; @@ -138,10 +140,10 @@ class MinimapOptions { return (this.renderMinimap === other.renderMinimap && this.scrollBeyondLastLine === other.scrollBeyondLastLine && this.showSlider === other.showSlider - && this.side === other.side && this.pixelRatio === other.pixelRatio && this.typicalHalfwidthCharacterWidth === other.typicalHalfwidthCharacterWidth && this.lineHeight === other.lineHeight + && this.minimapLeft === other.minimapLeft && this.minimapWidth === other.minimapWidth && this.minimapHeight === other.minimapHeight && this.canvasInnerWidth === other.canvasInnerWidth @@ -460,11 +462,6 @@ export class Minimap extends ViewPart { this._domNode.setPosition('absolute'); this._domNode.setAttribute('role', 'presentation'); this._domNode.setAttribute('aria-hidden', 'true'); - if (this._options.side === 'right') { - this._domNode.setRight(this._context.configuration.editor.layoutInfo.verticalScrollbarWidth); - } else { - this._domNode.setLeft(0); - } this._shadow = createFastDomNode(document.createElement('div')); this._shadow.setClassName('minimap-shadow-hidden'); @@ -571,6 +568,7 @@ export class Minimap extends ViewPart { } private _applyLayout(): void { + this._domNode.setLeft(this._options.minimapLeft); this._domNode.setWidth(this._options.minimapWidth); this._domNode.setHeight(this._options.minimapHeight); this._shadow.setHeight(this._options.minimapHeight); diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts index 95f1995fc67..442d8e9cff7 100644 --- a/src/vs/editor/common/config/editorOptions.ts +++ b/src/vs/editor/common/config/editorOptions.ts @@ -1025,6 +1025,7 @@ export class InternalEditorOptions { && a.contentWidth === b.contentWidth && a.contentHeight === b.contentHeight && a.renderMinimap === b.renderMinimap + && a.minimapLeft === b.minimapLeft && a.minimapWidth === b.minimapWidth && a.viewportColumn === b.viewportColumn && a.verticalScrollbarWidth === b.verticalScrollbarWidth @@ -1295,6 +1296,10 @@ export interface EditorLayoutInfo { */ readonly contentHeight: number; + /** + * The position for the minimap + */ + readonly minimapLeft: number; /** * The width of the minimap */ @@ -2042,9 +2047,11 @@ export class EditorLayoutProvider { const remainingWidth = outerWidth - glyphMarginWidth - lineNumbersWidth - lineDecorationsWidth; let renderMinimap: RenderMinimap; + let minimapLeft: number; let minimapWidth: number; let contentWidth: number; if (!minimap) { + minimapLeft = 0; minimapWidth = 0; renderMinimap = RenderMinimap.None; contentWidth = remainingWidth; @@ -2078,10 +2085,13 @@ export class EditorLayoutProvider { contentWidth = remainingWidth - minimapWidth; if (minimapSide === 'left') { + minimapLeft = 0; glyphMarginLeft += minimapWidth; lineNumbersLeft += minimapWidth; decorationsLeft += minimapWidth; contentLeft += minimapWidth; + } else { + minimapLeft = outerWidth - minimapWidth - verticalScrollbarWidth; } } @@ -2110,6 +2120,7 @@ export class EditorLayoutProvider { contentHeight: outerHeight, renderMinimap: renderMinimap, + minimapLeft: minimapLeft, minimapWidth: minimapWidth, viewportColumn: viewportColumn, diff --git a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts index f25b151d595..eddae34ccc2 100644 --- a/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts +++ b/src/vs/editor/test/common/viewLayout/editorLayoutProvider.test.ts @@ -56,6 +56,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 99, @@ -113,6 +114,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 97, @@ -170,6 +172,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 89, @@ -227,6 +230,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 89, @@ -284,6 +288,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 89, @@ -341,6 +346,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 84, @@ -398,6 +404,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 84, @@ -455,6 +462,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 83, @@ -512,6 +520,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 172, @@ -569,6 +578,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 900, renderMinimap: RenderMinimap.None, + minimapLeft: 0, minimapWidth: 0, viewportColumn: 170, @@ -626,6 +636,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.Small, + minimapLeft: 910, minimapWidth: 90, viewportColumn: 90, @@ -683,6 +694,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.Large, + minimapLeft: 910, minimapWidth: 90, viewportColumn: 90, @@ -740,6 +752,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.Large, + minimapLeft: 953, minimapWidth: 47, viewportColumn: 94, @@ -797,6 +810,7 @@ suite('Editor ViewLayout - EditorLayoutProvider', () => { contentHeight: 800, renderMinimap: RenderMinimap.Large, + minimapLeft: 0, minimapWidth: 47, viewportColumn: 94, diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 457d106c534..2bf4f6caafb 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -3168,6 +3168,10 @@ declare module monaco.editor { * The height of the content (actual height) */ readonly contentHeight: number; + /** + * The position for the minimap + */ + readonly minimapLeft: number; /** * The width of the minimap */ From ffec1fa60f0feff467f7653b5c1d33d570245bcb Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 17:21:30 +0100 Subject: [PATCH 638/710] remove unused variable --- src/vs/workbench/parts/debug/electron-browser/debugService.ts | 1 - 1 file changed, 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 28815b8c5d0..e94b80550b6 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -53,7 +53,6 @@ import { IBroadcastService, IBroadcast } from 'vs/platform/broadcast/electron-br import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console'; import { Source } from 'vs/workbench/parts/debug/common/debugSource'; import { TaskEvent, TaskEventKind } from 'vs/workbench/parts/tasks/common/tasks'; -import { sequence } from 'vs/base/common/async'; const DEBUG_BREAKPOINTS_KEY = 'debug.breakpoint'; const DEBUG_BREAKPOINTS_ACTIVATED_KEY = 'debug.breakpointactivated'; From 65c8b8a92553812fe9aaf40068b28f9731797ced Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 17:23:02 +0100 Subject: [PATCH 639/710] Better wording for configuration option --- src/vs/editor/common/config/commonEditorConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts index 33e9d25b130..6f6f9040b52 100644 --- a/src/vs/editor/common/config/commonEditorConfig.ts +++ b/src/vs/editor/common/config/commonEditorConfig.ts @@ -268,7 +268,7 @@ const editorConfiguration: IConfigurationNode = { 'type': 'string', 'enum': ['left', 'right'], 'default': EDITOR_DEFAULTS.viewInfo.minimap.side, - 'description': nls.localize('minimap.side', "Controls display minimap which side.Possible values are \'right\' and \'left\'") + 'description': nls.localize('minimap.side', "Controls the side where to render the minimap. Possible values are \'right\' and \'left\'") }, 'editor.minimap.showSlider': { 'type': 'string', From 6494a1b69b94c136af05ad173561ab7a75911f36 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 24 Jan 2018 17:30:10 +0100 Subject: [PATCH 640/710] Remove bad test filter --- .../test/electron-browser/configurationResolverService.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts index 7c0564f7c85..fd97b00746e 100644 --- a/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts +++ b/src/vs/workbench/services/configurationResolver/test/electron-browser/configurationResolverService.test.ts @@ -15,7 +15,7 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { TestEnvironmentService, TestEditorService, TestContextService } from 'vs/workbench/test/workbenchTestServices'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; -suite.only('Configuration Resolver Service', () => { +suite('Configuration Resolver Service', () => { let configurationResolverService: IConfigurationResolverService; let envVariables: { [key: string]: string } = { key1: 'Value for key1', key2: 'Value for key2' }; let mockCommandService: MockCommandService; From ad79d802dd7deca4d9094bce251ae93d3202b029 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 24 Jan 2018 17:24:31 +0100 Subject: [PATCH 641/710] fix extension tests --- .../extensions/test/electron-browser/extensionsActions.test.ts | 1 + .../test/electron-browser/extensionsWorkbenchService.test.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts index ec79e302d8c..312c16c9b5c 100644 --- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts +++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts @@ -75,6 +75,7 @@ suite('ExtensionsActions Test', () => { setup(() => { instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []); + instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage()); instantiationService.stub(IExtensionService, { getExtensions: () => TPromise.wrap([]) }); (instantiationService.get(IExtensionEnablementService)).reset(); diff --git a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts index 0390501aceb..7c93cf08c8a 100644 --- a/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts +++ b/src/vs/workbench/parts/extensions/test/electron-browser/extensionsWorkbenchService.test.ts @@ -81,6 +81,7 @@ suite('ExtensionsWorkbenchService Test', () => { setup(() => { instantiationService.stubPromise(IExtensionManagementService, 'getInstalled', []); + instantiationService.stubPromise(IExtensionManagementService, 'getExtensionsReport', []); instantiationService.stubPromise(IExtensionGalleryService, 'query', aPage()); instantiationService.stubPromise(IChoiceService, 'choose', 0); (instantiationService.get(IExtensionEnablementService)).reset(); From 2472a47bc8f355bc1806378f900c043ff35f57d6 Mon Sep 17 00:00:00 2001 From: Mika Andrianarijaona Date: Wed, 24 Jan 2018 17:40:25 +0100 Subject: [PATCH 642/710] fix: add word boundray to check markdown italic (#41466) * fix: add word boundray to check markdown italic * fix: update markdown.tmLanguage.base --- extensions/markdown/syntaxes/markdown.tmLanguage | 4 ++-- extensions/markdown/syntaxes/markdown.tmLanguage.base | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage index 26a48c15d3e..bb0e0c36761 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage +++ b/extensions/markdown/syntaxes/markdown.tmLanguage @@ -3318,7 +3318,7 @@ begin (?x) - (\*|_)(?=\S) # Open + \b(\*|_)(?=\S) # Open (?= ( <[^>]*+> # HTML tags @@ -3368,7 +3368,7 @@ end - (?<=\S)(\1)((?!\1)|(?=\1\1)) + (?<=\S)(\1)((?!\1)|(?=\1\1))\b name markup.italic.markdown patterns diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.base b/extensions/markdown/syntaxes/markdown.tmLanguage.base index ca8b920a22f..442b45acce8 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage.base +++ b/extensions/markdown/syntaxes/markdown.tmLanguage.base @@ -808,7 +808,7 @@ begin (?x) - (\*|_)(?=\S) # Open + \b(\*|_)(?=\S) # Open (?= ( <[^>]*+> # HTML tags @@ -858,7 +858,7 @@ end - (?<=\S)(\1)((?!\1)|(?=\1\1)) + (?<=\S)(\1)((?!\1)|(?=\1\1))\b name markup.italic.markdown patterns From 9e6b718bd4254cfd2f3c03d768a22d20dd3b1288 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 08:42:06 -0800 Subject: [PATCH 643/710] Fixing markdown colorization test --- .../test/colorize-results/test_md.json | 46 +------------------ 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/extensions/markdown/test/colorize-results/test_md.json b/extensions/markdown/test/colorize-results/test_md.json index 01b3aac1707..a3dd8829dfe 100644 --- a/extensions/markdown/test/colorize-results/test_md.json +++ b/extensions/markdown/test/colorize-results/test_md.json @@ -1584,51 +1584,7 @@ } }, { - "c": "in", - "t": "text.html.markdown meta.paragraph.markdown", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "_", - "t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown punctuation.definition.italic.markdown", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "words", - "t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "_", - "t": "text.html.markdown meta.paragraph.markdown markup.italic.markdown punctuation.definition.italic.markdown", - "r": { - "dark_plus": "default: #D4D4D4", - "light_plus": "default: #000000", - "dark_vs": "default: #D4D4D4", - "light_vs": "default: #000000", - "hc_black": "default: #FFFFFF" - } - }, - { - "c": "are ignored.", + "c": "in_words_are ignored.", "t": "text.html.markdown meta.paragraph.markdown", "r": { "dark_plus": "default: #D4D4D4", From b7b3ddbc2e90ba16dfba732d99676bd7ee7068aa Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 08:55:33 -0800 Subject: [PATCH 644/710] Mark extract constant refactor as `refactor.extract.constant` --- extensions/typescript/src/features/refactorProvider.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/typescript/src/features/refactorProvider.ts b/extensions/typescript/src/features/refactorProvider.ts index 088d8879059..c6310dcf0d9 100644 --- a/extensions/typescript/src/features/refactorProvider.ts +++ b/extensions/typescript/src/features/refactorProvider.ts @@ -96,6 +96,9 @@ class SelectRefactorCommand implements Command { } export default class TypeScriptRefactorProvider implements vscode.CodeActionProvider { + private static readonly extractFunctionKind = vscode.CodeActionKind.RefactorExtract.append('function'); + private static readonly extractConstantKind = vscode.CodeActionKind.RefactorExtract.append('constant'); + constructor( private readonly client: ITypeScriptServiceClient, formattingOptionsManager: FormattingOptionsManager, @@ -171,7 +174,9 @@ export default class TypeScriptRefactorProvider implements vscode.CodeActionProv private static getKind(refactor: Proto.RefactorActionInfo) { if (refactor.name.startsWith('function_')) { - return vscode.CodeActionKind.RefactorExtract.append('function'); + return TypeScriptRefactorProvider.extractFunctionKind; + } else if (refactor.name.startsWith('constant_')) { + return TypeScriptRefactorProvider.extractConstantKind; } return vscode.CodeActionKind.Refactor; } From 89802f26c8a5fa04211086f89acada147c20198f Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Wed, 24 Jan 2018 09:49:59 -0800 Subject: [PATCH 645/710] Display truncated VSCode version in issue reporter --- .../issue/issueReporterMain.ts | 18 +++++++----------- .../issue/issueReporterPage.ts | 8 +++++--- src/vs/code/electron-main/diagnostics.ts | 9 --------- 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 93be7de5db0..67bb4b64a23 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -12,6 +12,7 @@ import { $ } from 'vs/base/browser/dom'; import * as browser from 'vs/base/browser/browser'; import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; +import * as os from 'os'; import { Disposable } from 'vs/base/common/lifecycle'; import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser'; import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc'; @@ -27,7 +28,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties'; import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; -import { IssueReporterModel, IssueReporterData } from 'vs/code/electron-browser/issue/issueReporterModel'; +import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel'; import { IssueReporterStyles } from 'vs/platform/issue/common/issue'; import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage'; @@ -54,7 +55,11 @@ export class IssueReporter extends Disposable { issueType: 0, includeSystemInfo: true, includeWorkspaceInfo: true, - includeProcessInfo: true + includeProcessInfo: true, + versionInfo: { + vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, + os: `${os.type()} ${os.arch()} ${os.release()}` + } }); ipcRenderer.on('issueStyleResponse', (event, styles: IssueReporterStyles) => { @@ -352,20 +357,11 @@ export class IssueReporter extends Disposable { */ private updateAllBlocks(state) { - this.updateVersionInfo(state); this.updateSystemInfo(state); this.updateProcessInfo(state); this.updateWorkspaceInfo(state); } - private updateVersionInfo = (state: IssueReporterData) => { - const version = document.getElementById('vscode-version'); - (version).value = state.versionInfo.vscodeVersion; - - const osversion = document.getElementById('os'); - (osversion).value = state.versionInfo.os; - } - private updateSystemInfo = (state) => { const target = document.querySelector('.block-system .block-info'); let tableHtml = ''; diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index 5836f45bd10..85bf92331c3 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -6,6 +6,8 @@ import { escape } from 'vs/base/common/strings'; import { localize } from 'vs/nls'; +import * as os from 'os'; +import pkg from 'vs/platform/node/package'; export default (): string => `
    @@ -32,11 +34,11 @@ export default (): string => `
    - +
    - +
    @@ -89,7 +91,7 @@ export default (): string => `
    - ${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue when we preview it on GitHub."))} + ${escape(localize('githubMarkdown', "We support GitHub-flavored Markdown. You will still be able to edit your issue and add screenshots when we preview it on GitHub."))}
    diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index 8a3fb1445fd..cfab99c860a 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -39,7 +39,6 @@ export interface ProcessInfo { } export interface DiagnosticInfo { - versionInfo?: VersionInfo; systemInfo?: SystemInfo; processInfo?: ProcessInfo[]; workspaceInfo?: string; @@ -80,7 +79,6 @@ export function buildDiagnostics(info: IMainProcessInfo): Promise Date: Wed, 24 Jan 2018 11:03:32 -0800 Subject: [PATCH 646/710] Settings search - don't refresh the default settings side when the editable side changes --- .../preferences/browser/preferencesEditor.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 5f6d1157f43..7daefe613ab 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -439,7 +439,7 @@ class PreferencesRenderersController extends Disposable { this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query); this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true); - this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1) + this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1, updateCurrentResults) .then(result => this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Marketplace Extension Results"), 2)); return this._remoteFilterInProgress.then(() => { @@ -455,15 +455,18 @@ class PreferencesRenderersController extends Disposable { localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise { this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query); - return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0); + return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0, updateCurrentResults); } - private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { + private filterOrSearchPreferences(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number, editableContentOnly?: boolean): TPromise { this._lastQuery = query; - const filterPs = [ - this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder), - this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)]; + const filterPs = []; + if (!editableContentOnly) { + filterPs.push(this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); + } + + filterPs.push(this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); return TPromise.join(filterPs).then(results => { const [defaultFilterResult, editableFilterResult] = results; From bc19d397494ff7381116838317c8ae13dc9631d4 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 11:04:23 -0800 Subject: [PATCH 647/710] Settings search- Fix match highlights on editable side --- .../preferences/common/preferencesModels.ts | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index af64f644416..f01c87d6a13 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -64,7 +64,7 @@ export abstract class AbstractSettingsModel extends EditorModel { if (groupMatched || settingMatchResult) { filterMatches.push({ - setting: this.copySetting(setting), + setting, matches: settingMatchResult && settingMatchResult.matches, score: settingMatchResult ? settingMatchResult.score : 0 }); @@ -73,22 +73,7 @@ export abstract class AbstractSettingsModel extends EditorModel { } } - return filterMatches - .sort((a, b) => b.score - a.score) - .map(filteredMatch => { - // Fix match ranges to offset from setting start line - return { - setting: filteredMatch.setting, - score: filteredMatch.score, - matches: filteredMatch.matches && filteredMatch.matches.map(match => { - return new Range( - match.startLineNumber - filteredMatch.setting.range.startLineNumber, - match.startColumn, - match.endLineNumber - filteredMatch.setting.range.startLineNumber, - match.endColumn); - }) - }; - }); + return filterMatches.sort((a, b) => b.score - a.score); } public getPreference(key: string): ISetting { @@ -104,17 +89,6 @@ export abstract class AbstractSettingsModel extends EditorModel { return null; } - private copySetting(setting: ISetting): ISetting { - return { - description: setting.description, - key: setting.key, - value: setting.value, - range: setting.range, - overrides: [], - overrideOf: setting.overrideOf - }; - } - protected collectMetadata(groups: ISearchResultGroup[]): IStringDictionary { const metadata = Object.create(null); let hasMetadata = false; @@ -710,6 +684,22 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements } private writeSettingsGroupToBuilder(builder: SettingsContentBuilder, settingsGroup: ISettingsGroup, filterMatches: ISettingMatch[]): IRange[] { + filterMatches = filterMatches + .map(filteredMatch => { + // Fix match ranges to offset from setting start line + return { + setting: filteredMatch.setting, + score: filteredMatch.score, + matches: filteredMatch.matches && filteredMatch.matches.map(match => { + return new Range( + match.startLineNumber - filteredMatch.setting.range.startLineNumber, + match.startColumn, + match.endLineNumber - filteredMatch.setting.range.startLineNumber, + match.endColumn); + }) + }; + }); + builder.pushGroup(settingsGroup); builder.pushLine(','); @@ -731,6 +721,17 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements return fixedMatches; } + private copySetting(setting: ISetting): ISetting { + return { + description: setting.description, + key: setting.key, + value: setting.value, + range: setting.range, + overrides: [], + overrideOf: setting.overrideOf + }; + } + public findValueMatches(filter: string, setting: ISetting): IRange[] { return []; } @@ -756,7 +757,7 @@ export class DefaultSettingsEditorModel extends AbstractSettingsModel implements titleRange: null, sections: [ { - settings: resultGroup.result.filterMatches.map(m => m.setting) + settings: resultGroup.result.filterMatches.map(m => this.copySetting(m.setting)) } ] }; From f4d99af451c01ea439d6e4a692aa98d5c1802b59 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 11:25:22 -0800 Subject: [PATCH 648/710] node-debug@1.20.4 --- build/builtInExtensions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json index f03be115d34..b243154b548 100644 --- a/build/builtInExtensions.json +++ b/build/builtInExtensions.json @@ -1,7 +1,7 @@ [ { "name": "ms-vscode.node-debug", - "version": "1.20.3", + "version": "1.20.4", "repo": "https://github.com/Microsoft/vscode-node-debug" }, { From b7d7b8bdb3eaa599322b3567a0ea876f1f787d7a Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 14:44:33 -0800 Subject: [PATCH 649/710] Settings search - Disable "new extension search" --- .../workbench/parts/preferences/browser/preferencesEditor.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 7daefe613ab..ceb06fd2818 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -374,7 +374,6 @@ class PreferencesRenderersController extends Disposable { private _currentLocalSearchProvider: ISearchProvider; private _currentRemoteSearchProvider: ISearchProvider; - private _currentNewExtensionsSearchProvider: ISearchProvider; private _lastQuery: string; private _lastFilterResult: IFilterOrSearchResult; @@ -437,10 +436,8 @@ class PreferencesRenderersController extends Disposable { } this._currentRemoteSearchProvider = (updateCurrentResults && this._currentRemoteSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query); - this._currentNewExtensionsSearchProvider = (updateCurrentResults && this._currentNewExtensionsSearchProvider) || this.preferencesSearchService.getRemoteSearchProvider(query, true); - this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1, updateCurrentResults) - .then(result => this.filterOrSearchPreferences(query, this._currentNewExtensionsSearchProvider, 'newExtensionsResult', nls.localize('newExtensionsResult', "Marketplace Extension Results"), 2)); + this._remoteFilterInProgress = this.filterOrSearchPreferences(query, this._currentRemoteSearchProvider, 'nlpResult', nls.localize('nlpResult', "Natural Language Results"), 1, updateCurrentResults); return this._remoteFilterInProgress.then(() => { this._remoteFilterInProgress = null; From 02538d0e6309a8a30ac7130d644684659253ca6d Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 14:45:16 -0800 Subject: [PATCH 650/710] Settings search - disable search settings group headers --- .../parts/preferences/browser/preferencesRenderers.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 4a9efa1869d..7a9bf4ce687 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -311,7 +311,7 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR if (filterResult) { this.filteredMatchesRenderer.render(filterResult, this.preferencesModel.settingsGroups); - this.settingsGroupTitleRenderer.render(filterResult.filteredGroups); + this.settingsGroupTitleRenderer.render(null); this.feedbackWidgetRenderer.render(filterResult); this.settingsHeaderRenderer.render(filterResult); this.settingHighlighter.clear(true); @@ -407,12 +407,12 @@ export class BracesHidingRenderer extends Disposable implements HiddenAreasProvi } ]; - const hideBraces = group => { + const hideBraces = (group: ISettingsGroup, hideExtraLine?: boolean) => { // Opening curly brace hiddenAreas.push({ startLineNumber: group.range.startLineNumber - 3, startColumn: 1, - endLineNumber: group.range.startLineNumber - 3, + endLineNumber: group.range.startLineNumber - (hideExtraLine ? 1 : 2), endColumn: 1 }); @@ -425,9 +425,9 @@ export class BracesHidingRenderer extends Disposable implements HiddenAreasProvi }); }; - this._settingsGroups.forEach(hideBraces); + this._settingsGroups.forEach(g => hideBraces(g)); if (this._result) { - this._result.filteredGroups.forEach(hideBraces); + this._result.filteredGroups.forEach((g, i) => hideBraces(g, true)); } // Closing square brace From 3c2082e49ce5992d7a4d80f52862fd4197ccbdde Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 24 Jan 2018 14:56:28 -0800 Subject: [PATCH 651/710] Fix #42111. use Array.concat instead of join. The footprint is larger but concat is faster, especially when array is large. --- .../model/pieceTreeTextBuffer/pieceTreeBase.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts index 3c98e8b6b31..d5497dd4c34 100644 --- a/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts +++ b/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.ts @@ -721,14 +721,17 @@ export class PieceTreeBase { for (let i = 0; i < lineStarts.length; i++) { lineStarts[i] += startOffset + 1; } - (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); + + this._buffers[0].lineStarts = (this._buffers[0].lineStarts).concat(lineStarts.slice(1)); this._buffers[0].buffer += '_' + text; startOffset += 1; } else { - for (let i = 0; i < lineStarts.length; i++) { - lineStarts[i] += startOffset; + if (startOffset !== 0) { + for (let i = 0; i < lineStarts.length; i++) { + lineStarts[i] += startOffset; + } } - (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); + this._buffers[0].lineStarts = (this._buffers[0].lineStarts).concat(lineStarts.slice(1)); this._buffers[0].buffer += text; } @@ -920,7 +923,8 @@ export class PieceTreeBase { // _lastChangeBufferPos is already wrong this._lastChangeBufferPos = { line: this._lastChangeBufferPos.line - 1, column: startOffset - prevStartOffset }; } - (this._buffers[0].lineStarts).push(...lineStarts.slice(1)); + + this._buffers[0].lineStarts = (this._buffers[0].lineStarts).concat(lineStarts.slice(1)); let endIndex = this._buffers[0].lineStarts.length - 1; let endColumn = this._buffers[0].buffer.length - this._buffers[0].lineStarts[endIndex]; let endPos = { line: endIndex, column: endColumn }; From 7da3f166246d20c67a9379f1ae8ef511102c6fde Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 14:53:32 -0800 Subject: [PATCH 652/710] Settings search - enable settings + extension settings search by default --- .../electron-browser/preferencesSearch.ts | 47 +++++++------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index ac34222b586..125ca09a4fd 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -69,13 +69,10 @@ export class PreferencesSearchService extends Disposable implements IPreferences } getRemoteSearchProvider(filter: string, newExtensionsOnly = false): ISearchProvider { - const workbenchSettings = this.configurationService.getValue().workbench.settings; - const opts: IRemoteSearchProviderOptions = { filter, newExtensionsOnly, - endpoint: this._endpoint, - usePost: workbenchSettings.useNaturalLanguageSearchPost + endpoint: this._endpoint }; return this.remoteSearchAllowed && this.instantiationService.createInstance(RemoteSearchProvider, opts, this._installedExtensions); @@ -127,7 +124,6 @@ interface IRemoteSearchProviderOptions { filter: string; endpoint: IEndpointDetails; newExtensionsOnly: boolean; - usePost: boolean; } class RemoteSearchProvider implements ISearchProvider { @@ -138,10 +134,9 @@ class RemoteSearchProvider implements ISearchProvider { @IRequestService private requestService: IRequestService, @ILogService private logService: ILogService ) { - this._remoteSearchP = (this.options.newExtensionsOnly && !this.options.usePost) ? TPromise.wrap(null) : - this.options.filter ? - this.getSettingsFromBing(this.options.filter) : - TPromise.wrap(null); + this._remoteSearchP = this.options.filter ? + this.getSettingsFromBing(this.options.filter) : + TPromise.wrap(null); } searchModel(preferencesModel: ISettingsEditorModel): TPromise { @@ -284,30 +279,20 @@ class RemoteSearchProvider implements ISearchProvider { url += `${API_VERSION}&${QUERY_TYPE}`; } - if (this.options.usePost) { - const filters = this.options.newExtensionsOnly ? - [`diminish eq 'latest'`] : - await this.getVersionFilters(buildNumber); + const filters = this.options.newExtensionsOnly ? + [`diminish eq 'latest'`] : + await this.getVersionFilters(buildNumber); - const filterStr = encodeURIComponent(filters.join(' or ')); - const body = JSON.stringify({ - query: encodedQuery, - filters: filterStr - }); + const filterStr = encodeURIComponent(filters.join(' or ')); + const body = JSON.stringify({ + query: encodedQuery, + filters: filterStr + }); - return { - url, - body - }; - } else { - url += `query=${encodedQuery}`; - - if (buildNumber) { - url += `&build=${buildNumber}`; - } - } - - return TPromise.wrap({ url }); + return { + url, + body + }; } private getVersionFilters(buildNumber?: number): TPromise { From 3a4242ea854ac20081574af48eef7f0f22f5a14b Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 15:04:30 -0800 Subject: [PATCH 653/710] Settings search - tweak hidden lines --- .../workbench/parts/preferences/browser/preferencesRenderers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 7a9bf4ce687..5db633e7ed6 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -412,7 +412,7 @@ export class BracesHidingRenderer extends Disposable implements HiddenAreasProvi hiddenAreas.push({ startLineNumber: group.range.startLineNumber - 3, startColumn: 1, - endLineNumber: group.range.startLineNumber - (hideExtraLine ? 1 : 2), + endLineNumber: group.range.startLineNumber - (hideExtraLine ? 1 : 3), endColumn: 1 }); From 69c4f486ef6450f661fa7728780c9bbf13ddc680 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 15:34:51 -0800 Subject: [PATCH 654/710] Fix failing test - VariableResolver constructor fails accessing this.envVariables --- .../electron-browser/configurationResolverService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index 9863b0dbfad..664df71fe85 100644 --- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -34,6 +34,7 @@ class VariableResolver { private workspaceContextService: IWorkspaceContextService ) { if (isWindows) { + this.envVariables = {}; Object.keys(envVariables).forEach(key => { this.envVariables[key.toLowerCase()] = envVariables[key]; }); From 501bafd0169b5256fb61e33732f8dfd84194e897 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 17 Jan 2018 18:23:26 -0800 Subject: [PATCH 655/710] Add command to edit the focused setting in settings editor Fix #42124 --- .../preferences/browser/preferencesEditor.ts | 35 +++++++++++++++++- .../browser/preferencesRenderers.ts | 37 +++++++++++++++++++ .../parts/preferences/common/preferences.ts | 1 + 3 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index ceb06fd2818..9fbd7a192bd 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -24,7 +24,7 @@ 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, IFilterMetadata, ISearchProvider, ISearchResult + 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, IFilterMetadata, ISearchProvider, ISearchResult, SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING } from 'vs/workbench/parts/preferences/common/preferences'; import { SettingsEditorModel, DefaultSettingsEditorModel } from 'vs/workbench/parts/preferences/common/preferencesModels'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -178,6 +178,10 @@ export class PreferencesEditor extends BaseEditor { } } + public editFocusedPreference(): void { + this.preferencesRenderers.editFocusedPreference(); + } + public setInput(newInput: PreferencesEditorInput, options?: EditorOptions): TPromise { this.defaultSettingsEditorContextKey.set(true); const oldInput = this.input; @@ -488,6 +492,18 @@ class PreferencesRenderersController extends Disposable { this._focusPreference(setting, this._editablePreferencesRenderer); } + editFocusedPreference(): void { + if (!this._settingsNavigator || !this._settingsNavigator.current()) { + return; + } + + const setting = this._settingsNavigator.current(); + const shownInEditableRenderer = this._editablePreferencesRenderer.editPreference(setting); + if (!shownInEditableRenderer) { + this.defaultPreferencesRenderer.editPreference(setting); + } + } + private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { if (preferencesRenderer) { const model = preferencesRenderer.preferencesModel; @@ -1165,3 +1181,20 @@ const focusPreviousSearchResultCommand = new FocusPreviousSearchResultCommand({ kbOpts: { primary: KeyMod.Shift | KeyCode.Enter } }); KeybindingsRegistry.registerCommandAndKeybindingRule(focusPreviousSearchResultCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib())); + +class EditFocusedSettingCommand extends SettingsCommand { + + public runCommand(accessor: ServicesAccessor, args: any): void { + const preferencesEditor = this.getPreferencesEditor(accessor); + if (preferencesEditor) { + preferencesEditor.editFocusedPreference(); + } + } + +} +const editFocusedSettingCommand = new EditFocusedSettingCommand({ + id: SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING, + precondition: CONTEXT_SETTINGS_SEARCH_FOCUS, + kbOpts: { primary: KeyMod.CtrlCmd | KeyCode.US_DOT } +}); +KeybindingsRegistry.registerCommandAndKeybindingRule(editFocusedSettingCommand.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorContrib())); diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 5db633e7ed6..45373e35c5f 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -9,6 +9,7 @@ import { Delayer } from 'vs/base/common/async'; import * as arrays from 'vs/base/common/arrays'; import * as strings from 'vs/base/common/strings'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; +import { Position } from 'vs/editor/common/core/position'; import { IAction } from 'vs/base/common/actions'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import Event, { Emitter } from 'vs/base/common/event'; @@ -36,6 +37,7 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { ITextModel, IModelDeltaDecoration, TrackedRangeStickiness } from 'vs/editor/common/model'; import { CodeLensProviderRegistry, CodeLensProvider, ICodeLensSymbol } from 'vs/editor/common/modes'; import { CancellationToken } from 'vs/base/common/cancellation'; +import { getDomNodePagePosition } from 'vs/base/browser/dom'; export interface IPreferencesRenderer extends IDisposable { readonly preferencesModel: IPreferencesEditorModel; @@ -52,6 +54,7 @@ export interface IPreferencesRenderer extends IDisposable { focusPreference(setting: T): void; clearFocus(setting: T): void; filterPreferences(filterResult: IFilterResult): void; + editPreference(setting: T): boolean; } export class UserSettingsRenderer extends Disposable implements IPreferencesRenderer { @@ -186,6 +189,10 @@ export class UserSettingsRenderer extends Disposable implements IPreferencesRend public clearFocus(setting: ISetting): void { this.settingHighlighter.clear(true); } + + public editPreference(setting: ISetting): boolean { + return this.editSettingActionRenderer.activateOnSetting(setting); + } } export class WorkspaceSettingsRenderer extends UserSettingsRenderer implements IPreferencesRenderer { @@ -377,6 +384,10 @@ export class DefaultSettingsRenderer extends Disposable implements IPreferencesR public updatePreference(key: string, value: any, source: ISetting): void { } + + public editPreference(setting: ISetting): boolean { + return this.editSettingActionRenderer.activateOnSetting(setting); + } } export interface HiddenAreasProvider { @@ -1097,6 +1108,32 @@ class EditSettingRenderer extends Disposable { }); } + public activateOnSetting(setting: ISetting): boolean { + const startLine = setting.keyRange.startLineNumber; + const settings = this.getSettings(startLine); + if (!settings.length) { + return false; + } + + this.editPreferenceWidgetForMouseMove.show(startLine, '', settings); + const actions = this.getActions(this.editPreferenceWidgetForMouseMove.preferences[0], this.getConfigurationsMap()[this.editPreferenceWidgetForMouseMove.preferences[0].key]); + this.contextMenuService.showContextMenu({ + getAnchor: () => this.toAbsoluteCoords(new Position(startLine, 1)), + getActions: () => TPromise.wrap(actions) + }); + + return true; + } + + private toAbsoluteCoords(position: Position): { x: number, y: number } { + const positionCoords = this.editor.getScrolledVisiblePosition(position); + const editorCoords = getDomNodePagePosition(this.editor.getDomNode()); + const x = editorCoords.left + positionCoords.left; + const y = editorCoords.top + positionCoords.top + positionCoords.height; + + return { x, y: y + 10 }; + } + private getConfigurationsMap(): { [qualifiedKey: string]: IConfigurationPropertySchema } { return Registry.as(ConfigurationExtensions.Configuration).getConfigurationProperties(); } diff --git a/src/vs/workbench/parts/preferences/common/preferences.ts b/src/vs/workbench/parts/preferences/common/preferences.ts index 519887d8e01..89ec595b52e 100644 --- a/src/vs/workbench/parts/preferences/common/preferences.ts +++ b/src/vs/workbench/parts/preferences/common/preferences.ts @@ -215,6 +215,7 @@ export const SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS = 'settings.action.cle export const SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING = 'settings.action.focusNextSetting'; export const SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING = 'settings.action.focusPreviousSetting'; export const SETTINGS_EDITOR_COMMAND_FOCUS_FILE = 'settings.action.focusSettingsFile'; +export const SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING = 'settings.action.editFocusedSetting'; export const KEYBINDINGS_EDITOR_COMMAND_SEARCH = 'keybindings.editor.searchKeybindings'; export const KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS = 'keybindings.editor.clearSearchResults'; export const KEYBINDINGS_EDITOR_COMMAND_DEFINE = 'keybindings.editor.defineKeybinding'; From c496f7b61fce457e355c730e7dd40c9f647d3688 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Wed, 24 Jan 2018 15:44:15 -0800 Subject: [PATCH 656/710] Display enabled extension information in Issue Reporter --- .../issue/issueReporterMain.ts | 136 +++++++++++------- .../issue/issueReporterModel.ts | 59 +++++++- .../issue/issueReporterPage.ts | 12 ++ src/vs/code/electron-main/app.ts | 6 - src/vs/code/electron-main/diagnostics.ts | 1 - .../environment/common/environment.ts | 1 - src/vs/platform/environment/node/argv.ts | 2 - .../environment/node/environmentService.ts | 1 - src/vs/platform/issue/common/issue.ts | 8 +- src/vs/platform/issue/common/issueIpc.ts | 8 +- .../issue/electron-main/issueService.ts | 20 +-- src/vs/workbench/electron-browser/actions.ts | 48 ++++--- 12 files changed, 201 insertions(+), 101 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 67bb4b64a23..79e51813d01 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -9,6 +9,7 @@ import 'vs/css!./media/issueReporter'; import { shell, ipcRenderer, webFrame, remote } from 'electron'; import { localize } from 'vs/nls'; import { $ } from 'vs/base/browser/dom'; +import * as collections from 'vs/base/common/collections'; import * as browser from 'vs/base/browser/browser'; import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; @@ -28,11 +29,16 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties'; import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; -import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel'; -import { IssueReporterStyles } from 'vs/platform/issue/common/issue'; +import { IssueReporterModel, IssueType } from 'vs/code/electron-browser/issue/issueReporterModel'; +import { IssueReporterData, IssueReporterStyles } from 'vs/platform/issue/common/issue'; import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage'; +import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; -export function startup(configuration: IWindowConfiguration) { +export interface IssueReporterConfiguration extends IWindowConfiguration { + data: IssueReporterData; +} + +export function startup(configuration: IssueReporterConfiguration) { document.body.innerHTML = BaseHtml(); const issueReporter = new IssueReporter(configuration); @@ -48,25 +54,21 @@ export class IssueReporter extends Disposable { private telemetryService: ITelemetryService; private issueReporterModel: IssueReporterModel; - constructor(configuration: IWindowConfiguration) { + constructor(configuration: IssueReporterConfiguration) { super(); this.issueReporterModel = new IssueReporterModel({ - issueType: 0, + issueType: IssueType.Bug, includeSystemInfo: true, includeWorkspaceInfo: true, includeProcessInfo: true, + includeExtensions: true, versionInfo: { vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, os: `${os.type()} ${os.arch()} ${os.release()}` } }); - ipcRenderer.on('issueStyleResponse', (event, styles: IssueReporterStyles) => { - this.applyZoom(styles.zoomLevel); - this.applyStyles(styles); - }); - ipcRenderer.on('issueInfoResponse', (event, info) => { this.issueReporterModel.update(info); @@ -78,7 +80,6 @@ export class IssueReporter extends Disposable { }); ipcRenderer.send('issueInfoRequest'); - ipcRenderer.send('issueStyleRequest'); this.initServices(configuration); this.setEventHandlers(); @@ -86,6 +87,10 @@ export class IssueReporter extends Disposable { if (window.document.documentElement.lang !== 'en') { show(document.getElementById('english')); } + + this.applyZoom(configuration.data.zoomLevel); + this.applyStyles(configuration.data.styles); + this.handleExtensionData(configuration.data.enabledExtensions); } render(): void { @@ -153,6 +158,18 @@ export class IssueReporter extends Disposable { document.body.style.color = styles.color; } + private handleExtensionData(extensions: ILocalExtension[]) { + const { nonThemes, themes } = collections.groupBy(extensions, ext => { + const manifestKeys = ext.manifest.contributes ? Object.keys(ext.manifest.contributes) : []; + const onlyTheme = !ext.manifest.activationEvents && manifestKeys.length === 1 && manifestKeys[0] === 'themes'; + return onlyTheme ? 'themes' : 'nonThemes'; + }); + + const numberOfThemeExtesions = themes && themes.length; + this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes }); + this.updateExtensionTable(nonThemes, numberOfThemeExtesions); + } + private initServices(configuration: IWindowConfiguration): void { const serviceCollection = new ServiceCollection(); const mainProcessClient = new ElectronIPCClient(String(`window${configuration.windowId}`)); @@ -187,19 +204,11 @@ export class IssueReporter extends Disposable { this.render(); }); - document.getElementById('includeSystemInfo').addEventListener('click', (event: Event) => { - event.stopPropagation(); - this.issueReporterModel.update({ includeSystemInfo: !this.issueReporterModel.getData().includeSystemInfo }); - }); - - document.getElementById('includeProcessInfo').addEventListener('click', (event: Event) => { - event.stopPropagation(); - this.issueReporterModel.update({ includeProcessInfo: !this.issueReporterModel.getData().includeSystemInfo }); - }); - - document.getElementById('includeWorkspaceInfo').addEventListener('click', (event: Event) => { - event.stopPropagation(); - this.issueReporterModel.update({ includeWorkspaceInfo: !this.issueReporterModel.getData().includeWorkspaceInfo }); + ['includeSystemInfo', 'includeProcessInfo', 'includeWorkspaceInfo', 'includeExtensions'].forEach(elementId => { + document.getElementById(elementId).addEventListener('click', (event: Event) => { + event.stopPropagation(); + this.issueReporterModel.update({ [elementId]: !this.issueReporterModel.getData()[elementId] }); + }); }); document.getElementById('description').addEventListener('blur', (event: Event) => { @@ -261,35 +270,34 @@ export class IssueReporter extends Disposable { const systemBlock = document.querySelector('.block-system'); const processBlock = document.querySelector('.block-process'); const workspaceBlock = document.querySelector('.block-workspace'); + const extensionsBlock = document.querySelector('.block-extensions'); const descriptionTitle = document.getElementById('issue-description-label'); const descriptionSubtitle = document.getElementById('issue-description-subtitle'); - // 1 - Bug - if (issueType === 0) { + if (issueType === IssueType.Bug) { show(systemBlock); hide(processBlock); hide(workspaceBlock); + show(extensionsBlock); descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} *`; show(descriptionSubtitle); descriptionSubtitle.innerHTML = localize('bugDescription', "How did you encounter this problem? Please provide clear steps to reproduce the problem during our investigation. What did you expect to happen and what actually did happen?"); - } - // 2 - Perf Issue - else if (issueType === 1) { + } else if (issueType === IssueType.PerformanceIssue) { show(systemBlock); show(processBlock); show(workspaceBlock); + show(extensionsBlock); descriptionTitle.innerHTML = `${localize('stepsToReproduce', "Steps to Reproduce")} *`; show(descriptionSubtitle); descriptionSubtitle.innerHTML = localize('performanceIssueDesciption', "When did this performance issue happen? For example, does it occur on startup or after a specific series of actions? Any details you can provide help our investigation."); - } - // 3 - Feature Request - else { + } else { hide(systemBlock); hide(processBlock); hide(workspaceBlock); + hide(extensionsBlock); descriptionTitle.innerHTML = `${localize('description', "Description")} *`; hide(descriptionSubtitle); @@ -367,10 +375,10 @@ export class IssueReporter extends Disposable { let tableHtml = ''; Object.keys(state.systemInfo).forEach(k => { tableHtml += ` - - ${k} - ${state.systemInfo[k]} -`; + + ${k} + ${state.systemInfo[k]} + `; }); target.innerHTML = `${tableHtml}
    `; } @@ -379,28 +387,58 @@ export class IssueReporter extends Disposable { const target = document.querySelector('.block-process .block-info'); let tableHtml = ` - - pid - CPU % - Memory (MB) - Name - -`; + + pid + CPU % + Memory (MB) + Name + `; + state.processInfo.forEach(p => { tableHtml += ` - - ${p.pid} - ${p.cpu} - ${p.memory} - ${p.name} -`; + + ${p.pid} + ${p.cpu} + ${p.memory} + ${p.name} + `; }); + target.innerHTML = `${tableHtml}
    `; } private updateWorkspaceInfo = (state) => { document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; } + + private updateExtensionTable(extensions: ILocalExtension[], numThemeExtensions: number): void { + const target = document.querySelector('.block-extensions .block-info'); + const themeExclusionStr = numThemeExtensions ? `\n(${numThemeExtensions} theme extensions excluded)` : ''; + extensions = extensions || []; + + if (!extensions.length) { + target.innerHTML = 'Extensions: none' + themeExclusionStr; + return; + } + + let table = ` + + Extension + Author (truncated) + Version + `; + + extensions.forEach(extension => { + table += ` + + ${extension.manifest.name} + ${extension.manifest.publisher.substr(0, 3)} + ${extension.manifest.version} + `; + }); + + target.innerHTML = `${table}
    ${themeExclusionStr}`; + } } // helper functions diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index ab6facf3a25..9fc265a4f7f 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -6,9 +6,16 @@ 'use strict'; import { assign } from 'vs/base/common/objects'; +import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; + +export enum IssueType { + Bug, + PerformanceIssue, + FeatureRequest +} export interface IssueReporterData { - issueType?: number; + issueType?: IssueType; issueDescription?: string; versionInfo?: any; systemInfo?: any; @@ -17,6 +24,9 @@ export interface IssueReporterData { includeSystemInfo?: boolean; includeWorkspaceInfo?: boolean; includeProcessInfo?: boolean; + includeExtensions?: boolean; + numberOfThemeExtesions?: number; + enabledNonThemeExtesions?: ILocalExtension[]; } export class IssueReporterModel { @@ -55,9 +65,9 @@ ${this.getInfos()} } private getIssueTypeTitle(): string { - if (this._data.issueType === 0) { + if (this._data.issueType === IssueType.Bug) { return 'Bug'; - } else if (this._data.issueType === 1) { + } else if (this._data.issueType === IssueType.PerformanceIssue) { return 'Performance Issue'; } else { return 'Feature Request'; @@ -71,8 +81,13 @@ ${this.getInfos()} info += this.generateSystemInfoMd(); } - // For perf issue, add process info and workspace info too - if (this._data.issueType === 1) { + if (this._data.issueType === IssueType.Bug) { + if (this._data.includeExtensions) { + info += this.generateExtensionsMd(); + } + } + + if (this._data.issueType === IssueType.PerformanceIssue) { if (this._data.includeProcessInfo) { info += this.generateProcessInfoMd(); @@ -81,6 +96,10 @@ ${this.getInfos()} if (this._data.includeWorkspaceInfo) { info += this.generateWorkspaceInfoMd(); } + + if (this._data.includeExtensions) { + info += this.generateExtensionsMd(); + } } return info; @@ -131,4 +150,34 @@ ${this._data.workspaceInfo};
    `; } + + private generateExtensionsMd(): string { + const themeExclusionStr = this._data.numberOfThemeExtesions ? `\n(${this._data.numberOfThemeExtesions} theme extensions excluded)` : ''; + + if (!this._data.enabledNonThemeExtesions) { + return 'Extensions: none' + themeExclusionStr; + } + + let tableHeader = `Extension|Author (truncated)|Version +---|---|---`; + const table = this._data.enabledNonThemeExtesions.map(e => { + return `${e.manifest.name}|${e.manifest.publisher.substr(0, 3)}|${e.manifest.version}`; + }).join('\n'); + + const extensionTable = `
    Extensions (${this._data.enabledNonThemeExtesions.length}) + +${tableHeader} +${table} +${themeExclusionStr} + +
    `; + + // 2000 chars is browsers de-facto limit for URLs, 400 chars are allowed for other string parts of the issue URL + // http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers + if (encodeURIComponent(extensionTable).length > 1600) { + return 'the listing length exceeds browsers\' URL characters limit'; + } + + return extensionTable; + } } \ No newline at end of file diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index 85bf92331c3..2065544ff09 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -81,6 +81,18 @@ export default (): string => `
    +
    +
    + ${escape(localize('extensions', "Extensions"))} + + + + +
    + +
    +
    +
    diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 64c73d5b91c..06ce9b9d2f0 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -452,12 +452,6 @@ export class CodeApplication { // Start shared process here this.sharedProcess.spawn(); - - // Launch Issue BrowserWindow if --issue is specified - if (this.environmentService.args.issue) { - const issueService = accessor.get(IIssueService); - issueService.openReporter(); - } } private dispose(): void { diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index cfab99c860a..926ce809c15 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -215,7 +215,6 @@ function getProcessList(info: IMainProcessInfo, rootProcess: ProcessItem): Proce info.windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title)); const processes: ProcessInfo[] = []; - getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); if (rootProcess) { getProcessItem(mapPidToWindowTitle, processes, rootProcess, 0); diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts index 7bd8700a868..7af1337322a 100644 --- a/src/vs/platform/environment/common/environment.ts +++ b/src/vs/platform/environment/common/environment.ts @@ -12,7 +12,6 @@ export interface ParsedArgs { help?: boolean; version?: boolean; status?: boolean; - issue?: boolean; wait?: boolean; waitMarkerFilePath?: string; diff?: boolean; diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index fade5e83e1a..967ad4ab533 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -74,7 +74,6 @@ const options: minimist.Opts = { 'new-window': 'n', 'reuse-window': 'r', performance: 'p', - 'issue': 'i', 'disable-extensions': 'disableExtensions', 'extensions-dir': 'extensionHomePath', 'debugPluginHost': 'inspect-extensions', @@ -168,7 +167,6 @@ const troubleshootingHelp: { [name: string]: string; } = { '--inspect-brk-extensions': localize('inspect-brk-extensions', "Allow debugging and profiling of extensions with the extension host being paused after start. Check the developer tools for the connection uri."), '--disable-gpu': localize('disableGPU', "Disable GPU hardware acceleration."), '--upload-logs': localize('uploadLogs', "Uploads logs from current session to a secure endpoint."), - '-i, --issue': localize('issue', "Report an issue."), }; export function formatOptions(options: { [name: string]: string; }, columns: number): string { diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index fcc62b80c75..f70b6e81a5a 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -156,7 +156,6 @@ export class EnvironmentService implements IEnvironmentService { get performance(): boolean { return this._args.performance; } get status(): boolean { return this._args.status; } - get issue(): boolean { return this._args.issue; } @memoize get mainIPCHandle(): string { return getIPCHandle(this.userDataPath, 'main'); } diff --git a/src/vs/platform/issue/common/issue.ts b/src/vs/platform/issue/common/issue.ts index 5d43f4e5c4a..1f80ba156b7 100644 --- a/src/vs/platform/issue/common/issue.ts +++ b/src/vs/platform/issue/common/issue.ts @@ -7,6 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; export const ID = 'issueService'; export const IIssueService = createDecorator(ID); @@ -23,10 +24,15 @@ export interface IssueReporterStyles { buttonBackground: string; buttonForeground: string; buttonHoverBackground: string; +} + +export interface IssueReporterData { + styles: IssueReporterStyles; zoomLevel: number; + enabledExtensions: ILocalExtension[]; } export interface IIssueService { _serviceBrand: any; - openReporter(theme?: IssueReporterStyles): TPromise; + openReporter(data: IssueReporterData): TPromise; } \ No newline at end of file diff --git a/src/vs/platform/issue/common/issueIpc.ts b/src/vs/platform/issue/common/issueIpc.ts index f9f05c05ede..99d73534b5e 100644 --- a/src/vs/platform/issue/common/issueIpc.ts +++ b/src/vs/platform/issue/common/issueIpc.ts @@ -7,10 +7,10 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IChannel } from 'vs/base/parts/ipc/common/ipc'; -import { IIssueService, IssueReporterStyles } from './issue'; +import { IIssueService, IssueReporterData } from './issue'; export interface IIssueChannel extends IChannel { - call(command: 'openIssueReporter', arg: IssueReporterStyles): TPromise; + call(command: 'openIssueReporter', arg: IssueReporterData): TPromise; call(command: 'getStatusInfo'): TPromise; call(command: string, arg?: any): TPromise; } @@ -34,7 +34,7 @@ export class IssueChannelClient implements IIssueService { constructor(private channel: IIssueChannel) { } - openReporter(theme: IssueReporterStyles): TPromise { - return this.channel.call('openIssueReporter', theme); + openReporter(data: IssueReporterData): TPromise { + return this.channel.call('openIssueReporter', data); } } \ No newline at end of file diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 096aec418c8..238605a9c65 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -7,7 +7,7 @@ import { TPromise, Promise } from 'vs/base/common/winjs.base'; import { localize } from 'vs/nls'; -import { IIssueService, IssueReporterStyles } from 'vs/platform/issue/common/issue'; +import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue'; import { BrowserWindow, ipcMain } from 'electron'; import { ILaunchService } from 'vs/code/electron-main/launch'; import { buildDiagnostics, DiagnosticInfo } from 'vs/code/electron-main/diagnostics'; @@ -25,31 +25,24 @@ export class IssueService implements IIssueService { @ILaunchService private launchService: ILaunchService ) { } - openReporter(theme?: IssueReporterStyles): TPromise { + openReporter(data: IssueReporterData): TPromise { ipcMain.on('issueInfoRequest', event => { this.getStatusInfo().then(msg => { event.sender.send('issueInfoResponse', msg); }); }); - // When launching from cli, no theme is provided. Match theme if passed from workbench. - if (theme) { - ipcMain.on('issueStyleRequest', event => { - event.sender.send('issueStyleResponse', theme); - }); - } - this._issueWindow = new BrowserWindow({ width: 800, height: 900, title: localize('issueReporter', "Issue Reporter"), parent: BrowserWindow.getFocusedWindow(), - backgroundColor: theme && theme.backgroundColor || DEFAULT_BACKGROUND_COLOR + backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR }); this._issueWindow.setMenuBarVisibility(false); // workaround for now, until a menu is implemented - this._issueWindow.loadURL(this.getIssueReporterPath()); + this._issueWindow.loadURL(this.getIssueReporterPath(data)); return TPromise.as(null); } @@ -68,12 +61,13 @@ export class IssueService implements IIssueService { }); } - private getIssueReporterPath() { + private getIssueReporterPath(data: IssueReporterData) { const config = { appRoot: this.environmentService.appRoot, nodeCachedDataDir: this.environmentService.nodeCachedDataDir, windowId: this._issueWindow.id, - machineId: this.machineId + machineId: this.machineId, + data }; return `${require.toUrl('vs/code/electron-browser/issue/issueReporter.html')}?config=${encodeURIComponent(JSON.stringify(config))}`; } diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 8d7c147db61..e45ec3cff94 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -755,29 +755,41 @@ export class OpenIssueReporterAction extends Action { id: string, label: string, @IIssueService private issueService: IIssueService, - @IThemeService private themeService: IThemeService + @IThemeService private themeService: IThemeService, + @IExtensionManagementService private extensionManagementService: IExtensionManagementService, + @IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService ) { super(id, label); } public run(): TPromise { - const theme = this.themeService.getTheme(); - const style = { - backgroundColor: theme.getColor(SIDE_BAR_BACKGROUND) && theme.getColor(SIDE_BAR_BACKGROUND).toString(), - color: theme.getColor(foreground).toString(), - textLinkColor: theme.getColor(textLinkForeground) && theme.getColor(textLinkForeground).toString(), - inputBackground: theme.getColor(inputBackground) && theme.getColor(inputBackground).toString(), - inputForeground: theme.getColor(inputForeground) && theme.getColor(inputForeground).toString(), - inputBorder: theme.getColor(inputBorder) && theme.getColor(inputBorder).toString(), - inputActiveBorder: theme.getColor(inputActiveOptionBorder) && theme.getColor(inputActiveOptionBorder).toString(), - inputErrorBorder: theme.getColor(inputValidationErrorBorder) && theme.getColor(inputValidationErrorBorder).toString(), - buttonBackground: theme.getColor(buttonBackground) && theme.getColor(buttonBackground).toString(), - buttonForeground: theme.getColor(buttonForeground) && theme.getColor(buttonForeground).toString(), - buttonHoverBackground: theme.getColor(buttonHoverBackground) && theme.getColor(buttonHoverBackground).toString(), - zoomLevel: webFrame.getZoomLevel() - }; - return this.issueService.openReporter(style).then(() => { - return TPromise.as(true); + return this.extensionManagementService.getInstalled(LocalExtensionType.User).then(extensions => { + const enabledExtensions = extensions.filter(extension => this.extensionEnablementService.isEnabled(extension.identifier)); + const theme = this.themeService.getTheme(); + const styles = { + backgroundColor: theme.getColor(SIDE_BAR_BACKGROUND) && theme.getColor(SIDE_BAR_BACKGROUND).toString(), + color: theme.getColor(foreground).toString(), + textLinkColor: theme.getColor(textLinkForeground) && theme.getColor(textLinkForeground).toString(), + inputBackground: theme.getColor(inputBackground) && theme.getColor(inputBackground).toString(), + inputForeground: theme.getColor(inputForeground) && theme.getColor(inputForeground).toString(), + inputBorder: theme.getColor(inputBorder) && theme.getColor(inputBorder).toString(), + inputActiveBorder: theme.getColor(inputActiveOptionBorder) && theme.getColor(inputActiveOptionBorder).toString(), + inputErrorBorder: theme.getColor(inputValidationErrorBorder) && theme.getColor(inputValidationErrorBorder).toString(), + buttonBackground: theme.getColor(buttonBackground) && theme.getColor(buttonBackground).toString(), + buttonForeground: theme.getColor(buttonForeground) && theme.getColor(buttonForeground).toString(), + buttonHoverBackground: theme.getColor(buttonHoverBackground) && theme.getColor(buttonHoverBackground).toString(), + zoomLevel: webFrame.getZoomLevel(), + extensions + }; + const issueReporterData = { + styles, + zoomLevel: webFrame.getZoomLevel(), + enabledExtensions + }; + + return this.issueService.openReporter(issueReporterData).then(() => { + return TPromise.as(true); + }); }); } } From 322b391a034ae88f6e237c0fc652ace550ad447b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 12:50:37 -0800 Subject: [PATCH 657/710] Adding status bar zoom control --- .../ui/resourceviewer/resourceViewer.ts | 154 +++++++++++++++--- 1 file changed, 130 insertions(+), 24 deletions(-) diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts index 1cc85d0ae29..286f893c481 100644 --- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts +++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts @@ -16,6 +16,17 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle import { LRUCache } from 'vs/base/common/map'; import { Schemas } from 'vs/base/common/network'; import { clamp } from 'vs/base/common/numbers'; +import { Themable } from 'vs/workbench/common/theme'; +import { IStatusbarItem, StatusbarItemDescriptor, IStatusbarRegistry, Extensions, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar'; +import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; +import { } from 'vs/platform/workspace/common/workspace'; +import { IDisposable } from 'vs/base/common/lifecycle'; +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { Registry } from 'vs/platform/registry/common/platform'; +import { TPromise } from 'vs/base/common/winjs.base'; +import { Action } from 'vs/base/common/actions'; +import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; +import { memoize } from 'vs/base/common/decorators'; interface MapExtToMediaMimes { [index: string]: string; @@ -236,8 +247,91 @@ class GenericBinaryFileView { } } +type Scale = number | 'fit'; + +class ZoomStatusbarItem extends Themable implements IStatusbarItem { + showTimeout: number; + public static instance: ZoomStatusbarItem; + + private statusBarItem: HTMLElement; + + private onSelectScale?: (scale: Scale) => void; + + constructor( + @IContextMenuService private contextMenuService: IContextMenuService, + @IEditorGroupService editorGroupService: IEditorGroupService, + @IThemeService themeService: IThemeService + ) { + super(themeService); + ZoomStatusbarItem.instance = this; + this.toUnbind.push(editorGroupService.onEditorsChanged(() => this.onEditorsChanged())); + } + + private onEditorsChanged(): void { + this.hide(); + this.onSelectScale = undefined; + } + + public show(scale: Scale, onSelectScale: (scale: number) => void) { + clearTimeout(this.showTimeout); + this.showTimeout = setTimeout(() => { + this.onSelectScale = onSelectScale; + this.statusBarItem.style.display = 'block'; + this.updateLabel(scale); + }, 0); + } + + public hide() { + this.statusBarItem.style.display = 'none'; + } + + public render(container: HTMLElement): IDisposable { + if (!this.statusBarItem && container) { + this.statusBarItem = $(container).a() + .addClass('.zoom-statusbar-item') + .on('click', () => { + this.contextMenuService.showContextMenu({ + getAnchor: () => container, + getActions: () => TPromise.as(this.zoomActions) + }); + }) + .getHTMLElement(); + this.statusBarItem.style.display = 'none'; + } + return this; + } + + private updateLabel(scale: Scale) { + this.statusBarItem.textContent = scale === 'fit' + ? nls.localize('zoom.fit.label', 'Fit') + : `${+(scale * 100).toFixed(2)}%`; + } + + @memoize + private get zoomActions(): Action[] { + const scales: Scale[] = [10, 5, 2, 1, 0.5, 0.25, 'fit']; + return scales.map(scale => + new Action('zoom.' + scale, ZoomStatusbarItem.zoomActionLabel(scale), undefined, undefined, () => { + if (this.onSelectScale) { + this.onSelectScale(scale); + } + return null; + })); + } + + private static zoomActionLabel(scale: Scale): string { + return scale === 'fit' + ? nls.localize('zoom.action.fit.label', 'Reset') + : `${+(scale * 100).toFixed(2)}%`; + } +} + +Registry.as(Extensions.Statusbar).registerStatusbarItem( + new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, -1) +); + class InlineImageView { - private static readonly SCALE_PINCH_FACTOR = 0.1; + private static readonly SCALE_PINCH_FACTOR = 0.05; private static readonly SCALE_FACTOR = 1.5; private static readonly MAX_SCALE = 20; private static readonly MIN_SCALE = 0.1; @@ -274,42 +368,54 @@ class InlineImageView { .addClass('image', 'zoom-in') .img({ src: InlineImageView.imageSrc(descriptor) }) .addClass('untouched') + .on(DOM.EventType.BLUR, () => { + ZoomStatusbarItem.instance.hide(); + }) .on(DOM.EventType.LOAD, (e, img) => { - const imgElement = img.getHTMLElement(); + const imgElement = img.getHTMLElement() as HTMLImageElement; const cacheKey = descriptor.resource.toString(); let scaleDirection = ScaleDirection.IN; - let scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || null; + let scale: Scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || 'fit'; if (scale) { img.removeClass('untouched'); updateScale(scale); } + ZoomStatusbarItem.instance.show(scale || 'fit', updateScale); + function setImageWidth(width) { img.style('width', `${width}px`); img.style('height', 'auto'); } - function updateScale(newScale) { - scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE); - if (scale >= InlineImageView.PIXELATION_THRESHOLD) { - img.addClass('pixelated'); + function updateScale(newScale: Scale) { + if (newScale === 'fit') { + scale = 'fit'; + img.addClass('untouched'); + img.style('width', 'auto'); + InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); } else { - img.removeClass('pixelated'); + scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE); + if (scale >= InlineImageView.PIXELATION_THRESHOLD) { + img.addClass('pixelated'); + } else { + img.removeClass('pixelated'); + } + img.removeClass('untouched'); + setImageWidth(Math.floor(imgElement.naturalWidth * scale)); + InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); } - setImageWidth(Math.floor(imgElement.naturalWidth * scale)); - InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); + ZoomStatusbarItem.instance.show(scale, updateScale); scrollbar.scanDomNode(); updateMetadata(); } function updateMetadata() { if (metadataClb) { - const scale = Math.round((imgElement.width / imgElement.naturalWidth) * 10000) / 100; - metadataClb(nls.localize('imgMeta', '{0}% {1}x{2} {3}', scale, imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); + metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); } } context.layout = updateMetadata; function firstZoom() { const { clientWidth, naturalWidth } = imgElement; setImageWidth(clientWidth); - img.removeClass('untouched'); scale = clientWidth / naturalWidth; } $(container) @@ -326,18 +432,15 @@ class InlineImageView { } }); $(container).on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { - if (scale === null) { - firstZoom(); - } - // right click - if (e.button === 2) { - updateScale(1); - } - else { + // left click + if (e.button === 0) { + if (scale === 'fit') { + firstZoom(); + } const scaleFactor = scaleDirection === ScaleDirection.IN ? InlineImageView.SCALE_FACTOR : 1 / InlineImageView.SCALE_FACTOR; - updateScale(scale * scaleFactor); + updateScale(scale as number * scaleFactor); } }); $(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => { @@ -345,16 +448,17 @@ class InlineImageView { if (!e.ctrlKey) { return; } - if (scale === null) { + if (scale === 'fit') { firstZoom(); } // scrolling up, pinching out should increase the scale const delta = -e.deltaY; - updateScale(scale + delta * InlineImageView.SCALE_PINCH_FACTOR); + updateScale(scale as number + delta * InlineImageView.SCALE_PINCH_FACTOR); }); updateMetadata(); scrollbar.scanDomNode(); }); + return context; } @@ -379,3 +483,5 @@ class InlineImageView { return cached.src; } } + + From 5e4ca4354e81c6e8d299cf3f59c758d6174f451f Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 12:53:25 -0800 Subject: [PATCH 658/710] Move resource viwer into workbench --- src/vs/workbench/browser/parts/editor/binaryEditor.ts | 2 +- .../browser/parts}/resourceviewer/resourceViewer.ts | 0 .../browser/parts}/resourceviewer/resourceviewer.css | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/vs/{base/browser/ui => workbench/browser/parts}/resourceviewer/resourceViewer.ts (100%) rename src/vs/{base/browser/ui => workbench/browser/parts}/resourceviewer/resourceviewer.css (100%) diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index 8d4b64f9f4b..a36becdf872 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -10,7 +10,6 @@ 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 { ResourceViewer, ResourceViewerContext } from 'vs/base/browser/ui/resourceviewer/resourceViewer'; import { EditorModel, EditorInput, EditorOptions } from 'vs/workbench/common/editor'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel'; @@ -19,6 +18,7 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle 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/resourceviewer/resourceViewer'; /* * This class is only intended to be subclassed and not instantiated. diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts similarity index 100% rename from src/vs/base/browser/ui/resourceviewer/resourceViewer.ts rename to src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts diff --git a/src/vs/base/browser/ui/resourceviewer/resourceviewer.css b/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css similarity index 100% rename from src/vs/base/browser/ui/resourceviewer/resourceviewer.css rename to src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css From 0b2d6168285a82a578bda4acc1bbb868ec4ea86a Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 12:55:22 -0800 Subject: [PATCH 659/710] More desriptive name for scale to fit --- .../browser/parts/resourceviewer/resourceViewer.ts | 8 ++++---- .../browser/parts/resourceviewer/resourceviewer.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 286f893c481..784e0debdf5 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -367,7 +367,7 @@ class InlineImageView { .empty() .addClass('image', 'zoom-in') .img({ src: InlineImageView.imageSrc(descriptor) }) - .addClass('untouched') + .addClass('scale-to-fit') .on(DOM.EventType.BLUR, () => { ZoomStatusbarItem.instance.hide(); }) @@ -377,7 +377,7 @@ class InlineImageView { let scaleDirection = ScaleDirection.IN; let scale: Scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || 'fit'; if (scale) { - img.removeClass('untouched'); + img.removeClass('scale-to-fit'); updateScale(scale); } ZoomStatusbarItem.instance.show(scale || 'fit', updateScale); @@ -389,7 +389,7 @@ class InlineImageView { function updateScale(newScale: Scale) { if (newScale === 'fit') { scale = 'fit'; - img.addClass('untouched'); + img.addClass('scale-to-fit'); img.style('width', 'auto'); InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); } else { @@ -399,7 +399,7 @@ class InlineImageView { } else { img.removeClass('pixelated'); } - img.removeClass('untouched'); + img.removeClass('scale-to-fit'); setImageWidth(Math.floor(imgElement.naturalWidth * scale)); InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); } diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css b/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css index 1f7b897d6b8..308e97b5c93 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css @@ -39,7 +39,7 @@ image-rendering: pixelated; } -.monaco-resource-viewer img.untouched { +.monaco-resource-viewer img.scale-to-fit { max-width: 100%; object-fit: contain; } From fb51bc765d7f57a4ec4aabb75f5b7366ef57bbca Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 12:56:11 -0800 Subject: [PATCH 660/710] Use click instead of mouse down --- src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 784e0debdf5..3565413fe37 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -431,7 +431,7 @@ class InlineImageView { c.removeClass('zoom-out').addClass('zoom-in'); } }); - $(container).on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { + $(container).on(DOM.EventType.CLICK, (e: MouseEvent) => { // left click if (e.button === 0) { if (scale === 'fit') { From 9d928c96d9e49d08ce7ce832bc1783fb8f74df4c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 12:56:46 -0800 Subject: [PATCH 661/710] Never pixelate scale to fit image --- src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 3565413fe37..9548ff0dc5f 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -390,6 +390,7 @@ class InlineImageView { if (newScale === 'fit') { scale = 'fit'; img.addClass('scale-to-fit'); + img.removeClass('pixelated'); img.style('width', 'auto'); InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); } else { From 78da1821ea9a87064a61f688e406767fb4e00158 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 15:03:10 -0800 Subject: [PATCH 662/710] Continue working on zoom --- .../parts/resourceviewer/resourceViewer.ts | 51 +++++++++++++------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 9548ff0dc5f..c4f2382b213 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -382,8 +382,8 @@ class InlineImageView { } ZoomStatusbarItem.instance.show(scale || 'fit', updateScale); - function setImageWidth(width) { - img.style('width', `${width}px`); + function setImageScale(scale: number) { + img.style('width', `${(imgElement.naturalWidth * scale)}px`); img.style('height', 'auto'); } function updateScale(newScale: Scale) { @@ -401,7 +401,7 @@ class InlineImageView { img.removeClass('pixelated'); } img.removeClass('scale-to-fit'); - setImageWidth(Math.floor(imgElement.naturalWidth * scale)); + setImageScale(scale); InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); } ZoomStatusbarItem.instance.show(scale, updateScale); @@ -415,9 +415,8 @@ class InlineImageView { } context.layout = updateMetadata; function firstZoom() { - const { clientWidth, naturalWidth } = imgElement; - setImageWidth(clientWidth); - scale = clientWidth / naturalWidth; + scale = imgElement.clientWidth / imgElement.naturalWidth; + setImageScale(scale); } $(container) .on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => { @@ -428,21 +427,33 @@ class InlineImageView { }) .on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => { if (!e.altKey) { - scaleDirection = ScaleDirection.IN; c.removeClass('zoom-out').addClass('zoom-in'); } }); $(container).on(DOM.EventType.CLICK, (e: MouseEvent) => { - // left click - if (e.button === 0) { - if (scale === 'fit') { - firstZoom(); - } - const scaleFactor = scaleDirection === ScaleDirection.IN - ? InlineImageView.SCALE_FACTOR - : 1 / InlineImageView.SCALE_FACTOR; - updateScale(scale as number * scaleFactor); + if (e.button !== 0) { + return; } + // left click + if (scale === 'fit') { + firstZoom(); + } + const { scrollTop, scrollLeft } = imgElement.parentElement; + + const scaleMultiplier = scaleDirection === ScaleDirection.IN + ? InlineImageView.SCALE_FACTOR + : 1 / InlineImageView.SCALE_FACTOR; + updateScale(scale as number * scaleMultiplier); + + const dx = e.offsetX - scrollLeft; + const dy = e.offsetY - scrollTop; + const cx = imgElement.parentElement.clientWidth * 1 / scale / 2; + const cy = imgElement.parentElement.clientHeight * 1 / scale / 2; + + scrollbar.setScrollPosition({ + scrollLeft: scrollLeft + (dx - cx), + scrollTop: scrollTop + (dy - cy), + }); }); $(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => { // pinching is reported as scroll wheel + ctrl @@ -452,9 +463,17 @@ class InlineImageView { if (scale === 'fit') { firstZoom(); } + const { scrollTop, scrollLeft } = imgElement.parentElement; + // scrolling up, pinching out should increase the scale const delta = -e.deltaY; updateScale(scale as number + delta * InlineImageView.SCALE_PINCH_FACTOR); + + const scaleFactor = 1 - (delta * InlineImageView.SCALE_PINCH_FACTOR); + scrollbar.setScrollPosition({ + scrollLeft: e.offsetX - ((e.offsetX - scrollLeft) * scaleFactor), + scrollTop: e.offsetY - ((e.offsetY - scrollTop) * scaleFactor), + }); }); updateMetadata(); scrollbar.scanDomNode(); From 066820f4769e53d690c6c83147da3b87c2ef6d45 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 15:51:31 -0800 Subject: [PATCH 663/710] Better keep resource centered while zooming --- .../parts/resourceviewer/resourceViewer.ts | 226 +++++++++--------- 1 file changed, 118 insertions(+), 108 deletions(-) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index c4f2382b213..1d47f086f03 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -363,120 +363,130 @@ class InlineImageView { const context = { layout(dimension: Dimension) { } }; + + const cacheKey = descriptor.resource.toString(); + + let scaleDirection = ScaleDirection.IN; + let scale: Scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || 'fit'; + let img: Builder | null = null; + let imgElement: HTMLImageElement | null = null; + + function setImageScale(scale: number) { + img.style('width', `${(imgElement.naturalWidth * scale)}px`); + img.style('height', 'auto'); + } + + function updateScale(newScale: Scale) { + if (newScale === 'fit') { + scale = 'fit'; + img.addClass('scale-to-fit'); + img.removeClass('pixelated'); + img.style('width', 'auto'); + InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); + } else { + const oldWidth = imgElement.width; + const oldHeight = imgElement.height; + + scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE); + if (scale >= InlineImageView.PIXELATION_THRESHOLD) { + img.addClass('pixelated'); + } else { + img.removeClass('pixelated'); + } + + const { scrollTop, scrollLeft } = imgElement.parentElement; + const dx = (scrollLeft + imgElement.parentElement.clientWidth / 2) / imgElement.parentElement.scrollWidth; + const dy = (scrollTop + imgElement.parentElement.clientHeight / 2) / imgElement.parentElement.scrollHeight; + + img.removeClass('scale-to-fit'); + setImageScale(scale); + InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); + + const newWidth = imgElement.width; + const scaleFactor = (newWidth - oldWidth) / oldWidth; + + scrollbar.setScrollPosition({ + scrollLeft: ((oldWidth * scaleFactor * dx) + scrollLeft), + scrollTop: ((oldHeight * scaleFactor * dy) + scrollTop), + }); + } + ZoomStatusbarItem.instance.show(scale, updateScale); + scrollbar.scanDomNode(); + } + + function firstZoom() { + scale = imgElement.clientWidth / imgElement.naturalWidth; + setImageScale(scale); + } + + $(container) + .on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => { + if (!img) { + return; + } + + if (e.altKey) { + scaleDirection = ScaleDirection.OUT; + c.removeClass('zoom-in').addClass('zoom-out'); + } + }) + .on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => { + if (!img) { + return; + } + + if (!e.altKey) { + scaleDirection = ScaleDirection.IN; + c.removeClass('zoom-out').addClass('zoom-in'); + } + }) + .on(DOM.EventType.CLICK, (e: MouseEvent) => { + if (!img) { + return; + } + + if (e.button !== 0) { + return; + } + + // left click + if (scale === 'fit') { + firstZoom(); + } + + const scaleMultiplier = scaleDirection === ScaleDirection.IN + ? InlineImageView.SCALE_FACTOR + : 1 / InlineImageView.SCALE_FACTOR; + updateScale(scale as number * scaleMultiplier); + }) + .on(DOM.EventType.WHEEL, (e: WheelEvent) => { + if (!img) { + return; + } + // pinching is reported as scroll wheel + ctrl + if (!e.ctrlKey) { + return; + } + if (scale === 'fit') { + firstZoom(); + } + + // scrolling up, pinching out should increase the scale + const delta = -e.deltaY; + updateScale(scale as number + delta * InlineImageView.SCALE_PINCH_FACTOR); + }); + $(container) .empty() .addClass('image', 'zoom-in') .img({ src: InlineImageView.imageSrc(descriptor) }) .addClass('scale-to-fit') - .on(DOM.EventType.BLUR, () => { - ZoomStatusbarItem.instance.hide(); - }) - .on(DOM.EventType.LOAD, (e, img) => { - const imgElement = img.getHTMLElement() as HTMLImageElement; - const cacheKey = descriptor.resource.toString(); - let scaleDirection = ScaleDirection.IN; - let scale: Scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || 'fit'; - if (scale) { - img.removeClass('scale-to-fit'); - updateScale(scale); - } - ZoomStatusbarItem.instance.show(scale || 'fit', updateScale); - - function setImageScale(scale: number) { - img.style('width', `${(imgElement.naturalWidth * scale)}px`); - img.style('height', 'auto'); - } - function updateScale(newScale: Scale) { - if (newScale === 'fit') { - scale = 'fit'; - img.addClass('scale-to-fit'); - img.removeClass('pixelated'); - img.style('width', 'auto'); - InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); - } else { - scale = clamp(newScale, InlineImageView.MIN_SCALE, InlineImageView.MAX_SCALE); - if (scale >= InlineImageView.PIXELATION_THRESHOLD) { - img.addClass('pixelated'); - } else { - img.removeClass('pixelated'); - } - img.removeClass('scale-to-fit'); - setImageScale(scale); - InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); - } - ZoomStatusbarItem.instance.show(scale, updateScale); - scrollbar.scanDomNode(); - updateMetadata(); - } - function updateMetadata() { - if (metadataClb) { - metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); - } - } - context.layout = updateMetadata; - function firstZoom() { - scale = imgElement.clientWidth / imgElement.naturalWidth; - setImageScale(scale); - } - $(container) - .on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent, c) => { - if (e.altKey) { - scaleDirection = ScaleDirection.OUT; - c.removeClass('zoom-in').addClass('zoom-out'); - } - }) - .on(DOM.EventType.KEY_UP, (e: KeyboardEvent, c) => { - if (!e.altKey) { - c.removeClass('zoom-out').addClass('zoom-in'); - } - }); - $(container).on(DOM.EventType.CLICK, (e: MouseEvent) => { - if (e.button !== 0) { - return; - } - // left click - if (scale === 'fit') { - firstZoom(); - } - const { scrollTop, scrollLeft } = imgElement.parentElement; - - const scaleMultiplier = scaleDirection === ScaleDirection.IN - ? InlineImageView.SCALE_FACTOR - : 1 / InlineImageView.SCALE_FACTOR; - updateScale(scale as number * scaleMultiplier); - - const dx = e.offsetX - scrollLeft; - const dy = e.offsetY - scrollTop; - const cx = imgElement.parentElement.clientWidth * 1 / scale / 2; - const cy = imgElement.parentElement.clientHeight * 1 / scale / 2; - - scrollbar.setScrollPosition({ - scrollLeft: scrollLeft + (dx - cx), - scrollTop: scrollTop + (dy - cy), - }); - }); - $(container).on(DOM.EventType.WHEEL, (e: WheelEvent) => { - // pinching is reported as scroll wheel + ctrl - if (!e.ctrlKey) { - return; - } - if (scale === 'fit') { - firstZoom(); - } - const { scrollTop, scrollLeft } = imgElement.parentElement; - - // scrolling up, pinching out should increase the scale - const delta = -e.deltaY; - updateScale(scale as number + delta * InlineImageView.SCALE_PINCH_FACTOR); - - const scaleFactor = 1 - (delta * InlineImageView.SCALE_PINCH_FACTOR); - scrollbar.setScrollPosition({ - scrollLeft: e.offsetX - ((e.offsetX - scrollLeft) * scaleFactor), - scrollTop: e.offsetY - ((e.offsetY - scrollTop) * scaleFactor), - }); - }); - updateMetadata(); + .on(DOM.EventType.LOAD, (e, i) => { + img = i; + imgElement = img.getHTMLElement() as HTMLImageElement; + metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); scrollbar.scanDomNode(); + updateScale('fit'); }); return context; From f1843d39a3e77456ce6867ae7f92ed6e79f03d54 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 15:58:37 -0800 Subject: [PATCH 664/710] Make settings editor navigation order predictable - fix #42126 --- .../workbench/parts/preferences/browser/preferencesEditor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 9fbd7a192bd..bc978fbac87 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -578,8 +578,8 @@ class PreferencesRenderersController extends Disposable { } private _consolidateSettings(editableSettingsGroups: ISettingsGroup[], defaultSettingsGroups: ISettingsGroup[]): ISetting[] { - const editableSettings = this._flatten(editableSettingsGroups); - const defaultSettings = this._flatten(defaultSettingsGroups).filter(secondarySetting => editableSettings.every(primarySetting => primarySetting.key !== secondarySetting.key)); + const defaultSettings = this._flatten(defaultSettingsGroups); + const editableSettings = this._flatten(editableSettingsGroups).filter(secondarySetting => defaultSettings.every(primarySetting => primarySetting.key !== secondarySetting.key)); return [...defaultSettings, ...editableSettings]; } From 4dd943cd9f07e820d42b839708c1e65ee2c70332 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 15:55:04 -0800 Subject: [PATCH 665/710] Inline setImageScale --- .../browser/parts/resourceviewer/resourceViewer.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 1d47f086f03..27f083242ff 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -371,11 +371,6 @@ class InlineImageView { let img: Builder | null = null; let imgElement: HTMLImageElement | null = null; - function setImageScale(scale: number) { - img.style('width', `${(imgElement.naturalWidth * scale)}px`); - img.style('height', 'auto'); - } - function updateScale(newScale: Scale) { if (newScale === 'fit') { scale = 'fit'; @@ -399,7 +394,8 @@ class InlineImageView { const dy = (scrollTop + imgElement.parentElement.clientHeight / 2) / imgElement.parentElement.scrollHeight; img.removeClass('scale-to-fit'); - setImageScale(scale); + img.style('width', `${(imgElement.naturalWidth * scale)}px`); + img.style('height', 'auto'); InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); const newWidth = imgElement.width; @@ -416,7 +412,7 @@ class InlineImageView { function firstZoom() { scale = imgElement.clientWidth / imgElement.naturalWidth; - setImageScale(scale); + updateScale(scale); } $(container) From 101eb6d9220bd52e1512e7b21a2e37513fa739a0 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 16:15:48 -0800 Subject: [PATCH 666/710] Fix possible nullderef --- .../workbench/browser/parts/resourceviewer/resourceViewer.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts index 27f083242ff..4e90fd870bd 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts @@ -372,6 +372,10 @@ class InlineImageView { let imgElement: HTMLImageElement | null = null; function updateScale(newScale: Scale) { + if (!img || !imgElement.parentElement) { + return; + } + if (newScale === 'fit') { scale = 'fit'; img.addClass('scale-to-fit'); From a25749513e8539b3b29c0110970168facd0b9423 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 16:18:18 -0800 Subject: [PATCH 667/710] Settings search - limit size of request Stopgap fix for Microsoft/vscode-bing#54 --- .../preferences/electron-browser/preferencesSearch.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index 125ca09a4fd..bb71d6ec0e2 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -127,6 +127,9 @@ interface IRemoteSearchProviderOptions { } class RemoteSearchProvider implements ISearchProvider { + // Must keep extension filter size under 8kb. 42 extension filters + core buildnum filter puts us there. + private static MAX_EXTENSION_FILTERS = 42; + private _remoteSearchP: TPromise; constructor(private options: IRemoteSearchProviderOptions, private installedExtensions: TPromise, @@ -283,10 +286,13 @@ class RemoteSearchProvider implements ISearchProvider { [`diminish eq 'latest'`] : await this.getVersionFilters(buildNumber); - const filterStr = encodeURIComponent(filters.join(' or ')); + const filterStr = filters + .slice(0, RemoteSearchProvider.MAX_EXTENSION_FILTERS) + .join(' or '); + const body = JSON.stringify({ query: encodedQuery, - filters: filterStr + filters: encodeURIComponent(filterStr) }); return { From 54f56f7df80f87461d06044f7ffbfd8b61a98ff0 Mon Sep 17 00:00:00 2001 From: Daniel Ye Date: Wed, 24 Jan 2018 16:51:50 -0800 Subject: [PATCH 668/710] 2018-01-24. Merged in translations from Transifex. --- .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 14 ++++++++++++++ .../parts/editor/editor.contribution.i18n.json | 2 +- .../workbench/electron-browser/actions.i18n.json | 1 + .../debugConfigurationManager.i18n.json | 4 ++-- .../electron-browser/search.contribution.i18n.json | 1 - .../terminal.contribution.i18n.json | 1 + .../electron-browser/terminalActions.i18n.json | 2 +- i18n/cht/extensions/git/package.i18n.json | 1 + .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../editor/contrib/gotoError/gotoError.i18n.json | 2 ++ .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 14 ++++++++++++++ .../workbench/api/node/extHostTreeViews.i18n.json | 3 ++- .../actions/toggleSidebarPosition.i18n.json | 1 + .../parts/editor/editor.contribution.i18n.json | 1 + .../workbench/electron-browser/actions.i18n.json | 1 + .../debugConfigurationManager.i18n.json | 4 ++-- .../extensionTipsService.i18n.json | 2 ++ .../node/extensionsWorkbenchService.i18n.json | 3 +++ .../feedback.contribution.i18n.json | 3 ++- .../feedback/electron-browser/feedback.i18n.json | 1 + .../fileActions.contribution.i18n.json | 2 ++ .../files/electron-browser/fileActions.i18n.json | 2 ++ .../electron-browser/files.contribution.i18n.json | 1 + .../parts/markers/common/messages.i18n.json | 2 ++ .../browser/keybindingsEditor.i18n.json | 1 + .../browser/preferencesEditor.i18n.json | 2 ++ .../electron-browser/search.contribution.i18n.json | 1 - .../terminal.contribution.i18n.json | 3 +++ .../electron-browser/terminalActions.i18n.json | 1 + .../electron-browser/terminalService.i18n.json | 1 + i18n/deu/extensions/git/package.i18n.json | 2 +- .../out/features/quickFixProvider.i18n.json | 6 ++++++ .../common/config/commonEditorConfig.i18n.json | 3 --- .../vs/platform/list/browser/listService.i18n.json | 8 ++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/search.contribution.i18n.json | 1 - i18n/esn/extensions/git/out/autofetch.i18n.json | 4 +++- i18n/esn/extensions/git/out/commands.i18n.json | 5 +++++ i18n/esn/extensions/git/package.i18n.json | 5 ++++- .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../vs/platform/environment/node/argv.i18n.json | 1 + .../node/extensionManagementService.i18n.json | 3 +++ .../vs/platform/list/browser/listService.i18n.json | 10 ++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 11 +++++++++++ .../mainThreadSaveParticipant.i18n.json | 4 +++- .../workbench/api/node/extHostTreeViews.i18n.json | 3 ++- .../browser/actions/workspaceCommands.i18n.json | 1 + .../parts/editor/editor.contribution.i18n.json | 1 + .../browser/parts/editor/editorActions.i18n.json | 5 ++++- .../browser/parts/editor/textDiffEditor.i18n.json | 3 ++- .../browser/parts/views/viewsViewlet.i18n.json | 4 +++- .../workbench/electron-browser/actions.i18n.json | 1 + .../vs/workbench/electron-browser/window.i18n.json | 3 ++- .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/saveErrorHandler.i18n.json | 5 +++++ .../electron-browser/logs.contribution.i18n.json | 4 ++++ .../logs/electron-browser/logsActions.i18n.json | 4 +++- .../electron-browser/scm.contribution.i18n.json | 3 ++- .../scm/electron-browser/scmViewlet.i18n.json | 2 ++ .../electron-browser/search.contribution.i18n.json | 1 - .../out/features/quickFixProvider.i18n.json | 6 ++++++ .../common/config/commonEditorConfig.i18n.json | 3 --- .../vs/platform/list/browser/listService.i18n.json | 8 ++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/search.contribution.i18n.json | 1 - .../electron-browser/terminalActions.i18n.json | 1 - i18n/hun/extensions/git/package.i18n.json | 1 + .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 14 ++++++++++++++ .../workbench/electron-browser/actions.i18n.json | 1 + .../debugConfigurationManager.i18n.json | 4 ++-- .../extensionTipsService.i18n.json | 2 ++ .../node/extensionsWorkbenchService.i18n.json | 3 +++ .../electron-browser/search.contribution.i18n.json | 1 - .../out/features/quickFixProvider.i18n.json | 6 ++++++ i18n/ita/src/vs/base/node/ps.i18n.json | 4 +++- .../common/config/commonEditorConfig.i18n.json | 4 +--- .../common/view/editorColorRegistry.i18n.json | 1 + .../editor/contrib/gotoError/gotoError.i18n.json | 2 ++ .../wordHighlighter/wordHighlighter.i18n.json | 2 ++ .../vs/platform/environment/node/argv.i18n.json | 5 ++++- .../node/extensionManagementService.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 8 ++++++++ .../platform/theme/common/colorRegistry.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/search.contribution.i18n.json | 1 - .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 14 ++++++++++++++ .../workbench/electron-browser/actions.i18n.json | 1 + .../debugConfigurationManager.i18n.json | 4 ++-- .../node/extensionsWorkbenchService.i18n.json | 3 +++ .../electron-browser/search.contribution.i18n.json | 1 - .../terminal.contribution.i18n.json | 1 + .../electron-browser/terminalActions.i18n.json | 1 + .../out/features/quickFixProvider.i18n.json | 6 ++++++ .../common/config/commonEditorConfig.i18n.json | 3 --- .../vs/platform/list/browser/listService.i18n.json | 8 ++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/search.contribution.i18n.json | 1 - i18n/ptb/extensions/git/package.i18n.json | 1 + .../out/features/quickFixProvider.i18n.json | 8 ++++++++ .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 11 +++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../extensionTipsService.i18n.json | 2 ++ .../node/extensionsWorkbenchService.i18n.json | 3 +++ .../electron-browser/search.contribution.i18n.json | 1 - .../vs_code_welcome_page.i18n.json | 2 +- .../out/features/quickFixProvider.i18n.json | 6 ++++++ .../common/config/commonEditorConfig.i18n.json | 3 --- .../vs/platform/list/browser/listService.i18n.json | 8 ++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../electron-browser/search.contribution.i18n.json | 1 - i18n/trk/extensions/git/out/commands.i18n.json | 1 + i18n/trk/extensions/git/package.i18n.json | 1 + .../out/features/quickFixProvider.i18n.json | 6 ++++++ i18n/trk/src/vs/base/node/ps.i18n.json | 4 +++- .../common/config/commonEditorConfig.i18n.json | 6 +++--- .../editor/contrib/gotoError/gotoError.i18n.json | 2 ++ .../vs/platform/environment/node/argv.i18n.json | 1 + .../vs/platform/list/browser/listService.i18n.json | 10 ++++++++++ .../browser/localizationsExtensionPoint.i18n.json | 9 +++++++++ .../debugConfigurationManager.i18n.json | 2 -- .../feedbackStatusbarItem.i18n.json | 4 +++- .../electron-browser/logs.contribution.i18n.json | 3 +++ .../logs/electron-browser/logsActions.i18n.json | 2 ++ .../electron-browser/scm.contribution.i18n.json | 3 ++- .../electron-browser/search.contribution.i18n.json | 1 - 149 files changed, 513 insertions(+), 94 deletions(-) create mode 100644 i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/chs/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/cht/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/deu/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/esn/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/fra/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/hun/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/ita/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/jpn/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/kor/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/ptb/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/rus/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json create mode 100644 i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json create mode 100644 i18n/trk/src/vs/platform/list/browser/listService.i18n.json create mode 100644 i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json diff --git a/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..dabfe74346b --- /dev/null +++ b/i18n/chs/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (修复文件中所有问题)" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json index b2f32f3d15b..7633e13d1a4 100644 --- a/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "在 \"editor.wordWrap\" 为 \"wordWrapColumn\" 或 \"bounded\" 时控制编辑器列的换行。", "wrappingIndent": "控制折行的缩进。可以是“none”、“same”或“indent”。", "mouseWheelScrollSensitivity": "要对鼠标滚轮滚动事件的 \"deltaX\" 和 \"deltaY\" 使用的乘数 ", - "multiCursorModifier.ctrlCmd": "映射到“Control”（Windows 和 Linux）或“Command”（OSX）。", - "multiCursorModifier.alt": "映射到“Alt”（Windows 和 Linux）或“Option”（OSX）。", - "multiCursorModifier": "用鼠标添加多个光标时使用的修改键。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (OSX)。“转到定义”和“打开链接”功能所需的动作将会相应调整，不与多光标修改键冲突。", + "multiCursorModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)", + "multiCursorModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)", + "multiCursorModifier": "在通过鼠标添加多个光标时使用的修改键。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“转到定义”和“打开链接”功能所需的鼠标动作将会相应调整，不与多光标修改键冲突。", "quickSuggestions.strings": "在字符串内启用快速建议。", "quickSuggestions.comments": "在注释内启用快速建议。", "quickSuggestions.other": "在字符串和注释外启用快速建议。", diff --git a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json index 30d7fd225a2..2f9194ac09c 100644 --- a/i18n/chs/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/chs/src/vs/platform/environment/node/argv.i18n.json @@ -31,6 +31,7 @@ "inspect-brk-extensions": "允许在扩展主机在启动后暂停时进行扩展的调试与分析。检查开发人员工具可获取连接 URI。", "disableGPU": "禁用 GPU 硬件加速。", "uploadLogs": "将当前会话的日志上传到安全端点。", + "issue": "报告问题。", "usage": "使用情况", "options": "选项", "paths": "路径", diff --git a/i18n/chs/src/vs/platform/list/browser/listService.i18n.json b/i18n/chs/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..6abcaadf646 --- /dev/null +++ b/i18n/chs/src/vs/platform/list/browser/listService.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. +{ + "workbenchConfigurationTitle": "工作台", + "multiSelectModifier.ctrlCmd": "映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)", + "multiSelectModifier.alt": "映射为 \"Alt\" (Windows 和 Linux) 或 \"Option\" (macOS)", + "multiSelectModifier": "在通过鼠标添加条目到多选项中时使用的修改键 (例如在支持此项操作的树或列表中)。\"ctrlCmd\" 会映射为 \"Ctrl\" (Windows 和 Linux) 或 \"Command\" (macOS)。“打开到侧边”功能所需的鼠标动作 (若可用) 将会相应调整，不与多选修改键冲突。" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..103d823dcdd --- /dev/null +++ b/i18n/chs/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirearray": "localizations 必须为数组", + "requirestring": "属性“{0}”是必要属性，其类型必须是 \"string\"", + "optstring": "属性“{0}”可以省略，否则其类型必须是 \"string\"", + "vscode.extension.contributes.localizations": "向编辑器提供本地化内容", + "vscode.extension.contributes.localizations.languageId": "显示字符串翻译的目标语言 ID。", + "vscode.extension.contributes.localizations.languageName": "显示字符串翻译的目标语言名称。", + "vscode.extension.contributes.localizations.translations": "文件夹的相对路径，其中包含了提供语言的所有翻译文件。" +} \ No newline at end of file diff --git a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index d2749a69222..139236ab4a9 100644 --- a/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -16,7 +16,7 @@ "file": "文件", "close": "关闭", "closeOthers": "关闭其他", - "closeRight": "关闭到右侧", + "closeRight": "关闭右侧", "closeAllUnmodified": "关闭未更改", "closeAll": "全部关闭", "keepOpen": "保持打开状态", diff --git a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json index f941d8a0956..102013aa46a 100644 --- a/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json @@ -29,6 +29,7 @@ "openRecent": "打开最近的文件…", "quickOpenRecent": "快速打开最近的文件…", "closeMessages": "关闭通知消息", + "openIssueReporter": "打开问题报告程序", "reportIssueInEnglish": "使用英文报告问题", "reportPerformanceIssue": "报告性能问题", "keybindingsReference": "键盘快捷方式参考", diff --git a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index fd6211c4e06..83ae4f6295a 100644 --- a/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,8 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "用于验证 \"launch.json\" 的 JSON 架构配置。", "vscode.extension.contributes.debuggers.windows": "Windows 特定的设置。", "vscode.extension.contributes.debuggers.windows.runtime": "用于 Windows 的运行时。", - "vscode.extension.contributes.debuggers.osx": "OS X 特定的设置。", - "vscode.extension.contributes.debuggers.osx.runtime": "用于 OSX 的运行时。", + "vscode.extension.contributes.debuggers.osx": "macOS 特定的设置。", + "vscode.extension.contributes.debuggers.osx.runtime": "用于 macOS 的运行时。", "vscode.extension.contributes.debuggers.linux": "Linux 特定的设置。", "vscode.extension.contributes.debuggers.linux.runtime": "用于 Linux 的运行时。", "vscode.extension.contributes.breakpoints": "添加断点。", diff --git a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index b75ed7a9817..e22eff45b62 100644 --- a/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "在文件中查找", "openAnythingHandlerDescription": "转到文件", "openSymbolDescriptionNormal": "转到工作区中的符号", - "searchOutputChannelTitle": "搜索", "searchConfigurationTitle": "搜索", "exclude": "配置 glob 模式以在搜索中排除文件和文件夹。从 files.exclude 设置中继承所有 glob 模式。", "exclude.boolean": "匹配文件路径所依据的 glob 模式。设置为 true 或 false 可启用或禁用该模式。", diff --git a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 199139684a9..40bc57dc321 100644 --- a/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/chs/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -13,6 +13,7 @@ "terminal.integrated.shellArgs.osx": "在 OS X 终端上时要使用的命令行参数。", "terminal.integrated.shell.windows": "终端在 Windows 使用的 shell 路径。使用随 Windows 一起提供的 shell (cmd、PowerShell 或 Bash on Ubuntu) 时。", "terminal.integrated.shellArgs.windows": "在 Windows 终端上时使用的命令行参数。", + "terminal.integrated.macOptionIsMeta": "在终端中，使用 Option 键作为 Meta 键。(macOS)", "terminal.integrated.rightClickCopyPaste": "设置后，在终端内右键单击时，这将阻止显示上下文菜单，相反，它将在有选项时进行复制，并且在没有选项时进行粘贴。", "terminal.integrated.copyOnSelection": "设置后，终端中选中的文字将被复制到剪贴板。", "terminal.integrated.fontFamily": "控制终端的字体系列，这在编辑器中是默认的。fontFamily 的值。", 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 6db35403434..916f76ed987 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 @@ -12,7 +12,7 @@ "workbench.action.terminal.selectAll": "全选", "workbench.action.terminal.deleteWordLeft": "删除左侧的字符", "workbench.action.terminal.deleteWordRight": "删除右侧的字符", - "workbench.action.terminal.enterLineNavigationMode": "进入按行导航模式", + "workbench.action.terminal.enterLineNavigationMode": "进入屏幕阅读器导航模式", "workbench.action.terminal.new": "新建集成终端", "workbench.action.terminal.new.short": "新的终端", "workbench.action.terminal.newWorkspacePlaceholder": "选择当前工作目录新建终端", diff --git a/i18n/cht/extensions/git/package.i18n.json b/i18n/cht/extensions/git/package.i18n.json index 46908731864..5f9e86aed6c 100644 --- a/i18n/cht/extensions/git/package.i18n.json +++ b/i18n/cht/extensions/git/package.i18n.json @@ -60,6 +60,7 @@ "config.enableLongCommitWarning": "是否發出長認可訊息的警告", "config.confirmSync": "請先確認再同步處理 GIT 存放庫", "config.countBadge": "控制 git 徽章計數器。[全部] 會計算所有變更。[已追蹤] 只會計算追蹤的變更。[關閉] 會將其關閉。", + "config.checkoutType": "控制在執行 [簽出至...] 時，會列出哪些類型的分支。[全部] 會顯示所有參考，[本機] 只會顯示本機分支，[標籤] 只會顯示標籤，以及 [遠端] 只會顯示遠端分支。", "config.ignoreLegacyWarning": "略過舊的 Git 警告", "config.ignoreMissingGitWarning": "忽略遺漏 Git 時的警告", "config.ignoreLimitWarning": "當儲存庫中有過多變更時，略過警告。", diff --git a/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..b2cbb689282 --- /dev/null +++ b/i18n/cht/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (檔案中修復全部)" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json index 1cd1bd85b24..48d79ffbdd2 100644 --- a/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/cht/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "當 `editor.wordWrap` 為 [wordWrapColumn] 或 [bounded] 時，控制編輯器中的資料行換行。", "wrappingIndent": "控制換行的縮排。可以是 [無]、[相同] 或 [縮排]。", "mouseWheelScrollSensitivity": "滑鼠滾輪捲動事件的 'deltaX' 與 'deltaY' 所使用的乘數", - "multiCursorModifier.ctrlCmd": "對應Windows和Linux的'Control'與對應OSX的'Command'", - "multiCursorModifier.alt": "對應Windows和Linux的'Alt'與對應OSX的'Option'", - "multiCursorModifier": "用於新增多個滑鼠游標的修改程式。`ctrlCmd` 會對應到 Windows 及 Linux 上的 `Control` 以及 OSX 上的 `Command`。[移至定義] 及 [開啟連結] 滑鼠手勢將會適應以避免和 multicursor 修改程式衝突。", + "multiCursorModifier.ctrlCmd": "對應 Windows 和 Linux 的 `Control` 與對應 macOS 的 `Command`", + "multiCursorModifier.alt": "對應 Windows 和 Linux 的 `Alt` 與對應 macOS 的 `Option`", + "multiCursorModifier": "用於新增多個滑鼠游標的修改。 `ctrlCmd` 會對應到 Windows 和 Linux 上的 `Control` 以及 macOS 上的 `Command`。 [移至定義] 及 [開啟連結] 滑鼠手勢將會適應以避免和 multicursor 修改衝突。", "quickSuggestions.strings": "允許在字串內顯示即時建議。", "quickSuggestions.comments": "允許在註解中顯示即時建議。", "quickSuggestions.other": "允許在字串與註解以外之處顯示即時建議。", 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 c569d86bd1a..fcb4645d048 100644 --- a/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/cht/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,6 +5,8 @@ // Do not edit this file. It is machine generated. { "title.wo_source": "({0}/{1})", + "markerAction.next.label": "移至下一個問題 (錯誤, 警告, 資訊)", + "markerAction.previous.label": "移至上一個問題 (錯誤, 警告, 資訊)", "editorMarkerNavigationError": "編輯器標記導覽小工具錯誤的色彩。", "editorMarkerNavigationWarning": "編輯器標記導覽小工具警告的色彩。", "editorMarkerNavigationInfo": "編輯器標記導覽小工具資訊的色彩", diff --git a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json index 4e6ecb355e3..0026dc0d184 100644 --- a/i18n/cht/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/cht/src/vs/platform/environment/node/argv.i18n.json @@ -31,6 +31,7 @@ "inspect-brk-extensions": "允許對擴展主機在啟動後暫停擴充功能進行除錯和分析。檢查開發工具中的連接 uri。", "disableGPU": "停用 GPU 硬體加速。", "uploadLogs": "上傳目前的工作階段紀錄至安全的端點。", + "issue": "回報1個問題", "usage": "使用方式", "options": "選項", "paths": "路徑", diff --git a/i18n/cht/src/vs/platform/list/browser/listService.i18n.json b/i18n/cht/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..14d649f76d2 --- /dev/null +++ b/i18n/cht/src/vs/platform/list/browser/listService.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. +{ + "workbenchConfigurationTitle": "工作台", + "multiSelectModifier.ctrlCmd": "對應Windows和Linux的'Control'與對應 macOS 的'Command'。", + "multiSelectModifier.alt": "對應Windows和Linux的'Alt'與對應macOS的'Option'。", + "multiSelectModifier": "用於新增項目至滑鼠多選的修改 (例如在樹狀及列表支援下)。 `ctrlCmd` 會對應到 Windows 和 Linux 上的 `Control` 以及 macOS 上的 `Command`。 [在側邊開啟] 滑鼠手勢若支援，將會適應以避免和 multiselect 修改衝突。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..1127905705c --- /dev/null +++ b/i18n/cht/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirearray": "在地化資料必須為陣列", + "requirestring": "屬性 '{0}' 為強制項目且必須屬於 `string` 類型", + "optstring": "屬性 `{0}` 可以省略或必須屬於 `string` 類型", + "vscode.extension.contributes.localizations": "提供在地化服務給編輯者", + "vscode.extension.contributes.localizations.languageId": "顯示已翻譯字串的語言 Id", + "vscode.extension.contributes.localizations.languageName": "顯示已翻譯字串的語言名稱", + "vscode.extension.contributes.localizations.translations": "檔案的相對路徑，其中該資料包含夾貢獻語言所有翻譯檔案。" +} \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json index 2df7e9c33f5..1e554271b86 100644 --- a/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/cht/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。" + "treeView.notRegistered": "未註冊識別碼為 '{0}' 的樹狀檢視。", + "treeView.duplicateElement": "識別碼為 {0} 的元件已被註冊" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json index 16f408d9bec..ce860535636 100644 --- a/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/actions/toggleSidebarPosition.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "toggleSidebarPosition": "切換提要欄位位置", "view": "檢視" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 9dbae940daf..3e12d7d30b8 100644 --- a/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -20,6 +20,7 @@ "closeAllUnmodified": "關閉未變更的檔案", "closeAll": "全部關閉", "keepOpen": "保持開啟", + "toggleInlineView": "切換至內嵌檢視", "showOpenedEditors": "顯示開啟的編輯器", "keepEditor": "保留編輯器", "closeEditorsInGroup": "關閉群組中的所有編輯器", diff --git a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json index c6e5b092bd1..8b7032221cc 100644 --- a/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/cht/src/vs/workbench/electron-browser/actions.i18n.json @@ -29,6 +29,7 @@ "openRecent": "開啟最近使用的檔案...", "quickOpenRecent": "快速開啟最近使用的檔案...", "closeMessages": "關閉通知訊息", + "openIssueReporter": "公開問題回報者", "reportIssueInEnglish": "回報問題", "reportPerformanceIssue": "回報效能問題", "keybindingsReference": "鍵盤快速鍵參考", diff --git a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 19f502a82ef..7bccdf99f80 100644 --- a/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,8 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "JSON 結構描述組態，用於驗證 'launch.json'。", "vscode.extension.contributes.debuggers.windows": "Windows 特定設定。", "vscode.extension.contributes.debuggers.windows.runtime": "用於 Windows 的執行階段。", - "vscode.extension.contributes.debuggers.osx": "OS X 特定設定。", - "vscode.extension.contributes.debuggers.osx.runtime": "用於 OSX 的執行階段。", + "vscode.extension.contributes.debuggers.osx": "macOS 特定設定。", + "vscode.extension.contributes.debuggers.osx.runtime": "用於 macOS 的執行階段。", "vscode.extension.contributes.debuggers.linux": "Linux 特定設定。", "vscode.extension.contributes.debuggers.linux.runtime": "用於 Linux 的執行階段。", "vscode.extension.contributes.breakpoints": "提供中斷點。", diff --git a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index ac9779dde41..f7439bf6054 100644 --- a/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -13,6 +13,8 @@ "reallyRecommendedExtensionPack": "建議對此檔案類型使用 '{0}' 延伸模組套件。", "showRecommendations": "顯示建議", "install": "安裝", + "showLanguageExtensions": "市集有 '.{0}' 個文件的擴充功能可以提供協助", + "searchMarketplace": "搜尋市集", "workspaceRecommended": "此工作區具有擴充功能建議。", "installAll": "全部安裝", "ignoreExtensionRecommendations": "是否略過所有的延伸模組建議?", diff --git a/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json index 44a55467fbf..adf7f4b2563 100644 --- a/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json @@ -4,6 +4,9 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "installingVSIXExtension": "從 VSIX 安裝擴充功能...", + "installingMarketPlaceExtension": "從市集安裝擴充功能...", + "uninstallingExtension": "解除安裝擴充功能...", "enableDependeciesConfirmation": "啟用 '{0}' 也會啟用其相依性。仍要繼續嗎?", "enable": "是", "doNotEnable": "否", diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json index 37b9d5384a5..6a2ef8c5498 100644 --- a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.contribution.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "workbenchConfigurationTitle": "工作台" + "workbenchConfigurationTitle": "工作台", + "feedbackVisibility": "控制工作台底部狀態列中的 Twitter 回饋 (笑臉) 的可見度。" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json index 3ae75fe7ef4..50c2a802497 100644 --- a/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/feedback/electron-browser/feedback.i18n.json @@ -16,6 +16,7 @@ "request a missing feature": "要求遺漏的功能", "tell us why?": "請告訴我們原因", "commentsHeader": "註解", + "showFeedback": "顯示狀態列中的回饋笑臉", "tweet": "推文", "character left": "剩餘字元", "characters left": "剩餘字元", diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json index 8b0fa7e726f..fe4146d1ad2 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.i18n.json @@ -22,7 +22,9 @@ "copyPath": "複製路徑", "saveAll": "全部儲存", "compareWithSaved": "與已儲存的檔案比較", + "compareWithSelected": "與選取的比較", "compareSource": "選取用以比較", + "compareSelected": "比較已選取", "close": "關閉", "closeOthers": "關閉其他", "closeUnmodified": "關閉未變更的檔案", 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 e173bdcc79b..3cf9c4c6208 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 @@ -23,11 +23,13 @@ "dirtyMessageFolderDelete": "您要刪除的資料夾中 {0} 個檔案有未儲存的變更。要繼續嗎?", "dirtyMessageFileDelete": "您要刪除的檔案有未儲存的變更。要繼續嗎?", "dirtyWarning": "如果您不儲存變更，這些變更將會遺失。", + "confirmMoveTrashMessageMultiple": "確定要刪除以下 {0} 個檔案嗎？", "confirmMoveTrashMessageFolder": "您確定要刪除 '{0}' 及其內容嗎?", "confirmMoveTrashMessageFile": "您確定要刪除 '{0}' 嗎?", "undoBin": "您可以從資源回收筒還原。", "undoTrash": "您可以從垃圾筒還原。", "doNotAskAgain": "不要再詢問我", + "confirmDeleteMessageMultiple": "確定要永久地刪除以下 {0} 個檔案嗎？", "confirmDeleteMessageFolder": "您確定要永久刪除 '{0}' 和其中的內容嗎?", "confirmDeleteMessageFile": "您確定要永久刪除 '{0}' 嗎?", "irreversible": "此動作無法回復!", diff --git a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json index 28e38af66ab..1d9b4ba3736 100644 --- a/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/files/electron-browser/files.contribution.i18n.json @@ -36,6 +36,7 @@ "editorConfigurationTitle": "編輯器", "formatOnSave": "在儲存時設定檔案格式。格式器必須處於可用狀態、檔案不得自動儲存，且編輯器不得關機。", "explorerConfigurationTitle": "檔案總管", + "openEditorsVisible": "[開放式編輯器] 窗格中顯示的編輯器數目。", "autoReveal": "控制總管是否在開啟檔案時自動加以顯示及選取。", "enableDragAndDrop": "控制總管是否應該允許透過拖放功能移動檔案和資料夾。", "confirmDragAndDrop": "控制總管是否須要求確認，以透過拖放來移動檔案和資料夾。", diff --git a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json index c754d02f873..8f07ff5d3b3 100644 --- a/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/markers/common/messages.i18n.json @@ -5,6 +5,8 @@ // 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": "問題", 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 0db1b09d33b..5c81c87f361 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 @@ -17,6 +17,7 @@ "resetLabel": "重設按鍵繫結關係", "showConflictsLabel": "顯示衝突", "copyLabel": "複製", + "copyCommandLabel": "複製命令", "error": "編輯按鍵繫結關係時發生錯誤 '{0}'。請開啟 'keybindings.json' 檔案加以檢查。", "command": "Command", "keybinding": "按鍵繫結關係", diff --git a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json index 1b98a0d9db9..c35a778205c 100644 --- a/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json @@ -11,6 +11,8 @@ "oneSettingFound": "1 項相符設定", "settingsFound": "{0} 項相符設定", "totalSettingsMessage": "共 {0} 項設定", + "nlpResult": "自然語言結果", + "filterResult": "篩選結果", "defaultSettings": "預設設定", "defaultFolderSettings": "預設資料夾設定", "defaultEditorReadonly": "在右方編輯器中編輯以覆寫預設。", diff --git a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 1244f50ad8c..fa44f03a99c 100644 --- a/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "在檔案中尋找", "openAnythingHandlerDescription": "前往檔案", "openSymbolDescriptionNormal": "前往工作區中的符號", - "searchOutputChannelTitle": "搜尋", "searchConfigurationTitle": "搜尋", "exclude": "設定 Glob 模式，以排除不要搜尋的檔案及資料夾。請從 file.exclude 設定繼承所有的 Glob 模式。", "exclude.boolean": "要符合檔案路徑的 Glob 模式。設為 True 或 False 可啟用或停用模式。", diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index d824ac236e9..11d4003e254 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -13,6 +13,7 @@ "terminal.integrated.shellArgs.osx": "在 OS X 終端機要使用的命令列引數。", "terminal.integrated.shell.windows": "終端機在 Windows 上使用的殼層路徑。使用隨附於 Windows 的殼層 (cmd、PowerShell 或 Bash on Ubuntu) 時。", "terminal.integrated.shellArgs.windows": "在 Windows 終端機上時要使用的命令列引數。", + "terminal.integrated.macOptionIsMeta": "將選項鍵視為 macOS 終端機中的 meta 鍵。", "terminal.integrated.rightClickCopyPaste": "如有設定，這會防止在終端機內按滑鼠右鍵時顯示操作功能表，而是在有選取項目時複製、沒有選取項目時貼上。", "terminal.integrated.copyOnSelection": "當設定時，在終端機中選擇的文字將會被複製至剪貼簿", "terminal.integrated.fontFamily": "控制終端機的字型家族，預設為 editor.fontFamily 的值。", @@ -25,10 +26,12 @@ "terminal.integrated.setLocaleVariables": "控制是否在終端機啟動時設定地區設定變數，這在 OS X 上預設為 true，在其他平台則為 false。", "terminal.integrated.cwd": "終端機啟動位置的明確起始路徑，這會用作殼層處理序的目前工作目錄 (cwd)。當根目錄不是方便的 cwd 時，這在工作區設定中特別好用。", "terminal.integrated.confirmOnExit": "當有使用中的終端機工作階段時，是否要在結束時確認。", + "terminal.integrated.enableBell": "是否啟用終端機警告聲。", "terminal.integrated.commandsToSkipShell": "一組命令識別碼，其按鍵繫結關係將不會傳送到殼層，而會一律由 Code 處理。這讓通常由殼層取用的按鍵繫結關係，在使用上與未聚焦於終端機時行為相同，例如 Ctrl+P 可啟動 Quick Open。", "terminal.integrated.env.osx": "OS X 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件", "terminal.integrated.env.linux": "Linux 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件", "terminal.integrated.env.windows": "Windows 上的終端機要使用之具有將新增至 VS Code 流程之環境變數的物件", + "terminal.integrated.showExitAlert": "當結束代碼非 0，顯示警告訊息 '終端處理序已終止並回傳結束代碼'", "terminalCategory": "終端機", "viewCategory": "檢視" } \ No newline at end of file diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index 3338d6ea3da..2fcd49773a9 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -12,6 +12,7 @@ "workbench.action.terminal.selectAll": "全選", "workbench.action.terminal.deleteWordLeft": "刪除左方文字", "workbench.action.terminal.deleteWordRight": "刪除右方文字", + "workbench.action.terminal.enterLineNavigationMode": "進入螢幕閱讀器導航模式", "workbench.action.terminal.new": "建立新的整合式終端機", "workbench.action.terminal.new.short": "新增終端機", "workbench.action.terminal.newWorkspacePlaceholder": "為新的終端機選擇目前的工作目錄", diff --git a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json index 331a28ddaf2..fc6b0624a08 100644 --- a/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json +++ b/i18n/cht/src/vs/workbench/parts/terminal/electron-browser/terminalService.i18n.json @@ -7,6 +7,7 @@ "terminal.integrated.chooseWindowsShellInfo": "您可以選取 [自訂] 按鈕變更預設的終端機殼層。", "customize": "自訂", "cancel": "取消", + "never again": "確定，不要再顯示", "terminal.integrated.chooseWindowsShell": "請選取所需的終端機殼層。您之後可以在設定中變更此選擇", "terminalService.terminalCloseConfirmationSingular": "仍有一個使用中的終端機工作階段。要予以終止嗎?", "terminalService.terminalCloseConfirmationPlural": "目前共有 {0} 個使用中的終端機工作階段。要予以終止嗎?" diff --git a/i18n/deu/extensions/git/package.i18n.json b/i18n/deu/extensions/git/package.i18n.json index eba5779a178..d9f684ed551 100644 --- a/i18n/deu/extensions/git/package.i18n.json +++ b/i18n/deu/extensions/git/package.i18n.json @@ -49,7 +49,7 @@ "command.showOutput": "Git-Ausgabe anzeigen", "command.ignore": "Datei zu .gitignore hinzufügen", "command.stashIncludeUntracked": "Stash (einschließlich nicht verfolgt)", - "command.stash": " Stash ausführen", + "command.stash": "Stash ausführen", "command.stashPop": "Pop für Stash ausführen...", "command.stashPopLatest": "Pop für letzten Stash ausführen", "config.enabled": "Gibt an, ob Git aktiviert ist.", diff --git a/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/deu/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json index ed57dd20d06..4fbcab5f91e 100644 --- a/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/deu/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,6 @@ "wordWrapColumn": "Steuert die Umbruchspalte des Editors, wenn für \"editor.wordWrap\" die Option \"wordWrapColumn\" oder \"bounded\" festgelegt ist.", "wrappingIndent": "Steuert den Einzug der umbrochenen Zeilen. Der Wert kann \"none\", \"same\" oder \"indent\" sein.", "mouseWheelScrollSensitivity": "Ein Multiplikator, der für die Mausrad-Bildlaufereignisse \"deltaX\" und \"deltaY\" verwendet werden soll.", - "multiCursorModifier.ctrlCmd": "Ist unter Windows und Linux der Taste \"STRG\" und unter OSX der Befehlstaste zugeordnet.", - "multiCursorModifier.alt": "Ist unter Windows und Linux der Taste \"Alt\" und unter OSX der Wahltaste zugeordnet. ", - "multiCursorModifier": "Der Modifizierer, der zum Hinzufügen mehrerer Cursor mit der Maus verwendet wird. \"ctrlCmd\" wird unter Windows und Linux der Taste \"STRG\" und unter OSX der Befehlstaste zugeordnet. Die Mausbewegungen \"Gehe zu Definition\" und \"Link öffnen\" werden so angepasst, dass kein Konflikt mit dem Multi-Cursor-Modifizierer entsteht.", "quickSuggestions.strings": "Schnellvorschläge innerhalb von Zeichenfolgen aktivieren.", "quickSuggestions.comments": "Schnellvorschläge innerhalb von Kommentaren aktivieren.", "quickSuggestions.other": "Schnellvorschläge außerhalb von Zeichenfolgen und Kommentaren aktivieren.", diff --git a/i18n/deu/src/vs/platform/list/browser/listService.i18n.json b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..b9d7e353c74 --- /dev/null +++ b/i18n/deu/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Workbench" +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..92a29050896 --- /dev/null +++ b/i18n/deu/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "Die Eigenschaft \"{0}\" ist erforderlich. Sie muss vom Typ \"string\" sein.", + "optstring": "Die Eigenschaft \"{0}\" kann ausgelassen werden oder muss vom Typ \"string\" sein." +} \ No newline at end of file diff --git a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 1c098b69622..6cfd4e91479 100644 --- a/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "JSON-Schemakonfigurationen zum Überprüfen von \"launch.json\".", "vscode.extension.contributes.debuggers.windows": "Windows-spezifische Einstellungen.", "vscode.extension.contributes.debuggers.windows.runtime": "Die für Windows verwendete Laufzeit.", - "vscode.extension.contributes.debuggers.osx": "OS X-spezifische Einstellungen.", - "vscode.extension.contributes.debuggers.osx.runtime": "Die für OS X verwendete Laufzeit.", "vscode.extension.contributes.debuggers.linux": "Linux-spezifische Einstellungen.", "vscode.extension.contributes.debuggers.linux.runtime": "Die für Linux verwendete Laufzeit.", "vscode.extension.contributes.breakpoints": "Trägt Haltepunkte bei.", diff --git a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index e32b687f050..0816ad37e8d 100644 --- a/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/deu/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "In Dateien suchen", "openAnythingHandlerDescription": "Zu Datei wechseln", "openSymbolDescriptionNormal": "Zu Symbol im Arbeitsbereich wechseln", - "searchOutputChannelTitle": "Suchen", "searchConfigurationTitle": "Suchen", "exclude": "Konfigurieren Sie Globmuster zum Ausschließen von Dateien und Ordnern in Suchvorgängen. Alle Globmuster werden von der files.exclude-Einstellung geerbt.", "exclude.boolean": "Das Globmuster, mit dem Dateipfade verglichen werden sollen. Legen Sie diesen Wert auf \"true\" oder \"false\" fest, um das Muster zu aktivieren bzw. zu deaktivieren.", diff --git a/i18n/esn/extensions/git/out/autofetch.i18n.json b/i18n/esn/extensions/git/out/autofetch.i18n.json index 98972c6f0a2..2e2bb63e461 100644 --- a/i18n/esn/extensions/git/out/autofetch.i18n.json +++ b/i18n/esn/extensions/git/out/autofetch.i18n.json @@ -6,5 +6,7 @@ { "yes": "Sí", "read more": "Leer más", - "no": "No" + "no": "No", + "not now": "Preguntarme luego", + "suggest auto fetch": "Te gustaría que Code ejecute `git fetch` periódicamente?" } \ 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 3be82274dd3..9a3ea98e470 100644 --- a/i18n/esn/extensions/git/out/commands.i18n.json +++ b/i18n/esn/extensions/git/out/commands.i18n.json @@ -41,6 +41,10 @@ "confirm discard all 2": "{0}\n\nEsta acción es IRREVERSIBLE. Su espacio de trabajo actual SE PERDERÁ PARA SIEMPRE.", "yes discard tracked": "Descartar un archivo con seguimiento", "yes discard tracked multiple": "Descartar {0} archivos con seguimiento", + "unsaved files single": "El siguiente archivo no está guardado: {0}.\n¿Desea guardarlo antes de confirmarlo? ", + "unsaved files": "Hay {0} archivos sin guardar.\n¿Desea guardarlos antes de confirmar?", + "save and commit": "Guardar todo y confirmar", + "commit": "Confirmar de todas formas", "no staged changes": "No hay elementos almacenados provisionalmente.\n\n¿Desea almacenar de forma provisional todos sus cambios y confirmarlos directamente?", "always": "Siempre", "no changes": "No hay cambios para confirmar.", @@ -69,6 +73,7 @@ "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.", "provide stash message": "Opcionalmente, proporcionar un mensaje para el guardado provisional", diff --git a/i18n/esn/extensions/git/package.i18n.json b/i18n/esn/extensions/git/package.i18n.json index 9dab8cc59ce..71eed7035ea 100644 --- a/i18n/esn/extensions/git/package.i18n.json +++ b/i18n/esn/extensions/git/package.i18n.json @@ -54,11 +54,13 @@ "command.stashPopLatest": "Aplicar y quitar últimos cambios guardados provisionalmente...", "config.enabled": "Si GIT está habilitado", "config.path": "Ruta de acceso del ejecutable de GIT", + "config.autoRepositoryDetection": "Si se deben detectar automáticamente los repositories ", "config.autorefresh": "Indica si la actualización automática está habilitada", "config.autofetch": "Si la búsqueda automática está habilitada", "config.enableLongCommitWarning": "Si se debe advertir sobre los mensajes de confirmación largos", "config.confirmSync": "Confirmar antes de sincronizar repositorios GIT", "config.countBadge": "Controla el contador de insignia de Git. \"Todo\" cuenta todos los cambios. \"Seguimiento\" solamente cuenta los cambios realizados. \"Desactivado\" lo desconecta.", + "config.checkoutType": "Controla el tipo de ramas listadas cuando ejecuta \"Desproteger\". \"Todo\" muetra todas las referencias, \"local\" solamente las ramas locales y \"remoto\" las ramas remotas.", "config.ignoreLegacyWarning": "Ignora las advertencias hereradas de Git", "config.ignoreMissingGitWarning": "Ignora la advertencia cuando falta Git", "config.ignoreLimitWarning": "\nIgnora advertencias cuando se encuentran muchos cambios en un repositorio.", @@ -71,5 +73,6 @@ "colors.deleted": "Color para los recursos eliminados.", "colors.untracked": "Color para los recursos a los que no se les hace seguimiento.", "colors.ignored": "Color para los recursos ignorados.", - "colors.conflict": "Color para los recursos con conflictos." + "colors.conflict": "Color para los recursos con conflictos.", + "colors.submodule": "Color para los recursos de submódulos." } \ No newline at end of file diff --git a/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..37a369cc83b --- /dev/null +++ b/i18n/esn/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (Corregir todo en el archivo)" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json index 9e12f7523e1..dae6488ccb2 100644 --- a/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/esn/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "Controls the wrapping column of the editor when `editor.wordWrap` is 'wordWrapColumn' or 'bounded'.", "wrappingIndent": "Controla el sangrado de las líneas ajustadas. Puede ser uno los valores 'none', 'same' o 'indent'.", "mouseWheelScrollSensitivity": "Se utilizará un multiplicador en los eventos de desplazamiento de la rueda del mouse `deltaX` y `deltaY`", - "multiCursorModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en OSX.", - "multiCursorModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en OSX.", - "multiCursorModifier": "El modificador que se usará para agregar varios cursores con el mouse. \"ctrlCmd\" se asigna a \"Control\" en Windows y Linux y a \"Comando\" en OSX. Los gestos del mouse Ir a la definición y Abrir vínculo se adaptarán de modo que no entren en conflicto con el modificador multicursor.", + "multiCursorModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.", + "multiCursorModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS.", + "multiCursorModifier": "El modificador que se usará para agregar varios cursores con el mouse. \"ctrlCmd\" se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS. Los gestos del mouse \"Ir a la definición\" y \"Abrir vínculo\" se adaptarán de modo que no entren en conflicto con el modificador multicurso", "quickSuggestions.strings": "Habilita sugerencias rápidas en las cadenas.", "quickSuggestions.comments": "Habilita sugerencias rápidas en los comentarios.", "quickSuggestions.other": "Habilita sugerencias rápidas fuera de las cadenas y los comentarios.", diff --git a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json index 65665985d3d..ab77c62ca8d 100644 --- a/i18n/esn/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/esn/src/vs/platform/environment/node/argv.i18n.json @@ -30,6 +30,7 @@ "inspect-extensions": "Permitir la depuración y el perfil de las extensiones. Revisar las herramientas de desarrollador para la conexión uri.", "inspect-brk-extensions": "Permitir la depuración y el perfil de las extensiones con el host de la extensión pausado después del inicio. Revisar las herramientas de desarrollador para la conexión uri.", "disableGPU": "Deshabilita la aceleración de hardware de GPU.", + "issue": "Notificar un problema. ", "usage": "Uso", "options": "opciones", "paths": "rutas de acceso", 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 f654894f7d5..77d52783b53 100644 --- a/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/esn/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -10,7 +10,10 @@ "override": "Anular", "cancel": "Cancelar", "errorInstallingDependencies": "Error instalando dependencias. {0}", + "notFoundCompatible": "No se pueden instalar '{0}'; no hay ninguna versión disponible compatible con VS Code '{1}'. ", "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", diff --git a/i18n/esn/src/vs/platform/list/browser/listService.i18n.json b/i18n/esn/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..f2af41d4337 --- /dev/null +++ b/i18n/esn/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Área de trabajo", + "multiSelectModifier.ctrlCmd": "Se asigna a \"Control\" en Windows y Linux y a \"Comando\" en macOS.", + "multiSelectModifier.alt": "Se asigna a \"Alt\" en Windows y Linux y a \"Opción\" en macOS." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..ab1f8a53027 --- /dev/null +++ b/i18n/esn/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirearray": "las localizaciones 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.localizations.languageName": "Nombre del idioma en el que se traducen las cadenas visualizadas." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json index 8b6ad71cd4e..a0da8956de3 100644 --- a/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json +++ b/i18n/esn/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.i18n.json @@ -3,4 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. -{} \ No newline at end of file +{ + "saveParticipants": "Ejecutando Guardar Participantes..." +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json b/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json index e897d06ac34..12c9dbb13d3 100644 --- a/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json +++ b/i18n/esn/src/vs/workbench/api/node/extHostTreeViews.i18n.json @@ -4,5 +4,6 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { - "treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'." + "treeView.notRegistered": "No se ha registrado ninga vista del árbol con id '{0}'.", + "treeView.duplicateElement": "El elemento con id {0} está ya registrado" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json b/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json index 832cb0abb68..e1642a76137 100644 --- a/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/actions/workspaceCommands.i18n.json @@ -5,6 +5,7 @@ // Do not edit this file. It is machine generated. { "addFolderToWorkspace": "Agregar carpeta al área de trabajo...", + "add": "&&Añadir", "addFolderToWorkspaceTitle": "Agregar carpeta al área de trabajo", "workspaceFolderPickerPlaceholder": "Seleccionar la carpeta del área de trabajo" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json index 0e9cbb0a9e2..5d49307d15f 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/editor/editor.contribution.i18n.json @@ -20,6 +20,7 @@ "closeAllUnmodified": "Cerrar los que no se han modificado", "closeAll": "Cerrar todo", "keepOpen": "Mantener abierto", + "toggleInlineView": "Cambiar vista en línea", "showOpenedEditors": "Mostrar editores abiertos", "keepEditor": "Mantener editor", "closeEditorsInGroup": "Cerrar todos los editores del grupo", 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 93badc7f42a..0063a5e42f9 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 @@ -48,5 +48,8 @@ "moveEditorLeft": "Mover el editor a la izquierda", "moveEditorRight": "Mover el editor a la derecha", "moveEditorToPreviousGroup": "Mover editor al grupo anterior", - "moveEditorToNextGroup": "Mover editor al grupo siguiente" + "moveEditorToNextGroup": "Mover editor al grupo siguiente", + "moveEditorToFirstGroup": "Mover el Editor al Primer Grupo", + "moveEditorToSecondGroup": "Mover el Editor al Segundo Grupo", + "moveEditorToThirdGroup": "Mover el Editor al Tercer Grupo" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json index 8fda6300549..ce242cd2e74 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/editor/textDiffEditor.i18n.json @@ -10,5 +10,6 @@ "editableEditorWithInputAriaLabel": "{0}. Editor de comparación de archivos de texto.", "editableEditorAriaLabel": "Editor de comparación de archivos de texto.", "navigate.next.label": "Cambio siguiente", - "navigate.prev.label": "Cambio anterior" + "navigate.prev.label": "Cambio anterior", + "toggleIgnoreTrimWhitespace.label": "Ignorar espacios en blanco al principio y final" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json b/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json index 8b6ad71cd4e..e40ee5163a0 100644 --- a/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json +++ b/i18n/esn/src/vs/workbench/browser/parts/views/viewsViewlet.i18n.json @@ -3,4 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. -{} \ No newline at end of file +{ + "hideView": "Ocultar" +} \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json index c875a388e03..27010729e22 100644 --- a/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/esn/src/vs/workbench/electron-browser/actions.i18n.json @@ -29,6 +29,7 @@ "openRecent": "Abrir Reciente...", "quickOpenRecent": "Abrir Reciente Rapidamente...", "closeMessages": "Cerrar mensajes de notificación", + "openIssueReporter": "Abrir Reportador de Problemas", "reportIssueInEnglish": "Notificar problema", "reportPerformanceIssue": "Notificar problema de rendimiento", "keybindingsReference": "Referencia de métodos abreviados de teclado", diff --git a/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json b/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json index 5ceee829d26..bf0f301897f 100644 --- a/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json +++ b/i18n/esn/src/vs/workbench/electron-browser/window.i18n.json @@ -9,5 +9,6 @@ "cut": "Cortar", "copy": "Copiar", "paste": "Pegar", - "selectAll": "Seleccionar todo" + "selectAll": "Seleccionar todo", + "runningAsRoot": "No se recomienda ejecutar {0} como usuario root." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 28c7690312b..59239289a53 100644 --- a/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "Configuraciones de esquema JSON para validar \"launch.json\".", "vscode.extension.contributes.debuggers.windows": "Configuración específica de Windows.", "vscode.extension.contributes.debuggers.windows.runtime": "Entorno de ejecución que se usa para Windows.", - "vscode.extension.contributes.debuggers.osx": "Configuración específica de OS X.", - "vscode.extension.contributes.debuggers.osx.runtime": "Entorno de ejecución que se usa para OSX.", "vscode.extension.contributes.debuggers.linux": "Configuración específica de Linux.", "vscode.extension.contributes.debuggers.linux.runtime": "Entorno de ejecución que se usa para Linux.", "vscode.extension.contributes.breakpoints": "Aporta puntos de interrupción.", diff --git a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json b/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json index 85b5734142e..b8d86411047 100644 --- a/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/files/electron-browser/saveErrorHandler.i18n.json @@ -5,9 +5,14 @@ // Do not edit this file. It is machine generated. { "userGuide": "Use las acciones de la barra de herramientas del editor situada a la derecha para **deshacer** los cambios o **sobrescribir** el contenido del disco con sus cambios", + "overwriteElevated": "Sobrescribir como Admin...", + "saveElevated": "Reintentar como Admin...", "overwrite": "Sobrescribir", "retry": "Reintentar", "discard": "Descartar", + "readonlySaveErrorAdmin": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir como Admin' para volverlo a intentar como administrador.", + "readonlySaveError": "No se pudo guardar '{0}': El archivo está protegido contra escritura. Seleccione 'Sobrescribir' para intentar quitar la protección.", + "permissionDeniedSaveError": "No se pudo guardar '{0}': Permisos insuficientes. Seleccione 'Reintentar como Admin' para volverlo a intentar como administrador.", "genericSaveError": "No se pudo guardar '{0}': {1}", "staleSaveError": "No se pudo guardar '{0}': El contenido del disco es más reciente. Haga clic en **Comparar** para comparar su versión con la que hay en el disco.", "compareChanges": "Comparar", diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json index 68e35e56b16..29b8033be98 100644 --- a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -4,5 +4,9 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "mainLog": "Log (Principal)", + "sharedLog": "Log (Compartido)", + "rendererLog": "Log (Ventana)", + "extensionsLog": "Log (Extensión del Host)", "developer": "Desarrollador" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json index 80e723dfda2..850ca48cdd2 100644 --- a/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -11,6 +11,7 @@ "rendererProcess": "Ventana", "extensionHost": "Host de extensión", "selectProcess": "Seleccionar proceso", + "openLogFile": "Abrir archivo de log...", "setLogLevel": "Establecer nivel de registro", "trace": "Seguimiento", "debug": "Depurar", @@ -18,5 +19,6 @@ "warn": "Advertencia", "err": "Error", "critical": "Crítico", - "off": "Apagado" + "off": "Apagado", + "selectLogLevel": "Seleccionar nivel de log" } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index c5061e853b0..45352bad122 100644 --- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -8,5 +8,6 @@ "source control": "Control de código fuente", "toggleSCMViewlet": "Mostrar SCM", "view": "Ver", - "scmConfigurationTitle": "SCM" + "scmConfigurationTitle": "SCM", + "inputCounter": "Controla cuándo mostrar el contador de entradas." } \ No newline at end of file diff --git a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json index 7f679305c9e..812f048c02f 100644 --- a/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/scm/electron-browser/scmViewlet.i18n.json @@ -6,6 +6,8 @@ { "scm providers": "Proveedores de Control de Código fuente", "hideRepository": "Ocultar", + "commitMessageInfo": "{0} caracteres en la línea actual", + "commitMessageCountdown": "quedan {0} caracteres en la línea actual", "installAdditionalSCMProviders": "Instalar proveedores adicionales de SCM...", "no open repo": "No hay proveedores de control de código fuente activos.", "source control": "Control de código fuente", diff --git a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index a0aba2b8419..3b7e2d3cd41 100644 --- a/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/esn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Buscar en archivos", "openAnythingHandlerDescription": "Ir al archivo", "openSymbolDescriptionNormal": "Ir al símbolo en el área de trabajo", - "searchOutputChannelTitle": "Buscar", "searchConfigurationTitle": "Buscar", "exclude": "Configure patrones globales para excluir archivos y carpetas de las búsquedas. Hereda todos los patrones globales de la configuración files.exclude.", "exclude.boolean": "El patrón global con el que se harán coincidir las rutas de acceso de los archivos. Establézcalo en true o false para habilitarlo o deshabilitarlo.", diff --git a/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/fra/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json index 4beaeedee28..76111fb62b0 100644 --- a/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/fra/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,6 @@ "wordWrapColumn": "Contrôle la colonne de retour automatique à la ligne de l'éditeur quand 'editor.wordWrap' a la valeur 'wordWrapColumn' ou 'bounded'.", "wrappingIndent": "Contrôle le retrait des lignes renvoyées. La valeur peut être 'none', 'same' ou 'indent'.", "mouseWheelScrollSensitivity": "Multiplicateur à utiliser pour le 'deltaX' et le 'deltaY' des événements de défilement de la roulette de la souris", - "multiCursorModifier.ctrlCmd": "Mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans OSX.", - "multiCursorModifier.alt": "Mappe vers 'Alt' dans Windows et Linux, et vers 'Option' dans OSX.", - "multiCursorModifier": "Modificateur à utiliser pour ajouter plusieurs curseurs avec la souris. 'ctrlCmd' mappe vers 'Contrôle' dans Windows et Linux, et vers 'Commande' dans OSX. Les mouvements de souris Accéder à la définition et Ouvrir le lien s'adaptent pour ne pas entrer en conflit avec le modificateur multicurseur.", "quickSuggestions.strings": "Activez les suggestions rapides dans les chaînes.", "quickSuggestions.comments": "Activez les suggestions rapides dans les commentaires.", "quickSuggestions.other": "Activez les suggestions rapides en dehors des chaînes et des commentaires.", diff --git a/i18n/fra/src/vs/platform/list/browser/listService.i18n.json b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..92f8f5bfde6 --- /dev/null +++ b/i18n/fra/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Banc d'essai" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..1c77d004aae --- /dev/null +++ b/i18n/fra/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "la propriété '{0}' est obligatoire et doit être de type 'string'", + "optstring": "La propriété '{0}' peut être omise ou doit être de type 'string'" +} \ No newline at end of file diff --git a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 5a3987eaa76..64badf8518f 100644 --- a/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "Configurations de schéma JSON pour la validation de 'launch.json'.", "vscode.extension.contributes.debuggers.windows": "Paramètres spécifiques à Windows.", "vscode.extension.contributes.debuggers.windows.runtime": "Runtime utilisé pour Windows.", - "vscode.extension.contributes.debuggers.osx": "Paramètres spécifiques à OS X.", - "vscode.extension.contributes.debuggers.osx.runtime": "Runtime utilisé pour OS X.", "vscode.extension.contributes.debuggers.linux": "Paramètres spécifiques à Linux.", "vscode.extension.contributes.debuggers.linux.runtime": "Runtime utilisé pour Linux.", "vscode.extension.contributes.breakpoints": "Ajoute des points d'arrêt.", diff --git a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index f5dbbc47515..69ce9d7f6cd 100644 --- a/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Chercher dans les fichiers", "openAnythingHandlerDescription": "Accéder au fichier", "openSymbolDescriptionNormal": "Atteindre le symbole dans l'espace de travail", - "searchOutputChannelTitle": "Rechercher", "searchConfigurationTitle": "Rechercher", "exclude": "Configurez les modèles Glob pour exclure les fichiers et les dossiers des recherches. Hérite de tous les modèles Glob à partir du paramètre files.exclude.", "exclude.boolean": "Modèle Glob auquel les chemins de fichiers doivent correspondre. Affectez la valeur true ou false pour activer ou désactiver le modèle.", diff --git a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json index c4ad53ee08a..5b59359d46e 100644 --- a/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json +++ b/i18n/fra/src/vs/workbench/parts/terminal/electron-browser/terminalActions.i18n.json @@ -12,7 +12,6 @@ "workbench.action.terminal.selectAll": "Tout Sélectionner", "workbench.action.terminal.deleteWordLeft": "Supprimer le mot à gauche", "workbench.action.terminal.deleteWordRight": "Supprimer le mot à droite", - "workbench.action.terminal.enterLineNavigationMode": "Saisir la ligne de mode de navigation", "workbench.action.terminal.new": "Créer un terminal intégré", "workbench.action.terminal.new.short": "Nouveau terminal", "workbench.action.terminal.newWorkspacePlaceholder": "Sélectionner le répertoire de travail actuel pour le nouveau terminal", diff --git a/i18n/hun/extensions/git/package.i18n.json b/i18n/hun/extensions/git/package.i18n.json index 52f61e79d5d..87388db14f4 100644 --- a/i18n/hun/extensions/git/package.i18n.json +++ b/i18n/hun/extensions/git/package.i18n.json @@ -60,6 +60,7 @@ "config.enableLongCommitWarning": "Figyelmeztessen-e az alkalmazás hosszú beadási üzenet esetén", "config.confirmSync": "Megerősítés kérése git forráskódtárak szinkronizálása előtt", "config.countBadge": "Meghatározza a git jelvényen megjelenő számláló működését. Az `all` minden módosítást számol, a `tracked` csak a követkett változtatásokat. Az `off` kikapcsolja a jelvényt.", + "config.checkoutType": "Meghatározza, hogy milyen típusú ágak jelenjenek meg a `Checkout adott helyről... ` parancs futtatása esetén. Az `all` esetén az összes ref megjelenik, `local` esetén csak a helyi ágak, `tags` esetén csak a címkék, `remote` esetén pedig csak a távoli ágak.", "config.ignoreLegacyWarning": "Régi gittel kapcsolatos figyelmeztetés figyelmen kívül hagyása", "config.ignoreMissingGitWarning": "Figyelmeztetés figyelmen kívül hagyása, ha a Git hiányzik", "config.ignoreLimitWarning": "Túl sok módosítás esetén megjelenő figyelmeztetés figyelmen kívül hagyása", diff --git a/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..6d6ae6eab7e --- /dev/null +++ b/i18n/hun/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (összes javítása a fájlban)" +} \ No newline at end of file diff --git a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json index 7f137c6fbff..5a0b782e9aa 100644 --- a/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/hun/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "Meghatározza a sortöréshez használt oszlopszámot a szerkesztőablakban, ha az `editor.wordWrap` értéke 'wordWrapColumn' vagy 'bounded'.", "wrappingIndent": "Meghatározza a tördelt sorok behúzását. Értéke 'none', 'same' vagy 'indent' lehet.", "mouseWheelScrollSensitivity": "Az egér görgetési eseményeinél keletkező `deltaX` és `deltaY` paraméterek szorzója", - "multiCursorModifier.ctrlCmd": "Windows és Linux alatt a `Control`, OSX alatt a `Command` billentyűt jelenti.", - "multiCursorModifier.alt": "Windows és Linux alatt az `Alt`, OSX alatt az `Option` billentyűt jelenti.", - "multiCursorModifier": "Több kurzor hozzáadásához használt módosítóbillentyű. A `ctrlCmd` Windows és Linux alatt a `Control`, OSX alatt a `Command` billentyűt jelenti. A Definíció megkeresése és Hivatkozás megnyitása egérgesztusok automatikusan alkalmazkodnak úgy, hogy ne ütközzenek a többkurzorhoz tartozó módosítóval.", + "multiCursorModifier.ctrlCmd": "Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti.", + "multiCursorModifier.alt": "Windows és Linux alatt az `Alt`, macOS alatt az `Option` billentyűt jelenti.", + "multiCursorModifier": "Több kurzor hozzáadásához használt módosítóbillentyű. A `ctrlCmd` Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti. A Definíció megkeresése és Hivatkozás megnyitása egérgesztusok automatikusan úgy lesznek beállítva, hogy ne ütközzenek a többkurzorhoz tartozó módosítóval.", "quickSuggestions.strings": "Kiegészítési javaslatok engedélyezése karakterláncokban (stringekben)", "quickSuggestions.comments": "Kiegészítési javaslatok engedélyezése megjegyzésekben", "quickSuggestions.other": "Kiegészítési javaslatok engedélyezése karakterláncokon (stringeken) és megjegyzéseken kívül", diff --git a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json index f2b86a65d34..06b5ed441c6 100644 --- a/i18n/hun/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/hun/src/vs/platform/environment/node/argv.i18n.json @@ -31,6 +31,7 @@ "inspect-brk-extensions": "Hibakeresés és profilozás engedélyezése a kiegészítőkben, úgy, hogy a kiegészítő gazdafolyamata szüneteltetve lesz az indítás után. Ellenőrizze a fejlesztői eszközöket a csatlakozási URI-hoz. ", "disableGPU": "Hardveres gyorsítás letiltása.", "uploadLogs": "Az aktuális munkamenet naplóinak feltöltése egy biztonságos végpontra.", + "issue": "Probléma jelentése", "usage": "Használat", "options": "beállítások", "paths": "elérési utak", diff --git a/i18n/hun/src/vs/platform/list/browser/listService.i18n.json b/i18n/hun/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..b784e240a18 --- /dev/null +++ b/i18n/hun/src/vs/platform/list/browser/listService.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. +{ + "workbenchConfigurationTitle": "Munkaterület", + "multiSelectModifier.ctrlCmd": "Windows és Linux alatt a `Control`, macOS alatt a `Command` billentyűt jelenti.", + "multiSelectModifier.alt": "Windows és Linux alatt az `Alt`, macOS alatt az `Option` billentyűt jelenti.", + "multiSelectModifier": "Több elem kijelölése esetén újabb elem hozzáadásához használt módosítóbillentyű (például a fanézetekben és listáknál, ha támogatva van). 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." +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..95d3d6d773a --- /dev/null +++ b/i18n/hun/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirearray": "a localizationst tömbként kell megadni", + "requirestring": "a(z) `{0}` tulajdonság kötelező és `string` típusúnak kell lennie", + "optstring": "a(z) `{0}` tulajdonság elhagyható vagy `string` típusúnak kell lennie", + "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.", + "vscode.extension.contributes.localizations.languageName": "Annak a nyelvnek a neve, amelyre a megjelenített szövegek fordítva vannak.", + "vscode.extension.contributes.localizations.translations": "A nyelvhez tartozó összes, fordítási fájlokat tartalmazó mappa relatív elérési útja." +} \ No newline at end of file diff --git a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json index 2e7a5636a3d..f67fea70490 100644 --- a/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/hun/src/vs/workbench/electron-browser/actions.i18n.json @@ -29,6 +29,7 @@ "openRecent": "Legutóbbi megnyitása...", "quickOpenRecent": "Legutóbbi gyors megnyitása...", "closeMessages": "Értesítések törlése", + "openIssueReporter": "Hibajelentő megnyitása", "reportIssueInEnglish": "Probléma jelentése", "reportPerformanceIssue": "Teljesítményproblémák jelentése", "keybindingsReference": "Billentyűparancs-referencia", diff --git a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index a54b3a8b776..06dec99b6e3 100644 --- a/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,8 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "JSON-sémakonfigurációk a 'launch.json' validálásához.", "vscode.extension.contributes.debuggers.windows": "Windows-specifikus beállítások.", "vscode.extension.contributes.debuggers.windows.runtime": "A Windows által használt futtatókörnyezet.", - "vscode.extension.contributes.debuggers.osx": "OS X-specifikus beállítások.", - "vscode.extension.contributes.debuggers.osx.runtime": "Az OSX által használt futtatókörnyezet.", + "vscode.extension.contributes.debuggers.osx": "macOS-specifikus beállítások.", + "vscode.extension.contributes.debuggers.osx.runtime": "A macOS által használt futtatókörnyezet.", "vscode.extension.contributes.debuggers.linux": "Linux-specifikus beállítások.", "vscode.extension.contributes.debuggers.linux.runtime": "A Linux által használt futtatókörnyezet.", "vscode.extension.contributes.breakpoints": "Töréspontokat szolgáltat.", 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 27e3da174c1..0ad54ad8b33 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 @@ -13,6 +13,8 @@ "reallyRecommendedExtensionPack": "Ehhez a fájltípushoz a(z) '{0}' kiegészítőcsomag ajánlott.", "showRecommendations": "Ajánlatok megjelenítése", "install": "Telepítés", + "showLanguageExtensions": "A piactéren található olyan kiegészítő, ami segíthet a(z) '.{0}' fájloknál", + "searchMarketplace": "Keresés a piactéren", "workspaceRecommended": "A munkaterülethez vannak javasolt kiegészítők", "installAll": "Összes telepítése", "ignoreExtensionRecommendations": "Figyelmen kívül akarja hagyni az összes javasolt kiegészítőt?", diff --git a/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json index 4769b5168e9..73fb02efab6 100644 --- a/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json @@ -4,6 +4,9 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "installingVSIXExtension": "Kiegészítő telepítése VSIX-ből...", + "installingMarketPlaceExtension": "Kiegészítő telepítése a piactérről...", + "uninstallingExtension": "Kiegészítő eltávolítása...", "enableDependeciesConfirmation": "A(z) '{0}' engedélyezésével annak függőségei is engedélyezve lesznek. Szeretné folytatni?", "enable": "Igen", "doNotEnable": "Nem", diff --git a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 9cd24f4c872..e928937e0a8 100644 --- a/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/hun/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Keresés a fájlokban", "openAnythingHandlerDescription": "Fájl megkeresése", "openSymbolDescriptionNormal": "Szimbólum megkeresése a munkaterületen", - "searchOutputChannelTitle": "Keresés", "searchConfigurationTitle": "Keresés", "exclude": "Globális minták konfigurálása fájlok és mappák keresésből való kizárásához. Örökli az összes globális mintát a fliex.exclude beállításból.", "exclude.boolean": "A globális minta, amire illesztve lesznek a fájlok elérési útjai. A minta engedélyezéséhez vagy letiltásához állítsa igaz vagy hamis értékre.", diff --git a/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/ita/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/ita/src/vs/base/node/ps.i18n.json b/i18n/ita/src/vs/base/node/ps.i18n.json index 8b6ad71cd4e..9b7eb442bac 100644 --- a/i18n/ita/src/vs/base/node/ps.i18n.json +++ b/i18n/ita/src/vs/base/node/ps.i18n.json @@ -3,4 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. -{} \ No newline at end of file +{ + "collecting": "Raccolta informazioni su CPU e memoria in corso. Potrebbe impiegare qualche secondo." +} \ No newline at end of file diff --git a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json index 71aff162568..d740e2e557d 100644 --- a/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/ita/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,6 @@ "wordWrapColumn": "Controlla la colonna di wrapping dell'editor quando il valore di `editor.wordWrap` è 'wordWrapColumn' o 'bounded'.", "wrappingIndent": "Controlla il rientro delle righe con ritorno a capo. Può essere uno dei valori seguenti: 'none', 'same' o 'indent'.", "mouseWheelScrollSensitivity": "Moltiplicatore da usare sui valori `deltaX` e `deltaY` degli eventi di scorrimento della rotellina del mouse", - "multiCursorModifier.ctrlCmd": "Rappresenta il tasto 'Control' (ctrl) su Windows e Linux e il tasto 'Comando' (cmd) su OSX.", - "multiCursorModifier.alt": "Rappresenta il tasto 'Alt' su Windows e Linux e il tasto 'Opzione' su OSX.", - "multiCursorModifier": "Il modificatore da utilizzare per aggiungere molteplici cursori con il mouse. 'ctrlCmd' rappresenta il tasto 'Control' su Windows e Linux e il tasto 'Comando' su OSX. I gesti del mouse Vai a definizione e Apri il Link si adatteranno in modo da non entrare in conflitto con il modificatore multi-cursore.", "quickSuggestions.strings": "Abilita i suggerimenti rapidi all'interno di stringhe.", "quickSuggestions.comments": "Abilita i suggerimenti rapidi all'interno di commenti.", "quickSuggestions.other": "Abilita i suggerimenti rapidi all'esterno di stringhe e commenti.", @@ -72,6 +69,7 @@ "cursorBlinking": "Controlla lo stile di animazione del cursore. I valori possibili sono: 'blink', 'smooth', 'phase', 'expand' e 'solid'", "mouseWheelZoom": "Ingrandisce il carattere dell'editor quando si usa la rotellina del mouse e si tiene premuto CTRL", "cursorStyle": "Controlla lo stile del cursore. I valori accettati sono 'block', 'block-outline', 'line', 'line-thin', 'underline' e 'underline-thin'", + "lineCursorWidth": "Controlla la larghezza del cursore quando editor.cursorSyle è impostato a 'line'", "fontLigatures": "Abilita i caratteri legatura", "hideCursorInOverviewRuler": "Controlla se il cursore deve essere nascosto nel righello delle annotazioni.", "renderWhitespace": "Consente di controllare in che modo l'editor deve eseguire il rendering dei caratteri di spazio vuoto. Le opzioni possibili sono: 'none', 'boundary' e 'all'. Con l'opzione 'boundary' non viene eseguito il rendering di singoli spazi tra le parole.", 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 81909087f69..57a55fb4bfd 100644 --- a/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json +++ b/i18n/ita/src/vs/editor/common/view/editorColorRegistry.i18n.json @@ -6,6 +6,7 @@ { "lineHighlight": "Colore di sfondo per l'evidenziazione della riga alla posizione del cursore.", "lineHighlightBorderBox": "Colore di sfondo per il bordo intorno alla riga alla posizione del cursore.", + "rangeHighlight": "Colore di sfondo degli intervalli evidenziati, ad esempio dalle funzionalità Quick Open e Trova. il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", "caret": "Colore del cursore dell'editor.", "editorCursorBackground": "Colore di sfondo del cursore editor. Permette di personalizzare il colore di un carattere quando sovrapposto da un blocco cursore.", "editorWhitespaces": "Colore dei caratteri di spazio vuoto nell'editor.", 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 505e8cba014..5fb4bad149e 100644 --- a/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/ita/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,6 +5,8 @@ // 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.", 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 b355190a13b..b8a49a5af0b 100644 --- a/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json +++ b/i18n/ita/src/vs/editor/contrib/wordHighlighter/wordHighlighter.i18n.json @@ -4,6 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "wordHighlight": "Colore di sfondo di un simbolo durante l'accesso in lettura, ad esempio durante la lettura di una variabile. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "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.", "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", diff --git a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json index c1d35df0230..9dd58076c04 100644 --- a/i18n/ita/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/ita/src/vs/platform/environment/node/argv.i18n.json @@ -30,10 +30,13 @@ "inspect-extensions": "Consentire il debug e profiling delle estensioni. Controllare gli strumenti di sviluppo per l'uri di connessione.", "inspect-brk-extensions": "Consentire il debug e profiling delle estensioni con l'host di estensione in pausa dopo inizio. Controllare gli strumenti di sviluppo per l'uri di connessione.", "disableGPU": "Disabilita l'accelerazione hardware della GPU.", + "uploadLogs": "Caricamento dei log della sessione corrente verso un punto di comunicazione sicuro.", "usage": "Utilizzo", "options": "opzioni", "paths": "percorsi", "stdinWindows": "Per leggere l'output da un altro programma, aggiungere alla fine '-' (ad esempio 'echo Hello World | {0} -')", "stdinUnix": "Per leggere da stdin, aggiungere alla fine '-' (ad esempio 'ps aux | grep code | {0} -')", - "optionsUpperCase": "Opzioni" + "optionsUpperCase": "Opzioni", + "extensionsManagement": "Gestione delle estensioni", + "troubleshooting": "Risoluzione dei problemi" } \ 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 d13d2b8b626..973c52b94e0 100644 --- a/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json +++ b/i18n/ita/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json @@ -9,6 +9,7 @@ "installingOutdatedExtension": "Una versione più recente di questa estensione è già installata. Vuoi eseguire l'override di questa con la versione precedente?", "override": "Eseguire l'override", "cancel": "Annulla", + "errorInstallingDependencies": "Errore durante l'installazione delle dipendenze. {0}", "notFoundCompatible": "Impossibile installare '{0}'; non è presente alcuna versione compatibile con VS Code '{1}'.", "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.", diff --git a/i18n/ita/src/vs/platform/list/browser/listService.i18n.json b/i18n/ita/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..1866903b33e --- /dev/null +++ b/i18n/ita/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Area di lavoro" +} \ 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 5375e34f3cb..28433311cf7 100644 --- a/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json +++ b/i18n/ita/src/vs/platform/theme/common/colorRegistry.i18n.json @@ -63,7 +63,12 @@ "editorWidgetBorder": "Colore bordo dei widget dell'editor. Il colore viene utilizzato solo se il widget sceglie di avere un bordo e se il colore non è sottoposto a override da un widget.", "editorSelectionBackground": "Colore della selezione dell'editor.", "editorSelectionForeground": "Colore del testo selezionato per il contrasto elevato.", + "editorInactiveSelection": "Colore della selezione in un editor non attivo. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "editorSelectionHighlight": "Colore delle aree con lo stesso contenuto della selezione. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", "editorFindMatch": "Colore della corrispondenza di ricerca corrente.", + "findMatchHighlight": "Colore degli altri risultati della ricerca. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "findRangeHighlight": "Colore dell'intervallo limite della ricerca. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "hoverHighlight": "Evidenziazione sotto la parola per cui è visualizzata un'area sensibile al passaggio del mouse. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", "hoverBackground": "Colore di sfondo dell'area sensibile al passaggio del mouse dell'editor.", "hoverBorder": "Colore del bordo dell'area sensibile al passaggio del mouse dell'editor.", "activeLinkForeground": "Colore dei collegamenti attivi.", @@ -71,6 +76,12 @@ "diffEditorRemoved": "Colore di sfondo del testo che è stato rimosso.", "diffEditorInsertedOutline": "Colore del contorno del testo che è stato inserito.", "diffEditorRemovedOutline": "Colore del contorno del testo che è stato rimosso.", + "mergeCurrentHeaderBackground": "Sfondo intestazione corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "mergeCurrentContentBackground": "Sfondo contenuto corrente in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "mergeIncomingHeaderBackground": "Sfondo intestazione modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "mergeIncomingContentBackground": "Sfondo contenuto modifica in ingresso in conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "mergeCommonHeaderBackground": "Sfondo dell'intestazione dell'antenato comune nei conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", + "mergeCommonContentBackground": "Sfondo del contenuto dell'antenato comune nei conflitti di merge in linea. Il colore non deve essere opaco per evitare di nascondere le decorazioni sottostanti.", "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.", diff --git a/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..c6ca6920d97 --- /dev/null +++ b/i18n/ita/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "la proprietà `{0}` è obbligatoria e deve essere di tipo `string`", + "optstring": "la proprietà `{0}` può essere omessa o deve essere di tipo `string`" +} \ No newline at end of file diff --git a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 7729690837e..250efcc3000 100644 --- a/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "Configurazioni dello schema JSON per la convalida di 'launch.json'.", "vscode.extension.contributes.debuggers.windows": "Impostazioni specifiche di Windows.", "vscode.extension.contributes.debuggers.windows.runtime": "Runtime usato per Windows.", - "vscode.extension.contributes.debuggers.osx": "Impostazioni specifiche di OS X.", - "vscode.extension.contributes.debuggers.osx.runtime": "Runtime usato per OS X.", "vscode.extension.contributes.debuggers.linux": "Impostazioni specifiche di Linux.", "vscode.extension.contributes.debuggers.linux.runtime": "Runtime usato per Linux.", "vscode.extension.contributes.breakpoints": "Punti di interruzione per contributes.", diff --git a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index b29d6b897b6..cd92af0e23c 100644 --- a/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/ita/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Cerca nei file", "openAnythingHandlerDescription": "Vai al file", "openSymbolDescriptionNormal": "Vai al simbolo nell'area di lavoro", - "searchOutputChannelTitle": "Cerca", "searchConfigurationTitle": "Cerca", "exclude": "Consente di configurare i criteri GLOB per escludere file e cartelle nelle ricerche. Eredita tutti i criteri GLOB dall'impostazione files.exclude.", "exclude.boolean": "Criterio GLOB da usare per trovare percorsi file. Impostare su True o False per abilitare o disabilitare il criterio.", diff --git a/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..4c0d77d1fd0 --- /dev/null +++ b/i18n/jpn/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (ファイルの中のすべてを修正する)" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json index 6d5f2ea1582..8a9677dc258 100644 --- a/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/jpn/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "'editor.wordWrap' が 'wordWrapColumn' または 'bounded' の場合に、エディターの折り返し桁を制御します。", "wrappingIndent": "折り返し行のインデントを制御します。'none'、'same'、または 'indent' のいずれかを指定できます。", "mouseWheelScrollSensitivity": "マウス ホイール スクロール イベントの `deltaX` と `deltaY` で使用される乗数", - "multiCursorModifier.ctrlCmd": "Windows および Linux 上の `Control` と OSX 上の `Command` にマップします。", - "multiCursorModifier.alt": "Windows および Linux 上の `Alt` と OSX 上の `Option` にマップします。", - "multiCursorModifier": "マウスで複数のカーソルを追加するときに使用する修飾キーです。`ctrlCmd` は Windows および Linux 上の `Control` キーと OSX 上の `Command` キーにマップします。「定義に移動」や「リンクを開く」のマウス操作は、マルチカーソルの修飾キーと競合しないように適用されます。", + "multiCursorModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。", + "multiCursorModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。", + "multiCursorModifier": "マウスを使用して複数のカーソルを追加するときに使用する修飾キーです。`ctrlCmd` は Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。「定義に移動」や「リンクを開く」のマウス操作は、マルチカーソルの修飾キーと競合しないように適用されます。", "quickSuggestions.strings": "文字列内でクイック候補を有効にします。", "quickSuggestions.comments": "コメント内でクイック候補を有効にします。", "quickSuggestions.other": "文字列およびコメント外でクイック候補を有効にします。", diff --git a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json index 41c3e146387..ef9379487ec 100644 --- a/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/jpn/src/vs/platform/environment/node/argv.i18n.json @@ -31,6 +31,7 @@ "inspect-brk-extensions": "起動後に一時停止されている拡張ホストとの拡張機能のデバッグとプロファイリングを許可します。接続 URI を開発者ツールでチェックします。", "disableGPU": "GPU ハードウェア アクセラレータを無効にします。", "uploadLogs": "現在のセッションから安全なエンドポイントにログをアップロードします。", + "issue": "問題を報告します。", "usage": "使用法", "options": "オプション", "paths": "パス", diff --git a/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json b/i18n/jpn/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..bebbbaf4486 --- /dev/null +++ b/i18n/jpn/src/vs/platform/list/browser/listService.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. +{ + "workbenchConfigurationTitle": "ワークベンチ", + "multiSelectModifier.ctrlCmd": "Windows および Linux 上の `Control` キーと macOS 上の `Command` キーに割り当てます。", + "multiSelectModifier.alt": "Windows および Linux 上の `Alt` キーと macOS 上の `Option` キーに割り当てます。", + "multiSelectModifier": "(tたとえば、サポートしている場合、ツリーやリストで) マウスを使用して項目を複数選択するときに使用する修飾キーです。`ctrlCmd` は Windows および Linux 上の `Control` キーと macOS 上の `Command` に割り当てます。「横に開く」のマウス操作をサポートしている場合、複数選択の修飾キーと競合しないように適応されます。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..9178423f0e4 --- /dev/null +++ b/i18n/jpn/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirearray": "ローカリゼーションは配列にする必要があります", + "requirestring": " `{0}` プロパティは必須で、`string` 型でなければなりません", + "optstring": "`{0}` プロパティは省略するか、`string` 型にする必要があります", + "vscode.extension.contributes.localizations": "ローカリゼーションをエディターに提供します", + "vscode.extension.contributes.localizations.languageId": "表示文字列が翻訳される言語の id。", + "vscode.extension.contributes.localizations.languageName": "表示文字列が翻訳される言語名。", + "vscode.extension.contributes.localizations.translations": "提供されている言語のすべての翻訳ファイルを含むフォルダへの相対パス。" +} \ No newline at end of file diff --git a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json index 68ba00974f3..2c9fa4def7f 100644 --- a/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json +++ b/i18n/jpn/src/vs/workbench/electron-browser/actions.i18n.json @@ -29,6 +29,7 @@ "openRecent": "最近開いた項目…", "quickOpenRecent": "最近使用したものを開く...", "closeMessages": "通知メッセージを閉じる", + "openIssueReporter": "問題のレポーターを開く", "reportIssueInEnglish": "問題の報告", "reportPerformanceIssue": "パフォーマンスの問題のレポート", "keybindingsReference": "キーボード ショートカットの参照", diff --git a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 84777c482b2..ac2caf3a825 100644 --- a/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,8 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' を検証するための JSON スキーマ構成。", "vscode.extension.contributes.debuggers.windows": "Windows 固有の設定。", "vscode.extension.contributes.debuggers.windows.runtime": "Windows で使用されるランタイム。", - "vscode.extension.contributes.debuggers.osx": "OS X 固有の設定。", - "vscode.extension.contributes.debuggers.osx.runtime": "OSX で使用されるランタイム。", + "vscode.extension.contributes.debuggers.osx": "macOS 固有の設定。", + "vscode.extension.contributes.debuggers.osx.runtime": "macOS で使用されるランタイム。", "vscode.extension.contributes.debuggers.linux": "Linux 固有の設定。", "vscode.extension.contributes.debuggers.linux.runtime": "Linux で使用されるランタイム。", "vscode.extension.contributes.breakpoints": "ブレークポイントを提供します。", diff --git a/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json index eb5578bf82e..e3313b2824f 100644 --- a/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json @@ -4,6 +4,9 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "installingVSIXExtension": "VSIX から拡張機能をインストールしています...", + "installingMarketPlaceExtension": "マーケット プレースから拡張機能をインストールしています... ", + "uninstallingExtension": "拡張機能をアンインストールしています...", "enableDependeciesConfirmation": "'{0}' を有効にするとその依存関係も有効になります。続行しますか?", "enable": "はい", "doNotEnable": "いいえ", diff --git a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 5253824e4bd..0a9eaace998 100644 --- a/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "フォルダーを指定して検索", "openAnythingHandlerDescription": "ファイルに移動する", "openSymbolDescriptionNormal": "ワークスペース内のシンボルへ移動", - "searchOutputChannelTitle": "検索", "searchConfigurationTitle": "検索", "exclude": "検索でファイルとフォルダーを除外するために glob パターンを構成します。files.exclude 設定からすべての glob パターンを継承します。", "exclude.boolean": "ファイル パスの照合基準となる glob パターン。これを true または false に設定すると、パターンがそれぞれ有効/無効になります。", diff --git a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json index 189e87c799d..e264431a00f 100644 --- a/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json +++ b/i18n/jpn/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.i18n.json @@ -13,6 +13,7 @@ "terminal.integrated.shellArgs.osx": "OS X 端末で使用するコマンド ライン引数。", "terminal.integrated.shell.windows": "Windows でターミナルが使用するシェルのパス。 Windows に同梱されているシェルを使用する場合 (cmd、PowerShell、または Bash on Ubuntu) 。", "terminal.integrated.shellArgs.windows": "Windows ターミナル上の場合に使用されるコマンド ライン引数。", + "terminal.integrated.macOptionIsMeta": "macOS のターミナルでは、オプション キーをメタ キーとして扱います。", "terminal.integrated.rightClickCopyPaste": "設定している場合、ターミナル内で右クリックしたときにコンテキスト メニューを表示させず、選択範囲がある場合はコピー、選択範囲がない場合は貼り付けの操作を行います。", "terminal.integrated.copyOnSelection": "設定した場合、ターミナルで選択しているテキストはクリップボードにコピーされます。", "terminal.integrated.fontFamily": "端末のフォント ファミリを制御します。既定値は editor.fontFamily になります。", 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 96aa73cab67..dfb2ffeb9e2 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 @@ -12,6 +12,7 @@ "workbench.action.terminal.selectAll": "すべて選択", "workbench.action.terminal.deleteWordLeft": "左の文字を削除", "workbench.action.terminal.deleteWordRight": "右の文字を削除", + "workbench.action.terminal.enterLineNavigationMode": "スクリーン リーダー移動モードにする", "workbench.action.terminal.new": "新しい統合ターミナルの作成", "workbench.action.terminal.new.short": "新しいターミナル", "workbench.action.terminal.newWorkspacePlaceholder": "新しいターミナルの作業ディレクトリを選択してください", diff --git a/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/kor/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json index 15922e98314..31de53acb3a 100644 --- a/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/kor/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,6 @@ "wordWrapColumn": "`editor.wordWrap`이 'wordWrapColumn' 또는 'bounded'인 경우 편집기의 열 줄 바꿈을 제어합니다.", "wrappingIndent": "줄 바꿈 행의 들여쓰기를 제어합니다. 'none', 'same' 또는 'indent' 중 하나일 수 있습니다.", "mouseWheelScrollSensitivity": "마우스 휠 스크롤 이벤트의 `deltaX` 및 `deltaY`에서 사용할 승수", - "multiCursorModifier.ctrlCmd": "Windows와 Linux의 'Control'을 OSX의 'Command'로 매핑합니다.", - "multiCursorModifier.alt": "Windows와 Linux의 'Alt'를 OSX의 'Option'으로 매핑합니다.", - "multiCursorModifier": "마우스로 여러 커서를 추가할 때 사용할 수정자입니다. `ctrlCmd`는 Windows와 Linux에서 `Control`로 매핑되고 OSX에서 `Command`로 매핑됩니다. Go To Definition 및 Open Link 마우스 제스처가 멀티커서 수정자와 충돌하지 않도록 조정됩니다.", "quickSuggestions.strings": "문자열 내에서 빠른 제안을 사용합니다.", "quickSuggestions.comments": "주석 내에서 빠른 제안을 사용합니다.", "quickSuggestions.other": "문자열 및 주석 외부에서 빠른 제안을 사용합니다.", diff --git a/i18n/kor/src/vs/platform/list/browser/listService.i18n.json b/i18n/kor/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..f1ae7883f32 --- /dev/null +++ b/i18n/kor/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "워크벤치" +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..31dbb01b8b0 --- /dev/null +++ b/i18n/kor/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "속성 `{0}`은(는) 필수이며 `string` 형식이어야 합니다.", + "optstring": "속성 `{0}`은(는) 생략할 수 있으며 `string` 형식이어야 합니다." +} \ No newline at end of file diff --git a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 0db91f83b2f..ba5ae3f8c3f 100644 --- a/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json'의 유효성 검사를 위한 JSON 스키마 구성입니다.", "vscode.extension.contributes.debuggers.windows": "Windows 특정 설정", "vscode.extension.contributes.debuggers.windows.runtime": "Windows에 사용되는 런타임입니다.", - "vscode.extension.contributes.debuggers.osx": "OS X 특정 설정입니다.", - "vscode.extension.contributes.debuggers.osx.runtime": "OSX에 사용되는 런타임입니다.", "vscode.extension.contributes.debuggers.linux": "Linux 특정 설정", "vscode.extension.contributes.debuggers.linux.runtime": "Linux에 사용되는 런타임입니다.", "vscode.extension.contributes.breakpoints": "중단점을 적용합니다.", diff --git a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index bbdbfe77846..4233df18482 100644 --- a/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/kor/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -12,7 +12,6 @@ "findInFiles": "파일에서 찾기", "openAnythingHandlerDescription": "파일로 이동", "openSymbolDescriptionNormal": "작업 영역에서 기호로 이동", - "searchOutputChannelTitle": "검색", "searchConfigurationTitle": "검색", "exclude": "검색에서 파일 및 폴더를 제외하도록 GLOB 패턴을 구성합니다. files.exclude 설정에서 모든 GLOB 패턴을 상속합니다.", "exclude.boolean": "파일 경로를 일치시킬 GLOB 패턴입니다. 패턴을 사용하거나 사용하지 않도록 설정하려면 true 또는 false로 설정하세요.", diff --git a/i18n/ptb/extensions/git/package.i18n.json b/i18n/ptb/extensions/git/package.i18n.json index 670378da7f5..3f76d9389b0 100644 --- a/i18n/ptb/extensions/git/package.i18n.json +++ b/i18n/ptb/extensions/git/package.i18n.json @@ -60,6 +60,7 @@ "config.enableLongCommitWarning": "Se mensagens longas de confirmação devem ter aviso", "config.confirmSync": "Confirmar antes de sincronizar repositórios git", "config.countBadge": "Controla o contador de distintivos do git. 'todos' considera todas as alterações. 'rastreado' considera apenas as alterações controladas. 'desligado' desliga o contador.", + "config.checkoutType": "Controla quais tipos de ramos são listados quando executando `Checkout para... `. `todos` mostra todas as referências, `local` mostra apenas os ramos locais, `etiquetas` mostra apenas etiquetas e `remoto` mostra apenas os ramos remotos.", "config.ignoreLegacyWarning": "Ignora o aviso de Git legado", "config.ignoreMissingGitWarning": "Ignora o aviso quando Git não existir.", "config.ignoreLimitWarning": "Ignora o aviso quando houver muitas alterações em um repositório", diff --git a/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..7e0ce09dfcd --- /dev/null +++ b/i18n/ptb/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "fixAllInFileLabel": "{0} (Reparar tudo no arquivo)" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json index 3e9436d02bf..3cb267503b9 100644 --- a/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/ptb/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "Controla a coluna de quebra de linha do editor quando editor.wordWrap` é 'wordWrapColumn' ou 'bounded'.", "wrappingIndent": "Controla o recuo de linhas quebradas. Pode ser \"none\", \"same\" ou \"indent\".", "mouseWheelScrollSensitivity": "Um multiplicador a ser usado em \"deltaX\" e \"deltaY\" dos eventos de rolagem do botão de rolagem do mouse", - "multiCursorModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e 'Command' no OSX.", - "multiCursorModifier.alt": "Mapeia para 'Alt' em Windows e Linux e 'Option' em OSX.", - "multiCursorModifier": "O modificador a ser usado para adicionar vários cursores com o mouse. `ctrlCmd` mapeia 'Control' no Windows e Linux e 'Command' no OSX. Os gestos do mouse Ir para definição e Abrir Link irão adaptar-se tal maneira que eles não entrem em conflito com o modificador multicursor.", + "multiCursorModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e para 'Command' no macOS.", + "multiCursorModifier.alt": "Mapeia para 'Alt' em Windows e Linux e para 'Option' em macOS.", + "multiCursorModifier": "O modificador a ser usado para adicionar vários cursores com o mouse. `ctrlCmd` mapeia para 'Control' no Windows e Linux e para 'Command' no macOS. Os gestos do mouse Ir para definição e Abrir Link irão adaptar-se de forma que eles não entrem em conflito com o modificador multicursor.", "quickSuggestions.strings": "Habilitar sugestões rápidas dentro de strings.", "quickSuggestions.comments": "Habilitar sugestões rápidas dentro de comentários.", "quickSuggestions.other": "Habilitar sugestões rápidas fora de strings e comentários.", diff --git a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json index 72fb01e6637..c7a8e620a99 100644 --- a/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/ptb/src/vs/platform/environment/node/argv.i18n.json @@ -31,6 +31,7 @@ "inspect-brk-extensions": "Permitir depuração e criação de perfil de extensões com o host de extensão em pausa após o início. Verifique as ferramentas do desenvolvedor para a conexão uri.", "disableGPU": "Desabilita aceleração de hardware da GPU.", "uploadLogs": "Envia os registros de atividade da sessão atual para um destino seguro.", + "issue": "Reportar um problema.", "usage": "Uso", "options": "opções", "paths": "caminhos", diff --git a/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json b/i18n/ptb/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..f0c45d298c0 --- /dev/null +++ b/i18n/ptb/src/vs/platform/list/browser/listService.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. +{ + "workbenchConfigurationTitle": "Área de Trabalho", + "multiSelectModifier.ctrlCmd": "Mapeia para 'Control' no Windows e Linux e para 'Command' no macOS.", + "multiSelectModifier.alt": "Mapeia para 'Alt' no Windows e Linux e 'Option' no macOS.", + "multiSelectModifier": "O modificador a ser usado para adicionar um item à múltiplas seleções com o mouse (por exemplo, em árvores e listas, se suportado) `ctrlCmd` mapeia para 'Control' no Windows e Linux e 'Command' no macOS. Os gestos do mouse para 'Abrir do Lado' - se suportado - irá adaptar-se de forma que eles não entrem em conflito com o modificador de múltiplas seleções." +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..299a2d2ab1d --- /dev/null +++ b/i18n/ptb/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "a propriedade `{0}` é obrigatória e deve ser do tipo `string`", + "optstring": "a propriedade `{0}` é opcional ou deve ser do tipo `string`" +} \ No newline at end of file diff --git a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 3908acc5028..f196dbc34be 100644 --- a/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "Configurações de esquema JSON para validar 'launch.json'.", "vscode.extension.contributes.debuggers.windows": "Configurações específicas do Windows.", "vscode.extension.contributes.debuggers.windows.runtime": "Runtime usado para Windows.", - "vscode.extension.contributes.debuggers.osx": "Configurações específicas do OS X.", - "vscode.extension.contributes.debuggers.osx.runtime": "Runtime usado para o OS X.", "vscode.extension.contributes.debuggers.linux": "Configurações específicas do Linux.", "vscode.extension.contributes.debuggers.linux.runtime": "Runtime usado para o Linux.", "vscode.extension.contributes.breakpoints": "Contribui aos pontos de interrupção.", diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json index d532a7ba72e..9d1bc5a5312 100644 --- a/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.i18n.json @@ -13,6 +13,8 @@ "reallyRecommendedExtensionPack": "O pacote de extensão '{0}' é recomendado para este tipo de arquivo.", "showRecommendations": "Mostrar Recomendações", "install": "Instalar", + "showLanguageExtensions": "A Loja tem extensões que podem ajudar com arquivos '.{0}'", + "searchMarketplace": "Pesquisar na Loja", "workspaceRecommended": "Este espaço de trabalho possui recomendações de extensão.", "installAll": "Instalar Tudo", "ignoreExtensionRecommendations": "Você quer ignorar todas as recomendações de extensão?", diff --git a/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json b/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json index 3ab045563d8..07aeb8dd560 100644 --- a/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.i18n.json @@ -4,6 +4,9 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "installingVSIXExtension": "Instalando extensão do VSIX...", + "installingMarketPlaceExtension": "Instalando extensão da Loja...", + "uninstallingExtension": "Desinstalando extensão...", "enableDependeciesConfirmation": "Habilitando '{0}' também habilita suas dependências. Gostaria de continuar?", "enable": "Sim", "doNotEnable": "Não", diff --git a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 1676173518c..d407ebde609 100644 --- a/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Localizar nos Arquivos", "openAnythingHandlerDescription": "Ir para o Arquivo", "openSymbolDescriptionNormal": "Ir para o Símbolo em Área de Trabalho", - "searchOutputChannelTitle": "Pesquisar", "searchConfigurationTitle": "Pesquisar", "exclude": "Configure os padrões glob para excluir arquivos e pastas nas pesquisas. Herda todos os padrões glob da configuração files.exclude.", "exclude.boolean": "O padrão glob com o qual combinar os caminhos de arquivo. Defina para verdadeiro ou falso para habilitar ou desabilitar o padrão.", diff --git a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json index 5411c925e8d..76ee2be0031 100644 --- a/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json +++ b/i18n/ptb/src/vs/workbench/parts/welcome/page/electron-browser/vs_code_welcome_page.i18n.json @@ -5,7 +5,7 @@ // Do not edit this file. It is machine generated. { "welcomePage.vscode": "Visual Studio Code", - "welcomePage.editingEvolved": "Edição evoluiu", + "welcomePage.editingEvolved": "Edição evoluída", "welcomePage.start": "Início", "welcomePage.newFile": "Novo arquivo", "welcomePage.openFolder": "Abrir pasta...", diff --git a/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/rus/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json index acc13bcc696..9d201095183 100644 --- a/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/rus/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,6 @@ "wordWrapColumn": "Определяет столбец переноса редактора, если значение \"editor.wordWrap\" — \"wordWrapColumn\" или \"bounded\".", "wrappingIndent": "Управляет отступом строк с переносом по словам. Допустимые значения: \"none\", \"same\" или \"indent\".", "mouseWheelScrollSensitivity": "Множитель, используемый для параметров deltaX и deltaY событий прокрутки колесика мыши.", - "multiCursorModifier.ctrlCmd": "Соответствует клавише CTRL в Windows и Linux и клавише COMMAND в OS X.", - "multiCursorModifier.alt": "Соответствует клавише ALT в Windows и Linux и клавише OPTION в OS X.", - "multiCursorModifier": "Модификатор, который будет использоваться для добавления нескольких курсоров с помощью мыши. \"ctrlCmd\" соответствует клавише CTRL в Windows и Linux и клавише COMMAND в OS X. Жесты мыши \"Перейти к определению\" и \"Открыть ссылку\" будут изменены так, чтобы они не конфликтовали с несколькими курсорами.", "quickSuggestions.strings": "Разрешение кратких предложений в строках.", "quickSuggestions.comments": "Разрешение кратких предложений в комментариях.", "quickSuggestions.other": "Разрешение кратких предложений вне строк и комментариев.", diff --git a/i18n/rus/src/vs/platform/list/browser/listService.i18n.json b/i18n/rus/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..933a96a0d6f --- /dev/null +++ b/i18n/rus/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,8 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Рабочее место" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..16bdf1f2fc4 --- /dev/null +++ b/i18n/rus/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "свойство \"{0}\" является обязательным и должно иметь тип string", + "optstring": "свойство \"{0}\" может быть опущено или должно иметь тип string" +} \ No newline at end of file diff --git a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index 63d876aca0d..c98dad92f14 100644 --- a/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "Конфигурации схемы JSON для проверки launch.json.", "vscode.extension.contributes.debuggers.windows": "Параметры, связанные с Windows.", "vscode.extension.contributes.debuggers.windows.runtime": "Среда выполнения, используемая для Windows.", - "vscode.extension.contributes.debuggers.osx": "Параметры, связанные с OS X.", - "vscode.extension.contributes.debuggers.osx.runtime": "Среда выполнения, используемая для OS X.", "vscode.extension.contributes.debuggers.linux": "Параметры, связанные с Linux.", "vscode.extension.contributes.debuggers.linux.runtime": "Среда выполнения, используемая для Linux.", "vscode.extension.contributes.breakpoints": "Добавляет точки останова.", diff --git a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index e2ad0465583..ad29f26eb2e 100644 --- a/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/rus/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -12,7 +12,6 @@ "findInFiles": "Найти в файлах", "openAnythingHandlerDescription": "Перейти к файлу", "openSymbolDescriptionNormal": "Перейти к символу в рабочей области", - "searchOutputChannelTitle": "Поиск", "searchConfigurationTitle": "Поиск", "exclude": "Настройте стандартные маски для исключения файлов и папок при поиске. Все стандартные маски наследуются от параметра file.exclude.", "exclude.boolean": "Стандартная маска, соответствующая путям к файлам. Задайте значение true или false, чтобы включить или отключить маску.", diff --git a/i18n/trk/extensions/git/out/commands.i18n.json b/i18n/trk/extensions/git/out/commands.i18n.json index 1f602af17de..3e01d946db5 100644 --- a/i18n/trk/extensions/git/out/commands.i18n.json +++ b/i18n/trk/extensions/git/out/commands.i18n.json @@ -74,6 +74,7 @@ "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.", "provide stash message": "İsteğe bağlı olarak bir geçici olarak saklama mesajı belirtin", diff --git a/i18n/trk/extensions/git/package.i18n.json b/i18n/trk/extensions/git/package.i18n.json index 193dcf3dff8..7e10d7b3dae 100644 --- a/i18n/trk/extensions/git/package.i18n.json +++ b/i18n/trk/extensions/git/package.i18n.json @@ -60,6 +60,7 @@ "config.enableLongCommitWarning": "Uzun commit mesajları hakkında uyarıda bulunulup bulunulmayacağı", "config.confirmSync": "Git depolarını senkronize etmeden önce onaylayın", "config.countBadge": "Git gösterge sayacını denetler. `all` tüm değişiklikleri sayar. `tracked` sadece izlenen değişikliklikleri sayar. `off` ise kapatır.", + "config.checkoutType": "`Geçiş Yap...` çalıştırılırken listelenecek dal türlerini denetler. `all` tüm başvuruları gösterir, `local` sadece yerel dalları gösterir, `tags` sadece etiketleri gösterir ve `remote` sadece uzak uçbirim dallarını gösterir.", "config.ignoreLegacyWarning": "Eski Git uyarısını görmezden gelir", "config.ignoreMissingGitWarning": "Git mevcut olmadığında uyarıyı yok sayar", "config.ignoreLimitWarning": "Bir depoda çok fazla değişiklik var uyarısını görmezden gelir", diff --git a/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json b/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json new file mode 100644 index 00000000000..8b6ad71cd4e --- /dev/null +++ b/i18n/trk/extensions/typescript/out/features/quickFixProvider.i18n.json @@ -0,0 +1,6 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{} \ No newline at end of file diff --git a/i18n/trk/src/vs/base/node/ps.i18n.json b/i18n/trk/src/vs/base/node/ps.i18n.json index 8b6ad71cd4e..1ecdfb5a807 100644 --- a/i18n/trk/src/vs/base/node/ps.i18n.json +++ b/i18n/trk/src/vs/base/node/ps.i18n.json @@ -3,4 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. -{} \ No newline at end of file +{ + "collecting": "CPU ve bellek bilgisi toplanıyor. Bu işlem birkaç saniye sürebilir." +} \ No newline at end of file diff --git a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json b/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json index d00cee8579f..0987f2e64af 100644 --- a/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json +++ b/i18n/trk/src/vs/editor/common/config/commonEditorConfig.i18n.json @@ -40,9 +40,9 @@ "wordWrapColumn": "`editor.wordWrap` ögesi, 'wordWrapColumn' veya 'bounded' iken düzenleyicinin kaydırma sütununu denetler.", "wrappingIndent": "Kaydırılan satır girintisini denetler. 'none', 'same' veya 'indent' değerlerinden biri olabilir.", "mouseWheelScrollSensitivity": "Fare tekerleği kaydırma olaylarında `deltaX` ve `deltaY` üzerinde kullanılan bir çarpan", - "multiCursorModifier.ctrlCmd": "Windows ve Linux'da `Control` ve OSX'de `Command` ile eşleşir.", - "multiCursorModifier.alt": "Windows ve Linux'da `Alt` ve OSX'de `Option` ile eşleşir.", - "multiCursorModifier": "Fare ile birden çok imleç eklenmesinde kullanılacak değiştirici. `ctrlCmd` Windows ve Linux'da `Control` ve OSX'de `Command` ile eşleşir. Tanıma Git ve Bağlantıyı Aç fare hareketleri, birden çok imleç değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.", + "multiCursorModifier.ctrlCmd": "Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir.", + "multiCursorModifier.alt": "Windows ve Linux'da `Alt` ve macOS'de `Option` ile eşleşir.", + "multiCursorModifier": "Fare ile birden çok imleç eklenmesinde kullanılacak değiştirici. `ctrlCmd` Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir. Tanıma Git ve Bağlantıyı Aç fare hareketleri, birden çok imleç değiştiricisi ile çakışmayacak şekilde uyum sağlarlar.", "quickSuggestions.strings": "Dizelerin içinde hızlı önerileri etkinleştir.", "quickSuggestions.comments": "Yorumların içinde hızlı önerileri etkinleştir.", "quickSuggestions.other": "Dizeler ve yorumlar dışında hızlı önerileri etkinleştirin.", 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 b9f1dd5ddfd..47acac3ba2a 100644 --- a/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json +++ b/i18n/trk/src/vs/editor/contrib/gotoError/gotoError.i18n.json @@ -5,6 +5,8 @@ // 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.", diff --git a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json index 6838345e4f9..c0a53eb4448 100644 --- a/i18n/trk/src/vs/platform/environment/node/argv.i18n.json +++ b/i18n/trk/src/vs/platform/environment/node/argv.i18n.json @@ -30,6 +30,7 @@ "inspect-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", "inspect-brk-extensions": "Eklentilerde hata ayıklama ve ayrımlamaya eklenti sunucusu başladıktan hemen sonra duraklatılacak şekilde izin ver. Bağlantı URI'ı için geliştirici araçlarını kontrol edin.", "disableGPU": "GPU donanım hızlandırmasını devre dışı bırak.", + "issue": "Sorun bildirin.", "usage": "Kullanım", "options": "seçenekler", "paths": "yollar", diff --git a/i18n/trk/src/vs/platform/list/browser/listService.i18n.json b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json new file mode 100644 index 00000000000..9f083e8ed4a --- /dev/null +++ b/i18n/trk/src/vs/platform/list/browser/listService.i18n.json @@ -0,0 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +// Do not edit this file. It is machine generated. +{ + "workbenchConfigurationTitle": "Çalışma Ekranı", + "multiSelectModifier.ctrlCmd": "Windows ve Linux'da `Control` ve macOS'de `Command` ile eşleşir.", + "multiSelectModifier.alt": "Windows ve Linux'da `Alt` ve macOS'de `Option` ile eşleşir." +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json b/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.i18n.json new file mode 100644 index 00000000000..0ca04fc5f49 --- /dev/null +++ b/i18n/trk/src/vs/workbench/api/browser/localizationsExtensionPoint.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. +{ + "requirestring": "`{0}` özelliği zorunludur ve `string` türünde olmalıdır", + "optstring": "`{0}` özelliği atlanabilir veya `string` türünde olmalıdır" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json index ea94460b89a..bd924b59861 100644 --- a/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.i18n.json @@ -19,8 +19,6 @@ "vscode.extension.contributes.debuggers.configurationAttributes": "'launch.json' dosyasını doğrulayacak JSON şema yapılandırmaları.", "vscode.extension.contributes.debuggers.windows": "Windows'a özel ayarlar.", "vscode.extension.contributes.debuggers.windows.runtime": "Windows'da kullanılacak çalışma zamanı.", - "vscode.extension.contributes.debuggers.osx": "OS X'e özel ayarlar.", - "vscode.extension.contributes.debuggers.osx.runtime": "OS X'de kullanılacak çalışma zamanı.", "vscode.extension.contributes.debuggers.linux": "Linux'a özel ayarlar.", "vscode.extension.contributes.debuggers.linux.runtime": "Linux'da kullanılacak çalışma zamanı.", "vscode.extension.contributes.breakpoints": "Kesme noktalarına ekleme yapar.", diff --git a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json index 8b6ad71cd4e..f2a7a6f5dc4 100644 --- a/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.i18n.json @@ -3,4 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. -{} \ No newline at end of file +{ + "hide": "Gizle" +} \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json index aeb7121cb05..d1c3589857b 100644 --- a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logs.contribution.i18n.json @@ -4,5 +4,8 @@ *--------------------------------------------------------------------------------------------*/ // Do not edit this file. It is machine generated. { + "mainLog": "Günlük (Temel)", + "sharedLog": "Günlük (Ortak)", + "rendererLog": "Günlük (Pencere)", "developer": "Geliştirici" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json index ad7b602e907..06c087ca4a9 100644 --- a/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/logs/electron-browser/logsActions.i18n.json @@ -6,6 +6,8 @@ { "openLogsFolder": "Günlük Klasörünü Aç", "showLogs": "Günlükleri Göster...", + "mainProcess": "Temel", + "sharedProcess": "Ortak", "rendererProcess": "Pencere", "extensionHost": "Eklenti Sunucusu", "selectProcess": "İşlem seçin", diff --git a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json index 06bd99d62b1..137024a0daf 100644 --- a/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/scm/electron-browser/scm.contribution.i18n.json @@ -7,5 +7,6 @@ "toggleGitViewlet": "Git'i Göster", "source control": "Kaynak Kontrolü", "toggleSCMViewlet": "SCM'yi Göster", - "view": "Görüntüle" + "view": "Görüntüle", + "scmConfigurationTitle": "SCM" } \ No newline at end of file diff --git a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json index 58d2149f726..5643091fd7a 100644 --- a/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json +++ b/i18n/trk/src/vs/workbench/parts/search/electron-browser/search.contribution.i18n.json @@ -14,7 +14,6 @@ "findInFiles": "Dosyalarda Bul", "openAnythingHandlerDescription": "Dosyaya Git", "openSymbolDescriptionNormal": "Çalışma Alanında Sembole Git", - "searchOutputChannelTitle": "Ara", "searchConfigurationTitle": "Ara", "exclude": "Aramalarda dosyaları ve klasörleri hariç tutmak için glob desenlerini yapılandırın. files.exclude ayarından, tüm glob desenlerini devralır.", "exclude.boolean": "Dosya yollarının eşleştirileceği glob deseni. Deseni etkinleştirmek veya devre dışı bırakmak için true veya false olarak ayarlayın.", From 3c59a4923cd1d17df13db4475cf6292de32aa95e Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 24 Jan 2018 19:19:47 -0800 Subject: [PATCH 669/710] Settings search - Don't send error telemetry with no details --- .../platform/request/electron-browser/requestService.ts | 2 +- .../parts/preferences/browser/preferencesEditor.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vs/platform/request/electron-browser/requestService.ts b/src/vs/platform/request/electron-browser/requestService.ts index 513ab815132..27bb2bba0c2 100644 --- a/src/vs/platform/request/electron-browser/requestService.ts +++ b/src/vs/platform/request/electron-browser/requestService.ts @@ -51,7 +51,7 @@ export const xhrRequest: IRequestFunction = (options: IRequestOptions): TPromise setRequestHeaders(xhr, options); xhr.responseType = 'arraybuffer'; - xhr.onerror = e => reject(new Error('XHR failed: ' + xhr.statusText)); + xhr.onerror = e => reject(new Error(xhr.statusText && ('XHR failed: ' + xhr.statusText))); xhr.onload = (e) => { resolve({ res: { diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index bc978fbac87..f363d51e8fd 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -518,8 +518,12 @@ class PreferencesRenderersController extends Disposable { "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } } */ - const message = getErrorMessage(err); - this.telemetryService.publicLog('defaultSettings.searchError', { message }); + const message = getErrorMessage(err).trim(); + if (message) { + // Empty message = any generic network error + this.telemetryService.publicLog('defaultSettings.searchError', { message }); + } + return null; } }) From e95489cbe164454caff8a60c49c3dd1897afd664 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 25 Jan 2018 07:22:46 +0100 Subject: [PATCH 670/710] :lipstick: --- src/vs/workbench/browser/parts/editor/binaryEditor.ts | 2 +- .../parts/{resourceviewer => editor/media}/resourceviewer.css | 0 .../browser/parts/{resourceviewer => editor}/resourceViewer.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/vs/workbench/browser/parts/{resourceviewer => editor/media}/resourceviewer.css (100%) rename src/vs/workbench/browser/parts/{resourceviewer => editor}/resourceViewer.ts (99%) diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index a36becdf872..b4cea8223f8 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -18,7 +18,7 @@ import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableEle 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/resourceviewer/resourceViewer'; +import { ResourceViewerContext, ResourceViewer } from 'vs/workbench/browser/parts/editor/resourceViewer'; /* * This class is only intended to be subclassed and not instantiated. diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css similarity index 100% rename from src/vs/workbench/browser/parts/resourceviewer/resourceviewer.css rename to src/vs/workbench/browser/parts/editor/media/resourceviewer.css diff --git a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts similarity index 99% rename from src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts rename to src/vs/workbench/browser/parts/editor/resourceViewer.ts index 4e90fd870bd..9fbdd3d0030 100644 --- a/src/vs/workbench/browser/parts/resourceviewer/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -5,7 +5,7 @@ 'use strict'; -import 'vs/css!./resourceviewer'; +import 'vs/css!./media/resourceviewer'; import nls = require('vs/nls'); import mimes = require('vs/base/common/mime'); import URI from 'vs/base/common/uri'; From f900f8eb95690a8bb6b2b0371de03de4b8cbb39a Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 11:05:29 +0100 Subject: [PATCH 671/710] configuraiton resovler service use Object.creat(null) --- .../electron-browser/configurationResolverService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts index 664df71fe85..99b29ec0e45 100644 --- a/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts +++ b/src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts @@ -34,7 +34,7 @@ class VariableResolver { private workspaceContextService: IWorkspaceContextService ) { if (isWindows) { - this.envVariables = {}; + this.envVariables = Object.create(null); Object.keys(envVariables).forEach(key => { this.envVariables[key.toLowerCase()] = envVariables[key]; }); @@ -228,7 +228,7 @@ export class ConfigurationResolverService implements IConfigurationResolverServi // We need a map from interactive variables to keys because we only want to trigger an command once per key - // even though it might occur multiple times in configuration #7026. - const interactiveVariablesToSubstitutes: { [interactiveVariable: string]: { object: any, key: string }[] } = {}; + const interactiveVariablesToSubstitutes: { [interactiveVariable: string]: { object: any, key: string }[] } = Object.create(null); const findInteractiveVariables = (object: any) => { Object.keys(object).forEach(key => { if (object[key] && typeof object[key] === 'object') { From 08d824f3acc47b00b87ae28ac92199a3b5267848 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 11:16:18 +0100 Subject: [PATCH 672/710] debug: on extension host debug restart do a bit more including saving fixes #42106 --- 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 e94b80550b6..857669d1093 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -150,7 +150,7 @@ export class DebugService implements debug.IDebugService { process.configuration.request = 'attach'; process.configuration.port = broadcast.payload.port; - this.doCreateProcess(process.session.root, process.configuration, process.getId()); + this.createProcess(process.session.root, process.configuration, process.getId()); return; } From be07c3cc0a204baca1de6f033d64b89e8b28ceac Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 24 Jan 2018 18:08:00 +0100 Subject: [PATCH 673/710] boost fully covered matches, #41060 Comparing `const` with `constructor` and `const` should favor the latter. Even tho both are prefix matches, the latter is a perfect match and that should be accounted for. --- src/vs/base/common/filters.ts | 2 +- src/vs/base/test/common/filters.test.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/vs/base/common/filters.ts b/src/vs/base/common/filters.ts index 92568a683f7..d5bec85ebaf 100644 --- a/src/vs/base/common/filters.ts +++ b/src/vs/base/common/filters.ts @@ -576,7 +576,7 @@ export function fuzzyScore(pattern: string, word: string, patternMaxWhitespaceIg _matchesCount = 0; _topScore = -100; _patternStartPos = patternStartPos; - _findAllMatches(patternLen, wordLen, 0, new LazyArray(), false); + _findAllMatches(patternLen, wordLen, patternLen === wordLen ? 1 : 0, new LazyArray(), false); if (_matchesCount === 0) { return undefined; diff --git a/src/vs/base/test/common/filters.test.ts b/src/vs/base/test/common/filters.test.ts index a6fe1a58b1a..bc330457fa8 100644 --- a/src/vs/base/test/common/filters.test.ts +++ b/src/vs/base/test/common/filters.test.ts @@ -393,11 +393,11 @@ suite('Filters', () => { // issue #17836 // assertTopScore(fuzzyScore, 'TEdit', 1, 'TextEditorDecorationType', 'TextEdit', 'TextEditor'); - assertTopScore(fuzzyScore, 'p', 0, 'parse', 'posix', 'pafdsa', 'path', 'p'); + assertTopScore(fuzzyScore, 'p', 4, 'parse', 'posix', 'pafdsa', 'path', 'p'); assertTopScore(fuzzyScore, 'pa', 0, 'parse', 'pafdsa', 'path'); // issue #14583 - assertTopScore(fuzzyScore, 'log', 3, 'HTMLOptGroupElement', 'ScrollLogicalPosition', 'SVGFEMorphologyElement', 'log'); + assertTopScore(fuzzyScore, 'log', 3, 'HTMLOptGroupElement', 'ScrollLogicalPosition', 'SVGFEMorphologyElement', 'log', 'logger'); assertTopScore(fuzzyScore, 'e', 2, 'AbstractWorker', 'ActiveXObject', 'else'); // issue #14446 @@ -415,6 +415,8 @@ suite('Filters', () => { assertTopScore(fuzzyScore, 'is', 0, 'isValidViewletId', 'import statement'); assertTopScore(fuzzyScore, 'title', 1, 'files.trimTrailingWhitespace', 'window.title'); + + assertTopScore(fuzzyScore, 'const', 1, 'constructor', 'const', 'cuOnstrul'); }); test('Unexpected suggestion scoring, #28791', function () { From 8708c716367d9ea6822c860c1fcfcff4e2034605 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 25 Jan 2018 11:13:13 +0100 Subject: [PATCH 674/710] fix #42144 --- .../actions/test/common/menuService.test.ts | 4 +++ .../commands/test/commandService.test.ts | 3 ++ .../platform/extensions/common/extensions.ts | 5 +++ .../extensionProfileService.ts | 8 +++++ .../electron-browser/extensionHost.ts | 2 ++ .../electron-browser/extensionHostProfiler.ts | 31 ------------------- .../electron-browser/extensionService.ts | 4 +++ 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/src/vs/platform/actions/test/common/menuService.test.ts b/src/vs/platform/actions/test/common/menuService.test.ts index d3844428fbe..caf6313eafb 100644 --- a/src/vs/platform/actions/test/common/menuService.test.ts +++ b/src/vs/platform/actions/test/common/menuService.test.ts @@ -48,6 +48,10 @@ class MockExtensionService implements IExtensionService { throw new Error('Not implemented'); } + public canProfileExtensionHost() { + return false; + } + public startExtensionHostProfile(): TPromise { throw new Error('Not implemented'); } diff --git a/src/vs/platform/commands/test/commandService.test.ts b/src/vs/platform/commands/test/commandService.test.ts index 9b03a2f1eea..1a08ba578ef 100644 --- a/src/vs/platform/commands/test/commandService.test.ts +++ b/src/vs/platform/commands/test/commandService.test.ts @@ -40,6 +40,9 @@ class SimpleExtensionService implements IExtensionService { getExtensions(): TPromise { return TPromise.wrap([]); } + canProfileExtensionHost() { + return false; + } startExtensionHostProfile(): TPromise { throw new Error('Not implemented'); } diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts index fe757879b07..ec5d37cfa9f 100644 --- a/src/vs/platform/extensions/common/extensions.ts +++ b/src/vs/platform/extensions/common/extensions.ts @@ -168,6 +168,11 @@ export interface IExtensionService { */ getExtensionsStatus(): { [id: string]: IExtensionsStatus }; + /** + * Check if the extension host can be profiled. + */ + canProfileExtensionHost(): boolean; + /** * Begin an extension host process profile session. */ diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts index 307d628fdd3..7a8e65fd19e 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionProfileService.ts @@ -16,6 +16,7 @@ import { StatusbarAlignment, IStatusbarRegistry, StatusbarItemDescriptor, Extens import { Registry } from 'vs/platform/registry/common/platform'; import { IExtensionHostProfileService, ProfileSessionState, RuntimeExtensionsInput } from 'vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IMessageService, Severity } from 'vs/platform/message/common/message'; export class ExtensionHostProfileService extends Disposable implements IExtensionHostProfileService { @@ -38,6 +39,7 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio @IExtensionService private readonly _extensionService: IExtensionService, @IWorkbenchEditorService private readonly _editorService: IWorkbenchEditorService, @IInstantiationService private readonly _instantiationService: IInstantiationService, + @IMessageService private readonly _messageService: IMessageService ) { super(); this._profile = null; @@ -67,6 +69,12 @@ export class ExtensionHostProfileService extends Disposable implements IExtensio if (this._state !== ProfileSessionState.None) { return; } + + if (!this._extensionService.canProfileExtensionHost()) { + this._messageService.show(Severity.Info, nls.localize('noPro', "To profile extensions, launch with `--inspect-extensions=`.")); + return; + } + this._setState(ProfileSessionState.Starting); this._extensionService.startExtensionHostProfile().then((value) => { diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index ee35a4980f5..cb7cb3d37fd 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -276,6 +276,8 @@ export class ExtensionHostProcessWorker { let startPort = 9333; if (typeof this._environmentService.debugExtensionHost.port === 'number') { startPort = expected = this._environmentService.debugExtensionHost.port; + } else { + return TPromise.as({ expected: undefined, actual: 0 }); } return new TPromise((c, e) => { return findFreePort(startPort, 10 /* try 10 ports */, 5000 /* try up to 5 seconds */).then(port => { diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts index 2b77e490063..0877a0df48a 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHostProfiler.ts @@ -7,15 +7,8 @@ import { IExtensionService, IExtensionDescription, ProfileSession, IExtensionHostProfile, ProfileSegmentId } from 'vs/platform/extensions/common/extensions'; import { TPromise } from 'vs/base/common/winjs.base'; -import { localize } from 'vs/nls'; import { TernarySearchTree } from 'vs/base/common/map'; import { realpathSync } from 'vs/base/node/extfs'; -import { CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; -import { writeFile } from 'vs/base/node/pfs'; -import * as path from 'path'; -import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { setTimeout } from 'timers'; import { Profile, ProfileNode } from 'v8-inspect-profiler'; export class ExtensionHostProfiler { @@ -128,27 +121,3 @@ export class ExtensionHostProfiler { }; } } - - -CommandsRegistry.registerCommand('exthost.profile.start', async accessor => { - const statusbarService = accessor.get(IStatusbarService); - const extensionService = accessor.get(IExtensionService); - const environmentService = accessor.get(IEnvironmentService); - - const handle = statusbarService.addEntry({ text: localize('message', "$(zap) Profiling Extension Host...") }, StatusbarAlignment.LEFT); - - extensionService.startExtensionHostProfile().then(session => { - setTimeout(() => { - session.stop().then(result => { - result.getAggregatedTimes().forEach((val, index) => { - console.log(`${index} : ${Math.round(val / 1000)} ms`); - }); - let profilePath = path.join(environmentService.userHome, 'extHostProfile.cpuprofile'); - console.log(`Saving profile at ${profilePath}`); - return writeFile(profilePath, JSON.stringify(result.data)); - }).then(() => { - handle.dispose(); - }); - }, 5000); - }); -}); diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts index 4d51f56bd85..1f32a1e5386 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts @@ -370,6 +370,10 @@ export class ExtensionService extends Disposable implements IExtensionService { return result; } + public canProfileExtensionHost(): boolean { + return this._extensionHostProcessWorker && Boolean(this._extensionHostProcessWorker.getInspectPort()); + } + public startExtensionHostProfile(): TPromise { if (this._extensionHostProcessWorker) { let port = this._extensionHostProcessWorker.getInspectPort(); From f93fb565e71eac433ad285c3b13b8153e2184575 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 25 Jan 2018 13:50:34 +0100 Subject: [PATCH 675/710] #42115 handle error --- .../node/extensionManagementService.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index aa2cc058595..5bc3e740751 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -279,13 +279,13 @@ export class ExtensionManagementService implements IExtensionManagementService { } }) .then(extension => this.downloadInstallableExtension(extension)) - .then(installableExtension => this.installExtension(installableExtension)); - - this.installingExtensions.set(extension.identifier.id, installingExtension); - installingExtension.then( + .then(installableExtension => this.installExtension(installableExtension)) + .then( local => { this.installingExtensions.delete(extension.identifier.id); return local; }, e => { this.installingExtensions.delete(extension.identifier.id); return TPromise.wrapError(e); } - ); + ); + + this.installingExtensions.set(extension.identifier.id, installingExtension); } return installingExtension; } From d55c88f8d7beac5d1a061d98cc26c35e39e18e67 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 15:59:46 +0100 Subject: [PATCH 676/710] debug: call stack view do not react on selection changes caused automatically by the view fixes #41774 --- .../debug/electron-browser/callStackView.ts | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts index fd458ff3c8b..123bcb9be6c 100644 --- a/src/vs/workbench/parts/debug/electron-browser/callStackView.ts +++ b/src/vs/workbench/parts/debug/electron-browser/callStackView.ts @@ -38,6 +38,7 @@ export class CallStackView extends TreeViewsViewletPanel { private onCallStackChangeScheduler: RunOnceScheduler; private settings: any; private needsRefresh: boolean; + private ignoreSelectionChangedEvent: boolean; constructor( private options: IViewletViewOptions, @@ -108,8 +109,11 @@ export class CallStackView extends TreeViewsViewletPanel { const fileResultsNavigation = new FileResultsNavigation(this.tree); this.disposables.push(fileResultsNavigation); this.disposables.push(fileResultsNavigation.openFile(e => { - const element = e.element; + if (this.ignoreSelectionChangedEvent) { + return; + } + const element = e.element; if (element instanceof StackFrame) { this.debugService.focusStackFrame(element, element.thread, element.thread.process, true); element.openInEditor(this.editorService, e.editorOptions.preserveFocus, e.sideBySide).done(undefined, errors.onUnexpectedError); @@ -140,8 +144,14 @@ export class CallStackView extends TreeViewsViewletPanel { this.onCallStackChangeScheduler.schedule(); } })); - this.disposables.push(this.debugService.getViewModel().onDidFocusStackFrame(() => - this.updateTreeSelection().done(undefined, errors.onUnexpectedError))); + this.disposables.push(this.debugService.getViewModel().onDidFocusStackFrame(() => { + if (!this.isVisible) { + this.needsRefresh = true; + return; + } + + this.updateTreeSelection().done(undefined, errors.onUnexpectedError); + })); // Schedule the update of the call stack tree if the viewlet is opened after a session started #14684 if (this.debugService.state === State.Stopped) { @@ -158,13 +168,22 @@ export class CallStackView extends TreeViewsViewletPanel { const stackFrame = this.debugService.getViewModel().focusedStackFrame; const thread = this.debugService.getViewModel().focusedThread; const process = this.debugService.getViewModel().focusedProcess; + const updateSelection = (element: IStackFrame | IProcess) => { + this.ignoreSelectionChangedEvent = true; + try { + this.tree.setSelection([element]); + } finally { + this.ignoreSelectionChangedEvent = false; + } + }; + if (!thread) { if (!process) { this.tree.clearSelection(); return TPromise.as(null); } - this.tree.setSelection([process]); + updateSelection(process); return this.tree.reveal(process); } @@ -173,7 +192,7 @@ export class CallStackView extends TreeViewsViewletPanel { return TPromise.as(null); } - this.tree.setSelection([stackFrame]); + updateSelection(stackFrame); return this.tree.reveal(stackFrame); }); } From a84cfc922f6d73a3ee98c57b49741548ef80f16a Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 25 Jan 2018 16:21:22 +0100 Subject: [PATCH 677/710] Fix #42097 --- .../workbench/browser/parts/views/media/views.css | 13 ++++++++----- src/vs/workbench/browser/parts/views/treeView.ts | 14 +++++++++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/media/views.css b/src/vs/workbench/browser/parts/views/media/views.css index f3b98771b75..3cda0e9caf6 100644 --- a/src/vs/workbench/browser/parts/views/media/views.css +++ b/src/vs/workbench/browser/parts/views/media/views.css @@ -20,10 +20,17 @@ content: ' '; } -.file-icon-themable-tree.align-icons-and-twisties .monaco-tree-row:not(.has-children) .content::before { +.file-icon-themable-tree.align-icons-and-twisties .monaco-tree-row:not(.has-children) .content::before, +.file-icon-themable-tree.hide-arrows .monaco-tree-row .content::before { display: none; } +/** Show the twistie content if the parent has opt in icon **/ +.tree-explorer-viewlet-tree-view.file-icon-themable-tree.align-icons-and-twisties .monaco-tree-row:not(.has-children) .content.parent-has-icon::before, +.tree-explorer-viewlet-tree-view.file-icon-themable-tree.hide-arrows .monaco-tree-row .content.parent-has-icon::before { + display: inline-block; +} + .file-icon-themable-tree .monaco-tree-row.has-children.expanded .content::before { background-image: url("expanded.svg"); } @@ -49,10 +56,6 @@ background-image: url("collapsed-hc.svg"); } -.file-icon-themable-tree.hide-arrows .monaco-tree-row .content::before { - display: none; -} - .tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item { display: flex; height: 22px; diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index a72b589137a..a1cc343d860 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -262,6 +262,7 @@ class TreeDataSource implements IDataSource { } interface ITreeExplorerTemplateData { + container: HTMLElement; label: HTMLElement; resourceLabel: ResourceLabel; icon: HTMLElement; @@ -300,14 +301,13 @@ class TreeRenderer implements IRenderer { actionRunner: new MultipleSelectionActionRunner(() => tree.getSelection()) }); - return { label, resourceLabel, icon, actionBar }; + return { container, label, resourceLabel, icon, actionBar }; } public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void { const resource = node.resourceUri ? URI.revive(node.resourceUri) : null; const name = node.label || basename(resource.path); - const theme = this.themeService.getTheme(); - const icon = theme.type === LIGHT ? node.icon : node.iconDark; + const icon = this.themeService.getTheme().type === LIGHT ? node.icon : node.iconDark; // reset templateData.resourceLabel.clear(); @@ -331,6 +331,14 @@ class TreeRenderer implements IRenderer { templateData.actionBar.context = ({ $treeViewId: this.treeViewId, $treeItemHandle: node.handle }); templateData.actionBar.push(this.menus.getResourceActions(node), { icon: true, label: false }); + + // Fix when the theme do not show folder icons but parent has opt in icon. + DOM.toggleClass(templateData.container, 'parent-has-icon', this.hasParentHasOptInIcon(node, tree)); + } + + private hasParentHasOptInIcon(node: ITreeItem, tree: ITree): boolean { + const parent: ITreeItem = tree.getNavigator(node).parent(); + return parent ? !!(this.themeService.getTheme().type === LIGHT ? parent.icon : parent.iconDark) : false; } public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void { From 4c762339a12298c0ecae9ac158e961b163435745 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 16:24:33 +0100 Subject: [PATCH 678/710] debug: improve compound schema for suggesting folder names --- .../electron-browser/debugConfigurationManager.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts index 34b56d52c49..65c36f84561 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts @@ -195,11 +195,11 @@ const schema: IJSONSchema = { required: ['name'], properties: { name: { - type: 'string', + enum: [], description: nls.localize('app.launch.json.compound.name', "Name of compound. Appears in the launch configuration drop down menu.") }, folder: { - type: 'string', + enum: [], description: nls.localize('app.launch.json.compound.folder', "Name of folder in which the compound is located.") } } @@ -342,6 +342,7 @@ export class ConfigurationManager implements IConfigurationManager { this.toDispose.push(this.contextService.onDidChangeWorkspaceFolders(() => { this.initLaunches(); this.selectConfiguration(); + this.setCompoundSchemaValues(); })); this.toDispose.push(this.configurationService.onDidChangeConfiguration(e => { if (e.affectsConfiguration('launch')) { @@ -366,8 +367,14 @@ export class ConfigurationManager implements IConfigurationManager { private setCompoundSchemaValues(): void { const compoundConfigurationsSchema = (schema.properties['compounds'].items).properties['configurations']; - (compoundConfigurationsSchema.items).oneOf[0].enum = this.launches.map(l => + const launchNames = this.launches.map(l => l.getConfigurationNames(false)).reduce((first, second) => first.concat(second), []); + (compoundConfigurationsSchema.items).oneOf[0].enum = launchNames; + (compoundConfigurationsSchema.items).oneOf[1].properties.name.enum = launchNames; + + const folderNames = this.contextService.getWorkspace().folders.map(f => f.name); + (compoundConfigurationsSchema.items).oneOf[1].properties.folder.enum = folderNames; + jsonRegistry.registerSchema(launchSchemaId, schema); } From ec5de9df8ba7f098fcde0f8406aceb9d6c7c10f8 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 25 Jan 2018 16:34:51 +0100 Subject: [PATCH 679/710] update inno_updater.exe --- build/win32/inno_updater.exe | Bin 147456 -> 146944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/build/win32/inno_updater.exe b/build/win32/inno_updater.exe index c83bcd48cacd90aaa9e5e0a2fda90ae0f568e210..2d5d1ab1d493d93ee67d18fe0b7c1665c3f3dec2 100644 GIT binary patch delta 50519 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 W#bGs*B Date: Thu, 25 Jan 2018 16:40:34 +0100 Subject: [PATCH 680/710] fixes #42115 --- src/vs/code/node/cli.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index b47a0015178..03b86b8c36d 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -347,6 +347,6 @@ function eventuallyExit(code: number): void { main(process.argv) .then(() => eventuallyExit(0)) .then(null, err => { - console.error(err.stack ? err.stack : err); + console.error(err.message || err.stack || err); eventuallyExit(1); }); From 5223e41ef907ea4d33e9f2ce30f66e83ae1b191b Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 25 Jan 2018 16:41:47 +0100 Subject: [PATCH 681/710] #40357 Probable fix --- src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts | 4 ++-- src/vs/workbench/api/node/extHostTreeViews.ts | 2 +- src/vs/workbench/browser/parts/views/treeView.ts | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts index 67bd6438fe5..b2970e5f093 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts @@ -67,7 +67,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider { return this.postGetElements(elements); }, err => { this.messageService.show(Severity.Error, err); - return null; + return []; }); } @@ -80,7 +80,7 @@ class TreeViewDataProvider implements ITreeViewDataProvider { return this.postGetElements(children); }, err => { this.messageService.show(Severity.Error, err); - return null; + return []; }); } diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index a1807377c88..effb25dd985 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -114,7 +114,7 @@ class ExtHostTreeView extends Disposable { } return null; }) - ))).then(extTreeItems => extTreeItems.map((({ element, extTreeItem }) => this.createTreeItem(element, extTreeItem, parentHandle)))); + ))).then(extTreeItems => coalesce(extTreeItems).map((({ element, extTreeItem }) => this.createTreeItem(element, extTreeItem, parentHandle)))); } getExtensionElement(treeItemHandle: TreeItemHandle): T { diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index a1cc343d860..98235ba28b6 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -245,7 +245,8 @@ class TreeDataSource implements IDataSource { return children; }); } - return TPromise.as(null); + + return TPromise.as([]); } public shouldAutoexpand(tree: ITree, node: ITreeItem): boolean { From 9c047b318b5a9ffad4c54c0dc62d794ae4b7bdb5 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 17:02:46 +0100 Subject: [PATCH 682/710] debug: when new raw source comes update the original reference fixes #42139 --- src/vs/workbench/parts/debug/common/debugModel.ts | 1 + src/vs/workbench/parts/debug/common/debugSource.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index d585e6276d8..16dd4a8a7da 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -560,6 +560,7 @@ export class Process implements IProcess { let source = new Source(raw, this.getId()); if (this.sources.has(source.uri.toString())) { source = this.sources.get(source.uri.toString()); + source.raw = raw; } else { this.sources.set(source.uri.toString(), source); } diff --git a/src/vs/workbench/parts/debug/common/debugSource.ts b/src/vs/workbench/parts/debug/common/debugSource.ts index a154158dc82..22a60851431 100644 --- a/src/vs/workbench/parts/debug/common/debugSource.ts +++ b/src/vs/workbench/parts/debug/common/debugSource.ts @@ -19,7 +19,7 @@ export class Source { public readonly uri: uri; public available: boolean; - constructor(public readonly raw: DebugProtocol.Source, sessionId: string) { + constructor(public raw: DebugProtocol.Source, sessionId: string) { if (!raw) { this.raw = { name: UNKNOWN_SOURCE_LABEL }; } @@ -110,4 +110,4 @@ export class Source { processId }; } -} \ No newline at end of file +} From e0a77715df320430eef32ab0af5e35db2d809c9d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 25 Jan 2018 17:11:34 +0100 Subject: [PATCH 683/710] no verbose tsfmt --- build/gulpfile.hygiene.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index eecc080ad1d..f766cfaca0f 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -198,7 +198,7 @@ const hygiene = exports.hygiene = (some, options) => { tsfmt.processString(file.path, file.contents.toString('utf8'), { verify: true, tsfmt: true, - verbose: true + // verbose: true }).then(result => { if (result.error) { console.error(result.message); From 390626a6898a4e2de1468fbe39f8aeed38fd6e0c Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 17:52:19 +0100 Subject: [PATCH 684/710] use modal dialogs for preLaunchTask errors fixes #42050 --- .../debug/electron-browser/debugService.ts | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 857669d1093..5e6acaea944 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -11,7 +11,6 @@ import * as strings from 'vs/base/common/strings'; import { generateUuid } from 'vs/base/common/uuid'; import uri from 'vs/base/common/uri'; import * as platform from 'vs/base/common/platform'; -import { Action } from 'vs/base/common/actions'; import { first, distinct } from 'vs/base/common/arrays'; import { isObject, isUndefinedOrNull } from 'vs/base/common/types'; import * as errors from 'vs/base/common/errors'; @@ -25,7 +24,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { FileChangesEvent, FileChangeType, IFileService } from 'vs/platform/files/common/files'; -import { IMessageService, CloseAction } from 'vs/platform/message/common/message'; +import { IMessageService, CloseAction, IChoiceService } from 'vs/platform/message/common/message'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService'; @@ -37,7 +36,7 @@ import { Model, ExceptionBreakpoint, FunctionBreakpoint, Breakpoint, Expression, import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel'; import * as debugactions from 'vs/workbench/parts/debug/browser/debugActions'; import { ConfigurationManager } from 'vs/workbench/parts/debug/electron-browser/debugConfigurationManager'; -import { ToggleMarkersPanelAction } from 'vs/workbench/parts/markers/browser/markersPanelActions'; +import Constants from 'vs/workbench/parts/markers/common/constants'; import { ITaskService, ITaskSummary } from 'vs/workbench/parts/tasks/common/taskService'; import { TaskError } from 'vs/workbench/parts/tasks/common/taskSystem'; import { VIEWLET_ID as EXPLORER_VIEWLET_ID } from 'vs/workbench/parts/files/common/files'; @@ -89,6 +88,7 @@ export class DebugService implements debug.IDebugService { @IViewletService private viewletService: IViewletService, @IPanelService private panelService: IPanelService, @IMessageService private messageService: IMessageService, + @IChoiceService private choiceService: IChoiceService, @IPartService private partService: IPartService, @IWindowService private windowService: IWindowService, @IBroadcastService private broadcastService: IBroadcastService, @@ -790,10 +790,6 @@ export class DebugService implements debug.IDebugService { } this.toDisposeOnSessionEnd.set(sessionId, []); - const debugAnywayAction = new Action('debug.continue', nls.localize('debugAnyway', "Debug Anyway"), null, true, () => { - this.messageService.hideAll(); - return this.doCreateProcess(root, resolvedConfig, sessionId); - }); return this.runPreLaunchTask(sessionId, root, resolvedConfig.preLaunchTask).then((taskSummary: ITaskSummary) => { const errorCount = resolvedConfig.preLaunchTask ? this.markerService.getStatistics().errors : 0; @@ -803,26 +799,32 @@ export class DebugService implements debug.IDebugService { return this.doCreateProcess(root, resolvedConfig, sessionId); } - this.messageService.show(severity.Error, { - message: errorCount > 1 ? nls.localize('preLaunchTaskErrors', "Build errors have been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) : - errorCount === 1 ? nls.localize('preLaunchTaskError', "Build error has been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) : - nls.localize('preLaunchTaskExitCode', "The preLaunchTask '{0}' terminated with exit code {1}.", resolvedConfig.preLaunchTask, taskSummary.exitCode), - actions: [ - debugAnywayAction, - this.instantiationService.createInstance(ToggleMarkersPanelAction, ToggleMarkersPanelAction.ID, ToggleMarkersPanelAction.LABEL), - CloseAction - ] + const message = errorCount > 1 ? nls.localize('preLaunchTaskErrors', "Build errors have been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) : + errorCount === 1 ? nls.localize('preLaunchTaskError', "Build error has been detected during preLaunchTask '{0}'.", resolvedConfig.preLaunchTask) : + nls.localize('preLaunchTaskExitCode', "The preLaunchTask '{0}' terminated with exit code {1}.", resolvedConfig.preLaunchTask, taskSummary.exitCode); + + return this.choiceService.choose(severity.Error, message, [nls.localize('debugAnyway', "Debug Anyway"), nls.localize('showErrors', "Show Errors"), nls.localize('cancel', "Cancel")], 2, true).then(choice => { + switch (choice) { + case 0: + return this.doCreateProcess(root, resolvedConfig, sessionId); + case 1: + return this.panelService.openPanel(Constants.MARKERS_PANEL_ID).then(() => undefined); + default: + return undefined; + } }); - return undefined; }, (err: TaskError) => { - this.messageService.show(err.severity, { - message: err.message, - actions: [ - debugAnywayAction, - this.instantiationService.createInstance(debugactions.ConfigureAction, debugactions.ConfigureAction.ID, debugactions.ConfigureAction.LABEL), - this.taskService.configureAction(), - CloseAction - ] + return this.choiceService.choose(severity.Error, err.message, [nls.localize('debugAnyway', "Debug Anyway"), debugactions.ConfigureAction.LABEL, this.taskService.configureAction().label, nls.localize('cancel', "Cancel")], 3, true).then(choice => { + switch (choice) { + case 0: + return this.doCreateProcess(root, resolvedConfig, sessionId); + case 1: + return this.configurationManager.selectedLaunch.openConfigFile(false); + case 2: + return this.taskService.configureAction().run(); + default: + return undefined; + } }); }); }, err => { From 154d8c784b9f1e5c759855cce33b16b21017c741 Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 25 Jan 2018 17:54:49 +0100 Subject: [PATCH 685/710] debug: proper fix for restart not saving --- .../debug/electron-browser/debugService.ts | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 5e6acaea944..b4074f675ba 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -150,7 +150,7 @@ export class DebugService implements debug.IDebugService { process.configuration.request = 'attach'; process.configuration.port = broadcast.payload.port; - this.createProcess(process.session.root, process.configuration, process.getId()); + this.doCreateProcess(process.session.root, process.configuration, process.getId()); return; } @@ -1043,43 +1043,45 @@ export class DebugService implements debug.IDebugService { } public restartProcess(process: debug.IProcess, restartData?: any): TPromise { - if (process.session.capabilities.supportsRestartRequest) { - return process.session.custom('restart', null); - } - const focusedProcess = this.viewModel.focusedProcess; - const preserveFocus = focusedProcess && process.getId() === focusedProcess.getId(); - - return process.session.disconnect(true).then(() => { - if (strings.equalsIgnoreCase(process.configuration.type, 'extensionHost') && process.session.root) { - return this.broadcastService.broadcast({ - channel: EXTENSION_RELOAD_BROADCAST_CHANNEL, - payload: [process.session.root.uri.fsPath] - }); + return this.textFileService.saveAll().then(() => { + if (process.session.capabilities.supportsRestartRequest) { + return process.session.custom('restart', null); } + const focusedProcess = this.viewModel.focusedProcess; + const preserveFocus = focusedProcess && process.getId() === focusedProcess.getId(); - return new TPromise((c, e) => { - setTimeout(() => { - // Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration - let config = process.configuration; - if (this.launchJsonChanged && this.configurationManager.selectedLaunch) { - this.launchJsonChanged = false; - config = this.configurationManager.selectedLaunch.getConfiguration(process.configuration.name) || config; - // Take the type from the process since the debug extension might overwrite it #21316 - config.type = process.configuration.type; - config.noDebug = process.configuration.noDebug; - } - config.__restart = restartData; - this.startDebugging(process.session.root, config).then(() => c(null), err => e(err)); - }, 300); - }); - }).then(() => { - if (preserveFocus) { - // Restart should preserve the focused process - const restartedProcess = this.model.getProcesses().filter(p => p.configuration.name === process.configuration.name).pop(); - if (restartedProcess && restartedProcess !== this.viewModel.focusedProcess) { - this.focusStackFrame(undefined, undefined, restartedProcess); + return process.session.disconnect(true).then(() => { + if (strings.equalsIgnoreCase(process.configuration.type, 'extensionHost') && process.session.root) { + return this.broadcastService.broadcast({ + channel: EXTENSION_RELOAD_BROADCAST_CHANNEL, + payload: [process.session.root.uri.fsPath] + }); } - } + + return new TPromise((c, e) => { + setTimeout(() => { + // Read the configuration again if a launch.json has been changed, if not just use the inmemory configuration + let config = process.configuration; + if (this.launchJsonChanged && this.configurationManager.selectedLaunch) { + this.launchJsonChanged = false; + config = this.configurationManager.selectedLaunch.getConfiguration(process.configuration.name) || config; + // Take the type from the process since the debug extension might overwrite it #21316 + config.type = process.configuration.type; + config.noDebug = process.configuration.noDebug; + } + config.__restart = restartData; + this.startDebugging(process.session.root, config).then(() => c(null), err => e(err)); + }, 300); + }); + }).then(() => { + if (preserveFocus) { + // Restart should preserve the focused process + const restartedProcess = this.model.getProcesses().filter(p => p.configuration.name === process.configuration.name).pop(); + if (restartedProcess && restartedProcess !== this.viewModel.focusedProcess) { + this.focusStackFrame(undefined, undefined, restartedProcess); + } + } + }); }); } From 7b2864f6895eb04258a760964fc1fb9d018e3ca3 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Thu, 25 Jan 2018 09:27:22 -0800 Subject: [PATCH 686/710] Fix regression with page up/down+modifiers in terminal Fixes #42161 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5079c68d462..14be3363124 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "vscode-debugprotocol": "1.25.0", "vscode-ripgrep": "^0.7.1-patch.0", "vscode-textmate": "^3.2.0", - "vscode-xterm": "3.1.0-beta10", + "vscode-xterm": "3.1.0-beta11", "yauzl": "2.8.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 71dafbf80d3..33d7443e5bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5808,9 +5808,9 @@ vscode-textmate@^3.2.0: fast-plist "^0.1.2" oniguruma "^6.0.1" -vscode-xterm@3.1.0-beta10: - version "3.1.0-beta10" - resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta10.tgz#274ab2f41c0417f477c4fe4488788a8be740784e" +vscode-xterm@3.1.0-beta11: + version "3.1.0-beta11" + resolved "https://registry.yarnpkg.com/vscode-xterm/-/vscode-xterm-3.1.0-beta11.tgz#a6cfa957a6cac3bcc574da0433a2aa58654f2d8f" vso-node-api@^6.1.2-preview: version "6.1.2-preview" From 32abd36d94eb37479e9768d68d920e8e78dc687e Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 25 Jan 2018 18:46:45 +0100 Subject: [PATCH 687/710] Fix #41781 --- .../parts/extensions/electron-browser/extensionsViews.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts index 03694331729..69e6766f25c 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViews.ts @@ -234,7 +234,7 @@ export class ExtensionsListView extends ViewsViewletPanel { const languageTag = languageName ? ` tag:"${languageName}"` : ''; // Construct a rich query - return `tag:"__ext_${ext}" tag:"__ext_.${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag}`; + return `tag:"__ext_${ext}" tag:"__ext_.${ext}" ${keywords.map(tag => `tag:"${tag}"`).join(' ')}${languageTag} tag:"${ext}"`; }); if (names.length) { From f310c3fb6f5c22ffea5ed2c117a8b60946d8f897 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Thu, 25 Jan 2018 10:38:53 -0800 Subject: [PATCH 688/710] Issue Reporter: Search GitHub issues on input instead of blur --- .../issue/issueReporterMain.ts | 92 +++++++++++-------- .../issue/issueReporterModel.ts | 5 + .../issue/issueReporterPage.ts | 2 +- .../issue/electron-main/issueService.ts | 15 ++- 4 files changed, 71 insertions(+), 43 deletions(-) diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts index 79e51813d01..e851e2e65b1 100644 --- a/src/vs/code/electron-browser/issue/issueReporterMain.ts +++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts @@ -33,6 +33,7 @@ import { IssueReporterModel, IssueType } from 'vs/code/electron-browser/issue/is import { IssueReporterData, IssueReporterStyles } from 'vs/platform/issue/common/issue'; import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage'; import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; +import { debounce } from 'vs/base/common/decorators'; export interface IssueReporterConfiguration extends IWindowConfiguration { data: IssueReporterData; @@ -57,6 +58,8 @@ export class IssueReporter extends Disposable { constructor(configuration: IssueReporterConfiguration) { super(); + this.initServices(configuration); + this.issueReporterModel = new IssueReporterModel({ issueType: IssueType.Bug, includeSystemInfo: true, @@ -66,7 +69,8 @@ export class IssueReporter extends Disposable { versionInfo: { vscodeVersion: `${pkg.name} ${pkg.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`, os: `${os.type()} ${os.arch()} ${os.release()}` - } + }, + extensionsDisabled: this.environmentService.disableExtensions }); ipcRenderer.on('issueInfoResponse', (event, info) => { @@ -81,13 +85,11 @@ export class IssueReporter extends Disposable { ipcRenderer.send('issueInfoRequest'); - this.initServices(configuration); - this.setEventHandlers(); - if (window.document.documentElement.lang !== 'en') { show(document.getElementById('english')); } + this.setEventHandlers(); this.applyZoom(configuration.data.zoomLevel); this.applyStyles(configuration.data.styles); this.handleExtensionData(configuration.data.enabledExtensions); @@ -215,42 +217,7 @@ export class IssueReporter extends Disposable { this.issueReporterModel.update({ issueDescription: (event.target).value }); }); - function addIssuesToList(list, issueJSON) { - for (let i = 0; i < 5; i++) { - const link = $('a', { href: issueJSON[i].html_url }); - link.textContent = issueJSON[i].title; - link.addEventListener('click', (event) => { - shell.openExternal((event.target).href); - }); - - const item = $('li', {}, link); - list.appendChild(item); - } - } - - document.getElementById('issue-title').addEventListener('blur', (event) => { - const title = (event.target).value; - const similarIssues = document.getElementById('similar-issues'); - similarIssues.innerHTML = ''; - - if (title) { - const query = `is:issue+repo:microsoft/vscode+${title}`; - window.fetch(`https://api.github.com/search/issues?q=${query}&per_page=5`).then((response) => { - response.json().then(result => { - if (result.items.length) { - const issues = $('ul'); - const issuesText = $('div.list-title'); - issuesText.textContent = localize('similarIssues', "Similar issues"); - addIssuesToList(issues, result.items); - similarIssues.appendChild(issuesText); - similarIssues.appendChild(issues); - } - }); - }).catch((error) => { - console.log(error); - }); - } - }); + document.getElementById('issue-title').addEventListener('input', this.searchGitHub); document.getElementById('github-submit-btn').addEventListener('click', () => this.createIssue()); @@ -264,6 +231,45 @@ export class IssueReporter extends Disposable { }; } + @debounce(300) + private searchGitHub(event: Event) { + const title = (event.target).value; + const similarIssues = document.getElementById('similar-issues'); + if (title) { + const query = `is:issue+repo:microsoft/vscode+${title}`; + window.fetch(`https://api.github.com/search/issues?q=${query}`).then((response) => { + response.json().then(result => { + similarIssues.innerHTML = ''; + if (result && result.items && result.items.length) { + const issues = $('ul'); + const issuesText = $('div.list-title'); + issuesText.textContent = localize('similarIssues', "Similar issues"); + + const { items } = result; + const numResultsToDisplay = items.length < 5 ? items.length : 5; + for (let i = 0; i < numResultsToDisplay; i++) { + const link = $('a', { href: items[i].html_url }); + link.textContent = items[i].title; + link.addEventListener('click', (event) => { + shell.openExternal((event.target).href); + }); + + const item = $('li', {}, link); + issues.appendChild(item); + } + + similarIssues.appendChild(issuesText); + similarIssues.appendChild(issues); + } + }); + }).catch((error) => { + console.log(error); + }); + } else { + similarIssues.innerHTML = ''; + } + } + private renderBlocks(): void { // Depending on Issue Type, we render different blocks and text const { issueType } = this.issueReporterModel.getData(); @@ -413,6 +419,12 @@ export class IssueReporter extends Disposable { private updateExtensionTable(extensions: ILocalExtension[], numThemeExtensions: number): void { const target = document.querySelector('.block-extensions .block-info'); + + if (this.environmentService.disableExtensions) { + target.innerHTML = localize('disabledExtensions', "Extensions are disabled"); + return; + } + const themeExclusionStr = numThemeExtensions ? `\n(${numThemeExtensions} theme extensions excluded)` : ''; extensions = extensions || []; diff --git a/src/vs/code/electron-browser/issue/issueReporterModel.ts b/src/vs/code/electron-browser/issue/issueReporterModel.ts index 9fc265a4f7f..3da55c9d6cc 100644 --- a/src/vs/code/electron-browser/issue/issueReporterModel.ts +++ b/src/vs/code/electron-browser/issue/issueReporterModel.ts @@ -27,6 +27,7 @@ export interface IssueReporterData { includeExtensions?: boolean; numberOfThemeExtesions?: number; enabledNonThemeExtesions?: ILocalExtension[]; + extensionsDisabled?: boolean; } export class IssueReporterModel { @@ -152,6 +153,10 @@ ${this._data.workspaceInfo}; } private generateExtensionsMd(): string { + if (this._data.extensionsDisabled) { + return 'Extensions disabled'; + } + const themeExclusionStr = this._data.numberOfThemeExtesions ? `\n(${this._data.numberOfThemeExtesions} theme extensions excluded)` : ''; if (!this._data.enabledNonThemeExtesions) { diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts index 2065544ff09..19085c508fa 100644 --- a/src/vs/code/electron-browser/issue/issueReporterPage.ts +++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts @@ -83,7 +83,7 @@ export default (): string => `
    - ${escape(localize('extensions', "Extensions"))} + ${escape(localize('extensions', "My Extensions"))} diff --git a/src/vs/platform/issue/electron-main/issueService.ts b/src/vs/platform/issue/electron-main/issueService.ts index 238605a9c65..f103065344f 100644 --- a/src/vs/platform/issue/electron-main/issueService.ts +++ b/src/vs/platform/issue/electron-main/issueService.ts @@ -7,6 +7,8 @@ import { TPromise, Promise } from 'vs/base/common/winjs.base'; import { localize } from 'vs/nls'; +import * as objects from 'vs/base/common/objects'; +import { parseArgs } from 'vs/platform/environment/node/argv'; import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue'; import { BrowserWindow, ipcMain } from 'electron'; import { ILaunchService } from 'vs/code/electron-main/launch'; @@ -34,7 +36,7 @@ export class IssueService implements IIssueService { this._issueWindow = new BrowserWindow({ width: 800, - height: 900, + height: 1000, title: localize('issueReporter', "Issue Reporter"), parent: BrowserWindow.getFocusedWindow(), backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR @@ -62,13 +64,22 @@ export class IssueService implements IIssueService { } private getIssueReporterPath(data: IssueReporterData) { - const config = { + const windowConfiguration = { appRoot: this.environmentService.appRoot, nodeCachedDataDir: this.environmentService.nodeCachedDataDir, windowId: this._issueWindow.id, machineId: this.machineId, data }; + + const environment = parseArgs(process.argv); + const config = objects.assign(environment, windowConfiguration); + for (let key in config) { + if (config[key] === void 0 || config[key] === null || config[key] === '') { + delete config[key]; // only send over properties that have a true value + } + } + return `${require.toUrl('vs/code/electron-browser/issue/issueReporter.html')}?config=${encodeURIComponent(JSON.stringify(config))}`; } } From 718be9ee16d9296a8a643b66df7557a38c5b1718 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 24 Jan 2018 16:31:32 -0800 Subject: [PATCH 689/710] Move zoom level to left of size info --- src/vs/workbench/browser/parts/editor/resourceViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 9fbdd3d0030..0c3040006f0 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -327,7 +327,7 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem { } Registry.as(Extensions.Statusbar).registerStatusbarItem( - new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, -1) + new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101) ); class InlineImageView { From 23fd92e63e3b23b8b9c6d62bf990d0af4e2c6713 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 01:59:15 -0800 Subject: [PATCH 690/710] Restore persisted zoom --- src/vs/workbench/browser/parts/editor/resourceViewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 0c3040006f0..2fdd7d860c7 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -486,7 +486,7 @@ class InlineImageView { imgElement = img.getHTMLElement() as HTMLImageElement; metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); scrollbar.scanDomNode(); - updateScale('fit'); + updateScale(scale); }); return context; From 045c212f83a808ea8ebd2e3ab1343f4b26c4da6d Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 02:02:11 -0800 Subject: [PATCH 691/710] Get rid of flash on scaled image load --- src/vs/workbench/browser/parts/editor/resourceViewer.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 2fdd7d860c7..427e40d07ac 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -480,12 +480,14 @@ class InlineImageView { .empty() .addClass('image', 'zoom-in') .img({ src: InlineImageView.imageSrc(descriptor) }) + .style('visibility', 'hidden') .addClass('scale-to-fit') .on(DOM.EventType.LOAD, (e, i) => { img = i; imgElement = img.getHTMLElement() as HTMLImageElement; metadataClb(nls.localize('imgMeta', '{0}x{1} {2}', imgElement.naturalWidth, imgElement.naturalHeight, BinarySize.formatSize(descriptor.size))); scrollbar.scanDomNode(); + img.style('visibility', 'visible'); updateScale(scale); }); From 69f9a3b8080f5e90a47743dda1a6dc3f55972be4 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 11:00:17 -0800 Subject: [PATCH 692/710] Persist scroll position in image view --- .../browser/parts/editor/resourceViewer.ts | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 427e40d07ac..857501fda36 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -330,6 +330,12 @@ Registry.as(Extensions.Statusbar).registerStatusbarItem( new StatusbarItemDescriptor(ZoomStatusbarItem, StatusbarAlignment.RIGHT, 101) ); +interface ImageState { + scale: Scale; + offsetX: number; + offsetY: number; +} + class InlineImageView { private static readonly SCALE_PINCH_FACTOR = 0.05; private static readonly SCALE_FACTOR = 1.5; @@ -350,9 +356,9 @@ class InlineImageView { private static IMAGE_RESOURCE_ETAG_CACHE = new LRUCache(100); /** - * Store the scale of an image so it can be restored when changing editor tabs + * Store the scale and position of an image so it can be restored when changing editor tabs */ - private static readonly IMAGE_SCALE_CACHE = new LRUCache(100); + private static readonly imageStateCache = new LRUCache(100); public static create( container: Builder, @@ -367,7 +373,8 @@ class InlineImageView { const cacheKey = descriptor.resource.toString(); let scaleDirection = ScaleDirection.IN; - let scale: Scale = InlineImageView.IMAGE_SCALE_CACHE.get(cacheKey) || 'fit'; + const initialState: ImageState = InlineImageView.imageStateCache.get(cacheKey) || { scale: 'fit', offsetX: 0, offsetY: 0 }; + let scale = initialState.scale; let img: Builder | null = null; let imgElement: HTMLImageElement | null = null; @@ -381,7 +388,7 @@ class InlineImageView { img.addClass('scale-to-fit'); img.removeClass('pixelated'); img.style('width', 'auto'); - InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, null); + InlineImageView.imageStateCache.set(cacheKey, null); } else { const oldWidth = imgElement.width; const oldHeight = imgElement.height; @@ -400,15 +407,19 @@ class InlineImageView { img.removeClass('scale-to-fit'); img.style('width', `${(imgElement.naturalWidth * scale)}px`); img.style('height', 'auto'); - InlineImageView.IMAGE_SCALE_CACHE.set(cacheKey, scale); const newWidth = imgElement.width; const scaleFactor = (newWidth - oldWidth) / oldWidth; + const newScrollLeft = ((oldWidth * scaleFactor * dx) + scrollLeft); + const newScrollTop = ((oldHeight * scaleFactor * dy) + scrollTop); scrollbar.setScrollPosition({ - scrollLeft: ((oldWidth * scaleFactor * dx) + scrollLeft), - scrollTop: ((oldHeight * scaleFactor * dy) + scrollTop), + scrollLeft: newScrollLeft, + scrollTop: newScrollTop, }); + + InlineImageView.imageStateCache.set(cacheKey, { scale: scale, offsetX: newScrollLeft, offsetY: newScrollTop }); + } ZoomStatusbarItem.instance.show(scale, updateScale); scrollbar.scanDomNode(); @@ -474,6 +485,17 @@ class InlineImageView { // scrolling up, pinching out should increase the scale const delta = -e.deltaY; updateScale(scale as number + delta * InlineImageView.SCALE_PINCH_FACTOR); + }) + .on(DOM.EventType.SCROLL, () => { + if (!imgElement || !imgElement.parentElement || scale === 'fit') { + return; + } + + const entry = InlineImageView.imageStateCache.get(cacheKey); + if (entry) { + const { scrollTop, scrollLeft } = imgElement.parentElement; + InlineImageView.imageStateCache.set(cacheKey, { scale: entry.scale, offsetX: scrollLeft, offsetY: scrollTop }); + } }); $(container) @@ -489,6 +511,12 @@ class InlineImageView { scrollbar.scanDomNode(); img.style('visibility', 'visible'); updateScale(scale); + if (initialState.scale !== 'fit') { + scrollbar.setScrollPosition({ + scrollLeft: initialState.offsetX, + scrollTop: initialState.offsetY, + }); + } }); return context; From 7941b1b0a932c7d99c87e80743824343bb100ea6 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 17 Jan 2018 17:29:24 -0800 Subject: [PATCH 693/710] Show pref search result count badges for user and workspace settings --- .../preferences/browser/preferencesEditor.ts | 157 ++++++++++++------ .../preferences/browser/preferencesWidgets.ts | 18 ++ 2 files changed, 123 insertions(+), 52 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index f363d51e8fd..86d1f89b0e9 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -119,7 +119,6 @@ export class PreferencesEditor extends BaseEditor { constructor( @IPreferencesService private preferencesService: IPreferencesService, - @IPreferencesSearchService private preferencesSearchService: IPreferencesSearchService, @ITelemetryService telemetryService: ITelemetryService, @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IContextKeyService private contextKeyService: IContextKeyService, @@ -155,7 +154,7 @@ export class PreferencesEditor extends BaseEditor { this._register(this.sideBySidePreferencesWidget.onFocus(() => this.lastFocusedWidget = this.sideBySidePreferencesWidget)); this._register(this.sideBySidePreferencesWidget.onDidSettingsTargetChange(target => this.switchSettings(target))); - this.preferencesRenderers = this._register(new PreferencesRenderersController(this.preferencesSearchService, this.telemetryService)); + this.preferencesRenderers = this._register(this.instantiationService.createInstance(PreferencesRenderersController)); this._register(this.preferencesRenderers.onDidFilterResultsCountChange(count => this.showSearchResultsMessage(count))); } @@ -286,17 +285,20 @@ export class PreferencesEditor extends BaseEditor { }); } - private showSearchResultsMessage(count: number): void { - if (this.searchWidget.getValue()) { - if (count === 0) { - this.searchWidget.showMessage(nls.localize('noSettingsFound', "No Results"), count); - } else if (count === 1) { - this.searchWidget.showMessage(nls.localize('oneSettingFound', "1 Setting Found"), count); + private showSearchResultsMessage(count: IPreferencesCount): void { + const countValue = count.count; + if (count.target) { + this.sideBySidePreferencesWidget.setResultCount(count.target, count.count); + } else if (this.searchWidget.getValue()) { + if (countValue === 0) { + this.searchWidget.showMessage(nls.localize('noSettingsFound', "No Results"), countValue); + } else if (countValue === 1) { + this.searchWidget.showMessage(nls.localize('oneSettingFound', "1 Setting Found"), countValue); } else { - this.searchWidget.showMessage(nls.localize('settingsFound', "{0} Settings Found", count), count); + this.searchWidget.showMessage(nls.localize('settingsFound', "{0} Settings Found", countValue), countValue); } } else { - this.searchWidget.showMessage(nls.localize('totalSettingsMessage', "Total {0} Settings", count), count); + this.searchWidget.showMessage(nls.localize('totalSettingsMessage', "Total {0} Settings", countValue), countValue); } } @@ -365,6 +367,11 @@ interface IFilterOrSearchResult { metadata: IStringDictionary; } +interface IPreferencesCount { + target?: SettingsTarget; + count: number; +} + class PreferencesRenderersController extends Disposable { private _defaultPreferencesRenderer: IPreferencesRenderer; @@ -375,18 +382,20 @@ class PreferencesRenderersController extends Disposable { private _settingsNavigator: SettingsNavigator; private _remoteFilterInProgress: TPromise; + private _prefsModelsForSearch = new Map(); private _currentLocalSearchProvider: ISearchProvider; private _currentRemoteSearchProvider: ISearchProvider; private _lastQuery: string; private _lastFilterResult: IFilterOrSearchResult; - private _onDidFilterResultsCountChange: Emitter = this._register(new Emitter()); - public onDidFilterResultsCountChange: Event = this._onDidFilterResultsCountChange.event; + private _onDidFilterResultsCountChange: Emitter = this._register(new Emitter()); + public onDidFilterResultsCountChange: Event = this._onDidFilterResultsCountChange.event; constructor( - private preferencesSearchService: IPreferencesSearchService, - private telemetryService: ITelemetryService + @IPreferencesSearchService private preferencesSearchService: IPreferencesSearchService, + @ITelemetryService private telemetryService: ITelemetryService, + @IPreferencesService private preferencesService: IPreferencesService, ) { super(); } @@ -468,6 +477,13 @@ class PreferencesRenderersController extends Disposable { } filterPs.push(this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); + const something = [ + this.searchSettingsTarget(searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder), + this.searchSettingsTarget(searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder) + ]; + + // for (const folder of this.workspaceContextService.getWorkspace().folders) { + // const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri); return TPromise.join(filterPs).then(results => { const [defaultFilterResult, editableFilterResult] = results; @@ -482,6 +498,34 @@ class PreferencesRenderersController extends Disposable { }); } + private searchSettingsTarget(provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number): TPromise { + return this.getPreferencesEditorModel(target).then(model => { + return this._filterOrSearchPreferencesModel('', model, provider, groupId, groupLabel, groupOrder); + }).then(result => { + const count = result ? this._flatten(result.filteredGroups).length : 0; + this._onDidFilterResultsCountChange.fire({ target, count }); + }, err => { + if (!isPromiseCanceledError(err)) { + return TPromise.wrapError(err); + } + + return null; + }); + } + + private async getPreferencesEditorModel(target: SettingsTarget): TPromise { + const resource = target === ConfigurationTarget.USER ? this.preferencesService.userSettingsResource : + target === ConfigurationTarget.WORKSPACE ? this.preferencesService.workspaceSettingsResource : + target; + + if (!this._prefsModelsForSearch.has(target)) { + const model = await this.preferencesService.createPreferencesEditorModel(resource); + this._prefsModelsForSearch.set(target, model); + } + + return this._prefsModelsForSearch.get(target); + } + focusNextPreference(forward: boolean = true) { if (!this._settingsNavigator) { return; @@ -507,48 +551,53 @@ class PreferencesRenderersController extends Disposable { private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { if (preferencesRenderer) { const model = preferencesRenderer.preferencesModel; - const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null); - return searchP - .then(null, err => { - if (isPromiseCanceledError(err)) { - return TPromise.wrapError(err); - } else { - /* __GDPR__ - "defaultSettings.searchError" : { - "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } - } - */ - const message = getErrorMessage(err).trim(); - if (message) { - // Empty message = any generic network error - this.telemetryService.publicLog('defaultSettings.searchError', { message }); - } - - return null; - } - }) - .then(searchResult => { - const filterResult = searchResult ? - model.updateResultGroup(groupId, { - id: groupId, - label: groupLabel, - result: searchResult, - order: groupOrder - }) : - model.updateResultGroup(groupId, null); - - if (filterResult) { - filterResult.query = filter; - } - - preferencesRenderer.filterPreferences(filterResult); - return filterResult; - }); + return this._filterOrSearchPreferencesModel(filter, model, provider, groupId, groupLabel, groupOrder).then(filterResult => { + preferencesRenderer.filterPreferences(filterResult); + return filterResult; + }); } return TPromise.wrap(null); } + private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { + const searchP = provider ? provider.searchModel(model) : TPromise.wrap(null); + return searchP + .then(null, err => { + if (isPromiseCanceledError(err)) { + return TPromise.wrapError(err); + } else { + /* __GDPR__ + "defaultSettings.searchError" : { + "message": { "classification": "SystemMetaData", "purpose": "FeatureInsight" } + } + */ + const message = getErrorMessage(err).trim(); + if (message) { + // Empty message = any generic network error + this.telemetryService.publicLog('defaultSettings.searchError', { message }); + } + return null; + } + }) + .then(searchResult => { + const filterResult = searchResult ? + model.updateResultGroup(groupId, { + id: groupId, + label: groupLabel, + result: searchResult, + order: groupOrder + }) : + model.updateResultGroup(groupId, null); + + if (filterResult) { + filterResult.query = filter; + } + + return filterResult; + }); + } + private consolidateAndUpdate(defaultFilterResult: IFilterResult, editableFilterResult: IFilterResult): void { const defaultPreferencesFilteredGroups = defaultFilterResult ? defaultFilterResult.filteredGroups : this._getAllPreferences(this._defaultPreferencesRenderer); const editablePreferencesFilteredGroups = editableFilterResult ? editableFilterResult.filteredGroups : this._getAllPreferences(this._editablePreferencesRenderer); @@ -556,7 +605,7 @@ class PreferencesRenderersController extends Disposable { this._settingsNavigator = new SettingsNavigator(this._lastQuery ? consolidatedSettings : []); const totalCount = consolidatedSettings.length; - this._onDidFilterResultsCountChange.fire(totalCount); + this._onDidFilterResultsCountChange.fire({ count: totalCount }); } private _getAllPreferences(preferencesRenderer: IPreferencesRenderer): ISettingsGroup[] { @@ -705,6 +754,10 @@ class SideBySidePreferencesWidget extends Widget { }); } + public setResultCount(settingsTarget: SettingsTarget, count: number): void { + this.settingsTargetsWidget.setResultCount(settingsTarget, count); + } + public layout(dimension: Dimension): void { this.dimension = dimension; this.sash.setDimenesion(this.dimension); diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts index 78cba03e94d..67b87c60e1b 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts @@ -492,6 +492,24 @@ export class SettingsTargetsWidget extends Widget { } } + public setResultCount(settingsTarget: SettingsTarget, count: number): void { + if (settingsTarget === ConfigurationTarget.WORKSPACE) { + let label = localize('workspaceSettings', "Workspace Settings"); + if (count) { + label += ` (${count})`; + } + + this.workspaceSettings.label = label; + } else if (settingsTarget === ConfigurationTarget.USER) { + let label = localize('userSettings', "User Settings"); + if (count) { + label += ` (${count})`; + } + + this.userSettings.label = label; + } + } + private onWorkbenchStateChanged(): void { this.folderSettings.folder = null; this.update(); From 987073d157bc866acad229e5008339f67563de0d Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 25 Jan 2018 11:19:17 -0800 Subject: [PATCH 694/710] Settings search - show tab result counts for folder settings --- .../preferences/browser/preferencesEditor.ts | 54 +++++++++++-------- .../preferences/browser/preferencesWidgets.ts | 25 ++++++++- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 86d1f89b0e9..67062ea9e49 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -382,7 +382,7 @@ class PreferencesRenderersController extends Disposable { private _settingsNavigator: SettingsNavigator; private _remoteFilterInProgress: TPromise; - private _prefsModelsForSearch = new Map(); + private _prefsModelsForSearch = new Map(); private _currentLocalSearchProvider: ISearchProvider; private _currentRemoteSearchProvider: ISearchProvider; @@ -396,6 +396,7 @@ class PreferencesRenderersController extends Disposable { @IPreferencesSearchService private preferencesSearchService: IPreferencesSearchService, @ITelemetryService private telemetryService: ITelemetryService, @IPreferencesService private preferencesService: IPreferencesService, + @IWorkspaceContextService private workspaceContextService: IWorkspaceContextService ) { super(); } @@ -473,17 +474,12 @@ class PreferencesRenderersController extends Disposable { const filterPs = []; if (!editableContentOnly) { - filterPs.push(this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); + filterPs.push( + this._filterOrSearchPreferences(query, this.defaultPreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); } - filterPs.push(this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder)); - const something = [ - this.searchSettingsTarget(searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder), - this.searchSettingsTarget(searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder) - ]; - - // for (const folder of this.workspaceContextService.getWorkspace().folders) { - // const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri); + filterPs.push(this._filterOrSearchPreferences(query, this.editablePreferencesRenderer, searchProvider, groupId, groupLabel, groupOrder), + this.updateSettingsTargetCounts(query, searchProvider, groupId, groupLabel, groupOrder)); return TPromise.join(filterPs).then(results => { const [defaultFilterResult, editableFilterResult] = results; @@ -498,6 +494,21 @@ class PreferencesRenderersController extends Disposable { }); } + private updateSettingsTargetCounts(query: string, searchProvider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { + const searchPs = [ + this.searchSettingsTarget(searchProvider, ConfigurationTarget.WORKSPACE, groupId, groupLabel, groupOrder), + this.searchSettingsTarget(searchProvider, ConfigurationTarget.USER, groupId, groupLabel, groupOrder) + ]; + + for (const folder of this.workspaceContextService.getWorkspace().folders) { + const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri); + searchPs.push(this.searchSettingsTarget(searchProvider, folderSettingsResource, groupId, groupLabel, groupOrder)); + } + + + return TPromise.join(searchPs).then(() => { }); + } + private searchSettingsTarget(provider: ISearchProvider, target: SettingsTarget, groupId: string, groupLabel: string, groupOrder: number): TPromise { return this.getPreferencesEditorModel(target).then(model => { return this._filterOrSearchPreferencesModel('', model, provider, groupId, groupLabel, groupOrder); @@ -518,12 +529,13 @@ class PreferencesRenderersController extends Disposable { target === ConfigurationTarget.WORKSPACE ? this.preferencesService.workspaceSettingsResource : target; - if (!this._prefsModelsForSearch.has(target)) { - const model = await this.preferencesService.createPreferencesEditorModel(resource); - this._prefsModelsForSearch.set(target, model); + const targetKey = resource.toString(); + if (!this._prefsModelsForSearch.has(targetKey)) { + const model = this._register(await this.preferencesService.createPreferencesEditorModel(resource)); + this._prefsModelsForSearch.set(targetKey, model); } - return this._prefsModelsForSearch.get(target); + return this._prefsModelsForSearch.get(targetKey); } focusNextPreference(forward: boolean = true) { @@ -549,15 +561,15 @@ class PreferencesRenderersController extends Disposable { } private _filterOrSearchPreferences(filter: string, preferencesRenderer: IPreferencesRenderer, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { - if (preferencesRenderer) { - const model = preferencesRenderer.preferencesModel; - return this._filterOrSearchPreferencesModel(filter, model, provider, groupId, groupLabel, groupOrder).then(filterResult => { - preferencesRenderer.filterPreferences(filterResult); - return filterResult; - }); + if (!preferencesRenderer) { + return TPromise.wrap(null); } - return TPromise.wrap(null); + const model = preferencesRenderer.preferencesModel; + return this._filterOrSearchPreferencesModel(filter, model, provider, groupId, groupLabel, groupOrder).then(filterResult => { + preferencesRenderer.filterPreferences(filterResult); + return filterResult; + }); } private _filterOrSearchPreferencesModel(filter: string, model: ISettingsEditorModel, provider: ISearchProvider, groupId: string, groupLabel: string, groupOrder: number): TPromise { diff --git a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts index 67b87c60e1b..54e0f675b06 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesWidgets.ts @@ -281,6 +281,7 @@ export class SettingsGroupTitleWidget extends Widget implements IViewZone { export class FolderSettingsActionItem extends BaseActionItem { private _folder: IWorkspaceFolder; + private _count: number; private container: HTMLElement; private anchorElement: HTMLElement; @@ -310,6 +311,11 @@ export class FolderSettingsActionItem extends BaseActionItem { this.update(); } + public setCount(value: number): void { + this._count = value; + this.update(); + } + public render(container: HTMLElement): void { this.builder = $(container); @@ -381,10 +387,18 @@ export class FolderSettingsActionItem extends BaseActionItem { if (this._folder) { this.labelElement.textContent = this._folder.name; this.anchorElement.title = this._folder.name; - this.detailsElement.textContent = this._action.label; + let detailsText = this._action.label; + if (this._count) { + detailsText += ` (${this._count})`; + } + this.detailsElement.textContent = detailsText; DOM.toggleClass(this.dropDownElement, 'hide', workspace.folders.length === 1 || !this._action.checked); } else { - this.labelElement.textContent = this._action.label; + let labelText = this._action.label; + if (this._count) { + labelText += ` (${this._count})`; + } + this.labelElement.textContent = labelText; this.detailsElement.textContent = ''; this.anchorElement.title = this._action.label; DOM.removeClass(this.dropDownElement, 'hide'); @@ -436,6 +450,7 @@ export class SettingsTargetsWidget extends Widget { private userSettings: Action; private workspaceSettings: Action; private folderSettings: FolderSettingsActionItem; + private folderSettingCounts = new Map(); private _settingsTarget: SettingsTarget; @@ -507,6 +522,12 @@ export class SettingsTargetsWidget extends Widget { } this.userSettings.label = label; + } else if (settingsTarget instanceof URI) { + this.folderSettingCounts.set(settingsTarget.toString(), count); + + let total = 0; + this.folderSettingCounts.forEach(count => total += count); + this.folderSettings.setCount(total); } } From c00aeba6e8c16f7e2068b8ab1774a1d19b5e9e76 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 25 Jan 2018 11:47:57 -0800 Subject: [PATCH 695/710] Settings search - highlight word matches in description for results from bing (still not using it to filter settings locally) --- .../parts/preferences/electron-browser/preferencesSearch.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts index bb71d6ec0e2..5c7d45b1c92 100644 --- a/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts +++ b/src/vs/workbench/parts/preferences/electron-browser/preferencesSearch.ts @@ -258,7 +258,7 @@ class RemoteSearchProvider implements ISearchProvider { scoredResults[getSettingKey(setting.key, 'core')] || // core setting scoredResults[getSettingKey(setting.key)]; // core setting from original prod endpoint if (remoteSetting && remoteSetting.score >= minScore) { - const settingMatches = new SettingMatches(this.options.filter, setting, false, false, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches; + const settingMatches = new SettingMatches(this.options.filter, setting, false, true, (filter, setting) => preferencesModel.findValueMatches(filter, setting)).matches; return { matches: settingMatches, score: remoteSetting.score }; } From 04594c864be35281ff7eca15a6db2a5a735bb320 Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Thu, 25 Jan 2018 21:13:24 +0100 Subject: [PATCH 696/710] Add support for Language Packs --- build/gulpfile.extensions.js | 20 +- build/gulpfile.vscode.js | 82 +- build/lib/i18n.js | 740 ++++++++-------- build/lib/i18n.resources.json | 4 - build/lib/i18n.ts | 807 +++++++++--------- build/lib/optimize.js | 2 - build/lib/optimize.ts | 6 +- build/lib/typings/event-stream.d.ts | 9 +- build/npm/update-localization-extension.js | 62 ++ extensions/configuration-editing/package.json | 2 +- .../configuration-editing/src/extension.ts | 6 +- extensions/configuration-editing/yarn.lock | 6 +- extensions/css/client/src/cssMain.ts | 7 +- extensions/css/package.json | 2 +- extensions/css/yarn.lock | 6 +- extensions/emmet/package.json | 2 +- extensions/emmet/yarn.lock | 6 +- extensions/extension-editing/package.json | 2 +- .../extension-editing/src/extensionLinter.ts | 6 +- extensions/extension-editing/yarn.lock | 6 +- extensions/git/package.json | 4 +- extensions/git/src/main.ts | 2 +- extensions/git/yarn.lock | 6 +- extensions/grunt/package.json | 2 +- extensions/grunt/src/main.ts | 5 +- extensions/grunt/yarn.lock | 6 +- extensions/gulp/package.json | 2 +- extensions/gulp/src/main.ts | 4 +- extensions/gulp/yarn.lock | 6 +- extensions/html/client/src/htmlMain.ts | 5 +- extensions/html/package.json | 2 +- extensions/html/server/package.json | 2 +- extensions/html/server/src/htmlServerMain.ts | 4 - extensions/html/server/yarn.lock | 4 + extensions/html/yarn.lock | 6 +- extensions/jake/package.json | 2 +- extensions/jake/src/main.ts | 5 +- extensions/jake/yarn.lock | 6 +- extensions/javascript/package.json | 2 +- extensions/javascript/src/javascriptMain.ts | 6 +- extensions/javascript/yarn.lock | 4 + extensions/json/client/src/jsonMain.ts | 5 +- extensions/json/package.json | 2 +- extensions/json/server/package.json | 2 +- extensions/json/server/src/jsonServerMain.ts | 3 - extensions/json/server/yarn.lock | 4 + extensions/json/yarn.lock | 6 +- extensions/markdown/package.json | 2 +- extensions/markdown/src/commands.ts | 2 +- extensions/markdown/yarn.lock | 6 +- extensions/merge-conflict/package.json | 2 +- extensions/merge-conflict/src/extension.ts | 2 - extensions/merge-conflict/yarn.lock | 6 +- extensions/npm/package.json | 2 +- extensions/npm/src/main.ts | 2 +- extensions/npm/yarn.lock | 6 +- extensions/php/package.json | 2 +- extensions/php/src/phpMain.ts | 2 - extensions/php/yarn.lock | 6 +- extensions/typescript/package.json | 2 +- extensions/typescript/src/extension.ts | 6 - extensions/typescript/yarn.lock | 6 +- package.json | 3 +- src/bootstrap-amd.js | 32 + src/main.js | 428 ++++++++-- .../electron-browser/issue/issueReporter.js | 31 + .../sharedProcess/sharedProcess.js | 31 + src/vs/nls.js | 254 +++--- src/vs/workbench/electron-browser/actions.ts | 1 + .../electron-browser/bootstrap/index.js | 32 +- .../services/timer/common/timerService.ts | 1 + .../services/timer/node/timerService.ts | 6 +- yarn.lock | 26 +- 73 files changed, 1674 insertions(+), 1115 deletions(-) create mode 100644 build/npm/update-localization-extension.js diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js index 42f1d92e2ce..385b024609b 100644 --- a/build/gulpfile.extensions.js +++ b/build/gulpfile.extensions.js @@ -20,6 +20,7 @@ const sourcemaps = require('gulp-sourcemaps'); const nlsDev = require('vscode-nls-dev'); const root = path.dirname(__dirname); const commit = util.getVersion(root); +const i18n = require('./lib/i18n'); const extensionsPath = path.join(path.dirname(__dirname), 'extensions'); @@ -29,7 +30,8 @@ const compilations = glob.sync('**/tsconfig.json', { }); const getBaseUrl = out => `https://ticino.blob.core.windows.net/sourcemaps/${commit}/${out}`; -const languages = ['chs', 'cht', 'jpn', 'kor', 'deu', 'fra', 'esn', 'rus', 'ita']; + +const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages: []); const tasks = compilations.map(function (tsconfigFile) { const absolutePath = path.join(extensionsPath, tsconfigFile); @@ -55,9 +57,19 @@ const tasks = compilations.map(function (tsconfigFile) { const srcBase = path.join(root, 'src'); const src = path.join(srcBase, '**'); const out = path.join(root, 'out'); - const i18n = path.join(__dirname, '..', 'i18n'); + const i18nPath = path.join(__dirname, '..', 'i18n'); const baseUrl = getBaseUrl(out); + let headerId, headerOut; + let index = relativeDirname.indexOf('/'); + if (index < 0) { + headerId = relativeDirname; + headerOut = 'out'; + } else { + headerId = relativeDirname.substr(0, index); + headerOut = relativeDirname.substr(index + 1) + '/out'; + } + function createPipeline(build, emitError) { const reporter = createReporter(); @@ -82,7 +94,9 @@ const tasks = compilations.map(function (tsconfigFile) { sourceRoot: '../src' })) .pipe(tsFilter.restore) - .pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18n, out) : es.through()) + .pipe(build ? nlsDev.createAdditionalLanguageFiles(languages, i18nPath, out) : es.through()) + .pipe(build ? nlsDev.bundleMetaDataFiles(headerId, headerOut) : es.through()) + .pipe(build ? nlsDev.bundleLanguageFiles() : es.through()) .pipe(reporter.end(emitError)); return es.duplex(input, output); diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 9ac087e38d4..8ebb0555a58 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -92,10 +92,7 @@ const BUNDLED_FILE_HEADER = [ ' *--------------------------------------------------------*/' ].join('\n'); -var languages = ['chs', 'cht', 'jpn', 'kor', 'deu', 'fra', 'esn', 'rus', 'ita']; -if (process.env.VSCODE_QUALITY !== 'stable') { - languages = languages.concat(['ptb', 'hun', 'trk']); // Add languages requested by the community to non-stable builds -} +const languages = i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages: []); gulp.task('clean-optimized-vscode', util.rimraf('out-vscode')); gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compile-extensions-build'], common.optimizeTask({ @@ -105,7 +102,7 @@ gulp.task('optimize-vscode', ['clean-optimized-vscode', 'compile-build', 'compil loaderConfig: common.loaderConfig(nodeModules), header: BUNDLED_FILE_HEADER, out: 'out-vscode', - languages: languages + languages: languages, })); @@ -382,25 +379,21 @@ gulp.task('vscode-linux-x64-min', ['minify-vscode', 'clean-vscode-linux-x64'], p gulp.task('vscode-linux-arm-min', ['minify-vscode', 'clean-vscode-linux-arm'], packageTask('linux', 'arm', { minified: true })); // Transifex Localizations -const vscodeLanguages = [ - 'zh-hans', - 'zh-hant', - 'ja', - 'ko', - 'de', - 'fr', - 'es', - 'ru', - 'it', - 'pt-br', - 'hu', - 'tr' -]; -const setupDefaultLanguages = [ - 'zh-hans', - 'zh-hant', - 'ko' -]; + +const innoSetupConfig = { + 'zh-cn': { codePage: 'CP936', defaultInfo: { name: 'Simplified Chinese', id: '$0804', } }, + 'zh-tw': { codePage: 'CP950', defaultInfo: { name: 'Traditional Chinese', id: '$0404' } }, + 'ko': { codePage: 'CP949', defaultInfo: { name: 'Korean', id: '$0412' } }, + 'ja': { codePage: 'CP932' }, + 'de': { codePage: 'CP1252' }, + 'fr': { codePage: 'CP1252' }, + 'es': { codePage: 'CP1252' }, + 'ru': { codePage: 'CP1251' }, + 'it': { codePage: 'CP1252' }, + 'pt-br': { codePage: 'CP1252' }, + 'hu': { codePage: 'CP1250' }, + 'tr': { codePage: 'CP1254' } +}; const apiHostname = process.env.TRANSIFEX_API_URL; const apiName = process.env.TRANSIFEX_API_NAME; @@ -408,27 +401,46 @@ const apiToken = process.env.TRANSIFEX_API_TOKEN; gulp.task('vscode-translations-push', ['optimize-vscode'], function () { const pathToMetadata = './out-vscode/nls.metadata.json'; - const pathToExtensions = './extensions/**/*.nls.json'; + const pathToExtensions = './extensions/*'; const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}'; return es.merge( - gulp.src(pathToMetadata).pipe(i18n.prepareXlfFiles()), - gulp.src(pathToSetup).pipe(i18n.prepareXlfFiles()), - gulp.src(pathToExtensions).pipe(i18n.prepareXlfFiles('vscode-extensions')) + gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()), + gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()), + gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions()) ).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken)); }); -gulp.task('vscode-translations-pull', function () { +gulp.task('vscode-translations-push-test', function () { + const pathToMetadata = './out-vscode/nls.metadata.json'; + const pathToExtensions = './extensions/*'; + const pathToSetup = 'build/win32/**/{Default.isl,messages.en.isl}'; + return es.merge( - i18n.pullXlfFiles('vscode-editor', apiHostname, apiName, apiToken, vscodeLanguages), - i18n.pullXlfFiles('vscode-workbench', apiHostname, apiName, apiToken, vscodeLanguages), - i18n.pullXlfFiles('vscode-extensions', apiHostname, apiName, apiToken, vscodeLanguages), - i18n.pullXlfFiles('vscode-setup', apiHostname, apiName, apiToken, setupDefaultLanguages) - ).pipe(vfs.dest('../vscode-localization')); + gulp.src(pathToMetadata).pipe(i18n.createXlfFilesForCoreBundle()), + gulp.src(pathToSetup).pipe(i18n.createXlfFilesForIsl()), + gulp.src(pathToExtensions).pipe(i18n.createXlfFilesForExtensions()) + ).pipe(vfs.dest('../vscode-transifex-input')); +}); + +gulp.task('vscode-translations-pull', function () { + [...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => { + i18n.pullBuildXlfFiles(apiHostname, apiName, apiToken, language).pipe(vfs.dest(`../vscode-localization/${language.id}/build`)); + + let includeDefault = !!innoSetupConfig[language.id].defaultInfo; + i18n.pullSetupXlfFiles(apiHostname, apiName, apiToken, language, includeDefault).pipe(vfs.dest(`../vscode-localization/${language.id}/setup`)); + }); }); gulp.task('vscode-translations-import', function () { - return gulp.src('../vscode-localization/**/*.xlf').pipe(i18n.prepareJsonFiles()).pipe(vfs.dest('./i18n')); + [...i18n.defaultLanguages, ...i18n.extraLanguages].forEach(language => { + gulp.src(`../vscode-localization/${language.id}/build/*/*.xlf`) + .pipe(i18n.prepareI18nFiles(language)) + .pipe(vfs.dest(`./i18n/${language.folderName}`)); + gulp.src(`../vscode-localization/${language.id}/setup/*/*.xlf`) + .pipe(i18n.prepareIslFiles(language, innoSetupConfig[language.id])) + .pipe(vfs.dest(`./build/win32/i18n`)); + }); }); // Sourcemaps diff --git a/build/lib/i18n.js b/build/lib/i18n.js index 1358c7dfdda..907010f0841 100644 --- a/build/lib/i18n.js +++ b/build/lib/i18n.js @@ -12,6 +12,7 @@ var Is = require("is"); var xml2js = require("xml2js"); var glob = require("glob"); var https = require("https"); +var gulp = require("gulp"); var util = require('gulp-util'); var iconv = require('iconv-lite'); var NUMBER_OF_CONCURRENT_DOWNLOADS = 1; @@ -22,6 +23,24 @@ function log(message) { } util.log.apply(util, [util.colors.green('[i18n]'), message].concat(rest)); } +exports.defaultLanguages = [ + { id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' }, + { id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' }, + { id: 'ja', folderName: 'jpn' }, + { id: 'ko', folderName: 'kor' }, + { id: 'de', folderName: 'deu' }, + { id: 'fr', folderName: 'fra' }, + { id: 'es', folderName: 'esn' }, + { id: 'ru', folderName: 'rus' }, + { id: 'it', folderName: 'ita' } +]; +// languages requested by the community to non-stable builds +exports.extraLanguages = [ + { id: 'pt-br', folderName: 'ptb' }, + { id: 'hu', folderName: 'hun' }, + { id: 'tr', folderName: 'trk' } +]; +exports.pseudoLanguage = { id: 'pseudo', folderName: 'pseudo', transifexId: 'pseudo' }; var LocalizeInfo; (function (LocalizeInfo) { function is(value) { @@ -117,27 +136,31 @@ var XLF = /** @class */ (function () { return this.buffer.join('\r\n'); }; XLF.prototype.addFile = function (original, keys, messages) { + if (keys.length !== messages.length) { + throw new Error("Unmatching keys(" + keys.length + ") and messages(" + messages.length + ")."); + } this.files[original] = []; - var existingKeys = []; - for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) { - var key = keys_1[_i]; - // Ignore duplicate keys because Transifex does not populate those with translated values. - if (existingKeys.indexOf(key) !== -1) { + var existingKeys = new Set(); + for (var i = 0; i < keys.length; i++) { + var key = keys[i]; + var realKey = void 0; + var comment = void 0; + if (Is.string(key)) { + realKey = key; + comment = undefined; + } + else if (LocalizeInfo.is(key)) { + realKey = key.key; + if (key.comment && key.comment.length > 0) { + comment = key.comment.map(function (comment) { return encodeEntities(comment); }).join('\r\n'); + } + } + if (!realKey || existingKeys.has(realKey)) { continue; } - existingKeys.push(key); - var message = encodeEntities(messages[keys.indexOf(key)]); - var comment = undefined; - // Check if the message contains description (if so, it becomes an object type in JSON) - if (Is.string(key)) { - this.files[original].push({ id: key, message: message, comment: comment }); - } - else { - if (key['comment'] && key['comment'].length > 0) { - comment = key['comment'].map(function (comment) { return encodeEntities(comment); }).join('\r\n'); - } - this.files[original].push({ id: key['key'], message: message, comment: comment }); - } + existingKeys.add(realKey); + var message = encodeEntities(messages[i]); + this.files[original].push({ id: realKey, message: message, comment: comment }); } }; XLF.prototype.addStringItem = function (item) { @@ -169,20 +192,20 @@ var XLF = /** @class */ (function () { var files = []; parser.parseString(xlfString, function (err, result) { if (err) { - reject("Failed to parse XLIFF string. " + err); + reject(new Error("XLF parsing error: Failed to parse XLIFF string. " + err)); } var fileNodes = result['xliff']['file']; if (!fileNodes) { - reject('XLIFF file does not contain "xliff" or "file" node(s) required for parsing.'); + reject(new Error("XLF parsing error: XLIFF file does not contain \"xliff\" or \"file\" node(s) required for parsing.")); } fileNodes.forEach(function (file) { var originalFilePath = file.$.original; if (!originalFilePath) { - reject('XLIFF file node does not contain original attribute to determine the original location of the resource file.'); + reject(new Error("XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.")); } - var language = file.$['target-language'].toLowerCase(); + var language = file.$['target-language']; if (!language) { - reject('XLIFF file node does not contain target-language attribute to determine translated language.'); + reject(new Error("XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.")); } var messages = {}; var transUnits = file.body[0]['trans-unit']; @@ -196,10 +219,10 @@ var XLF = /** @class */ (function () { messages[key] = decodeEntities(val); } else { - reject('XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.'); + reject(new Error("XLF parsing error: XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.")); } }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: language }); + files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() }); }); resolve(files); }); @@ -238,67 +261,9 @@ var Limiter = /** @class */ (function () { return Limiter; }()); exports.Limiter = Limiter; -var iso639_3_to_2 = { - 'chs': 'zh-cn', - 'cht': 'zh-tw', - 'csy': 'cs-cz', - 'deu': 'de', - 'enu': 'en', - 'esn': 'es', - 'fra': 'fr', - 'hun': 'hu', - 'ita': 'it', - 'jpn': 'ja', - 'kor': 'ko', - 'nld': 'nl', - 'plk': 'pl', - 'ptb': 'pt-br', - 'ptg': 'pt', - 'rus': 'ru', - 'sve': 'sv-se', - 'trk': 'tr' -}; -/** - * Used to map Transifex to VS Code language code representation. - */ -var iso639_2_to_3 = { - 'zh-hans': 'chs', - 'zh-hant': 'cht', - 'cs-cz': 'csy', - 'de': 'deu', - 'en': 'enu', - 'es': 'esn', - 'fr': 'fra', - 'hu': 'hun', - 'it': 'ita', - 'ja': 'jpn', - 'ko': 'kor', - 'nl': 'nld', - 'pl': 'plk', - 'pt-br': 'ptb', - 'pt': 'ptg', - 'ru': 'rus', - 'sv-se': 'sve', - 'tr': 'trk' -}; -function sortLanguages(directoryNames) { - return directoryNames.map(function (dirName) { - var lower = dirName.toLowerCase(); - return { - name: lower, - iso639_2: iso639_3_to_2[lower] - }; - }).sort(function (a, b) { - if (!a.iso639_2 && !b.iso639_2) { - return 0; - } - if (!a.iso639_2) { - return -1; - } - if (!b.iso639_2) { - return 1; - } - return a.iso639_2 < b.iso639_2 ? -1 : (a.iso639_2 > b.iso639_2 ? 1 : 0); +function sortLanguages(languages) { + return languages.sort(function (a, b) { + return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0); }); } function stripComments(content) { @@ -386,7 +351,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { defaultMessages[module] = messageMap; keys.map(function (key, i) { total++; - if (Is.string(key)) { + if (typeof key === 'string') { messageMap[key] = messages[i]; } else { @@ -395,23 +360,15 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { }); }); var languageDirectory = path.join(__dirname, '..', '..', 'i18n'); - var languageDirs; - if (languages) { - languageDirs = sortLanguages(languages); - } - else { - languageDirs = sortLanguages(fs.readdirSync(languageDirectory).filter(function (item) { return fs.statSync(path.join(languageDirectory, item)).isDirectory(); })); - } - languageDirs.forEach(function (language) { - if (!language.iso639_2) { - return; - } + var sortedLanguages = sortLanguages(languages); + sortedLanguages.forEach(function (language) { if (process.env['VSCODE_BUILD_VERBOSE']) { - log("Generating nls bundles for: " + language.iso639_2); + log("Generating nls bundles for: " + language.id); } - statistics[language.iso639_2] = 0; + statistics[language.id] = 0; var localizedModules = Object.create(null); - var cwd = path.join(languageDirectory, language.name, 'src'); + var languageFolderName = language.folderName || language.id; + var cwd = path.join(languageDirectory, languageFolderName, 'src'); modules.forEach(function (module) { var order = keysSection[module]; var i18nFile = path.join(cwd, module) + '.i18n.json'; @@ -425,12 +382,12 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { log("No localized messages found for module " + module + ". Using default messages."); } messages = defaultMessages[module]; - statistics[language.iso639_2] = statistics[language.iso639_2] + Object.keys(messages).length; + statistics[language.id] = statistics[language.id] + Object.keys(messages).length; } var localizedMessages = []; order.forEach(function (keyInfo) { var key = null; - if (Is.string(keyInfo)) { + if (typeof keyInfo === 'string') { key = keyInfo; } else { @@ -442,7 +399,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { log("No localized message found for key " + key + " in module " + module + ". Using default message."); } message = defaultMessages[module][key]; - statistics[language.iso639_2] = statistics[language.iso639_2] + 1; + statistics[language.id] = statistics[language.id] + 1; } localizedMessages.push(message); }); @@ -452,7 +409,7 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { var modules = bundleSection[bundle]; var contents = [ fileHeader, - "define(\"" + bundle + ".nls." + language.iso639_2 + "\", {" + "define(\"" + bundle + ".nls." + language.id + "\", {" ]; modules.forEach(function (module, index) { contents.push("\t\"" + module + "\": ["); @@ -467,24 +424,17 @@ function processCoreBundleFormat(fileHeader, languages, json, emitter) { contents.push(index < modules.length - 1 ? '\t],' : '\t]'); }); contents.push('});'); - emitter.emit('data', new File({ path: bundle + '.nls.' + language.iso639_2 + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') })); + emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') })); }); }); Object.keys(statistics).forEach(function (key) { var value = statistics[key]; log(key + " has " + value + " untranslated strings."); }); - languageDirs.forEach(function (dir) { - var language = dir.name; - var iso639_2 = iso639_3_to_2[language]; - if (!iso639_2) { - log("\tCouldn't find iso639 2 mapping for language " + language + ". Using default language instead."); - } - else { - var stats = statistics[iso639_2]; - if (Is.undef(stats)) { - log("\tNo translations found for language " + language + ". Using default language instead."); - } + sortedLanguages.forEach(function (language) { + var stats = statistics[language.id]; + if (Is.undef(stats)) { + log("\tNo translations found for language " + language.id + ". Using default language instead."); } }); } @@ -498,39 +448,16 @@ function processNlsFiles(opts) { } else { this.emit('error', "Failed to read component file: " + file.relative); + return; } if (BundledFormat.is(json)) { processCoreBundleFormat(opts.fileHeader, opts.languages, json, this); } } - this.emit('data', file); + this.queue(file); }); } exports.processNlsFiles = processNlsFiles; -function prepareXlfFiles(projectName, extensionName) { - return event_stream_1.through(function (file) { - if (!file.isBuffer()) { - throw new Error("Failed to read component file: " + file.relative); - } - var extension = path.extname(file.path); - if (extension === '.json') { - var json = JSON.parse(file.contents.toString('utf8')); - if (BundledFormat.is(json)) { - importBundleJson(file, json, this); - } - else if (PackageJsonFormat.is(json) || ModuleJsonFormat.is(json)) { - importModuleOrPackageJson(file, json, projectName, this, extensionName); - } - else { - throw new Error("JSON format cannot be deduced for " + file.relative + "."); - } - } - else if (extension === '.isl') { - importIsl(file, this); - } - }); -} -exports.prepareXlfFiles = prepareXlfFiles; var editorProject = 'vscode-editor', workbenchProject = 'vscode-workbench', extensionsProject = 'vscode-extensions', setupProject = 'vscode-setup'; function getResource(sourceFile) { var resource; @@ -563,113 +490,186 @@ function getResource(sourceFile) { throw new Error("Could not identify the XLF bundle for " + sourceFile); } exports.getResource = getResource; -function importBundleJson(file, json, stream) { - var bundleXlfs = Object.create(null); - for (var source in json.keys) { - var projectResource = getResource(source); - var resource = projectResource.name; - var project = projectResource.project; - var keys = json.keys[source]; - var messages = json.messages[source]; - if (keys.length !== messages.length) { - throw new Error("There is a mismatch between keys and messages in " + file.relative); - } - var xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project); - xlf.addFile('src/' + source, keys, messages); - } - for (var resource in bundleXlfs) { - var newFilePath = bundleXlfs[resource].project + "/" + resource.replace(/\//g, '_') + ".xlf"; - var xlfFile = new File({ path: newFilePath, contents: new Buffer(bundleXlfs[resource].toString(), 'utf-8') }); - stream.emit('data', xlfFile); - } -} -// Keeps existing XLF instances and a state of how many files were already processed for faster file emission -var extensions = Object.create(null); -function importModuleOrPackageJson(file, json, projectName, stream, extensionName) { - if (ModuleJsonFormat.is(json) && json['keys'].length !== json['messages'].length) { - throw new Error("There is a mismatch between keys and messages in " + file.relative); - } - // Prepare the source path for attribute in XLF & extract messages from JSON - var formattedSourcePath = file.relative.replace(/\\/g, '/'); - var messages = Object.keys(json).map(function (key) { return json[key].toString(); }); - // Stores the amount of localization files to be transformed to XLF before the emission - var localizationFilesCount, originalFilePath; - // If preparing XLF for external extension, then use different glob pattern and source path - if (extensionName) { - localizationFilesCount = glob.sync('**/*.nls.json').length; - originalFilePath = "" + formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length); - } - else { - // Used for vscode/extensions folder - extensionName = formattedSourcePath.split('/')[0]; - localizationFilesCount = glob.sync("./extensions/" + extensionName + "/**/*.nls.json").length; - originalFilePath = "extensions/" + formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length); - } - var extension = extensions[extensionName] ? - extensions[extensionName] : extensions[extensionName] = { xlf: new XLF(projectName), processed: 0 }; - // .nls.json can come with empty array of keys and messages, check for it - if (ModuleJsonFormat.is(json) && json.keys.length !== 0) { - extension.xlf.addFile(originalFilePath, json.keys, json.messages); - } - else if (PackageJsonFormat.is(json) && Object.keys(json).length !== 0) { - extension.xlf.addFile(originalFilePath, Object.keys(json), messages); - } - // Check if XLF is populated with file nodes to emit it - if (++extensions[extensionName].processed === localizationFilesCount) { - var newFilePath = path.join(projectName, extensionName + '.xlf'); - var xlfFile = new File({ path: newFilePath, contents: new Buffer(extension.xlf.toString(), 'utf-8') }); - stream.emit('data', xlfFile); - } -} -function importIsl(file, stream) { - var projectName, resourceFile; - if (path.basename(file.path) === 'Default.isl') { - projectName = setupProject; - resourceFile = 'setup_default.xlf'; - } - else { - projectName = workbenchProject; - resourceFile = 'setup_messages.xlf'; - } - var xlf = new XLF(projectName), keys = [], messages = []; - var model = new TextModel(file.contents.toString()); - var inMessageSection = false; - model.lines.forEach(function (line) { - if (line.length === 0) { - return; - } - var firstChar = line.charAt(0); - switch (firstChar) { - case ';': - // Comment line; +function createXlfFilesForCoreBundle() { + return event_stream_1.through(function (file) { + var basename = path.basename(file.path); + if (basename === 'nls.metadata.json') { + if (file.isBuffer()) { + var xlfs = Object.create(null); + var json = JSON.parse(file.contents.toString('utf8')); + for (var coreModule in json.keys) { + var projectResource = getResource(coreModule); + var resource = projectResource.name; + var project = projectResource.project; + var keys = json.keys[coreModule]; + var messages = json.messages[coreModule]; + if (keys.length !== messages.length) { + this.emit('error', "There is a mismatch between keys and messages in " + file.relative + " for module " + coreModule); + return; + } + else { + var xlf = xlfs[resource]; + if (!xlf) { + xlf = new XLF(project); + xlfs[resource] = xlf; + } + xlf.addFile("src/" + coreModule, keys, messages); + } + } + for (var resource in xlfs) { + var xlf = xlfs[resource]; + var filePath = xlf.project + "/" + resource.replace(/\//g, '_') + ".xlf"; + var xlfFile = new File({ + path: filePath, + contents: new Buffer(xlf.toString(), 'utf8') + }); + this.queue(xlfFile); + } + } + else { + this.emit('error', new Error("File " + file.relative + " is not using a buffer content")); return; - case '[': - inMessageSection = '[Messages]' === line || '[CustomMessages]' === line; - return; - } - if (!inMessageSection) { - return; - } - var sections = line.split('='); - if (sections.length !== 2) { - throw new Error("Badly formatted message found: " + line); - } - else { - var key = sections[0]; - var value = sections[1]; - if (key.length > 0 && value.length > 0) { - keys.push(key); - messages.push(value); } } + else { + this.emit('error', new Error("File " + file.relative + " is not a core meta data file.")); + return; + } }); - var originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/'); - xlf.addFile(originalPath, keys, messages); - // Emit only upon all ISL files combined into single XLF instance - var newFilePath = path.join(projectName, resourceFile); - var xlfFile = new File({ path: newFilePath, contents: new Buffer(xlf.toString(), 'utf-8') }); - stream.emit('data', xlfFile); } +exports.createXlfFilesForCoreBundle = createXlfFilesForCoreBundle; +function createXlfFilesForExtensions() { + var counter = 0; + var folderStreamEnded = false; + var folderStreamEndEmitted = false; + return event_stream_1.through(function (extensionFolder) { + var folderStream = this; + var stat = fs.statSync(extensionFolder.path); + if (!stat.isDirectory()) { + return; + } + var extensionName = path.basename(extensionFolder.path); + if (extensionName === 'node_modules') { + return; + } + counter++; + var _xlf; + function getXlf() { + if (!_xlf) { + _xlf = new XLF(extensionsProject); + } + return _xlf; + } + gulp.src(["./extensions/" + extensionName + "/package.nls.json", "./extensions/" + extensionName + "/**/nls.metadata.json"]).pipe(event_stream_1.through(function (file) { + if (file.isBuffer()) { + var buffer = file.contents; + var basename = path.basename(file.path); + if (basename === 'package.nls.json') { + var json_1 = JSON.parse(buffer.toString('utf8')); + var keys = Object.keys(json_1); + var messages = keys.map(function (key) { + var value = json_1[key]; + if (Is.string(value)) { + return value; + } + else if (value) { + return value.message; + } + else { + return "Unknown message for key: " + key; + } + }); + getXlf().addFile("extensions/" + extensionName + "/package", keys, messages); + } + else if (basename === 'nls.metadata.json') { + var json = JSON.parse(buffer.toString('utf8')); + var relPath = path.relative("./extensions/" + extensionName, path.dirname(file.path)); + for (var file_1 in json) { + var fileContent = json[file_1]; + getXlf().addFile("extensions/" + extensionName + "/" + relPath + "/" + file_1, fileContent.keys, fileContent.messages); + } + } + else { + this.emit('error', new Error(file.path + " is not a valid extension nls file")); + return; + } + } + }, function () { + if (_xlf) { + var xlfFile = new File({ + path: path.join(extensionsProject, extensionName + '.xlf'), + contents: new Buffer(_xlf.toString(), 'utf8') + }); + folderStream.queue(xlfFile); + } + this.queue(null); + counter--; + if (counter === 0 && folderStreamEnded && !folderStreamEndEmitted) { + folderStreamEndEmitted = true; + folderStream.queue(null); + } + })); + }, function () { + folderStreamEnded = true; + if (counter === 0) { + folderStreamEndEmitted = true; + this.queue(null); + } + }); +} +exports.createXlfFilesForExtensions = createXlfFilesForExtensions; +function createXlfFilesForIsl() { + return event_stream_1.through(function (file) { + var projectName, resourceFile; + if (path.basename(file.path) === 'Default.isl') { + projectName = setupProject; + resourceFile = 'setup_default.xlf'; + } + else { + projectName = workbenchProject; + resourceFile = 'setup_messages.xlf'; + } + var xlf = new XLF(projectName), keys = [], messages = []; + var model = new TextModel(file.contents.toString()); + var inMessageSection = false; + model.lines.forEach(function (line) { + if (line.length === 0) { + return; + } + var firstChar = line.charAt(0); + switch (firstChar) { + case ';': + // Comment line; + return; + case '[': + inMessageSection = '[Messages]' === line || '[CustomMessages]' === line; + return; + } + if (!inMessageSection) { + return; + } + var sections = line.split('='); + if (sections.length !== 2) { + throw new Error("Badly formatted message found: " + line); + } + else { + var key = sections[0]; + var value = sections[1]; + if (key.length > 0 && value.length > 0) { + keys.push(key); + messages.push(value); + } + } + }); + var originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/'); + xlf.addFile(originalPath, keys, messages); + // Emit only upon all ISL files combined into single XLF instance + var newFilePath = path.join(projectName, resourceFile); + var xlfFile = new File({ path: newFilePath, contents: new Buffer(xlf.toString(), 'utf-8') }); + this.queue(xlfFile); + }); +} +exports.createXlfFilesForIsl = createXlfFilesForIsl; function pushXlfFiles(apiHostname, username, password) { var tryGetPromises = []; var updateCreatePromises = []; @@ -695,7 +695,7 @@ function pushXlfFiles(apiHostname, username, password) { // End the pipe only after all the communication with Transifex API happened Promise.all(tryGetPromises).then(function () { Promise.all(updateCreatePromises).then(function () { - _this.emit('end'); + _this.queue(null); }).catch(function (reason) { throw new Error(reason); }); }).catch(function (reason) { throw new Error(reason); }); }); @@ -800,40 +800,37 @@ function updateResource(project, slug, xlfFile, apiHostname, credentials) { request.end(); }); } -function obtainProjectResources(projectName) { - var resources = []; - if (projectName === editorProject) { - var json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'); - resources = JSON.parse(json).editor; - } - else if (projectName === workbenchProject) { - var json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'); - resources = JSON.parse(json).workbench; - } - else if (projectName === extensionsProject) { - var extensionsToLocalize = glob.sync('./extensions/**/*.nls.json').map(function (extension) { return extension.split('/')[2]; }); - var resourcesToPull_1 = []; - extensionsToLocalize.forEach(function (extension) { - if (resourcesToPull_1.indexOf(extension) === -1) { - resourcesToPull_1.push(extension); - resources.push({ name: extension, project: projectName }); - } +// cache resources +var _buildResources; +function pullBuildXlfFiles(apiHostname, username, password, language) { + if (!_buildResources) { + _buildResources = []; + // editor and workbench + var json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8')); + _buildResources.push.apply(_buildResources, json.editor); + _buildResources.push.apply(_buildResources, json.workbench); + // extensions + var extensionsToLocalize_1 = Object.create(null); + glob.sync('./extensions/**/*.nls.json').forEach(function (extension) { return extensionsToLocalize_1[extension.split('/')[2]] = true; }); + glob.sync('./extensions/*/node_modules/vscode-nls').forEach(function (extension) { return extensionsToLocalize_1[extension.split('/')[2]] = true; }); + Object.keys(extensionsToLocalize_1).forEach(function (extension) { + _buildResources.push({ name: extension, project: 'vscode-extensions' }); }); } - else if (projectName === setupProject) { - resources.push({ name: 'setup_default', project: setupProject }); - } - return resources; + return pullXlfFiles(apiHostname, username, password, language, _buildResources); } -function pullXlfFiles(projectName, apiHostname, username, password, languages, resources) { - if (!resources) { - resources = obtainProjectResources(projectName); - } - if (!resources) { - throw new Error('Transifex projects and resources must be defined to be able to pull translations from Transifex.'); +exports.pullBuildXlfFiles = pullBuildXlfFiles; +function pullSetupXlfFiles(apiHostname, username, password, language, includeDefault) { + var setupResources = [{ name: 'setup_messages', project: 'vscode-workbench' }]; + if (includeDefault) { + setupResources.push({ name: 'setup_default', project: 'vscode-setup' }); } + return pullXlfFiles(apiHostname, username, password, language, setupResources); +} +exports.pullSetupXlfFiles = pullSetupXlfFiles; +function pullXlfFiles(apiHostname, username, password, language, resources) { var credentials = username + ":" + password; - var expectedTranslationsCount = languages.length * resources.length; + var expectedTranslationsCount = resources.length; var translationsRetrieved = 0, called = false; return event_stream_1.readable(function (count, callback) { // Mark end of stream when all resources were retrieved @@ -843,29 +840,27 @@ function pullXlfFiles(projectName, apiHostname, username, password, languages, r if (!called) { called = true; var stream_1 = this; - // Retrieve XLF files from main projects - languages.map(function (language) { - resources.map(function (resource) { - retrieveResource(language, resource, apiHostname, credentials).then(function (file) { + resources.map(function (resource) { + retrieveResource(language, resource, apiHostname, credentials).then(function (file) { + if (file) { stream_1.emit('data', file); - translationsRetrieved++; - }).catch(function (error) { throw new Error(error); }); - }); + } + translationsRetrieved++; + }).catch(function (error) { throw new Error(error); }); }); } callback(); }); } -exports.pullXlfFiles = pullXlfFiles; var limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS); function retrieveResource(language, resource, apiHostname, credentials) { return limiter.queue(function () { return new Promise(function (resolve, reject) { var slug = resource.name.replace(/\//g, '_'); var project = resource.project; - var iso639 = language.toLowerCase(); + var transifexLanguageId = language.transifexId || language.id; var options = { hostname: apiHostname, - path: "/api/2/project/" + project + "/resource/" + slug + "/translation/" + iso639 + "?file&mode=onlyreviewed", + path: "/api/2/project/" + project + "/resource/" + slug + "/translation/" + transifexLanguageId + "?file&mode=onlyreviewed", auth: credentials, port: 443, method: 'GET' @@ -875,20 +870,24 @@ function retrieveResource(language, resource, apiHostname, credentials) { res.on('data', function (chunk) { return xlfBuffer.push(chunk); }); res.on('end', function () { if (res.statusCode === 200) { - console.log('success: ' + options.path); - resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + iso639_2_to_3[language] + "/" + slug + ".xlf" })); + resolve(new File({ contents: Buffer.concat(xlfBuffer), path: project + "/" + slug + ".xlf" })); + } + else if (res.statusCode === 404) { + console.log(slug + " in " + project + " returned no data."); + resolve(null); + } + else { + reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + "."); } - reject(slug + " in " + project + " returned no data. Response code: " + res.statusCode + "."); }); }); request.on('error', function (err) { reject("Failed to query resource " + slug + " with the following error: " + err + ". " + options.path); }); request.end(); - console.log('started: ' + options.path); }); }); } -function prepareJsonFiles() { +function prepareI18nFiles() { var parsePromises = []; return event_stream_1.through(function (xlf) { var stream = this; @@ -896,69 +895,117 @@ function prepareJsonFiles() { parsePromises.push(parsePromise); parsePromise.then(function (resolvedFiles) { resolvedFiles.forEach(function (file) { - var messages = file.messages, translatedFile; - // ISL file path always starts with 'build/' - if (/^build\//.test(file.originalFilePath)) { - var defaultLanguages = { 'zh-hans': true, 'zh-hant': true, 'ko': true }; - if (path.basename(file.originalFilePath) === 'Default' && !defaultLanguages[file.language]) { - return; - } - translatedFile = createIslFile('..', file.originalFilePath, messages, iso639_2_to_3[file.language]); - } - else { - translatedFile = createI18nFile(iso639_2_to_3[file.language], file.originalFilePath, messages); - } - stream.emit('data', translatedFile); + var translatedFile = createI18nFile(file.originalFilePath, file.messages); + stream.queue(translatedFile); }); - }, function (rejectReason) { - throw new Error("XLF parsing error: " + rejectReason); }); }, function () { var _this = this; Promise.all(parsePromises) - .then(function () { _this.emit('end'); }) + .then(function () { _this.queue(null); }) .catch(function (reason) { throw new Error(reason); }); }); } -exports.prepareJsonFiles = prepareJsonFiles; -function createI18nFile(base, originalFilePath, messages) { - var content = [ - '/*---------------------------------------------------------------------------------------------', - ' * Copyright (c) Microsoft Corporation. All rights reserved.', - ' * Licensed under the MIT License. See License.txt in the project root for license information.', - ' *--------------------------------------------------------------------------------------------*/', - '// Do not edit this file. It is machine generated.' - ].join('\n') + '\n' + JSON.stringify(messages, null, '\t').replace(/\r\n/g, '\n'); +exports.prepareI18nFiles = prepareI18nFiles; +function createI18nFile(originalFilePath, messages) { + var result = Object.create(null); + result[''] = [ + '--------------------------------------------------------------------------------------------', + 'Copyright (c) Microsoft Corporation. All rights reserved.', + 'Licensed under the MIT License. See License.txt in the project root for license information.', + '--------------------------------------------------------------------------------------------', + 'Do not edit this file. It is machine generated.' + ]; + for (var _i = 0, _a = Object.keys(messages); _i < _a.length; _i++) { + var key = _a[_i]; + result[key] = messages[key]; + } + var content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n'); return new File({ - path: path.join(base, originalFilePath + '.i18n.json'), + path: path.join(originalFilePath + '.i18n.json'), contents: new Buffer(content, 'utf8') }); } -var languageNames = { - 'chs': 'Simplified Chinese', - 'cht': 'Traditional Chinese', - 'kor': 'Korean' -}; -var languageIds = { - 'chs': '$0804', - 'cht': '$0404', - 'kor': '$0412' -}; -var encodings = { - 'chs': 'CP936', - 'cht': 'CP950', - 'jpn': 'CP932', - 'kor': 'CP949', - 'deu': 'CP1252', - 'fra': 'CP1252', - 'esn': 'CP1252', - 'rus': 'CP1251', - 'ita': 'CP1252', - 'ptb': 'CP1252', - 'hun': 'CP1250', - 'trk': 'CP1254' -}; -function createIslFile(base, originalFilePath, messages, language) { +var i18nPackVersion = "1.0.0"; +function pullI18nPackFiles(apiHostname, username, password, language) { + return pullBuildXlfFiles(apiHostname, username, password, language).pipe(prepareI18nPackFiles()); +} +exports.pullI18nPackFiles = pullI18nPackFiles; +function prepareI18nPackFiles() { + var parsePromises = []; + var mainPack = { version: i18nPackVersion, contents: {} }; + var extensionsPacks = {}; + return event_stream_1.through(function (xlf) { + var stream = this; + var parsePromise = XLF.parse(xlf.contents.toString()); + parsePromises.push(parsePromise); + parsePromise.then(function (resolvedFiles) { + resolvedFiles.forEach(function (file) { + var path = file.originalFilePath; + var firstSlash = path.indexOf('/'); + var firstSegment = path.substr(0, firstSlash); + if (firstSegment === 'src') { + mainPack.contents[path.substr(firstSlash + 1)] = file.messages; + } + else if (firstSegment === 'extensions') { + var secondSlash = path.indexOf('/', firstSlash + 1); + var secondSegment = path.substring(firstSlash + 1, secondSlash); + if (secondSegment) { + var extPack = extensionsPacks[secondSegment]; + if (!extPack) { + extPack = extensionsPacks[secondSegment] = { version: i18nPackVersion, contents: {} }; + } + extPack.contents[path.substr(secondSlash + 1)] = file.messages; + } + else { + console.log('Unknown second segment ' + path); + } + } + else { + console.log('Unknown first segment ' + path); + } + }); + }); + }, function () { + var _this = this; + Promise.all(parsePromises) + .then(function () { + var translatedMainFile = createI18nFile('./main', mainPack); + _this.queue(translatedMainFile); + for (var extension in extensionsPacks) { + var translatedExtFile = createI18nFile("./extensions/" + extension, extensionsPacks[extension]); + _this.queue(translatedExtFile); + } + _this.queue(null); + }) + .catch(function (reason) { throw new Error(reason); }); + }); +} +exports.prepareI18nPackFiles = prepareI18nPackFiles; +function prepareIslFiles(language, innoSetupConfig) { + var parsePromises = []; + return event_stream_1.through(function (xlf) { + var stream = this; + var parsePromise = XLF.parse(xlf.contents.toString()); + parsePromises.push(parsePromise); + parsePromise.then(function (resolvedFiles) { + resolvedFiles.forEach(function (file) { + if (path.basename(file.originalFilePath) === 'Default' && !innoSetupConfig.defaultInfo) { + return; + } + var translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig); + stream.queue(translatedFile); + }); + }); + }, function () { + var _this = this; + Promise.all(parsePromises) + .then(function () { _this.queue(null); }) + .catch(function (reason) { throw new Error(reason); }); + }); +} +exports.prepareIslFiles = prepareIslFiles; +function createIslFile(originalFilePath, messages, language, innoSetup) { var content = []; var originalContent; if (path.basename(originalFilePath) === 'Default') { @@ -972,7 +1019,7 @@ function createIslFile(base, originalFilePath, messages, language) { var firstChar = line.charAt(0); if (firstChar === '[' || firstChar === ';') { if (line === '; *** Inno Setup version 5.5.3+ English messages ***') { - content.push("; *** Inno Setup version 5.5.3+ " + languageNames[language] + " messages ***"); + content.push("; *** Inno Setup version 5.5.3+ " + innoSetup.defaultInfo.name + " messages ***"); } else { content.push(line); @@ -984,13 +1031,13 @@ function createIslFile(base, originalFilePath, messages, language) { var translated = line; if (key) { if (key === 'LanguageName') { - translated = key + "=" + languageNames[language]; + translated = key + "=" + innoSetup.defaultInfo.name; } else if (key === 'LanguageID') { - translated = key + "=" + languageIds[language]; + translated = key + "=" + innoSetup.defaultInfo.id; } else if (key === 'LanguageCodePage') { - translated = key + "=" + encodings[language].substr(2); + translated = key + "=" + innoSetup.codePage.substr(2); } else { var translatedMessage = messages[key]; @@ -1003,12 +1050,11 @@ function createIslFile(base, originalFilePath, messages, language) { } } }); - var tag = iso639_3_to_2[language]; var basename = path.basename(originalFilePath); - var filePath = path.join(base, path.dirname(originalFilePath), basename) + "." + tag + ".isl"; + var filePath = basename + "." + language.id + ".isl"; return new File({ path: filePath, - contents: iconv.encode(new Buffer(content.join('\r\n'), 'utf8'), encodings[language]) + contents: iconv.encode(new Buffer(content.join('\r\n'), 'utf8'), innoSetup.codePage) }); } function encodeEntities(value) { diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index 93cf72c39c9..499ef117f7d 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -197,10 +197,6 @@ { "name": "vs/workbench/services/decorations", "project": "vscode-workbench" - }, - { - "name": "setup_messages", - "project": "vscode-workbench" } ] } \ No newline at end of file diff --git a/build/lib/i18n.ts b/build/lib/i18n.ts index 223b61ce911..aa249e1f2a3 100644 --- a/build/lib/i18n.ts +++ b/build/lib/i18n.ts @@ -6,13 +6,13 @@ import * as path from 'path'; import * as fs from 'fs'; -import { through, readable } from 'event-stream'; -import { ThroughStream } from 'through'; +import { through, readable, ThroughStream } from 'event-stream'; import File = require('vinyl'); import * as Is from 'is'; import * as xml2js from 'xml2js'; import * as glob from 'glob'; import * as https from 'https'; +import * as gulp from 'gulp'; var util = require('gulp-util'); var iconv = require('iconv-lite'); @@ -23,6 +23,41 @@ function log(message: any, ...rest: any[]): void { util.log(util.colors.green('[i18n]'), message, ...rest); } +export interface Language { + id: string; // laguage id, e.g. zh-tw, de + transifexId?: string; // language id used in transifex, e.g zh-hant, de (optional, if not set, the id is used) + folderName?: string; // language specific folder name, e.g. cht, deu (optional, if not set, the id is used) +} + +export interface InnoSetup { + codePage: string; //code page for encoding (http://www.jrsoftware.org/ishelp/index.php?topic=langoptionssection) + defaultInfo?: { + name: string; // inno setup language name + id: string; // locale identifier (https://msdn.microsoft.com/en-us/library/dd318693.aspx) + }; +} + +export const defaultLanguages: Language[] = [ + { id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' }, + { id: 'zh-cn', folderName: 'chs', transifexId: 'zh-hans' }, + { id: 'ja', folderName: 'jpn' }, + { id: 'ko', folderName: 'kor' }, + { id: 'de', folderName: 'deu' }, + { id: 'fr', folderName: 'fra' }, + { id: 'es', folderName: 'esn' }, + { id: 'ru', folderName: 'rus' }, + { id: 'it', folderName: 'ita' } +]; + +// languages requested by the community to non-stable builds +export const extraLanguages: Language[] = [ + { id: 'pt-br', folderName: 'ptb' }, + { id: 'hu', folderName: 'hun' }, + { id: 'tr', folderName: 'trk' } +]; + +export const pseudoLanguage: Language = { id: 'pseudo', folderName: 'pseudo', transifexId: 'pseudo' }; + interface Map { [key: string]: V; } @@ -110,6 +145,20 @@ module ModuleJsonFormat { } } +interface BundledExtensionHeaderFormat { + id: string; + type: string; + hash: string; + outDir: string; +} + +interface BundledExtensionFormat { + [key: string]: { + messages: string[]; + keys: (string | LocalizeInfo)[]; + }; +} + export class Line { private buffer: string[] = []; @@ -165,30 +214,31 @@ export class XLF { return this.buffer.join('\r\n'); } - public addFile(original: string, keys: any[], messages: string[]) { + public addFile(original: string, keys: (string | LocalizeInfo)[], messages: string[]) { + if (keys.length !== messages.length) { + throw new Error(`Unmatching keys(${keys.length}) and messages(${messages.length}).`); + } this.files[original] = []; - let existingKeys = []; - - for (let key of keys) { - // Ignore duplicate keys because Transifex does not populate those with translated values. - if (existingKeys.indexOf(key) !== -1) { + let existingKeys = new Set(); + for (let i = 0; i < keys.length; i++) { + let key = keys[i]; + let realKey: string; + let comment: string; + if (Is.string(key)) { + realKey = key; + comment = undefined; + } else if (LocalizeInfo.is(key)) { + realKey = key.key; + if (key.comment && key.comment.length > 0) { + comment = key.comment.map(comment => encodeEntities(comment)).join('\r\n'); + } + } + if (!realKey || existingKeys.has(realKey)) { continue; } - existingKeys.push(key); - - let message: string = encodeEntities(messages[keys.indexOf(key)]); - let comment: string = undefined; - - // Check if the message contains description (if so, it becomes an object type in JSON) - if (Is.string(key)) { - this.files[original].push({ id: key, message: message, comment: comment }); - } else { - if (key['comment'] && key['comment'].length > 0) { - comment = key['comment'].map(comment => encodeEntities(comment)).join('\r\n'); - } - - this.files[original].push({ id: key['key'], message: message, comment: comment }); - } + existingKeys.add(realKey); + let message: string = encodeEntities(messages[i]); + this.files[original].push({ id: realKey, message: message, comment: comment }); } } @@ -230,22 +280,22 @@ export class XLF { parser.parseString(xlfString, function (err, result) { if (err) { - reject(`Failed to parse XLIFF string. ${err}`); + reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`)); } const fileNodes: any[] = result['xliff']['file']; if (!fileNodes) { - reject('XLIFF file does not contain "xliff" or "file" node(s) required for parsing.'); + reject(new Error(`XLF parsing error: XLIFF file does not contain "xliff" or "file" node(s) required for parsing.`)); } fileNodes.forEach((file) => { const originalFilePath = file.$.original; if (!originalFilePath) { - reject('XLIFF file node does not contain original attribute to determine the original location of the resource file.'); + reject(new Error(`XLF parsing error: XLIFF file node does not contain original attribute to determine the original location of the resource file.`)); } - const language = file.$['target-language'].toLowerCase(); + const language = file.$['target-language']; if (!language) { - reject('XLIFF file node does not contain target-language attribute to determine translated language.'); + reject(new Error(`XLF parsing error: XLIFF file node does not contain target-language attribute to determine translated language.`)); } let messages: Map = {}; @@ -261,11 +311,11 @@ export class XLF { if (key && val) { messages[key] = decodeEntities(val); } else { - reject('XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.'); + reject(new Error(`XLF parsing error: XLIFF file does not contain full localization data. ID or target translation for one of the trans-unit nodes is not present.`)); } }); - files.push({ messages: messages, originalFilePath: originalFilePath, language: language }); + files.push({ messages: messages, originalFilePath: originalFilePath, language: language.toLowerCase() }); }); resolve(files); @@ -295,7 +345,7 @@ export class Limiter { queue(factory: ITask>): Promise { return new Promise((c, e) => { - this.outstandingPromises.push({factory, c, e}); + this.outstandingPromises.push({ factory, c, e }); this.consume(); }); } @@ -317,74 +367,9 @@ export class Limiter { } } -const iso639_3_to_2: Map = { - 'chs': 'zh-cn', - 'cht': 'zh-tw', - 'csy': 'cs-cz', - 'deu': 'de', - 'enu': 'en', - 'esn': 'es', - 'fra': 'fr', - 'hun': 'hu', - 'ita': 'it', - 'jpn': 'ja', - 'kor': 'ko', - 'nld': 'nl', - 'plk': 'pl', - 'ptb': 'pt-br', - 'ptg': 'pt', - 'rus': 'ru', - 'sve': 'sv-se', - 'trk': 'tr' -}; - -/** - * Used to map Transifex to VS Code language code representation. - */ -const iso639_2_to_3: Map = { - 'zh-hans': 'chs', - 'zh-hant': 'cht', - 'cs-cz': 'csy', - 'de': 'deu', - 'en': 'enu', - 'es': 'esn', - 'fr': 'fra', - 'hu': 'hun', - 'it': 'ita', - 'ja': 'jpn', - 'ko': 'kor', - 'nl': 'nld', - 'pl': 'plk', - 'pt-br': 'ptb', - 'pt': 'ptg', - 'ru': 'rus', - 'sv-se': 'sve', - 'tr': 'trk' -}; - -interface IDirectoryInfo { - name: string; - iso639_2: string; -} - -function sortLanguages(directoryNames: string[]): IDirectoryInfo[] { - return directoryNames.map((dirName) => { - var lower = dirName.toLowerCase(); - return { - name: lower, - iso639_2: iso639_3_to_2[lower] - }; - }).sort((a: IDirectoryInfo, b: IDirectoryInfo): number => { - if (!a.iso639_2 && !b.iso639_2) { - return 0; - } - if (!a.iso639_2) { - return -1; - } - if (!b.iso639_2) { - return 1; - } - return a.iso639_2 < b.iso639_2 ? -1 : (a.iso639_2 > b.iso639_2 ? 1 : 0); +function sortLanguages(languages: Language[]): Language[] { + return languages.sort((a: Language, b: Language): number => { + return a.id < b.id ? -1 : (a.id > b.id ? 1 : 0); }); } @@ -453,7 +438,7 @@ function escapeCharacters(value: string): string { return result.join(''); } -function processCoreBundleFormat(fileHeader: string, languages: string[], json: BundledFormat, emitter: any) { +function processCoreBundleFormat(fileHeader: string, languages: Language[], json: BundledFormat, emitter: ThroughStream) { let keysSection = json.keys; let messageSection = json.messages; let bundleSection = json.bundles; @@ -474,7 +459,7 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: defaultMessages[module] = messageMap; keys.map((key, i) => { total++; - if (Is.string(key)) { + if (typeof key === 'string') { messageMap[key] = messages[i]; } else { messageMap[key.key] = messages[i]; @@ -483,24 +468,16 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: }); let languageDirectory = path.join(__dirname, '..', '..', 'i18n'); - let languageDirs; - if (languages) { - languageDirs = sortLanguages(languages); - } else { - languageDirs = sortLanguages(fs.readdirSync(languageDirectory).filter((item) => fs.statSync(path.join(languageDirectory, item)).isDirectory())); - } - languageDirs.forEach((language) => { - if (!language.iso639_2) { - return; - } - + let sortedLanguages = sortLanguages(languages); + sortedLanguages.forEach((language) => { if (process.env['VSCODE_BUILD_VERBOSE']) { - log(`Generating nls bundles for: ${language.iso639_2}`); + log(`Generating nls bundles for: ${language.id}`); } - statistics[language.iso639_2] = 0; + statistics[language.id] = 0; let localizedModules: Map = Object.create(null); - let cwd = path.join(languageDirectory, language.name, 'src'); + let languageFolderName = language.folderName || language.id; + let cwd = path.join(languageDirectory, languageFolderName, 'src'); modules.forEach((module) => { let order = keysSection[module]; let i18nFile = path.join(cwd, module) + '.i18n.json'; @@ -513,12 +490,12 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: log(`No localized messages found for module ${module}. Using default messages.`); } messages = defaultMessages[module]; - statistics[language.iso639_2] = statistics[language.iso639_2] + Object.keys(messages).length; + statistics[language.id] = statistics[language.id] + Object.keys(messages).length; } let localizedMessages: string[] = []; order.forEach((keyInfo) => { let key: string = null; - if (Is.string(keyInfo)) { + if (typeof keyInfo === 'string') { key = keyInfo; } else { key = keyInfo.key; @@ -529,7 +506,7 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: log(`No localized message found for key ${key} in module ${module}. Using default message.`); } message = defaultMessages[module][key]; - statistics[language.iso639_2] = statistics[language.iso639_2] + 1; + statistics[language.id] = statistics[language.id] + 1; } localizedMessages.push(message); }); @@ -539,7 +516,7 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: let modules = bundleSection[bundle]; let contents: string[] = [ fileHeader, - `define("${bundle}.nls.${language.iso639_2}", {` + `define("${bundle}.nls.${language.id}", {` ]; modules.forEach((module, index) => { contents.push(`\t"${module}": [`); @@ -554,29 +531,23 @@ function processCoreBundleFormat(fileHeader: string, languages: string[], json: contents.push(index < modules.length - 1 ? '\t],' : '\t]'); }); contents.push('});'); - emitter.emit('data', new File({ path: bundle + '.nls.' + language.iso639_2 + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') })); + emitter.queue(new File({ path: bundle + '.nls.' + language.id + '.js', contents: new Buffer(contents.join('\n'), 'utf-8') })); }); }); Object.keys(statistics).forEach(key => { let value = statistics[key]; log(`${key} has ${value} untranslated strings.`); }); - languageDirs.forEach(dir => { - const language = dir.name; - let iso639_2 = iso639_3_to_2[language]; - if (!iso639_2) { - log(`\tCouldn't find iso639 2 mapping for language ${language}. Using default language instead.`); - } else { - let stats = statistics[iso639_2]; - if (Is.undef(stats)) { - log(`\tNo translations found for language ${language}. Using default language instead.`); - } + sortedLanguages.forEach(language => { + let stats = statistics[language.id]; + if (Is.undef(stats)) { + log(`\tNo translations found for language ${language.id}. Using default language instead.`); } }); } -export function processNlsFiles(opts: { fileHeader: string; languages: string[] }): ThroughStream { - return through(function (file: File) { +export function processNlsFiles(opts: { fileHeader: string; languages: Language[] }): ThroughStream { + return through(function (this: ThroughStream, file: File) { let fileName = path.basename(file.path); if (fileName === 'nls.metadata.json') { let json = null; @@ -584,40 +555,16 @@ export function processNlsFiles(opts: { fileHeader: string; languages: string[] json = JSON.parse((file.contents).toString('utf8')); } else { this.emit('error', `Failed to read component file: ${file.relative}`); + return; } if (BundledFormat.is(json)) { processCoreBundleFormat(opts.fileHeader, opts.languages, json, this); } } - this.emit('data', file); + this.queue(file); }); } -export function prepareXlfFiles(projectName?: string, extensionName?: string): ThroughStream { - return through( - function (file: File) { - if (!file.isBuffer()) { - throw new Error(`Failed to read component file: ${file.relative}`); - } - - const extension = path.extname(file.path); - if (extension === '.json') { - const json = JSON.parse((file.contents).toString('utf8')); - - if (BundledFormat.is(json)) { - importBundleJson(file, json, this); - } else if (PackageJsonFormat.is(json) || ModuleJsonFormat.is(json)) { - importModuleOrPackageJson(file, json, projectName, this, extensionName); - } else { - throw new Error(`JSON format cannot be deduced for ${file.relative}.`); - } - } else if (extension === '.isl') { - importIsl(file, this); - } - } - ); -} - const editorProject: string = 'vscode-editor', workbenchProject: string = 'vscode-workbench', extensionsProject: string = 'vscode-extensions', @@ -650,134 +597,190 @@ export function getResource(sourceFile: string): Resource { } -function importBundleJson(file: File, json: BundledFormat, stream: ThroughStream): void { - let bundleXlfs: Map = Object.create(null); +export function createXlfFilesForCoreBundle(): ThroughStream { + return through(function (this: ThroughStream, file: File) { + const basename = path.basename(file.path); + if (basename === 'nls.metadata.json') { + if (file.isBuffer()) { + const xlfs: Map = Object.create(null); + const json: BundledFormat = JSON.parse((file.contents as Buffer).toString('utf8')); + for (let coreModule in json.keys) { + const projectResource = getResource(coreModule); + const resource = projectResource.name; + const project = projectResource.project; - for (let source in json.keys) { - const projectResource = getResource(source); - const resource = projectResource.name; - const project = projectResource.project; - - const keys = json.keys[source]; - const messages = json.messages[source]; - if (keys.length !== messages.length) { - throw new Error(`There is a mismatch between keys and messages in ${file.relative}`); - } - - let xlf = bundleXlfs[resource] ? bundleXlfs[resource] : bundleXlfs[resource] = new XLF(project); - xlf.addFile('src/' + source, keys, messages); - } - - for (let resource in bundleXlfs) { - const newFilePath = `${bundleXlfs[resource].project}/${resource.replace(/\//g, '_')}.xlf`; - const xlfFile = new File({ path: newFilePath, contents: new Buffer(bundleXlfs[resource].toString(), 'utf-8') }); - stream.emit('data', xlfFile); - } -} - -// Keeps existing XLF instances and a state of how many files were already processed for faster file emission -var extensions: Map<{ xlf: XLF, processed: number }> = Object.create(null); -function importModuleOrPackageJson(file: File, json: ModuleJsonFormat | PackageJsonFormat, projectName: string, stream: ThroughStream, extensionName?: string): void { - if (ModuleJsonFormat.is(json) && json['keys'].length !== json['messages'].length) { - throw new Error(`There is a mismatch between keys and messages in ${file.relative}`); - } - - // Prepare the source path for attribute in XLF & extract messages from JSON - const formattedSourcePath = file.relative.replace(/\\/g, '/'); - const messages = Object.keys(json).map((key) => json[key].toString()); - - // Stores the amount of localization files to be transformed to XLF before the emission - let localizationFilesCount, - originalFilePath; - // If preparing XLF for external extension, then use different glob pattern and source path - if (extensionName) { - localizationFilesCount = glob.sync('**/*.nls.json').length; - originalFilePath = `${formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length)}`; - } else { - // Used for vscode/extensions folder - extensionName = formattedSourcePath.split('/')[0]; - localizationFilesCount = glob.sync(`./extensions/${extensionName}/**/*.nls.json`).length; - originalFilePath = `extensions/${formattedSourcePath.substr(0, formattedSourcePath.length - '.nls.json'.length)}`; - } - - let extension = extensions[extensionName] ? - extensions[extensionName] : extensions[extensionName] = { xlf: new XLF(projectName), processed: 0 }; - - // .nls.json can come with empty array of keys and messages, check for it - if (ModuleJsonFormat.is(json) && json.keys.length !== 0) { - extension.xlf.addFile(originalFilePath, json.keys, json.messages); - } else if (PackageJsonFormat.is(json) && Object.keys(json).length !== 0) { - extension.xlf.addFile(originalFilePath, Object.keys(json), messages); - } - - // Check if XLF is populated with file nodes to emit it - if (++extensions[extensionName].processed === localizationFilesCount) { - const newFilePath = path.join(projectName, extensionName + '.xlf'); - const xlfFile = new File({ path: newFilePath, contents: new Buffer(extension.xlf.toString(), 'utf-8') }); - stream.emit('data', xlfFile); - } -} - -function importIsl(file: File, stream: ThroughStream) { - let projectName: string, - resourceFile: string; - if (path.basename(file.path) === 'Default.isl') { - projectName = setupProject; - resourceFile = 'setup_default.xlf'; - } else { - projectName = workbenchProject; - resourceFile = 'setup_messages.xlf'; - } - - let xlf = new XLF(projectName), - keys: string[] = [], - messages: string[] = []; - - let model = new TextModel(file.contents.toString()); - let inMessageSection = false; - model.lines.forEach(line => { - if (line.length === 0) { - return; - } - let firstChar = line.charAt(0); - switch (firstChar) { - case ';': - // Comment line; + const keys = json.keys[coreModule]; + const messages = json.messages[coreModule]; + if (keys.length !== messages.length) { + this.emit('error', `There is a mismatch between keys and messages in ${file.relative} for module ${coreModule}`); + return; + } else { + let xlf = xlfs[resource]; + if (!xlf) { + xlf = new XLF(project); + xlfs[resource] = xlf; + } + xlf.addFile(`src/${coreModule}`, keys, messages); + } + } + for (let resource in xlfs) { + const xlf = xlfs[resource]; + const filePath = `${xlf.project}/${resource.replace(/\//g, '_')}.xlf`; + const xlfFile = new File({ + path: filePath, + contents: new Buffer(xlf.toString(), 'utf8') + }); + this.queue(xlfFile); + } + } else { + this.emit('error', new Error(`File ${file.relative} is not using a buffer content`)); return; - case '[': - inMessageSection = '[Messages]' === line || '[CustomMessages]' === line; - return; - } - if (!inMessageSection) { - return; - } - let sections: string[] = line.split('='); - if (sections.length !== 2) { - throw new Error(`Badly formatted message found: ${line}`); - } else { - let key = sections[0]; - let value = sections[1]; - if (key.length > 0 && value.length > 0) { - keys.push(key); - messages.push(value); } + } else { + this.emit('error', new Error(`File ${file.relative} is not a core meta data file.`)); + return; } }); +} - const originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/'); - xlf.addFile(originalPath, keys, messages); +export function createXlfFilesForExtensions(): ThroughStream { + let counter: number = 0; + let folderStreamEnded: boolean = false; + let folderStreamEndEmitted: boolean = false; + return through(function (this: ThroughStream, extensionFolder: File) { + const folderStream = this; + const stat = fs.statSync(extensionFolder.path); + if (!stat.isDirectory()) { + return; + } + let extensionName = path.basename(extensionFolder.path); + if (extensionName === 'node_modules') { + return; + } + counter++; + let _xlf: XLF; + function getXlf() { + if (!_xlf) { + _xlf = new XLF(extensionsProject); + } + return _xlf; + } + gulp.src([`./extensions/${extensionName}/package.nls.json`, `./extensions/${extensionName}/**/nls.metadata.json`]).pipe(through(function (file: File) { + if (file.isBuffer()) { + const buffer: Buffer = file.contents as Buffer; + const basename = path.basename(file.path); + if (basename === 'package.nls.json') { + const json: PackageJsonFormat = JSON.parse(buffer.toString('utf8')); + const keys = Object.keys(json); + const messages = keys.map((key) => { + const value = json[key]; + if (Is.string(value)) { + return value; + } else if (value) { + return value.message; + } else { + return `Unknown message for key: ${key}`; + } + }); + getXlf().addFile(`extensions/${extensionName}/package`, keys, messages); + } else if (basename === 'nls.metadata.json') { + const json: BundledExtensionFormat = JSON.parse(buffer.toString('utf8')); + const relPath = path.relative(`./extensions/${extensionName}`, path.dirname(file.path)); + for (let file in json) { + const fileContent = json[file]; + getXlf().addFile(`extensions/${extensionName}/${relPath}/${file}`, fileContent.keys, fileContent.messages); + } + } else { + this.emit('error', new Error(`${file.path} is not a valid extension nls file`)); + return; + } + } + }, function () { + if (_xlf) { + let xlfFile = new File({ + path: path.join(extensionsProject, extensionName + '.xlf'), + contents: new Buffer(_xlf.toString(), 'utf8') + }); + folderStream.queue(xlfFile); + } + this.queue(null); + counter--; + if (counter === 0 && folderStreamEnded && !folderStreamEndEmitted) { + folderStreamEndEmitted = true; + folderStream.queue(null); + } + })); + }, function () { + folderStreamEnded = true; + if (counter === 0) { + folderStreamEndEmitted = true; + this.queue(null); + } + }); +} - // Emit only upon all ISL files combined into single XLF instance - const newFilePath = path.join(projectName, resourceFile); - const xlfFile = new File({ path: newFilePath, contents: new Buffer(xlf.toString(), 'utf-8') }); - stream.emit('data', xlfFile); +export function createXlfFilesForIsl(): ThroughStream { + return through(function (this: ThroughStream, file: File) { + let projectName: string, + resourceFile: string; + if (path.basename(file.path) === 'Default.isl') { + projectName = setupProject; + resourceFile = 'setup_default.xlf'; + } else { + projectName = workbenchProject; + resourceFile = 'setup_messages.xlf'; + } + + let xlf = new XLF(projectName), + keys: string[] = [], + messages: string[] = []; + + let model = new TextModel(file.contents.toString()); + let inMessageSection = false; + model.lines.forEach(line => { + if (line.length === 0) { + return; + } + let firstChar = line.charAt(0); + switch (firstChar) { + case ';': + // Comment line; + return; + case '[': + inMessageSection = '[Messages]' === line || '[CustomMessages]' === line; + return; + } + if (!inMessageSection) { + return; + } + let sections: string[] = line.split('='); + if (sections.length !== 2) { + throw new Error(`Badly formatted message found: ${line}`); + } else { + let key = sections[0]; + let value = sections[1]; + if (key.length > 0 && value.length > 0) { + keys.push(key); + messages.push(value); + } + } + }); + + const originalPath = file.path.substring(file.cwd.length + 1, file.path.split('.')[0].length).replace(/\\/g, '/'); + xlf.addFile(originalPath, keys, messages); + + // Emit only upon all ISL files combined into single XLF instance + const newFilePath = path.join(projectName, resourceFile); + const xlfFile = new File({ path: newFilePath, contents: new Buffer(xlf.toString(), 'utf-8') }); + this.queue(xlfFile); + }); } export function pushXlfFiles(apiHostname: string, username: string, password: string): ThroughStream { let tryGetPromises = []; let updateCreatePromises = []; - return through(function (file: File) { + return through(function (this: ThroughStream, file: File) { const project = path.dirname(file.relative); const fileName = path.basename(file.path); const slug = fileName.substr(0, fileName.length - '.xlf'.length); @@ -799,7 +802,7 @@ export function pushXlfFiles(apiHostname: string, username: string, password: st // End the pipe only after all the communication with Transifex API happened Promise.all(tryGetPromises).then(() => { Promise.all(updateCreatePromises).then(() => { - this.emit('end'); + this.queue(null); }).catch((reason) => { throw new Error(reason); }); }).catch((reason) => { throw new Error(reason); }); }); @@ -910,42 +913,40 @@ function updateResource(project: string, slug: string, xlfFile: File, apiHostnam }); } -function obtainProjectResources(projectName: string): Resource[] { - let resources: Resource[] = []; +// cache resources +let _buildResources: Resource[]; - if (projectName === editorProject) { - const json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'); - resources = JSON.parse(json).editor; - } else if (projectName === workbenchProject) { - const json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8'); - resources = JSON.parse(json).workbench; - } else if (projectName === extensionsProject) { - let extensionsToLocalize: string[] = glob.sync('./extensions/**/*.nls.json').map(extension => extension.split('/')[2]); - let resourcesToPull: string[] = []; +export function pullBuildXlfFiles(apiHostname: string, username: string, password: string, language: Language): NodeJS.ReadableStream { + if (!_buildResources) { + _buildResources = []; + // editor and workbench + const json = JSON.parse(fs.readFileSync('./build/lib/i18n.resources.json', 'utf8')); + _buildResources.push(...json.editor); + _buildResources.push(...json.workbench); - extensionsToLocalize.forEach(extension => { - if (resourcesToPull.indexOf(extension) === -1) { // remove duplicate elements returned by glob - resourcesToPull.push(extension); - resources.push({ name: extension, project: projectName }); - } + // extensions + let extensionsToLocalize = Object.create(null); + glob.sync('./extensions/**/*.nls.json', ).forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true); + glob.sync('./extensions/*/node_modules/vscode-nls', ).forEach(extension => extensionsToLocalize[extension.split('/')[2]] = true); + + Object.keys(extensionsToLocalize).forEach(extension => { + _buildResources.push({ name: extension, project: 'vscode-extensions' }); }); - } else if (projectName === setupProject) { - resources.push({ name: 'setup_default', project: setupProject }); } - - return resources; + return pullXlfFiles(apiHostname, username, password, language, _buildResources); } -export function pullXlfFiles(projectName: string, apiHostname: string, username: string, password: string, languages: string[], resources?: Resource[]): NodeJS.ReadableStream { - if (!resources) { - resources = obtainProjectResources(projectName); - } - if (!resources) { - throw new Error('Transifex projects and resources must be defined to be able to pull translations from Transifex.'); +export function pullSetupXlfFiles(apiHostname: string, username: string, password: string, language: Language, includeDefault: boolean): NodeJS.ReadableStream { + let setupResources = [{ name: 'setup_messages', project: 'vscode-workbench' }]; + if (includeDefault) { + setupResources.push({ name: 'setup_default', project: 'vscode-setup' }); } + return pullXlfFiles(apiHostname, username, password, language, setupResources); +} +function pullXlfFiles(apiHostname: string, username: string, password: string, language: Language, resources: Resource[]): NodeJS.ReadableStream { const credentials = `${username}:${password}`; - let expectedTranslationsCount = languages.length * resources.length; + let expectedTranslationsCount = resources.length; let translationsRetrieved = 0, called = false; return readable(function (count, callback) { @@ -957,15 +958,13 @@ export function pullXlfFiles(projectName: string, apiHostname: string, username: if (!called) { called = true; const stream = this; - - // Retrieve XLF files from main projects - languages.map(function (language) { - resources.map(function (resource) { - retrieveResource(language, resource, apiHostname, credentials).then((file: File) => { + resources.map(function (resource) { + retrieveResource(language, resource, apiHostname, credentials).then((file: File) => { + if (file) { stream.emit('data', file); - translationsRetrieved++; - }).catch(error => { throw new Error(error); }); - }); + } + translationsRetrieved++; + }).catch(error => { throw new Error(error); }); }); } @@ -974,14 +973,14 @@ export function pullXlfFiles(projectName: string, apiHostname: string, username: } const limiter = new Limiter(NUMBER_OF_CONCURRENT_DOWNLOADS); -function retrieveResource(language: string, resource: Resource, apiHostname, credentials): Promise { +function retrieveResource(language: Language, resource: Resource, apiHostname, credentials): Promise { return limiter.queue(() => new Promise((resolve, reject) => { const slug = resource.name.replace(/\//g, '_'); const project = resource.project; - const iso639 = language.toLowerCase(); + const transifexLanguageId = language.transifexId || language.id; const options = { hostname: apiHostname, - path: `/api/2/project/${project}/resource/${slug}/translation/${iso639}?file&mode=onlyreviewed`, + path: `/api/2/project/${project}/resource/${slug}/translation/${transifexLanguageId}?file&mode=onlyreviewed`, auth: credentials, port: 443, method: 'GET' @@ -992,102 +991,152 @@ function retrieveResource(language: string, resource: Resource, apiHostname, cre res.on('data', (chunk: Buffer) => xlfBuffer.push(chunk)); res.on('end', () => { if (res.statusCode === 200) { - console.log('success: ' + options.path); - resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${iso639_2_to_3[language]}/${slug}.xlf` })); + resolve(new File({ contents: Buffer.concat(xlfBuffer), path: `${project}/${slug}.xlf` })); + } else if (res.statusCode === 404) { + console.log(`${slug} in ${project} returned no data.`); + resolve(null); + } else { + reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`); } - reject(`${slug} in ${project} returned no data. Response code: ${res.statusCode}.`); }); }); request.on('error', (err) => { reject(`Failed to query resource ${slug} with the following error: ${err}. ${options.path}`); }); request.end(); - console.log('started: ' + options.path); })); } -export function prepareJsonFiles(): ThroughStream { +export function prepareI18nFiles(): ThroughStream { let parsePromises: Promise[] = []; - return through(function (xlf: File) { + return through(function (this: ThroughStream, xlf: File) { let stream = this; let parsePromise = XLF.parse(xlf.contents.toString()); parsePromises.push(parsePromise); parsePromise.then( - function (resolvedFiles) { + resolvedFiles => { resolvedFiles.forEach(file => { - let messages = file.messages, translatedFile; - - // ISL file path always starts with 'build/' - if (/^build\//.test(file.originalFilePath)) { - const defaultLanguages = { 'zh-hans': true, 'zh-hant': true, 'ko': true }; - if (path.basename(file.originalFilePath) === 'Default' && !defaultLanguages[file.language]) { - return; - } - - translatedFile = createIslFile('..', file.originalFilePath, messages, iso639_2_to_3[file.language]); - } else { - translatedFile = createI18nFile(iso639_2_to_3[file.language], file.originalFilePath, messages); - } - - stream.emit('data', translatedFile); + let translatedFile = createI18nFile(file.originalFilePath, file.messages); + stream.queue(translatedFile); }); - }, - function (rejectReason) { - throw new Error(`XLF parsing error: ${rejectReason}`); } ); }, function () { Promise.all(parsePromises) - .then(() => { this.emit('end'); }) + .then(() => { this.queue(null); }) .catch(reason => { throw new Error(reason); }); }); } -function createI18nFile(base: string, originalFilePath: string, messages: Map): File { - let content = [ - '/*---------------------------------------------------------------------------------------------', - ' * Copyright (c) Microsoft Corporation. All rights reserved.', - ' * Licensed under the MIT License. See License.txt in the project root for license information.', - ' *--------------------------------------------------------------------------------------------*/', - '// Do not edit this file. It is machine generated.' - ].join('\n') + '\n' + JSON.stringify(messages, null, '\t').replace(/\r\n/g, '\n'); +function createI18nFile(originalFilePath: string, messages: any): File { + let result = Object.create(null); + result[''] = [ + '--------------------------------------------------------------------------------------------', + 'Copyright (c) Microsoft Corporation. All rights reserved.', + 'Licensed under the MIT License. See License.txt in the project root for license information.', + '--------------------------------------------------------------------------------------------', + 'Do not edit this file. It is machine generated.' + ]; + for (let key of Object.keys(messages)) { + result[key] = messages[key]; + } + let content = JSON.stringify(result, null, '\t').replace(/\r\n/g, '\n'); return new File({ - path: path.join(base, originalFilePath + '.i18n.json'), + path: path.join(originalFilePath + '.i18n.json'), contents: new Buffer(content, 'utf8') }); } +interface I18nPack { + version: string; + contents: { + [path: string]: Map; + }; +} -const languageNames: Map = { - 'chs': 'Simplified Chinese', - 'cht': 'Traditional Chinese', - 'kor': 'Korean' -}; +const i18nPackVersion = "1.0.0"; -const languageIds: Map = { - 'chs': '$0804', - 'cht': '$0404', - 'kor': '$0412' -}; +export function pullI18nPackFiles(apiHostname: string, username: string, password: string, language: Language): NodeJS.ReadableStream { + return pullBuildXlfFiles(apiHostname, username, password, language).pipe(prepareI18nPackFiles()); +} -const encodings: Map = { - 'chs': 'CP936', - 'cht': 'CP950', - 'jpn': 'CP932', - 'kor': 'CP949', - 'deu': 'CP1252', - 'fra': 'CP1252', - 'esn': 'CP1252', - 'rus': 'CP1251', - 'ita': 'CP1252', - 'ptb': 'CP1252', - 'hun': 'CP1250', - 'trk': 'CP1254' -}; +export function prepareI18nPackFiles() { + let parsePromises: Promise[] = []; + let mainPack: I18nPack = { version: i18nPackVersion, contents: {} }; + let extensionsPacks: Map = {}; + return through(function (this: ThroughStream, xlf: File) { + let stream = this; + let parsePromise = XLF.parse(xlf.contents.toString()); + parsePromises.push(parsePromise); + parsePromise.then( + resolvedFiles => { + resolvedFiles.forEach(file => { + const path = file.originalFilePath; + const firstSlash = path.indexOf('/'); + const firstSegment = path.substr(0, firstSlash); + if (firstSegment === 'src') { + mainPack.contents[path.substr(firstSlash + 1)] = file.messages; + } else if (firstSegment === 'extensions') { + const secondSlash = path.indexOf('/', firstSlash + 1); + const secondSegment = path.substring(firstSlash + 1, secondSlash); + if (secondSegment) { + let extPack = extensionsPacks[secondSegment]; + if (!extPack) { + extPack = extensionsPacks[secondSegment] = { version: i18nPackVersion, contents: {} }; + } + extPack.contents[path.substr(secondSlash + 1)] = file.messages; + } else { + console.log('Unknown second segment ' + path); + } + } else { + console.log('Unknown first segment ' + path); + } + }); + } + ); + }, function () { + Promise.all(parsePromises) + .then(() => { + const translatedMainFile = createI18nFile('./main', mainPack); + this.queue(translatedMainFile); + for (let extension in extensionsPacks) { + const translatedExtFile = createI18nFile(`./extensions/${extension}`, extensionsPacks[extension]); + this.queue(translatedExtFile); + } + this.queue(null); + }) + .catch(reason => { throw new Error(reason); }); + }); +} -function createIslFile(base: string, originalFilePath: string, messages: Map, language: string): File { +export function prepareIslFiles(language: Language, innoSetupConfig: InnoSetup): ThroughStream { + let parsePromises: Promise[] = []; + + return through(function (this: ThroughStream, xlf: File) { + let stream = this; + let parsePromise = XLF.parse(xlf.contents.toString()); + parsePromises.push(parsePromise); + parsePromise.then( + resolvedFiles => { + resolvedFiles.forEach(file => { + if (path.basename(file.originalFilePath) === 'Default' && !innoSetupConfig.defaultInfo) { + return; + } + let translatedFile = createIslFile(file.originalFilePath, file.messages, language, innoSetupConfig); + stream.queue(translatedFile); + }); + } + ); + }, function () { + Promise.all(parsePromises) + .then(() => { this.queue(null); }) + .catch(reason => { throw new Error(reason); }); + }); +} + +function createIslFile(originalFilePath: string, messages: Map, language: Language, innoSetup: InnoSetup): File { let content: string[] = []; let originalContent: TextModel; if (path.basename(originalFilePath) === 'Default') { @@ -1095,13 +1144,12 @@ function createIslFile(base: string, originalFilePath: string, messages: Map { if (line.length > 0) { let firstChar = line.charAt(0); if (firstChar === '[' || firstChar === ';') { if (line === '; *** Inno Setup version 5.5.3+ English messages ***') { - content.push(`; *** Inno Setup version 5.5.3+ ${languageNames[language]} messages ***`); + content.push(`; *** Inno Setup version 5.5.3+ ${innoSetup.defaultInfo.name} messages ***`); } else { content.push(line); } @@ -1111,11 +1159,11 @@ function createIslFile(base: string, originalFilePath: string, messages: Map NodeJS.ReadWriteStream { const entryPoints = opts.entryPoints; @@ -239,7 +239,7 @@ export function optimizeTask(opts: IOptimizeTaskOpts): () => NodeJS.ReadWriteStr })) .pipe(gulp.dest(out)); }; -}; +} declare class FileWithCopyright extends VinylFile { public __hasOurCopyright: boolean; @@ -324,4 +324,4 @@ export function minifyTask(src: string, sourceMapBaseUrl: string): (cb: any) => cb(err); }); }; -}; +} diff --git a/build/lib/typings/event-stream.d.ts b/build/lib/typings/event-stream.d.ts index 7e5ccee5e17..d79ac9183d0 100644 --- a/build/lib/typings/event-stream.d.ts +++ b/build/lib/typings/event-stream.d.ts @@ -1,7 +1,14 @@ declare module "event-stream" { import { Stream } from 'stream'; - import { ThroughStream } from 'through'; + import { ThroughStream as _ThroughStream} from 'through'; import { MapStream } from 'map-stream'; + import * as File from 'vinyl'; + + export interface ThroughStream extends _ThroughStream { + queue(data: File | null); + push(data: File | null); + paused: boolean; + } function merge(streams: Stream[]): ThroughStream; function merge(...streams: Stream[]): ThroughStream; diff --git a/build/npm/update-localization-extension.js b/build/npm/update-localization-extension.js new file mode 100644 index 00000000000..ca8a4139d6d --- /dev/null +++ b/build/npm/update-localization-extension.js @@ -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'; + +let i18n = require("../lib/i18n"); + +let fs = require("fs"); +let path = require("path"); +let vfs = require("vinyl-fs"); +let rimraf = require('rimraf'); + +function update(idOrPath) { + if (!idOrPath) { + throw new Error('Argument must be the location of the localization extension.'); + return; + } + let locExtFolder = idOrPath; + if (/^\w{2}(-\w+)?$/.test(idOrPath)) { + locExtFolder = '../vscode-localization-' + idOrPath; + } + let locExtStat = fs.statSync(locExtFolder); + if (!locExtStat || !locExtStat.isDirectory) { + throw new Error('No directory found at ' + idOrPath); + } + let packageJSON = JSON.parse(fs.readFileSync(path.join(locExtFolder, 'package.json')).toString()); + let contributes = packageJSON['contributes']; + if (!contributes) { + throw new Error('The extension must define a "localizations" contribution in the "package.json"'); + } + let localizations = contributes['localizations']; + if (!localizations) { + throw new Error('The extension must define a "localizations" contribution of type array in the "package.json"'); + } + + localizations.forEach(function (localization) { + if (!localization.languageId || !localization.languageName || !localization.translations) { + throw new Error('Each localization contribution must define "languageId", "languageName" and "translations" properties.'); + } + let server = localization.server || 'www.transifex.com'; + let userName = localization.userName || 'api'; + let apiToken = process.env.TRANSIFEX_API_TOKEN; + let languageId = localization.transifexId || localization.languageId; + let translationDataFolder = path.join(locExtFolder, localization.translations); + + if (fs.existsSync(translationDataFolder) && fs.existsSync(path.join(translationDataFolder, 'main.i18n.json'))) { + console.log('Clearing \'' + translationDataFolder + '\'...'); + rimraf.sync(translationDataFolder); + } + + console.log('Downloading translations for \'' + languageId + '\' to \'' + translationDataFolder + '\'...'); + i18n.pullI18nPackFiles(server, userName, apiToken, { id: languageId }) + .pipe(vfs.dest(translationDataFolder)); + }); + + +} +if (path.basename(process.argv[1]) === 'update-localization-extension.js') { + update(process.argv[2]); +} diff --git a/extensions/configuration-editing/package.json b/extensions/configuration-editing/package.json index cbf3960da86..ed2819ba97f 100644 --- a/extensions/configuration-editing/package.json +++ b/extensions/configuration-editing/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "jsonc-parser": "^1.0.0", - "vscode-nls": "^2.0.1" + "vscode-nls": "^3.1.2" }, "contributes": { "jsonValidation": [ diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts index a081f0ad448..ab31432ee85 100644 --- a/extensions/configuration-editing/src/extension.ts +++ b/extensions/configuration-editing/src/extension.ts @@ -2,16 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - 'use strict'; +import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); import * as vscode from 'vscode'; import { getLocation, visit, parse } from 'jsonc-parser'; import * as path from 'path'; import { SettingsDocument } from './settingsDocumentHelper'; -import * as nls from 'vscode-nls'; - -const localize = nls.loadMessageBundle(); const decoration = vscode.window.createTextEditorDecorationType({ color: '#9e9e9e' diff --git a/extensions/configuration-editing/yarn.lock b/extensions/configuration-editing/yarn.lock index 6e178dd74ea..3aecfb034d5 100644 --- a/extensions/configuration-editing/yarn.lock +++ b/extensions/configuration-editing/yarn.lock @@ -10,6 +10,6 @@ jsonc-parser@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-1.0.0.tgz#ddcc864ae708e60a7a6dd36daea00172fa8d9272" -vscode-nls@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/css/client/src/cssMain.ts b/extensions/css/client/src/cssMain.ts index 6c64c46a54e..930deba4a6e 100644 --- a/extensions/css/client/src/cssMain.ts +++ b/extensions/css/client/src/cssMain.ts @@ -3,18 +3,17 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ 'use strict'; - import * as path from 'path'; +import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); + import { languages, window, commands, ExtensionContext, TextDocument, ColorInformation, ColorPresentation, Color, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode'; import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient'; import { ConfigurationFeature } from 'vscode-languageclient/lib/configuration.proposed'; import { DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed'; -import * as nls from 'vscode-nls'; -let localize = nls.loadMessageBundle(); - // this method is called when vs code is activated export function activate(context: ExtensionContext) { diff --git a/extensions/css/package.json b/extensions/css/package.json index e404748578a..5f4354623e6 100644 --- a/extensions/css/package.json +++ b/extensions/css/package.json @@ -714,7 +714,7 @@ }, "dependencies": { "vscode-languageclient": "^3.5.0", - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/css/yarn.lock b/extensions/css/yarn.lock index f50be178c48..e6c3983fb99 100644 --- a/extensions/css/yarn.lock +++ b/extensions/css/yarn.lock @@ -27,6 +27,6 @@ vscode-languageserver-types@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json index 38326f318eb..8e9c4b0236e 100644 --- a/extensions/emmet/package.json +++ b/extensions/emmet/package.json @@ -320,6 +320,6 @@ "vscode-emmet-helper": "^1.1.21", "vscode-languageserver-types": "^3.5.0", "image-size": "^0.5.2", - "vscode-nls": "2.0.2" + "vscode-nls": "3.1.2" } } \ No newline at end of file diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock index c3294d4438d..bc19aef330b 100644 --- a/extensions/emmet/yarn.lock +++ b/extensions/emmet/yarn.lock @@ -2068,9 +2068,9 @@ vscode-languageserver-types@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" -vscode-nls@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.0.tgz#a8a264c0d4bd3e1ed4746a9883235fec5b62968a" vscode@1.0.1: version "1.0.1" diff --git a/extensions/extension-editing/package.json b/extensions/extension-editing/package.json index 8f4b631803e..fe7e6bdb413 100644 --- a/extensions/extension-editing/package.json +++ b/extensions/extension-editing/package.json @@ -23,7 +23,7 @@ "jsonc-parser": "^1.0.0", "markdown-it": "^8.3.1", "parse5": "^3.0.2", - "vscode-nls": "^2.0.1" + "vscode-nls": "^3.1.2" }, "contributes": { "jsonValidation": [ diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts index 63dab8afefb..0e486252598 100644 --- a/extensions/extension-editing/src/extensionLinter.ts +++ b/extensions/extension-editing/src/extensionLinter.ts @@ -6,8 +6,10 @@ import * as fs from 'fs'; import * as path from 'path'; -import { parseTree, findNodeAtLocation, Node as JsonNode } from 'jsonc-parser'; import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); + +import { parseTree, findNodeAtLocation, Node as JsonNode } from 'jsonc-parser'; import * as MarkdownItType from 'markdown-it'; import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, DiagnosticSeverity, Position } from 'vscode'; @@ -15,8 +17,6 @@ import { languages, workspace, Disposable, TextDocument, Uri, Diagnostic, Range, const product = require('../../../product.json'); const allowedBadgeProviders: string[] = (product.extensionAllowedBadgeProviders || []).map(s => s.toLowerCase()); -const localize = nls.loadMessageBundle(); - const httpsRequired = localize('httpsRequired', "Images must use the HTTPS protocol."); const svgsNotValid = localize('svgsNotValid', "SVGs are not a valid image source."); const embeddedSvgsNotValid = localize('embeddedSvgsNotValid', "Embedded SVGs are not a valid image source."); diff --git a/extensions/extension-editing/yarn.lock b/extensions/extension-editing/yarn.lock index ce500bb28a0..e0072b69ac8 100644 --- a/extensions/extension-editing/yarn.lock +++ b/extensions/extension-editing/yarn.lock @@ -58,6 +58,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192" -vscode-nls@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/git/package.json b/extensions/git/package.json index 645361ff5ec..e1c8322553e 100644 --- a/extensions/git/package.json +++ b/extensions/git/package.json @@ -1001,7 +1001,7 @@ "file-type": "^7.2.0", "iconv-lite": "0.4.19", "vscode-extension-telemetry": "0.0.8", - "vscode-nls": "2.0.2", + "vscode-nls": "^3.1.2", "which": "^1.3.0" }, "devDependencies": { @@ -1012,4 +1012,4 @@ "@types/which": "^1.0.28", "mocha": "^3.2.0" } -} \ No newline at end of file +} diff --git a/extensions/git/src/main.ts b/extensions/git/src/main.ts index d82223f0099..c00b71b12af 100644 --- a/extensions/git/src/main.ts +++ b/extensions/git/src/main.ts @@ -6,7 +6,7 @@ 'use strict'; import * as nls from 'vscode-nls'; -const localize = nls.config(process.env.VSCODE_NLS_CONFIG)(); +const localize = nls.loadMessageBundle(); import { ExtensionContext, workspace, window, Disposable, commands, Uri, OutputChannel } from 'vscode'; import { findGit, Git, IGit } from './git'; import { Model } from './model'; diff --git a/extensions/git/yarn.lock b/extensions/git/yarn.lock index a9d4c679d30..807d677b30a 100644 --- a/extensions/git/yarn.lock +++ b/extensions/git/yarn.lock @@ -242,9 +242,9 @@ vscode-extension-telemetry@0.0.8: applicationinsights "0.18.0" winreg "1.2.3" -vscode-nls@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" which@^1.3.0: version "1.3.0" diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json index b330d18326c..c63b52e02b4 100644 --- a/extensions/grunt/package.json +++ b/extensions/grunt/package.json @@ -15,7 +15,7 @@ "watch": "gulp watch-extension:grunt" }, "dependencies": { - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/grunt/src/main.ts b/extensions/grunt/src/main.ts index d08e845c1ba..3f425451a30 100644 --- a/extensions/grunt/src/main.ts +++ b/extensions/grunt/src/main.ts @@ -9,8 +9,7 @@ import * as fs from 'fs'; import * as cp from 'child_process'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; - -const localize = nls.config(process.env.VSCODE_NLS_CONFIG)(); +const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off'; @@ -68,7 +67,7 @@ interface GruntTaskDefinition extends vscode.TaskDefinition { class FolderDetector { - private fileWatcher: vscode.FileSystemWatcher; + private fileWatcher: vscode.FileSystemWatcher | undefined; private promise: Thenable | undefined; constructor(private _workspaceFolder: vscode.WorkspaceFolder) { diff --git a/extensions/grunt/yarn.lock b/extensions/grunt/yarn.lock index cde3e475ca8..e2fc7ae342e 100644 --- a/extensions/grunt/yarn.lock +++ b/extensions/grunt/yarn.lock @@ -6,6 +6,6 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/gulp/package.json b/extensions/gulp/package.json index 00e098d9b20..525398dcf9a 100644 --- a/extensions/gulp/package.json +++ b/extensions/gulp/package.json @@ -15,7 +15,7 @@ "watch": "gulp watch-extension:gulp" }, "dependencies": { - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/gulp/src/main.ts b/extensions/gulp/src/main.ts index 51a64054021..def484dc13f 100644 --- a/extensions/gulp/src/main.ts +++ b/extensions/gulp/src/main.ts @@ -8,9 +8,9 @@ import * as path from 'path'; import * as fs from 'fs'; import * as cp from 'child_process'; import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; -const localize = nls.config(process.env.VSCODE_NLS_CONFIG)(); +import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off'; diff --git a/extensions/gulp/yarn.lock b/extensions/gulp/yarn.lock index cde3e475ca8..e2fc7ae342e 100644 --- a/extensions/gulp/yarn.lock +++ b/extensions/gulp/yarn.lock @@ -6,6 +6,6 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/html/client/src/htmlMain.ts b/extensions/html/client/src/htmlMain.ts index b4b84b3ee01..a3bc91466ea 100644 --- a/extensions/html/client/src/htmlMain.ts +++ b/extensions/html/client/src/htmlMain.ts @@ -5,6 +5,8 @@ 'use strict'; import * as path from 'path'; +import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); import { languages, ExtensionContext, IndentAction, Position, TextDocument, Color, ColorInformation, ColorPresentation, Range, CompletionItem, CompletionItemKind, SnippetString } from 'vscode'; import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams } from 'vscode-languageclient'; @@ -14,9 +16,6 @@ import TelemetryReporter from 'vscode-extension-telemetry'; import { DocumentColorRequest, DocumentColorParams, ColorPresentationRequest, ColorPresentationParams } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed'; -import * as nls from 'vscode-nls'; -let localize = nls.loadMessageBundle(); - namespace TagCloseRequest { export const type: RequestType = new RequestType('html/tag'); } diff --git a/extensions/html/package.json b/extensions/html/package.json index 13e5d82ca51..c9662fab156 100644 --- a/extensions/html/package.json +++ b/extensions/html/package.json @@ -226,7 +226,7 @@ "dependencies": { "vscode-extension-telemetry": "0.0.8", "vscode-languageclient": "^3.5.0", - "vscode-nls": "2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/html/server/package.json b/extensions/html/server/package.json index 65cd75b02e9..37ab867085e 100644 --- a/extensions/html/server/package.json +++ b/extensions/html/server/package.json @@ -11,7 +11,7 @@ "vscode-css-languageservice": "^3.0.3", "vscode-html-languageservice": "^2.0.14", "vscode-languageserver": "^3.5.0", - "vscode-nls": "^2.0.2", + "vscode-nls": "^3.1.2", "vscode-uri": "^1.0.1" }, "devDependencies": { diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts index 85383529fd4..cf03f00d561 100644 --- a/extensions/html/server/src/htmlServerMain.ts +++ b/extensions/html/server/src/htmlServerMain.ts @@ -18,10 +18,6 @@ import { getDocumentContext } from './utils/documentContext'; import uri from 'vscode-uri'; import { formatError, runSafe } from './utils/errors'; -import * as nls from 'vscode-nls'; - -nls.config(process.env['VSCODE_NLS_CONFIG']); - namespace TagCloseRequest { export const type: RequestType = new RequestType('html/tag'); } diff --git a/extensions/html/server/yarn.lock b/extensions/html/server/yarn.lock index d676d5f4456..f12116b9872 100644 --- a/extensions/html/server/yarn.lock +++ b/extensions/html/server/yarn.lock @@ -51,6 +51,10 @@ vscode-nls@^2.0.1, vscode-nls@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" + vscode-uri@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8" diff --git a/extensions/html/yarn.lock b/extensions/html/yarn.lock index 4ebd6092170..fac01e86dad 100644 --- a/extensions/html/yarn.lock +++ b/extensions/html/yarn.lock @@ -38,9 +38,9 @@ vscode-languageserver-types@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" -vscode-nls@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" winreg@1.2.3: version "1.2.3" diff --git a/extensions/jake/package.json b/extensions/jake/package.json index 58ba0168e4a..374be5cea88 100644 --- a/extensions/jake/package.json +++ b/extensions/jake/package.json @@ -15,7 +15,7 @@ "watch": "gulp watch-extension:jake" }, "dependencies": { - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/jake/src/main.ts b/extensions/jake/src/main.ts index 0a2032c970c..514cfbacd41 100644 --- a/extensions/jake/src/main.ts +++ b/extensions/jake/src/main.ts @@ -9,8 +9,7 @@ import * as fs from 'fs'; import * as cp from 'child_process'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; - -const localize = nls.config(process.env.VSCODE_NLS_CONFIG)(); +const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off'; @@ -68,7 +67,7 @@ interface JakeTaskDefinition extends vscode.TaskDefinition { class FolderDetector { - private fileWatcher: vscode.FileSystemWatcher; + private fileWatcher: vscode.FileSystemWatcher | undefined; private promise: Thenable | undefined; constructor(private _workspaceFolder: vscode.WorkspaceFolder) { diff --git a/extensions/jake/yarn.lock b/extensions/jake/yarn.lock index cde3e475ca8..e2fc7ae342e 100644 --- a/extensions/jake/yarn.lock +++ b/extensions/jake/yarn.lock @@ -6,6 +6,6 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json index 8a6e0ed6708..b3377418c01 100644 --- a/extensions/javascript/package.json +++ b/extensions/javascript/package.json @@ -13,7 +13,7 @@ "dependencies": { "jsonc-parser": "^1.0.0", "request-light": "^0.2.2", - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "scripts": { "compile": "gulp compile-extension:javascript", diff --git a/extensions/javascript/src/javascriptMain.ts b/extensions/javascript/src/javascriptMain.ts index ed2552b87f0..319c5bae577 100644 --- a/extensions/javascript/src/javascriptMain.ts +++ b/extensions/javascript/src/javascriptMain.ts @@ -8,13 +8,9 @@ import { addJSONProviders } from './features/jsonContributions'; import * as httpRequest from 'request-light'; -import { ExtensionContext, env, workspace } from 'vscode'; - -import * as nls from 'vscode-nls'; +import { ExtensionContext, workspace } from 'vscode'; export function activate(context: ExtensionContext): any { - nls.config({ locale: env.language }); - configureHttpRequest(); workspace.onDidChangeConfiguration(() => configureHttpRequest()); diff --git a/extensions/javascript/yarn.lock b/extensions/javascript/yarn.lock index c74f9ca2c9f..72d121783eb 100644 --- a/extensions/javascript/yarn.lock +++ b/extensions/javascript/yarn.lock @@ -71,3 +71,7 @@ request-light@^0.2.2: vscode-nls@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" + +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/json/client/src/jsonMain.ts b/extensions/json/client/src/jsonMain.ts index 654db136a3f..e6fe6e4253b 100644 --- a/extensions/json/client/src/jsonMain.ts +++ b/extensions/json/client/src/jsonMain.ts @@ -5,6 +5,8 @@ 'use strict'; import * as path from 'path'; +import * as nls from 'vscode-nls'; +const localize = nls.loadMessageBundle(); import { workspace, languages, ExtensionContext, extensions, Uri, TextDocument, ColorInformation, Color, ColorPresentation, LanguageConfiguration } from 'vscode'; import { LanguageClient, LanguageClientOptions, RequestType, ServerOptions, TransportKind, NotificationType, DidChangeConfigurationNotification } from 'vscode-languageclient'; @@ -12,10 +14,7 @@ import TelemetryReporter from 'vscode-extension-telemetry'; import { ConfigurationFeature } from 'vscode-languageclient/lib/configuration.proposed'; import { DocumentColorRequest, DocumentColorParams, ColorPresentationParams, ColorPresentationRequest } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed'; - -import * as nls from 'vscode-nls'; import { hash } from './utils/hash'; -let localize = nls.loadMessageBundle(); namespace VSCodeContentRequest { export const type: RequestType = new RequestType('vscode/content'); diff --git a/extensions/json/package.json b/extensions/json/package.json index 31f13d8017b..e5ae54bde5b 100644 --- a/extensions/json/package.json +++ b/extensions/json/package.json @@ -164,7 +164,7 @@ "dependencies": { "vscode-extension-telemetry": "0.0.8", "vscode-languageclient": "^3.5.0", - "vscode-nls": "2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/json/server/package.json b/extensions/json/server/package.json index 2dc13ac6bef..562689ecf52 100644 --- a/extensions/json/server/package.json +++ b/extensions/json/server/package.json @@ -12,7 +12,7 @@ "request-light": "^0.2.2", "vscode-json-languageservice": "^3.0.4", "vscode-languageserver": "^3.5.0", - "vscode-nls": "^2.0.2", + "vscode-nls": "^3.1.2", "vscode-uri": "^1.0.1" }, "devDependencies": { diff --git a/extensions/json/server/src/jsonServerMain.ts b/extensions/json/server/src/jsonServerMain.ts index 182dfc60ddf..3137b954d36 100644 --- a/extensions/json/server/src/jsonServerMain.ts +++ b/extensions/json/server/src/jsonServerMain.ts @@ -21,9 +21,6 @@ import { formatError, runSafe } from './utils/errors'; import { JSONDocument, JSONSchema, LanguageSettings, getLanguageService, DocumentLanguageSettings } from 'vscode-json-languageservice'; import { getLanguageModelCache } from './languageModelCache'; -import * as nls from 'vscode-nls'; -nls.config(process.env['VSCODE_NLS_CONFIG']); - interface ISchemaAssociations { [pattern: string]: string[]; } diff --git a/extensions/json/server/yarn.lock b/extensions/json/server/yarn.lock index c526bf67451..8c005a3357a 100644 --- a/extensions/json/server/yarn.lock +++ b/extensions/json/server/yarn.lock @@ -99,6 +99,10 @@ vscode-nls@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" + vscode-uri@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8" diff --git a/extensions/json/yarn.lock b/extensions/json/yarn.lock index 4ebd6092170..fac01e86dad 100644 --- a/extensions/json/yarn.lock +++ b/extensions/json/yarn.lock @@ -38,9 +38,9 @@ vscode-languageserver-types@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz#e48d79962f0b8e02de955e3f524908e2b19c0374" -vscode-nls@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" winreg@1.2.3: version "1.2.3" diff --git a/extensions/markdown/package.json b/extensions/markdown/package.json index db8a18ec737..6d86a3d88fb 100644 --- a/extensions/markdown/package.json +++ b/extensions/markdown/package.json @@ -314,7 +314,7 @@ "markdown-it": "^8.4.0", "markdown-it-named-headers": "0.0.4", "vscode-extension-telemetry": "^0.0.8", - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/highlight.js": "9.1.10", diff --git a/extensions/markdown/src/commands.ts b/extensions/markdown/src/commands.ts index b0b029f1b24..583c0f85292 100644 --- a/extensions/markdown/src/commands.ts +++ b/extensions/markdown/src/commands.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as nls from 'vscode-nls'; -const localize = nls.config(process.env.VSCODE_NLS_CONFIG)(); +const localize = nls.loadMessageBundle(); import * as vscode from 'vscode'; import * as path from 'path'; diff --git a/extensions/markdown/yarn.lock b/extensions/markdown/yarn.lock index 4baed92f526..5e1e4c7a48b 100644 --- a/extensions/markdown/yarn.lock +++ b/extensions/markdown/yarn.lock @@ -162,9 +162,9 @@ vscode-extension-telemetry@^0.0.8: applicationinsights "0.18.0" winreg "1.2.3" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" winreg@1.2.3: version "1.2.3" diff --git a/extensions/merge-conflict/package.json b/extensions/merge-conflict/package.json index 1a0f35f9b34..d7a0031df97 100644 --- a/extensions/merge-conflict/package.json +++ b/extensions/merge-conflict/package.json @@ -100,7 +100,7 @@ }, "dependencies": { "vscode-extension-telemetry": "0.0.8", - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "8.0.33" diff --git a/extensions/merge-conflict/src/extension.ts b/extensions/merge-conflict/src/extension.ts index 3168d67ab42..33c996955db 100644 --- a/extensions/merge-conflict/src/extension.ts +++ b/extensions/merge-conflict/src/extension.ts @@ -3,8 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as nls from 'vscode-nls'; -nls.config(process.env.VSCODE_NLS_CONFIG)(); import * as vscode from 'vscode'; import MergeConflictServices from './services'; diff --git a/extensions/merge-conflict/yarn.lock b/extensions/merge-conflict/yarn.lock index feea62445f1..bd0aecc3553 100644 --- a/extensions/merge-conflict/yarn.lock +++ b/extensions/merge-conflict/yarn.lock @@ -17,9 +17,9 @@ vscode-extension-telemetry@0.0.8: applicationinsights "0.18.0" winreg "1.2.3" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" winreg@1.2.3: version "1.2.3" diff --git a/extensions/npm/package.json b/extensions/npm/package.json index 5810b4ee483..dba83356e28 100644 --- a/extensions/npm/package.json +++ b/extensions/npm/package.json @@ -15,7 +15,7 @@ "watch": "gulp watch-extension:npm" }, "dependencies": { - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "7.0.43" diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts index e18287872db..17d2c47b1c9 100644 --- a/extensions/npm/src/main.ts +++ b/extensions/npm/src/main.ts @@ -9,7 +9,7 @@ import * as path from 'path'; import * as fs from 'fs'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; -let localize = nls.loadMessageBundle(); +const localize = nls.loadMessageBundle(); type AutoDetect = 'on' | 'off'; let taskProvider: vscode.Disposable | undefined; diff --git a/extensions/npm/yarn.lock b/extensions/npm/yarn.lock index cde3e475ca8..e2fc7ae342e 100644 --- a/extensions/npm/yarn.lock +++ b/extensions/npm/yarn.lock @@ -6,6 +6,6 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/php/package.json b/extensions/php/package.json index fb5758ff8bf..bfe9fcaa5c5 100644 --- a/extensions/php/package.json +++ b/extensions/php/package.json @@ -10,7 +10,7 @@ ], "main": "./out/phpMain", "dependencies": { - "vscode-nls": "^1.0.4" + "vscode-nls": "^3.1.2" }, "contributes": { "languages": [ diff --git a/extensions/php/src/phpMain.ts b/extensions/php/src/phpMain.ts index 64eda6c7809..060f7587c18 100644 --- a/extensions/php/src/phpMain.ts +++ b/extensions/php/src/phpMain.ts @@ -5,8 +5,6 @@ 'use strict'; import * as vscode from 'vscode'; -import * as nls from 'vscode-nls'; -nls.config({ locale: vscode.env.language }); import PHPCompletionItemProvider from './features/completionItemProvider'; import PHPHoverProvider from './features/hoverProvider'; diff --git a/extensions/php/yarn.lock b/extensions/php/yarn.lock index fdd1d36b518..e2fc7ae342e 100644 --- a/extensions/php/yarn.lock +++ b/extensions/php/yarn.lock @@ -6,6 +6,6 @@ version "7.0.43" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" -vscode-nls@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-1.0.7.tgz#298c01fce87802c644c0a15ef526a33c62c0d58e" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json index 6e182cef3d1..27656dec922 100644 --- a/extensions/typescript/package.json +++ b/extensions/typescript/package.json @@ -14,7 +14,7 @@ "dependencies": { "semver": "4.3.6", "vscode-extension-telemetry": "^0.0.8", - "vscode-nls": "^2.0.2" + "vscode-nls": "^3.1.2" }, "devDependencies": { "@types/node": "8.0.33", diff --git a/extensions/typescript/src/extension.ts b/extensions/typescript/src/extension.ts index 5116fa9af72..73604a21c3f 100644 --- a/extensions/typescript/src/extension.ts +++ b/extensions/typescript/src/extension.ts @@ -5,12 +5,6 @@ import * as vscode from 'vscode'; -// This must be the first statement otherwise modules might got loaded with -// the wrong locale. -import * as nls from 'vscode-nls'; -nls.config({ locale: vscode.env.language }); -nls.loadMessageBundle(); - import { CommandManager } from './utils/commandManager'; import TypeScriptServiceClientHost from './typeScriptServiceClientHost'; import * as commands from './commands'; diff --git a/extensions/typescript/yarn.lock b/extensions/typescript/yarn.lock index eb4fd8e25fd..5f6bdee5635 100644 --- a/extensions/typescript/yarn.lock +++ b/extensions/typescript/yarn.lock @@ -25,9 +25,9 @@ vscode-extension-telemetry@^0.0.8: applicationinsights "0.18.0" winreg "1.2.3" -vscode-nls@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-2.0.2.tgz#808522380844b8ad153499af5c3b03921aea02da" +vscode-nls@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-3.1.2.tgz#c1b63f4338ac49c852267633dd99717916424a74" winreg@1.2.3: version "1.2.3" diff --git a/package.json b/package.json index 14be3363124..bfd9b7a1eb9 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "gulp": "gulp --max_old_space_size=4096", "7z": "7z", "update-grammars": "node build/npm/update-all-grammars.js", + "update-localization-extension": "node build/npm/update-localization-extension.js", "smoketest": "cd test/smoke && mocha" }, "dependencies": { @@ -115,7 +116,7 @@ "vinyl": "^0.4.5", "vinyl-fs": "^2.4.3", "vsce": "1.33.2", - "vscode-nls-dev": "^2.0.1" + "vscode-nls-dev": "^3.0.5" }, "repository": { "type": "git", diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js index b5e142fca8e..8b91b77b671 100644 --- a/src/bootstrap-amd.js +++ b/src/bootstrap-amd.js @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ var path = require('path'); +var fs = require('fs'); var loader = require('./vs/loader'); function uriFromPath(_path) { @@ -16,9 +17,40 @@ function uriFromPath(_path) { return encodeURI('file://' + pathName); } +function readFile(file) { + return new Promise(function(resolve, reject) { + fs.readFile(file, 'utf8', function(err, data) { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); +} + var rawNlsConfig = process.env['VSCODE_NLS_CONFIG']; var nlsConfig = rawNlsConfig ? JSON.parse(rawNlsConfig) : { availableLanguages: {} }; +// We have a special location of the nls files. They come from a language pack +if (nlsConfig._resolvedLanguagePackCoreLocation) { + let bundles = Object.create(null); + nlsConfig.loadBundle = function(bundle, language, cb) { + let result = bundles[bundle]; + if (result) { + cb(undefined, result); + return; + } + let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json'); + readFile(bundleFile).then(function (content) { + let json = JSON.parse(content); + bundles[bundle] = json; + cb(undefined, json); + }) + .catch(cb); + }; +} + loader.config({ baseUrl: uriFromPath(__dirname), catchError: true, diff --git a/src/main.js b/src/main.js index 6e29b5203a6..127e6500797 100644 --- a/src/main.js +++ b/src/main.js @@ -2,44 +2,41 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ - 'use strict'; -var perf = require('./vs/base/common/performance'); +let perf = require('./vs/base/common/performance'); perf.mark('main:started'); // Perf measurements global.perfStartTime = Date.now(); -var app = require('electron').app; -var fs = require('fs'); -var path = require('path'); -var minimist = require('minimist'); -var paths = require('./paths'); +let app = require('electron').app; +let fs = require('fs'); +let path = require('path'); +let minimist = require('minimist'); +let paths = require('./paths'); -var args = minimist(process.argv, { +let args = minimist(process.argv, { string: ['user-data-dir', 'locale'] }); function stripComments(content) { - var regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g; - var result = content.replace(regexp, function (match, m1, m2, m3, m4) { + let regexp = /("(?:[^\\\"]*(?:\\.)?)*")|('(?:[^\\\']*(?:\\.)?)*')|(\/\*(?:\r?\n|.)*?\*\/)|(\/{2,}.*?(?:(?:\r?\n)|$))/g; + let result = content.replace(regexp, function (match, m1, m2, m3, m4) { // Only one of m1, m2, m3, m4 matches if (m3) { // A block comment. Replace with nothing return ''; - } - else if (m4) { + } else if (m4) { // A line comment. If it ends in \r?\n then keep it. - var length_1 = m4.length; + let length_1 = m4.length; if (length_1 > 2 && m4[length_1 - 1] === '\n') { return m4[length_1 - 2] === '\r' ? '\r\n' : '\n'; } else { return ''; } - } - else { + } else { // We match a string return match; } @@ -47,71 +44,309 @@ function stripComments(content) { return result; } -function getNLSConfiguration() { - var locale = args['locale']; +let _commit; +function getCommit() { + if (_commit) { + return _commit; + } + if (_commit === null) { + return undefined; + } + try { + let productJson = require(path.join(__dirname, '../product.json')); + if (productJson.commit) { + _commit = productJson.commit; + } else { + _commit = null; + } + } catch (exp) { + _commit = null; + } +} - if (!locale) { - var userData = app.getPath('userData'); - var localeConfig = path.join(userData, 'User', 'locale.json'); - if (fs.existsSync(localeConfig)) { - try { - var content = stripComments(fs.readFileSync(localeConfig, 'utf8')); - var value = JSON.parse(content).locale; - if (value && typeof value === 'string') { - locale = value; +function mkdirp(dir) { + return mkdir(dir) + .then(null, (err) => { + if (err && err.code === 'ENOENT') { + let parent = path.dirname(dir); + if (parent !== dir) { // if not arrived at root + return mkdirp(parent) + .then(() => { + return mkdir(dir); + }); + } + } + throw err; + }); +} + +function mkdir(dir) { + return new Promise((resolve, reject) => { + fs.mkdir(dir, (err) => { + if (err && err.code !== 'EEXIST') { + reject(err); + } else { + resolve(dir); + } + }); + }); +} + +function exists(file) { + return new Promise((resolve) => { + fs.exists(file, (result) => { + resolve(result); + }); + }); +} + +function readFile(file) { + return new Promise((resolve, reject) => { + fs.readFile(file, 'utf8', (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); +} + +function writeFile(file, content) { + return new Promise((resolve, reject) => { + fs.writeFile(file, content, 'utf8', (err) => { + if (err) { + reject(err); + return; + } + resolve(undefined); + }); + }); +} + +function touch(file) { + return new Promise((resolve, reject) => { + let d = new Date(); + fs.utimes(file, d, d, (err) => { + if (err) { + reject(err); + return; + } + resolve(undefined); + }); + }); +} + +// Language tags are case insensitve however an amd loader is case sensitive +// To make this work on case preserving & insensitive FS we do the following: +// the language bundles have lower case language tags and we always lower case +// the locale we receive from the user or OS. + +function getUserDefinedLocale() { + let locale = args['locale']; + if (locale) { + return Promise.resolve(locale.toLowerCase()); + } + + let userData = app.getPath('userData'); + let localeConfig = path.join(userData, 'User', 'locale.json'); + return exists(localeConfig).then((result) => { + if (result) { + return readFile(localeConfig).then((content) => { + content = stripComments(content); + try { + let value = JSON.parse(content).locale; + return value && typeof value === 'string' ? value.toLowerCase() : undefined; + } catch (e) { + return undefined; + } + }); + } else { + return undefined; + } + }); +} + +function getLanguagePackConfigurations() { + let userData = app.getPath('userData'); + let configFile = path.join(userData, 'languagepacks.json'); + try { + return require(configFile); + } catch (err) { + // Do nothing. If we can't read the file we have no + // language pack config. + } + return undefined; +} + +function resolveLanguagePackLocale(config, locale) { + try { + while (locale) { + if (config[locale]) { + return locale; + } else { + let index = locale.lastIndexOf('-'); + if (index > 0) { + locale = locale.substring(0, index); + } else { + return undefined; } - } catch (e) { - // noop } } + } catch (err) { + console.error('Resolving language pack configuration failed.', err); + } + return undefined; +} + +function getNLSConfiguration(locale) { + if (locale === 'pseudo') { + return Promise.resolve({ locale: locale, availableLanguages: {}, pseudo: true }); } - var appLocale = app.getLocale(); - locale = locale || appLocale; - // Language tags are case insensitve however an amd loader is case sensitive - // To make this work on case preserving & insensitive FS we do the following: - // the language bundles have lower case language tags and we always lower case - // the locale we receive from the user or OS. - locale = locale ? locale.toLowerCase() : locale; - if (locale === 'pseudo') { - return { locale: locale, availableLanguages: {}, pseudo: true }; - } - var initialLocale = locale; if (process.env['VSCODE_DEV']) { - return { locale: locale, availableLanguages: {} }; + return Promise.resolve({ locale: locale, availableLanguages: {} }); } + let userData = app.getPath('userData'); + // We have a built version so we have extracted nls file. Try to find // the right file to use. // Check if we have an English locale. If so fall to default since that is our // English translation (we don't ship *.nls.en.json files) if (locale && (locale == 'en' || locale.startsWith('en-'))) { - return { locale: locale, availableLanguages: {} }; + return Promise.resolve({ locale: locale, availableLanguages: {} }); } + let initialLocale = locale; + function resolveLocale(locale) { while (locale) { - var candidate = path.join(__dirname, 'vs', 'code', 'electron-main', 'main.nls.') + locale + '.js'; + let candidate = path.join(__dirname, 'vs', 'code', 'electron-main', 'main.nls.') + locale + '.js'; if (fs.existsSync(candidate)) { return { locale: initialLocale, availableLanguages: { '*': locale } }; } else { - var index = locale.lastIndexOf('-'); + let index = locale.lastIndexOf('-'); if (index > 0) { locale = locale.substring(0, index); } else { - locale = null; + locale = undefined; } } } - return null; + return undefined; } - var resolvedLocale = resolveLocale(locale); - if (!resolvedLocale && appLocale && appLocale !== locale) { - resolvedLocale = resolveLocale(appLocale); + let isCoreLangaguage = true; + if (locale) { + isCoreLangaguage = ['de', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'tr', 'zh-cn', 'zh-tw'].some((language) => { + return locale === language || locale.startsWith(language + '-'); + }); + } + + if (isCoreLangaguage) { + return Promise.resolve(resolveLocale(locale)); + } else { + perf.mark('nlsGeneration:start'); + let defaultResult = function() { + perf.mark('nlsGeneration:end'); + return Promise.resolve({ locale: locale, availableLanguages: {} }); + }; + try { + let commit = getCommit(); + if (!commit) { + return defaultResult(); + } + let configs = getLanguagePackConfigurations(); + if (!configs) { + return defaultResult(); + } + let initialLocale = locale; + locale = resolveLanguagePackLocale(configs, locale); + if (!locale) { + return defaultResult(); + } + let packConfigs = configs[locale]; + if (!packConfigs || !Array.isArray(packConfigs) || packConfigs.length === 0) { + return defaultResult(); + } + // We take the first install language pack. No idea what to do if we have more + // than one :-) + let packConfig = packConfigs[0]; + if (typeof packConfig.translations !== 'string' || typeof packConfig.version !== 'string' || packConfig.version.match(/\d+\.\d+\.\d+/) === null) { + return defaultResult(); + } + return exists(packConfig.translations).then((fileExists) => { + if (!fileExists) { + return defaultResult(); + } + let packId = packConfig.extensionIdentifier.id + '-' + packConfig.version; + let cacheRoot = path.join(userData, 'clp', packId); + let coreLocation = path.join(cacheRoot, commit); + let result = { + locale: initialLocale, + availableLanguages: { '*': locale }, + _languagePackId: packId, + _languagePackLocation: packConfig.translations, + _cacheRoot: cacheRoot, + _resolvedLanguagePackCoreLocation: coreLocation + }; + return exists(coreLocation).then((fileExists) => { + if (fileExists) { + // We don't wait for this. No big harm if we can't touch + touch(coreLocation).catch(() => {}); + perf.mark('nlsGeneration:end'); + return result; + } + return mkdirp(coreLocation).then(() => { + return Promise.all([readFile(path.join(__dirname, 'nls.metadata.json')), readFile(path.join(packConfig.translations, 'main.i18n.json'))]); + }).then((values) => { + let metadata = JSON.parse(values[0]); + let packData = JSON.parse(values[1]).contents; + let bundles = Object.keys(metadata.bundles); + let writes = []; + for (let bundle of bundles) { + let modules = metadata.bundles[bundle]; + let target = Object.create(null); + for (let module of modules) { + let keys = metadata.keys[module]; + let defaultMessages = metadata.messages[module]; + let translations = packData[module]; + let targetStrings; + if (translations) { + targetStrings = []; + for (let i = 0; i < keys.length; i++) { + let elem = keys[i]; + let key = typeof elem === 'string' ? elem : elem.key; + let translatedMessage = translations[key]; + if (translatedMessage === undefined) { + translatedMessage = defaultMessages[i]; + } + targetStrings.push(translatedMessage); + } + } else { + targetStrings = defaultMessages; + } + target[module] = targetStrings; + } + writes.push(writeFile(path.join(coreLocation, bundle.replace(/\//g,'!') + '.nls.json'), JSON.stringify(target))); + } + return Promise.all(writes); + }).then(() => { + perf.mark('nlsGeneration:end'); + return result; + }).catch((err) => { + console.error('Generating translation files failed.', err); + return defaultResult(); + }); + }); + }); + } catch (err) { + console.error('Generating translation files failed.', err); + return defaultResult(); + } } - return resolvedLocale ? resolvedLocale : { locale: initialLocale, availableLanguages: {} }; } function getNodeCachedDataDir() { @@ -126,52 +361,24 @@ function getNodeCachedDataDir() { } // find commit id - var productJson = require(path.join(__dirname, '../product.json')); - if (!productJson.commit) { + let commit = getCommit(); + if (!commit) { return Promise.resolve(undefined); } - var dir = path.join(app.getPath('userData'), 'CachedData', productJson.commit); + let dir = path.join(app.getPath('userData'), 'CachedData', commit); return mkdirp(dir).then(undefined, function () { /*ignore*/ }); } -function mkdirp(dir) { - return mkdir(dir) - .then(null, function (err) { - if (err && err.code === 'ENOENT') { - var parent = path.dirname(dir); - if (parent !== dir) { // if not arrived at root - return mkdirp(parent) - .then(function () { - return mkdir(dir); - }); - } - } - throw err; - }); -} - -function mkdir(dir) { - return new Promise(function (resolve, reject) { - fs.mkdir(dir, function (err) { - if (err && err.code !== 'EEXIST') { - reject(err); - } else { - resolve(dir); - } - }); - }); -} - // Set userData path before app 'ready' event and call to process.chdir -var userData = path.resolve(args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform)); +let userData = path.resolve(args['user-data-dir'] || paths.getDefaultUserDataPath(process.platform)); app.setPath('userData', userData); // Update cwd based on environment and platform try { if (process.platform === 'win32') { - process.env['VSCODE_CWD'] = process.cwd(); // remember as environment variable + process.env['VSCODE_CWD'] = process.cwd(); // remember as environment letiable process.chdir(path.dirname(app.getPath('exe'))); // always set application folder as cwd } else if (process.env['VSCODE_CWD']) { process.chdir(process.env['VSCODE_CWD']); @@ -187,8 +394,8 @@ app.on('open-file', function (event, path) { global.macOpenFiles.push(path); }); -var openUrls = []; -var onOpenUrl = function (event, url) { +let openUrls = []; +let onOpenUrl = function (event, url) { event.preventDefault(); openUrls.push(url); }; @@ -205,7 +412,7 @@ global.getOpenUrls = function () { // use '/CachedData'-directory to store // node/v8 cached data. -var nodeCachedDataDir = getNodeCachedDataDir().then(function (value) { +let nodeCachedDataDir = getNodeCachedDataDir().then(function (value) { if (value) { // store the data directory process.env['VSCODE_NODE_CACHED_DATA_DIR_' + process.pid] = value; @@ -214,15 +421,56 @@ var nodeCachedDataDir = getNodeCachedDataDir().then(function (value) { // but because we generate cached data it makes subsequent startups much faster app.commandLine.appendSwitch('--js-flags', '--nolazy'); } + return value; +}); + +let nlsConfiguration = undefined; +let userDefinedLocale = getUserDefinedLocale(); +userDefinedLocale.then((locale) => { + if (locale && !nlsConfiguration) { + nlsConfiguration = getNLSConfiguration(locale); + } }); // Load our code once ready app.once('ready', function () { perf.mark('main:appReady'); - var nlsConfig = getNLSConfiguration(); - process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig); - - nodeCachedDataDir.then(function () { - require('./bootstrap-amd').bootstrap('vs/code/electron-main/main'); + Promise.all([nodeCachedDataDir, userDefinedLocale]).then((values) => { + let locale = values[1]; + if (locale && !nlsConfiguration) { + nlsConfiguration = getNLSConfiguration(locale); + } + if (!nlsConfiguration) { + nlsConfiguration = Promise.resolve(undefined); + } + // We first need to test a user defined locale. If it fails we try the app locale. + // If that fails we fall back to English. + nlsConfiguration.then((nlsConfig) => { + let boot = (nlsConfig) => { + process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig); + require('./bootstrap-amd').bootstrap('vs/code/electron-main/main'); + }; + // We recevied a valid nlsConfig from a user defined locale + if (nlsConfig) { + boot(nlsConfig); + } else { + // Try to use the app locale. Please note that the app locale is only + // valid after we have received the app ready event. This is why the + // code is here. + let appLocale = app.getLocale(); + if (!appLocale) { + boot({ locale: 'en', availableLanguages: {} }); + } else { + // See above the comment about the loader and case sensitiviness + appLocale.toLowerCase(); + getNLSConfiguration(appLocale).then((nlsConfig) => { + if (!nlsConfig) { + nlsConfig = { locale: appLocale, availableLanguages: {} }; + } + boot(nlsConfig); + }); + } + } + }); }, console.error); }); diff --git a/src/vs/code/electron-browser/issue/issueReporter.js b/src/vs/code/electron-browser/issue/issueReporter.js index ac9730d0d58..06cbab83f42 100644 --- a/src/vs/code/electron-browser/issue/issueReporter.js +++ b/src/vs/code/electron-browser/issue/issueReporter.js @@ -6,6 +6,7 @@ 'use strict'; const path = require('path'); +const fs = require('fs'); const remote = require('electron').remote; function parseURLQueryArgs() { @@ -36,6 +37,18 @@ function uriFromPath(_path) { return encodeURI('file://' + pathName); } +function readFile(file) { + return new Promise(function(resolve, reject) { + fs.readFile(file, 'utf8', function(err, data) { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); +} + function main() { const args = parseURLQueryArgs(); const configuration = JSON.parse(args['config'] || '{}') || {}; @@ -75,6 +88,24 @@ function main() { } catch (e) { /*noop*/ } } + if (nlsConfig._resolvedLanguagePackCoreLocation) { + let bundles = Object.create(null); + nlsConfig.loadBundle = function(bundle, language, cb) { + let result = bundles[bundle]; + if (result) { + cb(undefined, result); + return; + } + let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json'); + readFile(bundleFile).then(function (content) { + let json = JSON.parse(content); + bundles[bundle] = json; + cb(undefined, json); + }) + .catch(cb); + }; + } + var locale = nlsConfig.availableLanguages['*'] || 'en'; if (locale === 'zh-tw') { locale = 'zh-Hant'; diff --git a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js index 5f4f1dae5bd..94481666801 100644 --- a/src/vs/code/electron-browser/sharedProcess/sharedProcess.js +++ b/src/vs/code/electron-browser/sharedProcess/sharedProcess.js @@ -6,6 +6,7 @@ 'use strict'; const path = require('path'); +const fs = require('fs'); function assign(destination, source) { return Object.keys(source) @@ -40,6 +41,18 @@ function uriFromPath(_path) { return encodeURI('file://' + pathName); } +function readFile(file) { + return new Promise(function(resolve, reject) { + fs.readFile(file, 'utf8', function(err, data) { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); +} + function main() { const args = parseURLQueryArgs(); const configuration = JSON.parse(args['config'] || '{}') || {}; @@ -57,6 +70,24 @@ function main() { } catch (e) { /*noop*/ } } + if (nlsConfig._resolvedLanguagePackCoreLocation) { + let bundles = Object.create(null); + nlsConfig.loadBundle = function(bundle, language, cb) { + let result = bundles[bundle]; + if (result) { + cb(undefined, result); + return; + } + let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json'); + readFile(bundleFile).then(function (content) { + let json = JSON.parse(content); + bundles[bundle] = json; + cb(undefined, json); + }) + .catch(cb); + }; + } + var locale = nlsConfig.availableLanguages['*'] || 'en'; if (locale === 'zh-tw') { locale = 'zh-Hant'; diff --git a/src/vs/nls.js b/src/vs/nls.js index 231b85d0c86..2d633b44f9a 100644 --- a/src/vs/nls.js +++ b/src/vs/nls.js @@ -1,126 +1,140 @@ /*--------------------------------------------------------------------------------------------- -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the MIT License. See License.txt in the project root for license information. -*--------------------------------------------------------------------------------------------*/ + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -* Please make sure to make edits in the .ts file at https://github.com/Microsoft/vscode-loader/ -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------- -*--------------------------------------------------------------------------------------------*/ + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + * Please make sure to make edits in the .ts file at https://github.com/Microsoft/vscode-loader/ + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------- + *--------------------------------------------------------------------------------------------*/ 'use strict'; var NLSLoaderPlugin; (function (NLSLoaderPlugin) { - var Environment = (function () { - function Environment(isPseudo) { - this.isPseudo = isPseudo; - // - } - Environment.detect = function () { - var isPseudo = (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0); - return new Environment(isPseudo); - }; - return Environment; - }()); - function _format(message, args, env) { - var result; - if (args.length === 0) { - result = message; - } - else { - result = message.replace(/\{(\d+)\}/g, function (match, rest) { - var index = rest[0]; - return typeof args[index] !== 'undefined' ? args[index] : match; - }); - } - if (env.isPseudo) { - // FF3B and FF3D is the Unicode zenkaku representation for [ and ] - result = '\uFF3B' + result.replace(/[aouei]/g, '$&$&') + '\uFF3D'; - } - return result; - } - function findLanguageForModule(config, name) { - var result = config[name]; - if (result) - return result; - result = config['*']; - if (result) - return result; - return null; - } - function localize(env, data, message) { - var args = []; - for (var _i = 3; _i < arguments.length; _i++) { - args[_i - 3] = arguments[_i]; - } - return _format(message, args, env); - } - function createScopedLocalize(scope, env) { - return function (idx, defaultValue) { - var restArgs = Array.prototype.slice.call(arguments, 2); - return _format(scope[idx], restArgs, env); - }; - } - var NLSPlugin = (function () { - function NLSPlugin(env) { - var _this = this; - this._env = env; - this.localize = function (data, message) { - var args = []; - for (var _i = 2; _i < arguments.length; _i++) { - args[_i - 2] = arguments[_i]; - } - return localize.apply(void 0, [_this._env, data, message].concat(args)); - }; - } - NLSPlugin.prototype.setPseudoTranslation = function (value) { - this._env = new Environment(value); - }; - NLSPlugin.prototype.create = function (key, data) { - return { - localize: createScopedLocalize(data[key], this._env) - }; - }; - NLSPlugin.prototype.load = function (name, req, load, config) { - var _this = this; - config = config || {}; - if (!name || name.length === 0) { - load({ - localize: this.localize - }); - } - else { - var pluginConfig = config['vs/nls'] || {}; - var language = pluginConfig.availableLanguages ? findLanguageForModule(pluginConfig.availableLanguages, name) : null; - var suffix = '.nls'; - if (language !== null && language !== NLSPlugin.DEFAULT_TAG) { - suffix = suffix + '.' + language; - } - req([name + suffix], function (messages) { - if (Array.isArray(messages)) { - messages.localize = createScopedLocalize(messages, _this._env); - } - else { - messages.localize = createScopedLocalize(messages[name], _this._env); - } - load(messages); - }); - } - }; - return NLSPlugin; - }()); - NLSPlugin.DEFAULT_TAG = 'i-default'; - NLSLoaderPlugin.NLSPlugin = NLSPlugin; - function init() { - define('vs/nls', new NLSPlugin(Environment.detect())); - } - NLSLoaderPlugin.init = init; - if (typeof doNotInitLoader === 'undefined') { - init(); - } + var Environment = /** @class */ (function () { + function Environment(isPseudo) { + this.isPseudo = isPseudo; + // + } + Environment.detect = function () { + var isPseudo = (typeof document !== 'undefined' && document.location && document.location.hash.indexOf('pseudo=true') >= 0); + return new Environment(isPseudo); + }; + return Environment; + }()); + function _format(message, args, env) { + var result; + if (args.length === 0) { + result = message; + } + else { + result = message.replace(/\{(\d+)\}/g, function (match, rest) { + var index = rest[0]; + return typeof args[index] !== 'undefined' ? args[index] : match; + }); + } + if (env.isPseudo) { + // FF3B and FF3D is the Unicode zenkaku representation for [ and ] + result = '\uFF3B' + result.replace(/[aouei]/g, '$&$&') + '\uFF3D'; + } + return result; + } + function findLanguageForModule(config, name) { + var result = config[name]; + if (result) + return result; + result = config['*']; + if (result) + return result; + return null; + } + function localize(env, data, message) { + var args = []; + for (var _i = 3; _i < arguments.length; _i++) { + args[_i - 3] = arguments[_i]; + } + return _format(message, args, env); + } + function createScopedLocalize(scope, env) { + return function (idx, defaultValue) { + var restArgs = Array.prototype.slice.call(arguments, 2); + return _format(scope[idx], restArgs, env); + }; + } + var NLSPlugin = /** @class */ (function () { + function NLSPlugin(env) { + var _this = this; + this._env = env; + this.localize = function (data, message) { + var args = []; + for (var _i = 2; _i < arguments.length; _i++) { + args[_i - 2] = arguments[_i]; + } + return localize.apply(void 0, [_this._env, data, message].concat(args)); + }; + } + NLSPlugin.prototype.setPseudoTranslation = function (value) { + this._env = new Environment(value); + }; + NLSPlugin.prototype.create = function (key, data) { + return { + localize: createScopedLocalize(data[key], this._env) + }; + }; + NLSPlugin.prototype.load = function (name, req, load, config) { + var _this = this; + config = config || {}; + if (!name || name.length === 0) { + load({ + localize: this.localize + }); + } + else { + var pluginConfig = config['vs/nls'] || {}; + var language = pluginConfig.availableLanguages ? findLanguageForModule(pluginConfig.availableLanguages, name) : null; + var suffix = '.nls'; + if (language !== null && language !== NLSPlugin.DEFAULT_TAG) { + suffix = suffix + '.' + language; + } + var messagesLoaded_1 = function (messages) { + if (Array.isArray(messages)) { + messages.localize = createScopedLocalize(messages, _this._env); + } + else { + messages.localize = createScopedLocalize(messages[name], _this._env); + } + load(messages); + }; + if (typeof pluginConfig.loadBundle === 'function') { + pluginConfig.loadBundle(name, language, function (err, messages) { + // We have an error. Load the English default strings to not fail + if (err) { + req([name + '.nls'], messagesLoaded_1); + } + else { + messagesLoaded_1(messages); + } + }); + } + else { + req([name + suffix], messagesLoaded_1); + } + } + }; + NLSPlugin.DEFAULT_TAG = 'i-default'; + return NLSPlugin; + }()); + NLSLoaderPlugin.NLSPlugin = NLSPlugin; + function init() { + define('vs/nls', new NLSPlugin(Environment.detect())); + } + NLSLoaderPlugin.init = init; + if (typeof doNotInitLoader === 'undefined') { + init(); + } })(NLSLoaderPlugin || (NLSLoaderPlugin = {})); diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index e45ec3cff94..94d13e96a34 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -363,6 +363,7 @@ export class ShowStartupPerformance extends Action { if (metrics.initialStartup) { table.push({ Topic: '[main] start => app.isReady', 'Took (ms)': metrics.timers.ellapsedAppReady }); + table.push({ Topic: '[main] nls:start => nls:end', 'Took (ms)': metrics.timers.ellapsedNlsGeneration }); table.push({ Topic: '[main] app.isReady => window.loadUrl()', 'Took (ms)': metrics.timers.ellapsedWindowLoad }); } diff --git a/src/vs/workbench/electron-browser/bootstrap/index.js b/src/vs/workbench/electron-browser/bootstrap/index.js index 867ed81842e..558e8df307e 100644 --- a/src/vs/workbench/electron-browser/bootstrap/index.js +++ b/src/vs/workbench/electron-browser/bootstrap/index.js @@ -13,6 +13,7 @@ const perf = require('../../../base/common/performance'); perf.mark('renderer/started'); const path = require('path'); +const fs = require('fs'); const electron = require('electron'); const remote = electron.remote; const ipc = electron.ipcRenderer; @@ -66,6 +67,18 @@ function uriFromPath(_path) { return encodeURI('file://' + pathName); } +function readFile(file) { + return new Promise(function(resolve, reject) { + fs.readFile(file, 'utf8', function(err, data) { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); +} + function registerListeners(enableDeveloperTools) { // Devtools & reload support @@ -124,13 +137,30 @@ function main() { } catch (e) { /*noop*/ } } + if (nlsConfig._resolvedLanguagePackCoreLocation) { + let bundles = Object.create(null); + nlsConfig.loadBundle = function(bundle, language, cb) { + let result = bundles[bundle]; + if (result) { + cb(undefined, result); + return; + } + let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json'); + readFile(bundleFile).then(function (content) { + let json = JSON.parse(content); + bundles[bundle] = json; + cb(undefined, json); + }) + .catch(cb); + }; + } + var locale = nlsConfig.availableLanguages['*'] || 'en'; if (locale === 'zh-tw') { locale = 'zh-Hant'; } else if (locale === 'zh-cn') { locale = 'zh-Hans'; } - window.document.documentElement.setAttribute('lang', locale); const enableDeveloperTools = (process.env['VSCODE_DEV'] || !!configuration.extensionDevelopmentPath) && !configuration.extensionTestsPath; diff --git a/src/vs/workbench/services/timer/common/timerService.ts b/src/vs/workbench/services/timer/common/timerService.ts index f6ca71866cb..bee527e3878 100644 --- a/src/vs/workbench/services/timer/common/timerService.ts +++ b/src/vs/workbench/services/timer/common/timerService.ts @@ -66,6 +66,7 @@ export interface IStartupMetrics { ellapsedEditorRestore: number; ellapsedWorkbench: number; ellapsedTimersToTimersComputed: number; + ellapsedNlsGeneration: number; }; platform: string; release: string; diff --git a/src/vs/workbench/services/timer/node/timerService.ts b/src/vs/workbench/services/timer/node/timerService.ts index 7a49b00ba65..1de3ba8f6cc 100644 --- a/src/vs/workbench/services/timer/node/timerService.ts +++ b/src/vs/workbench/services/timer/node/timerService.ts @@ -70,6 +70,9 @@ export class TimerService implements ITimerService { // ignore, be on the safe side with these hardware method calls } + let nlsStart = perf.getEntry('mark', 'nlsGeneration:start'); + let nlsEnd = perf.getEntry('mark', 'nlsGeneration:end'); + let nlsTime = nlsStart && nlsEnd ? nlsEnd.startTime - nlsStart.startTime : 0; this._startupMetrics = { version: 1, ellapsed: perf.getEntry('mark', 'didStartWorkbench').startTime - start, @@ -81,7 +84,8 @@ export class TimerService implements ITimerService { ellapsedViewletRestore: perf.getDuration('willRestoreViewlet', 'didRestoreViewlet'), ellapsedWorkbench: perf.getDuration('willStartWorkbench', 'didStartWorkbench'), ellapsedWindowLoadToRequire: perf.getEntry('mark', 'willLoadWorkbenchMain').startTime - this.windowLoad, - ellapsedTimersToTimersComputed: Date.now() - now + ellapsedTimersToTimersComputed: Date.now() - now, + ellapsedNlsGeneration: nlsTime }, platform, release, diff --git a/yarn.lock b/yarn.lock index 33d7443e5bd..fd95983bc13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5781,21 +5781,21 @@ vscode-fsevents@0.3.8: dependencies: nan "^2.3.0" -vscode-nls-dev@^2.0.1: - version "2.1.5" - resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-2.1.5.tgz#19faa3b18a7f302201039a4c967bbd22fa12844d" +vscode-nls-dev@^3.0.5: + version "3.0.5" + resolved "https://registry.yarnpkg.com/vscode-nls-dev/-/vscode-nls-dev-3.0.3.tgz#9728541449576559ae7bf2cff4869edaeca7e2e1" dependencies: - clone "^1.0.2" - event-stream "^3.3.2" - glob "^6.0.4" - gulp-util "^3.0.7" - iconv-lite "^0.4.15" + clone "^2.1.1" + event-stream "^3.3.4" + glob "^7.1.2" + gulp-util "^3.0.8" + iconv-lite "^0.4.19" is "^3.2.1" - source-map "^0.5.3" - typescript "^2.0.3" - vinyl "^1.1.1" - xml2js "^0.4.17" - yargs "^3.32.0" + source-map "^0.6.1" + typescript "^2.6.2" + vinyl "^2.1.0" + xml2js "^0.4.19" + yargs "^10.1.1" vscode-ripgrep@^0.7.1-patch.0: version "0.7.1-patch.0" From b84f715120ad03a5d1f315ce119f0ecbc156c13b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 14:16:51 -0800 Subject: [PATCH 697/710] Update resource viewer zoom label --- .../workbench/browser/parts/editor/resourceViewer.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 857501fda36..35a961c698a 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -302,16 +302,14 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem { } private updateLabel(scale: Scale) { - this.statusBarItem.textContent = scale === 'fit' - ? nls.localize('zoom.fit.label', 'Fit') - : `${+(scale * 100).toFixed(2)}%`; + this.statusBarItem.textContent = ZoomStatusbarItem.zoomLabel(scale); } @memoize private get zoomActions(): Action[] { const scales: Scale[] = [10, 5, 2, 1, 0.5, 0.25, 'fit']; return scales.map(scale => - new Action('zoom.' + scale, ZoomStatusbarItem.zoomActionLabel(scale), undefined, undefined, () => { + new Action('zoom.' + scale, ZoomStatusbarItem.zoomLabel(scale), undefined, undefined, () => { if (this.onSelectScale) { this.onSelectScale(scale); } @@ -319,9 +317,9 @@ class ZoomStatusbarItem extends Themable implements IStatusbarItem { })); } - private static zoomActionLabel(scale: Scale): string { + private static zoomLabel(scale: Scale): string { return scale === 'fit' - ? nls.localize('zoom.action.fit.label', 'Reset') + ? nls.localize('zoom.action.fit.label', 'Whole Image') : `${+(scale * 100).toFixed(2)}%`; } } From 3e450309e960d2e4f3b0c4f263ba773578ed50fc Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 14:42:31 -0800 Subject: [PATCH 698/710] Fixing zooming and recentering of image in resource viewer --- .../browser/parts/editor/media/resourceviewer.css | 10 ++++------ .../workbench/browser/parts/editor/resourceViewer.ts | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css index 308e97b5c93..54dac885b18 100644 --- a/src/vs/workbench/browser/parts/editor/media/resourceviewer.css +++ b/src/vs/workbench/browser/parts/editor/media/resourceviewer.css @@ -16,11 +16,8 @@ padding: 10px 10px 0 10px; background-position: 0 0, 8px 8px; background-size: 16px 16px; - display: grid; -} - -.monaco-resource-viewer.image.full-size { - padding: 0; + display: flex; + box-sizing: border-box; } .vs .monaco-resource-viewer.image { @@ -41,11 +38,12 @@ .monaco-resource-viewer img.scale-to-fit { max-width: 100%; + max-height: 100%; object-fit: contain; } .monaco-resource-viewer img { - margin: auto; /* centers the image */ + margin: auto; } .monaco-resource-viewer.zoom-in { diff --git a/src/vs/workbench/browser/parts/editor/resourceViewer.ts b/src/vs/workbench/browser/parts/editor/resourceViewer.ts index 35a961c698a..4e3d9571b6d 100644 --- a/src/vs/workbench/browser/parts/editor/resourceViewer.ts +++ b/src/vs/workbench/browser/parts/editor/resourceViewer.ts @@ -385,6 +385,7 @@ class InlineImageView { scale = 'fit'; img.addClass('scale-to-fit'); img.removeClass('pixelated'); + img.style('min-width', 'auto'); img.style('width', 'auto'); InlineImageView.imageStateCache.set(cacheKey, null); } else { @@ -403,8 +404,8 @@ class InlineImageView { const dy = (scrollTop + imgElement.parentElement.clientHeight / 2) / imgElement.parentElement.scrollHeight; img.removeClass('scale-to-fit'); + img.style('min-width', `${(imgElement.naturalWidth * scale)}px`); img.style('width', `${(imgElement.naturalWidth * scale)}px`); - img.style('height', 'auto'); const newWidth = imgElement.width; const scaleFactor = (newWidth - oldWidth) / oldWidth; From 1ff5d84a5fd444c13dec747cc074d45b6329369b Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 15:17:13 -0800 Subject: [PATCH 699/710] Also capture dots in jsdoc property names --- extensions/typescript/src/utils/previewer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/typescript/src/utils/previewer.ts b/extensions/typescript/src/utils/previewer.ts index 22e39cf9079..647ae3bf91b 100644 --- a/extensions/typescript/src/utils/previewer.ts +++ b/extensions/typescript/src/utils/previewer.ts @@ -27,7 +27,7 @@ function getTagBodyText(tag: Proto.JSDocTagInfo): string | undefined { function getTagDocumentation(tag: Proto.JSDocTagInfo): string | undefined { switch (tag.name) { case 'param': - const body = (tag.text || '').split(/^(\w+)\s*/); + const body = (tag.text || '').split(/^([\w\.]+)\s*/); if (body && body.length === 3) { const param = body[1]; const doc = body[2]; From b3526e5adfa52339894e78265ec3c339b1a81ac5 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 25 Jan 2018 15:28:46 -0800 Subject: [PATCH 700/710] Update js/ts grammar --- .../syntaxes/JavaScript.tmLanguage.json | 26 +++++++++---------- .../syntaxes/JavaScriptReact.tmLanguage.json | 26 +++++++++---------- .../syntaxes/TypeScript.tmLanguage.json | 24 ++++++++--------- .../syntaxes/TypeScriptReact.tmLanguage.json | 26 +++++++++---------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 29765c0ba34..45dc54b7115 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/8b44958a27860957872cc6f628d843a71686af63", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/51323af933792ffbb9a088fd500536122be38b59", "name": "JavaScript (with React support)", "scopeName": "source.js", "fileTypes": [ @@ -292,7 +292,7 @@ "patterns": [ { "name": "meta.var-single-variable.expr.js", - "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "beginCaptures": { "1": { "name": "meta.definition.variable.js entity.name.function.js" @@ -354,7 +354,7 @@ "patterns": [ { "name": "meta.object-binding-pattern-variable.js", - "begin": "(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "captures": { "1": { "name": "storage.modifier.js" @@ -753,7 +753,7 @@ }, { "name": "meta.definition.property.js entity.name.function.js", - "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))" + "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))" }, { "name": "meta.definition.property.js variable.object.property.js", @@ -1884,7 +1884,7 @@ }, "after-operator-block-as-object-literal": { "name": "meta.objectliteral.js", - "begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)", + "begin": "(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)", "beginCaptures": { "1": { "name": "punctuation.definition.block.js" @@ -2057,13 +2057,13 @@ ] }, "function-call": { - "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", - "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", + "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "name": "meta.function-call.js", "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))", - "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "include": "#literal" @@ -3295,7 +3295,7 @@ "patterns": [ { "name": "string.regexp.js", - "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", + "begin": "(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", "beginCaptures": { "1": { "name": "punctuation.definition.string.begin.js" @@ -4041,7 +4041,7 @@ ] }, "jsx-tag-without-attributes-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", + "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "end": "(?!\\s*(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "patterns": [ { @@ -4089,7 +4089,7 @@ ] }, "jsx-tag-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n (?=(<)\\s*\n ([_$a-zA-Z][-$\\w.]*(?))", + "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*\n ([_$a-zA-Z][-$\\w.]*(?))", "end": "(/>)|(?:())", "endCaptures": { "0": { diff --git a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json b/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json index 30557f4a531..85ebfe2446f 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/8b44958a27860957872cc6f628d843a71686af63", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/51323af933792ffbb9a088fd500536122be38b59", "name": "JavaScript (with React support)", "scopeName": "source.js.jsx", "fileTypes": [ @@ -292,7 +292,7 @@ "patterns": [ { "name": "meta.var-single-variable.expr.js.jsx", - "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "beginCaptures": { "1": { "name": "meta.definition.variable.js.jsx entity.name.function.js.jsx" @@ -354,7 +354,7 @@ "patterns": [ { "name": "meta.object-binding-pattern-variable.js.jsx", - "begin": "(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "captures": { "1": { "name": "storage.modifier.js.jsx" @@ -753,7 +753,7 @@ }, { "name": "meta.definition.property.js.jsx entity.name.function.js.jsx", - "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))" + "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))" }, { "name": "meta.definition.property.js.jsx variable.object.property.js.jsx", @@ -1884,7 +1884,7 @@ }, "after-operator-block-as-object-literal": { "name": "meta.objectliteral.js.jsx", - "begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)", + "begin": "(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)", "beginCaptures": { "1": { "name": "punctuation.definition.block.js.jsx" @@ -2057,13 +2057,13 @@ ] }, "function-call": { - "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", - "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", + "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "name": "meta.function-call.js.jsx", "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))", - "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "include": "#literal" @@ -3295,7 +3295,7 @@ "patterns": [ { "name": "string.regexp.js.jsx", - "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", + "begin": "(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", "beginCaptures": { "1": { "name": "punctuation.definition.string.begin.js.jsx" @@ -4041,7 +4041,7 @@ ] }, "jsx-tag-without-attributes-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", + "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "end": "(?!\\s*(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "patterns": [ { @@ -4089,7 +4089,7 @@ ] }, "jsx-tag-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n (?=(<)\\s*\n ([_$a-zA-Z][-$\\w.]*(?))", + "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*\n ([_$a-zA-Z][-$\\w.]*(?))", "end": "(/>)|(?:())", "endCaptures": { "0": { diff --git a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json b/extensions/typescript/syntaxes/TypeScript.tmLanguage.json index cc81558cfc2..b76d98425eb 100644 --- a/extensions/typescript/syntaxes/TypeScript.tmLanguage.json +++ b/extensions/typescript/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/8b44958a27860957872cc6f628d843a71686af63", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/51323af933792ffbb9a088fd500536122be38b59", "name": "TypeScript", "scopeName": "source.ts", "fileTypes": [ @@ -286,7 +286,7 @@ "patterns": [ { "name": "meta.var-single-variable.expr.ts", - "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "beginCaptures": { "1": { "name": "meta.definition.variable.ts entity.name.function.ts" @@ -348,7 +348,7 @@ "patterns": [ { "name": "meta.object-binding-pattern-variable.ts", - "begin": "(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "captures": { "1": { "name": "storage.modifier.ts" @@ -747,7 +747,7 @@ }, { "name": "meta.definition.property.ts entity.name.function.ts", - "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))" + "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))" }, { "name": "meta.definition.property.ts variable.object.property.ts", @@ -1878,7 +1878,7 @@ }, "after-operator-block-as-object-literal": { "name": "meta.objectliteral.ts", - "begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)", + "begin": "(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)", "beginCaptures": { "1": { "name": "punctuation.definition.block.ts" @@ -2051,13 +2051,13 @@ ] }, "function-call": { - "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", - "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", + "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "name": "meta.function-call.ts", "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))", - "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "include": "#literal" @@ -2163,7 +2163,7 @@ "patterns": [ { "name": "cast.expr.ts", - "begin": "(?:(?<=return|throw|yield|await|default|[=(,:>*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!*?\\&\\|\\^]|[^_$[:alnum:]](?:\\+\\+|\\-\\-)|[^\\+]\\+|[^\\-]\\-))\\s*(<)(?!|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", + "begin": "(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", "beginCaptures": { "1": { "name": "punctuation.definition.string.begin.ts" diff --git a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json b/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json index 5da35c8fe7f..c8bb27a8610 100644 --- a/extensions/typescript/syntaxes/TypeScriptReact.tmLanguage.json +++ b/extensions/typescript/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/8b44958a27860957872cc6f628d843a71686af63", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/51323af933792ffbb9a088fd500536122be38b59", "name": "TypeScriptReact", "scopeName": "source.tsx", "fileTypes": [ @@ -289,7 +289,7 @@ "patterns": [ { "name": "meta.var-single-variable.expr.tsx", - "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "begin": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "beginCaptures": { "1": { "name": "meta.definition.variable.tsx entity.name.function.tsx" @@ -351,7 +351,7 @@ "patterns": [ { "name": "meta.object-binding-pattern-variable.tsx", - "begin": "(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))", + "match": "(?x)(?:\\s*\\b(public|private|protected|readonly)\\s+)?(\\.\\.\\.)?\\s*(?)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))", "captures": { "1": { "name": "storage.modifier.tsx" @@ -750,7 +750,7 @@ }, { "name": "meta.definition.property.tsx entity.name.function.tsx", - "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)))" + "match": "(?x)([_$[:alpha:]][_$[:alnum:]]*)(?=(\\?\\s*)?\\s*\n# function assignment |\n(=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)) |\n# typeannotation is fn type: < | () | (... | (param: | (param, | (param? | (param= | (param) =>\n(:\\s*(\n (<) |\n ([(]\\s*(\n ([)]) |\n (\\.\\.\\.) |\n ([_$[:alnum:]]+\\s*(\n ([:,?=])|\n ([)]\\s*=>)\n ))\n ))\n)) |\n(:\\s*(=>|(\\([^\\(\\)]*\\))|(<[^<>]*>)|[^<>(),=])+=\\s*(\n ((async\\s+)?(\n (function\\s*[(<*]) |\n (function\\s+) |\n ([_$[:alpha:]][_$[:alnum:]]*\\s*=>)\n )) |\n ((async\\s*)?(\n # sure shot arrow functions even if => is on new line\n(\n [(]\\s*\n (\n ([)]\\s*:) | # ():\n ((\\.\\.\\.\\s*)?[_$[:alpha:]][_$[:alnum:]]*\\s*:) # [(]param: | [(]...param:\n )\n) |\n(\n [<]\\s*[_$[:alpha:]][_$[:alnum:]]*\\s+extends\\s*[^=>] # < typeparam extends\n) |\n# arrow function possible to detect only with => on same line\n(\n (<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<]|\\<\\s*([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))([^=<>]|=[^<])*\\>)*>\\s*)? # typeparameters\n \\(\\s*([_$[:alpha:]\\{\\[]([^()]|\\((\\s*[^()]*)?\\))*)?\\) # parameteres\n (\\s*:\\s*([^<>\\(\\)]|\\<[^<>]+\\>|\\([^\\(\\)]+\\))+)? # return type\n \\s*=> # arrow operator\n)\n ))\n)))" }, { "name": "meta.definition.property.tsx variable.object.property.tsx", @@ -1881,7 +1881,7 @@ }, "after-operator-block-as-object-literal": { "name": "meta.objectliteral.tsx", - "begin": "(?<=[=(,\\[?+!]|await|return|yield|throw|in|of|typeof|&&|\\|\\||\\*)\\s*(\\{)", + "begin": "(?<=[=(,\\[?+!]|^await|[^\\._$[:alnum:]]await|^return|[^\\._$[:alnum:]]return|^yield|[^\\._$[:alnum:]]yield|^throw|[^\\._$[:alnum:]]throw|^in|[^\\._$[:alnum:]]in|^of|[^\\._$[:alnum:]]of|^typeof|[^\\._$[:alnum:]]typeof|&&|\\|\\||\\*)\\s*(\\{)", "beginCaptures": { "1": { "name": "punctuation.definition.block.tsx" @@ -2054,13 +2054,13 @@ ] }, "function-call": { - "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", - "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", + "end": "(?<=\\))(?!(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*)\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "name": "meta.function-call.tsx", "begin": "(?=(([_$[:alpha:]][_$[:alnum:]]*\\s*\\??\\.\\s*)*|(\\??\\.\\s*)?)([_$[:alpha:]][_$[:alnum:]]*))", - "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\)))*\\>)*>\\s*)?\\()", + "end": "(?=\\s*(\\?\\.\\s*)?(<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>|\\<\\s*(([_$[:alpha:]]|(\\{[^\\{\\}]*\\})|(\\([^\\(\\)]*\\))|(\\[[^\\[\\]]*\\]))|(\\'[^\\']*\\')|(\\\"[^\\\"]*\\\")|(\\`[^\\`]*\\`))([^<>\\(]|(\\([^\\(\\)]*\\))|(?<==)\\>)*(?!=)\\>)*(?!=)>\\s*)?\\()", "patterns": [ { "include": "#literal" @@ -3292,7 +3292,7 @@ "patterns": [ { "name": "string.regexp.tsx", - "begin": "(?<=[=(:,\\[?+!]|return|case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", + "begin": "(?<=[=(:,\\[?+!]|^return|[^\\._$[:alnum:]]return|^case|[^\\._$[:alnum:]]case|=>|&&|\\|\\||\\*\\/)\\s*(\\/)(?![\\/*])(?=(?:[^\\/\\\\\\[]|\\\\.|\\[([^\\]\\\\]|\\\\.)+\\])+\\/(?![\\/*])[gimuy]*(?!\\s*[a-zA-Z0-9_$]))", "beginCaptures": { "1": { "name": "punctuation.definition.string.begin.tsx" @@ -4038,7 +4038,7 @@ ] }, "jsx-tag-without-attributes-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", + "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|^return|[^\\._$[:alnum:]]return|^default|[^\\._$[:alnum:]]default|^)\\s*\n (?=(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "end": "(?!\\s*(<)\\s*((?:[a-z][a-z0-9]*|([_$a-zA-Z][-$\\w.]*))(?))", "patterns": [ { @@ -4086,7 +4086,7 @@ ] }, "jsx-tag-in-expression": { - "begin": "(?x)\n (?<=[({\\[,?=>:*]|&&|\\|\\||\\?|\\Wreturn|^return|\\Wdefault|^)\\s*\n (?!<\\s*[_$[:alpha:]][_$[:alnum:]]*((\\s+extends\\s+[^=>])|,)) # look ahead is not type parameter of arrow\n (?=(<)\\s*\n ([_$a-zA-Z][-$\\w.]*(?))", + "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*\n ([_$a-zA-Z][-$\\w.]*(?))", "end": "(/>)|(?:())", "endCaptures": { "0": { From 795fd255166d812555b1b2455f6121bef1abf34a Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Thu, 25 Jan 2018 15:58:53 -0800 Subject: [PATCH 701/710] Change 'Report Issue' in help menu and in feedback part to open issue reporter, fixes #42025 --- src/vs/code/electron-main/menus.ts | 2 +- src/vs/workbench/parts/feedback/electron-browser/feedback.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 76be406fa4e..f6f96d5cf64 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -944,7 +944,7 @@ export class CodeMenu { const label = nls.localize({ key: 'miReportIssue', comment: ['&& denotes a mnemonic', 'Translate this to "Report Issue in English" in all languages please!'] }, "Report &&Issue"); if (this.windowsMainService.getWindowCount() > 0) { - reportIssuesItem = this.createMenuItem(label, 'workbench.action.reportIssues'); + reportIssuesItem = this.createMenuItem(label, 'workbench.action.openIssueReporter'); } else { reportIssuesItem = new MenuItem({ label: this.mnemonicLabel(label), click: () => this.openUrl(product.reportIssueUrl, 'openReportIssues') }); } diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts index 6d25338079a..8fd4bf78233 100644 --- a/src/vs/workbench/parts/feedback/electron-browser/feedback.ts +++ b/src/vs/workbench/parts/feedback/electron-browser/feedback.ts @@ -171,7 +171,7 @@ export class FeedbackDropdown extends Dropdown { $('div').append($('a').attr('target', '_blank').attr('href', '#').text(nls.localize("submit a bug", "Submit a bug")).attr('tabindex', '0')) .on('click', event => { dom.EventHelper.stop(event); - this.commandService.executeCommand('workbench.action.reportIssues').done(null, errors.onUnexpectedError); + this.commandService.executeCommand('workbench.action.openIssueReporter').done(null, errors.onUnexpectedError); }) .appendTo($contactUsContainer); From eba681fed8b36e9abfeb0b80c7b0c5078c7d843d Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Fri, 26 Jan 2018 01:07:56 +0100 Subject: [PATCH 702/710] debug API to create/remove breakpoints; fixes #42173 --- src/vs/vscode.proposed.d.ts | 24 ++- .../mainThreadDebugService.ts | 73 ++++++-- src/vs/workbench/api/node/extHost.api.impl.ts | 8 +- src/vs/workbench/api/node/extHost.protocol.ts | 45 +++-- .../workbench/api/node/extHostDebugService.ts | 162 +++++++++++++++--- src/vs/workbench/api/node/extHostTypes.ts | 18 +- src/vs/workbench/parts/debug/common/debug.ts | 6 +- .../debug/electron-browser/debugService.ts | 13 +- .../parts/debug/test/common/mockDebug.ts | 6 +- 9 files changed, 280 insertions(+), 75 deletions(-) diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 7cbea7b4289..4551f8a4f2a 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -235,6 +235,18 @@ declare module 'vscode' { * An event that is emitted when a breakpoint is added, removed, or changed. */ export const onDidChangeBreakpoints: Event; + + /** + * Add breakpoints. + * @param breakpoints The breakpoints to add. + */ + export function addBreakpoints(breakpoints: Breakpoint[]): Thenable; + + /** + * Remove breakpoints. + * @param breakpoints The breakpoints to remove. + */ + export function removeBreakpoints(breakpoints: Breakpoint[]): Thenable; } /** @@ -274,7 +286,7 @@ declare module 'vscode' { */ readonly hitCondition?: string; - protected constructor(enabled: boolean, condition: string, hitCondition: string); + protected constructor(enabled?: boolean, condition?: string, hitCondition?: string); } /** @@ -286,7 +298,10 @@ declare module 'vscode' { */ readonly location: Location; - private constructor(enabled: boolean, condition: string, hitCondition: string, location: Location); + /** + * Create a new breakpoint for a source location. + */ + constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string); } /** @@ -298,7 +313,10 @@ declare module 'vscode' { */ readonly functionName: string; - private constructor(enabled: boolean, condition: string, hitCondition: string, functionName: string); + /** + * Create a new function breakpoint. + */ + constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string); } /** diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts index f43810a894f..82c4bf07937 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts @@ -6,10 +6,13 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import uri from 'vs/base/common/uri'; -import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint } from 'vs/workbench/parts/debug/common/debug'; +import { IDebugService, IConfig, IDebugConfigurationProvider, IBreakpoint, IFunctionBreakpoint, IRawBreakpoint } from 'vs/workbench/parts/debug/common/debug'; import { TPromise } from 'vs/base/common/winjs.base'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext, IExtHostContext, IBreakpointsDelta, ISourceBreakpointData, IFunctionBreakpointData } from '../node/extHost.protocol'; +import { + ExtHostContext, ExtHostDebugServiceShape, MainThreadDebugServiceShape, DebugSessionUUID, MainContext, + IExtHostContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, ISourceBreakpointDto, IFunctionBreakpointDto, IBreakpointIndexDto +} from '../node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import severity from 'vs/base/common/severity'; @@ -59,15 +62,15 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape { // set up a handler to send more this._toDispose.push(this.debugService.getModel().onDidChangeBreakpoints(e => { if (e) { - const delta: IBreakpointsDelta = {}; + const delta: IBreakpointsDeltaDto = {}; if (e.added) { - delta.added = this.toWire(e.added); + delta.added = this.convertToDto(e.added); } if (e.removed) { delta.removed = e.removed.map(x => x.getId()); } if (e.changed) { - delta.changed = this.toWire(e.changed); + delta.changed = this.convertToDto(e.changed); } if (delta.added || delta.removed || delta.changed) { @@ -81,7 +84,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape { const fbps = this.debugService.getModel().getFunctionBreakpoints(); if (bps.length > 0 || fbps.length > 0) { this._proxy.$acceptBreakpointsDelta({ - added: this.toWire(bps).concat(this.toWire(fbps)) + added: this.convertToDto(bps).concat(this.convertToDto(fbps)) }); } } @@ -89,30 +92,66 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape { return TPromise.wrap(undefined); } - private toWire(bps: (IBreakpoint | IFunctionBreakpoint)[]): (ISourceBreakpointData | IFunctionBreakpointData)[] { + public async $registerBreakpoints(DTOs: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise { + const result: IBreakpointIndexDto[] = []; + for (let dto of DTOs) { + if (dto.type === 'sourceMulti') { + const sdto = dto; + const rawbps = dto.lines.map(l => + { + enabled: l.enabled, + lineNumber: l.line + 1, + column: l.character > 0 ? l.character + 1 : 0, + condition: l.condition, + hitCondition: l.hitCondition + } + ); + const bps = await this.debugService.addBreakpoints(uri.revive(dto.uri), rawbps); + bps.forEach((bp, ix) => result.push({ + index: sdto.lines[ix].index, + id: bp.getId() + })); + } else if (dto.type === 'function') { + const fbs = this.debugService.addFunctionBreakpoint(dto.functionName); + result.push({ + index: dto.index, + id: fbs.getId() + }); + } + } + return result; + } + + public $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): TPromise { + breakpointIds.forEach(id => this.debugService.removeBreakpoints(id)); + functionBreakpointIds.forEach(id => this.debugService.removeFunctionBreakpoints(id)); + return void 0; + } + + private convertToDto(bps: (IBreakpoint | IFunctionBreakpoint)[]): (ISourceBreakpointDto | IFunctionBreakpointDto)[] { return bps.map(bp => { if ('name' in bp) { const fbp = bp; - return { + return { type: 'function', - id: bp.getId(), - enabled: bp.enabled, + id: fbp.getId(), + enabled: fbp.enabled, functionName: fbp.name, - hitCondition: bp.hitCondition, - /* condition: bp.condition */ + hitCondition: fbp.hitCondition, + /* condition: fbp.condition */ }; } else { const sbp = bp; - return { + return { type: 'source', - id: bp.getId(), - enabled: bp.enabled, + id: sbp.getId(), + enabled: sbp.enabled, condition: sbp.condition, - hitCondition: bp.hitCondition, + hitCondition: sbp.hitCondition, uri: sbp.uri, line: sbp.lineNumber > 0 ? sbp.lineNumber - 1 : 0, - character: (typeof sbp.column === 'number' && sbp.column > 0) ? sbp.column - 1 : 0 + character: (typeof sbp.column === 'number' && sbp.column > 0) ? sbp.column - 1 : 0, }; } }); diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 39b0905b90e..c3dc5974972 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -538,7 +538,13 @@ export function createApiFactory( }, registerDebugConfigurationProvider(debugType: string, provider: vscode.DebugConfigurationProvider) { return extHostDebugService.registerDebugConfigurationProvider(debugType, provider); - } + }, + addBreakpoints: proposedApiFunction(extension, (breakpoints: vscode.Breakpoint[]) => { + return extHostDebugService.addBreakpoints(breakpoints); + }), + removeBreakpoints: proposedApiFunction(extension, (breakpoints: vscode.Breakpoint[]) => { + return extHostDebugService.removeBreakpoints(breakpoints); + }) }; diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index bbf64eded98..c98531aa15a 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -442,6 +442,8 @@ export interface MainThreadDebugServiceShape extends IDisposable { $customDebugAdapterRequest(id: DebugSessionUUID, command: string, args: any): TPromise; $appendDebugConsole(value: string): TPromise; $startBreakpointEvents(): TPromise; + $registerBreakpoints(breakpoints: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[]): TPromise; + $unregisterBreakpoints(breakpointIds: string[], functionBreakpointIds: string[]): TPromise; } export interface MainThreadWindowShape extends IDisposable { @@ -696,30 +698,49 @@ export interface ExtHostTaskShape { $provideTasks(handle: number): TPromise; } -export interface IBreakpointData { - type: 'source' | 'function'; - id: string; +export interface IFunctionBreakpointDto { + type: 'function'; + index: number; + id?: string; enabled: boolean; condition?: string; hitCondition?: string; + functionName: string; } -export interface ISourceBreakpointData extends IBreakpointData { +export interface ISourceBreakpointDto { type: 'source'; + id?: string; + enabled: boolean; + condition?: string; + hitCondition?: string; uri: UriComponents; line: number; character: number; } -export interface IFunctionBreakpointData extends IBreakpointData { - type: 'function'; - functionName: string; +export interface IBreakpointsDeltaDto { + added?: (ISourceBreakpointDto | IFunctionBreakpointDto)[]; + removed?: string[]; + changed?: (ISourceBreakpointDto | IFunctionBreakpointDto)[]; } -export interface IBreakpointsDelta { - added?: (ISourceBreakpointData | IFunctionBreakpointData)[]; - removed?: string[]; - changed?: (ISourceBreakpointData | IFunctionBreakpointData)[]; +export interface ISourceMultiBreakpointDto { + type: 'sourceMulti'; + uri: UriComponents; + lines: { + index: number; + enabled: boolean; + condition?: string; + hitCondition?: string; + line: number; + character: number; + }[]; +} + +export interface IBreakpointIndexDto { + index: number; + id: string; } export interface ExtHostDebugServiceShape { @@ -729,7 +750,7 @@ export interface ExtHostDebugServiceShape { $acceptDebugSessionTerminated(id: DebugSessionUUID, type: string, name: string): void; $acceptDebugSessionActiveChanged(id: DebugSessionUUID | undefined, type?: string, name?: string): void; $acceptDebugSessionCustomEvent(id: DebugSessionUUID, type: string, name: string, event: any): void; - $acceptBreakpointsDelta(delat: IBreakpointsDelta): void; + $acceptBreakpointsDelta(delat: IBreakpointsDeltaDto): void; } diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts index 3276d4348ea..feae87b4e7d 100644 --- a/src/vs/workbench/api/node/extHostDebugService.ts +++ b/src/vs/workbench/api/node/extHostDebugService.ts @@ -7,7 +7,10 @@ import { TPromise } from 'vs/base/common/winjs.base'; import Event, { Emitter } from 'vs/base/common/event'; import { asWinJsPromise } from 'vs/base/common/async'; -import { MainContext, MainThreadDebugServiceShape, ExtHostDebugServiceShape, DebugSessionUUID, IMainContext, IBreakpointsDelta, ISourceBreakpointData, IFunctionBreakpointData } from 'vs/workbench/api/node/extHost.protocol'; +import { + MainContext, MainThreadDebugServiceShape, ExtHostDebugServiceShape, DebugSessionUUID, + IMainContext, IBreakpointsDeltaDto, ISourceMultiBreakpointDto, IFunctionBreakpointDto +} from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace'; import * as vscode from 'vscode'; @@ -95,51 +98,162 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape { return result; } - public $acceptBreakpointsDelta(delta: IBreakpointsDelta): void { + public $acceptBreakpointsDelta(delta: IBreakpointsDeltaDto): void { let a: vscode.Breakpoint[] = []; let r: vscode.Breakpoint[] = []; let c: vscode.Breakpoint[] = []; if (delta.added) { - a = delta.added.map(bpd => { - const bp = this.fromWire(bpd); + for (const bpd of delta.added) { + let bp: vscode.Breakpoint; + if (bpd.type === 'function') { + bp = new FunctionBreakpoint(bpd.functionName, bpd.enabled, bpd.condition, bpd.hitCondition); + } else { + const uri = URI.revive(bpd.uri); + bp = new SourceBreakpoint(new Location(uri, new Position(bpd.line, bpd.character)), bpd.enabled, bpd.condition, bpd.hitCondition); + } + bp['_id'] = bpd.id; this._breakpoints.set(bpd.id, bp); - return bp; - }); + a.push(bp); + } } if (delta.removed) { - r = delta.removed.map(id => { + for (const id of delta.removed) { const bp = this._breakpoints.get(id); if (bp) { this._breakpoints.delete(id); + r.push(bp); } - return bp; - }); + } } if (delta.changed) { - c = delta.changed.map(bpd => { - const bp = this.fromWire(bpd); - this._breakpoints.set(bpd.id, bp); - return bp; - }); + for (const bpd of delta.changed) { + let bp = this._breakpoints.get(bpd.id); + if (bp) { + if (bpd.type === 'function') { + const fbp = bp; + fbp.enabled = bpd.enabled; + fbp.condition = bpd.condition; + fbp.hitCondition = bpd.hitCondition; + fbp.functionName = bpd.functionName; + } else { + const sbp = bp; + sbp.enabled = bpd.enabled; + sbp.condition = bpd.condition; + sbp.hitCondition = bpd.hitCondition; + } + c.push(bp); + } + } } - this._onDidChangeBreakpoints.fire(Object.freeze({ - added: Object.freeze(a || []), - removed: Object.freeze(r || []), - changed: Object.freeze(c || []) - })); + this.fireBreakpointChanges(a, r, c); } - private fromWire(bp: ISourceBreakpointData | IFunctionBreakpointData): vscode.Breakpoint { - if (bp.type === 'function') { - return new FunctionBreakpoint(bp.enabled, bp.condition, bp.hitCondition, bp.functionName); + public addBreakpoints(breakpoints0: vscode.Breakpoint[]): TPromise { + + this.startBreakpoints(); + + // assign temporary ids for brand new breakpoints + const breakpoints: vscode.Breakpoint[] = []; + for (const bp of breakpoints0) { + let id = bp['_id']; + if (id) { // has already id + if (!this._breakpoints.has(id)) { + breakpoints.push(bp); + } + } else { + // no id -> assign temp id + breakpoints.push(bp); + } + } + + // convert to DTOs + const dtos: (ISourceMultiBreakpointDto | IFunctionBreakpointDto)[] = []; + const map = new Map(); + for (let i = 0; i < breakpoints.length; i++) { + const bp = breakpoints[i]; + if (bp instanceof SourceBreakpoint) { + let dto = map.get(bp.location.uri.toString()); + if (!dto) { + dto = { + type: 'sourceMulti', + uri: bp.location.uri, + lines: [] + }; + map.set(bp.location.uri.toString(), dto); + dtos.push(dto); + } + dto.lines.push({ + index: i, + enabled: bp.enabled, + condition: bp.condition, + hitCondition: bp.hitCondition, + line: bp.location.range.start.line, + character: bp.location.range.start.character + }); + } else if (bp instanceof FunctionBreakpoint) { + dtos.push({ + type: 'function', + index: i, + enabled: bp.enabled, + functionName: bp.functionName, + hitCondition: bp.hitCondition, + condition: bp.condition + }); + } + } + + // register with VS Code + return this._debugServiceProxy.$registerBreakpoints(dtos).then(ids => { + + // assign VS Code ids to breakpoints and store them in map + ids.forEach(id => { + const bp = breakpoints[id.index]; + bp['_id'] = id.id; + this._breakpoints.set(id.id, bp); + }); + + // send notification + this.fireBreakpointChanges(breakpoints, [], []); + + return void 0; + }); + } + + public removeBreakpoints(breakpoints0: vscode.Breakpoint[]): TPromise { + + this.startBreakpoints(); + + // remove from array + const breakpoints: vscode.Breakpoint[] = []; + for (const b of breakpoints0) { + let id = b['_id']; + if (id && this._breakpoints.delete(id)) { + breakpoints.push(b); + } + } + + // send notification + this.fireBreakpointChanges([], breakpoints, []); + + // unregister with VS Code + const ids = breakpoints.filter(bp => bp instanceof SourceBreakpoint).map(bp => bp['_id']); + const fids = breakpoints.filter(bp => bp instanceof FunctionBreakpoint).map(bp => bp['_id']); + return this._debugServiceProxy.$unregisterBreakpoints(ids, fids); + } + + private fireBreakpointChanges(added: vscode.Breakpoint[], removed: vscode.Breakpoint[], changed: vscode.Breakpoint[]) { + if (added.length > 0 || removed.length > 0 || changed.length > 0) { + this._onDidChangeBreakpoints.fire(Object.freeze({ + added: Object.freeze(added), + removed: Object.freeze(removed), + changed: Object.freeze(changed) + })); } - const uri = URI.revive(bp.uri); - return new SourceBreakpoint(bp.enabled, bp.condition, bp.hitCondition, new Location(uri, new Position(bp.line, bp.character))); } public registerDebugConfigurationProvider(type: string, provider: vscode.DebugConfigurationProvider): vscode.Disposable { diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index af2825a3eb8..ce9749e81fc 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -1581,19 +1581,21 @@ export class Breakpoint { readonly condition?: string; readonly hitCondition?: string; - protected constructor(enabled: boolean, condition: string, hitCondition: string) { - this.enabled = enabled; - this.condition = condition; - this.hitCondition = hitCondition; - this.condition = condition; - this.hitCondition = hitCondition; + protected constructor(enabled?: boolean, condition?: string, hitCondition?: string) { + this.enabled = typeof enabled === 'boolean' ? enabled : true; + if (typeof condition === 'string') { + this.condition = condition; + } + if (typeof hitCondition === 'string') { + this.hitCondition = hitCondition; + } } } export class SourceBreakpoint extends Breakpoint { readonly location: Location; - constructor(enabled: boolean, condition: string, hitCondition: string, location: Location) { + constructor(location: Location, enabled?: boolean, condition?: string, hitCondition?: string) { super(enabled, condition, hitCondition); this.location = location; } @@ -1602,7 +1604,7 @@ export class SourceBreakpoint extends Breakpoint { export class FunctionBreakpoint extends Breakpoint { readonly functionName: string; - constructor(enabled: boolean, condition: string, hitCondition: string, functionName: string) { + constructor(functionName: string, enabled?: boolean, condition?: string, hitCondition?: string) { super(enabled, condition, hitCondition); this.functionName = functionName; } diff --git a/src/vs/workbench/parts/debug/common/debug.ts b/src/vs/workbench/parts/debug/common/debug.ts index 2abec2b2d2a..cffb72a71e5 100644 --- a/src/vs/workbench/parts/debug/common/debug.ts +++ b/src/vs/workbench/parts/debug/common/debug.ts @@ -523,7 +523,7 @@ export interface IDebugService { /** * Adds new breakpoints to the model for the file specified with the uri. Notifies debug adapter of breakpoint changes. */ - addBreakpoints(uri: uri, rawBreakpoints: IRawBreakpoint[]): TPromise; + addBreakpoints(uri: uri, rawBreakpoints: IRawBreakpoint[]): TPromise; /** * Updates the breakpoints. @@ -549,9 +549,9 @@ export interface IDebugService { removeBreakpoints(id?: string): TPromise; /** - * Adds a new no name function breakpoint. The function breakpoint should be renamed once user enters the name. + * Adds a new function breakpoint for the given name. */ - addFunctionBreakpoint(): void; + addFunctionBreakpoint(name?: string): IFunctionBreakpoint; /** * Renames an already existing function breakpoint. diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index b4074f675ba..04259534cc6 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -580,11 +580,13 @@ export class DebugService implements debug.IDebugService { return this.sendAllBreakpoints(); } - public addBreakpoints(uri: uri, rawBreakpoints: debug.IRawBreakpoint[]): TPromise { - this.model.addBreakpoints(uri, rawBreakpoints); + public addBreakpoints(uri: uri, rawBreakpoints: debug.IRawBreakpoint[]): TPromise { + const bps = this.model.addBreakpoints(uri, rawBreakpoints); rawBreakpoints.forEach(rbp => aria.status(nls.localize('breakpointAdded', "Added breakpoint, line {0}, file {1}", rbp.lineNumber, uri.fsPath))); - return this.sendBreakpoints(uri); + return this.sendBreakpoints(uri).then(_ => { + return bps; + }); } public updateBreakpoints(uri: uri, data: { [id: string]: DebugProtocol.Breakpoint }): void { @@ -607,9 +609,10 @@ export class DebugService implements debug.IDebugService { return this.sendAllBreakpoints(); } - public addFunctionBreakpoint(): void { - const newFunctionBreakpoint = this.model.addFunctionBreakpoint(''); + public addFunctionBreakpoint(name?: string): debug.IFunctionBreakpoint { + const newFunctionBreakpoint = this.model.addFunctionBreakpoint(name || ''); this.viewModel.setSelectedFunctionBreakpoint(newFunctionBreakpoint); + return newFunctionBreakpoint; } public renameFunctionBreakpoint(id: string, newFunctionName: string): TPromise { diff --git a/src/vs/workbench/parts/debug/test/common/mockDebug.ts b/src/vs/workbench/parts/debug/test/common/mockDebug.ts index 7d722ef668d..737abebf932 100644 --- a/src/vs/workbench/parts/debug/test/common/mockDebug.ts +++ b/src/vs/workbench/parts/debug/test/common/mockDebug.ts @@ -39,7 +39,7 @@ export class MockDebugService implements debug.IDebugService { public focusStackFrame(focusedStackFrame: debug.IStackFrame): void { } - public addBreakpoints(uri: uri, rawBreakpoints: debug.IRawBreakpoint[]): TPromise { + public addBreakpoints(uri: uri, rawBreakpoints: debug.IRawBreakpoint[]): TPromise { return TPromise.as(null); } @@ -57,7 +57,9 @@ export class MockDebugService implements debug.IDebugService { return TPromise.as(null); } - public addFunctionBreakpoint(): void { } + public addFunctionBreakpoint(): debug.IFunctionBreakpoint { + return null; + } public moveWatchExpression(id: string, position: number): void { } From 3e676f05ec5e244519587c26adcbb097d25c8ebc Mon Sep 17 00:00:00 2001 From: Ramya Achutha Rao Date: Thu, 25 Jan 2018 18:22:04 -0800 Subject: [PATCH 703/710] Wait until extensions are registered before getting mime fixes #42154 --- .../electron-browser/extensionTipsService.ts | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index e630ffa559a..82e056f0e3b 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -31,7 +31,7 @@ import { flatten, distinct } from 'vs/base/common/arrays'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { guessMimeTypes, MIME_UNKNOWN } from 'vs/base/common/mime'; import { ShowLanguageExtensionsAction } from 'vs/workbench/browser/parts/editor/editorStatus'; -import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; +import { IExtensionService } from 'vs/platform/extensions/common/extensions'; interface IExtensionsContent { recommendations: string[]; @@ -67,7 +67,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe @IMessageService private messageService: IMessageService, @ITelemetryService private telemetryService: ITelemetryService, @IEnvironmentService private environmentService: IEnvironmentService, - @ILifecycleService private lifecycleService: ILifecycleService + @IExtensionService private extensionService: IExtensionService ) { super(); @@ -75,9 +75,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe return; } - this.lifecycleService.when(LifecyclePhase.Eventually).then(() => { - this._suggestFileBasedRecommendations(); - }); + this._suggestFileBasedRecommendations(); this.promptWorkspaceRecommendationsPromise = this._suggestWorkspaceRecommendations(); @@ -263,6 +261,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe this._modelService.getModels().forEach(model => this._suggest(model)); } + private getMimeTypes(path: string): TPromise { + return this.extensionService.whenInstalledExtensionsRegistered().then(() => { + return guessMimeTypes(path); + }); + } + private _suggest(model: ITextModel): void { const uri = model.uri; let hasSuggestion = false; @@ -380,10 +384,12 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe }); }); - importantTipsPromise.then(() => { + const mimeTypesPromise = this.getMimeTypes(uri.fsPath); + TPromise.join([importantTipsPromise, mimeTypesPromise]).then(result => { + const fileExtensionSuggestionIgnoreList = JSON.parse(this.storageService.get ('extensionsAssistant/fileExtensionsSuggestionIgnore', StorageScope.GLOBAL, '[]')); - let mimeTypes = guessMimeTypes(uri.fsPath); + const mimeTypes = result[1]; let fileExtension = paths.extname(uri.fsPath); if (fileExtension) { fileExtension = fileExtension.substr(1); // Strip the dot From 654e5da20d7ac31f243a3d43bbcb2d4c496b1de6 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 25 Jan 2018 19:55:26 -0800 Subject: [PATCH 704/710] Settings search - write out result counts to feedback editor --- .../parts/preferences/browser/preferencesRenderers.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 45373e35c5f..ebfb9efbaae 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -632,7 +632,6 @@ export class FeedbackWidgetRenderer extends Disposable { const result = this._currentResult; const metadata = result.metadata['nlpResult']; // Feedback only on nlpResult set for now - const marketplaceExtensionsResults = result.metadata['newExtensionsResult'] && result.metadata['newExtensionsResult'].scoredResults; const actualResults = metadata ? metadata.scoredResults : {}; const actualResultIds = Object.keys(actualResults); @@ -649,10 +648,14 @@ export class FeedbackWidgetRenderer extends Disposable { }); feedbackQuery['alts'] = []; + const groupCountsText = result.filteredGroups + .map(group => `// ${group.id}: ${group.sections[0].settings.length}`) + .join('\n'); + const contents = FeedbackWidgetRenderer.INSTRUCTION_TEXT + '\n' + JSON.stringify(feedbackQuery, undefined, ' ') + '\n\n' + this.getScoreText(actualResults) + '\n\n' + - this.getScoreText(marketplaceExtensionsResults) + '\n'; + groupCountsText + '\n'; this.editorService.openEditor({ contents, language: 'jsonc' }, /*sideBySide=*/true).then(feedbackEditor => { const sendFeedbackWidget = this._register(this.instantiationService.createInstance(FloatingClickWidget, feedbackEditor.getControl(), 'Send feedback', null)); From 89264676133f25c4990706c889a48eab277544f7 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 25 Jan 2018 20:00:48 -0800 Subject: [PATCH 705/710] Settings search - don't lose navigation position when remote results load --- .../preferences/browser/preferencesEditor.ts | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts index 67062ea9e49..8d937005e84 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts @@ -9,8 +9,9 @@ import URI from 'vs/base/common/uri'; import { onUnexpectedError, isPromiseCanceledError, getErrorMessage } from 'vs/base/common/errors'; import * as DOM from 'vs/base/browser/dom'; import { Delayer, ThrottledDelayer } from 'vs/base/common/async'; +import * as arrays from 'vs/base/common/arrays'; import { Dimension, Builder } from 'vs/base/browser/builder'; -import { ArrayNavigator, INavigator } from 'vs/base/common/iterator'; +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 } from 'vs/workbench/common/editor'; @@ -329,36 +330,18 @@ export class PreferencesEditor extends BaseEditor { } } -class SettingsNavigator implements INavigator { - - private iterator: ArrayNavigator; - - constructor(settings: ISetting[]) { - this.iterator = new ArrayNavigator(settings); - } +class SettingsNavigator extends ArrayNavigator { public next(): ISetting { - return this.iterator.next() || this.iterator.first(); + return super.next() || super.first(); } public previous(): ISetting { - return this.iterator.previous() || this.iterator.last(); + return super.previous() || super.last(); } - public parent(): ISetting { - return this.iterator.parent(); - } - - public first(): ISetting { - return this.iterator.first(); - } - - public last(): ISetting { - return this.iterator.last(); - } - - public current(): ISetting { - return this.iterator.current(); + public reset(): void { + this.index = this.start - 1; } } @@ -465,6 +448,10 @@ class PreferencesRenderersController extends Disposable { } localFilterPreferences(query: string, updateCurrentResults?: boolean): TPromise { + if (this._settingsNavigator) { + this._settingsNavigator.reset(); + } + this._currentLocalSearchProvider = (updateCurrentResults && this._currentLocalSearchProvider) || this.preferencesSearchService.getLocalSearchProvider(query); return this.filterOrSearchPreferences(query, this._currentLocalSearchProvider, 'filterResult', nls.localize('filterResult', "Filtered Results"), 0, updateCurrentResults); } @@ -615,7 +602,22 @@ class PreferencesRenderersController extends Disposable { const editablePreferencesFilteredGroups = editableFilterResult ? editableFilterResult.filteredGroups : this._getAllPreferences(this._editablePreferencesRenderer); const consolidatedSettings = this._consolidateSettings(editablePreferencesFilteredGroups, defaultPreferencesFilteredGroups); - this._settingsNavigator = new SettingsNavigator(this._lastQuery ? consolidatedSettings : []); + // Maintain the current navigation position when updating SettingsNavigator + const current = this._settingsNavigator && this._settingsNavigator.current(); + const navigatorSettings = this._lastQuery ? consolidatedSettings : []; + const currentIndex = current ? + arrays.firstIndex(navigatorSettings, s => s.key === current.key) : + -1; + + this._settingsNavigator = new SettingsNavigator(navigatorSettings, Math.max(currentIndex, 0)); + + if (currentIndex >= 0) { + this._settingsNavigator.next(); + const newCurrent = this._settingsNavigator.current(); + this._focusPreference(newCurrent, this._defaultPreferencesRenderer); + this._focusPreference(newCurrent, this._editablePreferencesRenderer); + } + const totalCount = consolidatedSettings.length; this._onDidFilterResultsCountChange.fire({ count: totalCount }); } From ed4c237467bfe7c37b173da782cb65e333484a13 Mon Sep 17 00:00:00 2001 From: Aldo Donetti Date: Fri, 26 Jan 2018 06:46:41 +0100 Subject: [PATCH 706/710] corrected typo (#42182) found by @agriffard during the translation process --- .../parts/terminal/electron-browser/terminal.contribution.ts | 2 +- 1 file changed, 1 insertion(+), 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 99e9d1d4b49..918ca090df4 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -193,7 +193,7 @@ configurationRegistry.registerConfiguration({ 'default': false }, 'terminal.integrated.enableBell': { - 'description': nls.localize('terminal.integrated.enableBell', "Whether the terminal bell is enabled on not."), + 'description': nls.localize('terminal.integrated.enableBell', "Whether the terminal bell is enabled or not."), 'type': 'boolean', 'default': false }, From 128a345e0df2e7d16c904c8ce35a5dea4acddcd1 Mon Sep 17 00:00:00 2001 From: Rachel Macfarlane Date: Thu, 25 Jan 2018 22:07:03 -0800 Subject: [PATCH 707/710] Add 'Cancel Search' button, #30336 --- .../search/browser/media/searchviewlet.css | 9 +++++++ .../search/browser/media/stop-inverse.svg | 1 + .../parts/search/browser/media/stop.svg | 1 + .../parts/search/browser/searchActions.ts | 26 ++++++++++++++++++ .../parts/search/browser/searchViewlet.ts | 27 +++++++++++++++---- 5 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 src/vs/workbench/parts/search/browser/media/stop-inverse.svg create mode 100644 src/vs/workbench/parts/search/browser/media/stop.svg diff --git a/src/vs/workbench/parts/search/browser/media/searchviewlet.css b/src/vs/workbench/parts/search/browser/media/searchviewlet.css index 3e747e6c15e..d866df8c809 100644 --- a/src/vs/workbench/parts/search/browser/media/searchviewlet.css +++ b/src/vs/workbench/parts/search/browser/media/searchviewlet.css @@ -310,6 +310,15 @@ background: url('clear-search-results-dark.svg') center center no-repeat; } +.monaco-workbench .search-action.cancel-search { + background: url('stop.svg') center center no-repeat; +} + +.vs-dark .monaco-workbench .search-action.cancel-search, +.hc-black .monaco-workbench .search-action.cancel-search { + background: url('stop-inverse.svg') center center no-repeat; +} + .vs .monaco-workbench .search-viewlet .query-details .file-types .controls > .custom-checkbox.pattern { background: url('pattern.svg') center center no-repeat; } diff --git a/src/vs/workbench/parts/search/browser/media/stop-inverse.svg b/src/vs/workbench/parts/search/browser/media/stop-inverse.svg new file mode 100644 index 00000000000..ef79528e9c8 --- /dev/null +++ b/src/vs/workbench/parts/search/browser/media/stop-inverse.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/search/browser/media/stop.svg b/src/vs/workbench/parts/search/browser/media/stop.svg new file mode 100644 index 00000000000..0b36e84ac92 --- /dev/null +++ b/src/vs/workbench/parts/search/browser/media/stop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 4145a5cc8b2..ffd61a26620 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -379,6 +379,32 @@ export class ClearSearchResultsAction extends SearchAction { } } +export class CancelSearchAction extends SearchAction { + + static ID: string = 'search.action.cancelSearch'; + static LABEL: string = nls.localize('CancelSearchAction.label', "Cancel Search"); + + constructor(id: string, label: string, @IViewletService viewletService: IViewletService) { + super(id, label, viewletService); + this.class = 'search-action cancel-search'; + this.update(); + } + + update(): void { + const searchViewlet = this.getSearchViewlet(); + this.enabled = searchViewlet && searchViewlet.isSearching(); + } + + public run(): TPromise { + const searchViewlet = this.getSearchViewlet(); + if (searchViewlet) { + searchViewlet.cancelSearch(); + } + + return TPromise.as(null); + } +} + export class FocusNextSearchResultAction extends Action { public static readonly ID = 'search.action.focusNextSearchResult'; public static readonly LABEL = nls.localize('FocusNextSearchResult.label', "Focus Next Search Result"); diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index a7e14a96539..eacdc0b2496 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -45,7 +45,7 @@ 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 { SearchWidget, ISearchWidgetOptions } from 'vs/workbench/parts/search/browser/searchWidget'; -import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction, SearchAction } from 'vs/workbench/parts/search/browser/searchActions'; +import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction, SearchAction, CancelSearchAction } from 'vs/workbench/parts/search/browser/searchActions'; import { IReplaceService } from 'vs/workbench/parts/search/common/replace'; import Severity from 'vs/base/common/severity'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; @@ -81,6 +81,7 @@ export class SearchViewlet extends Viewlet { private folderMatchFocused: IContextKey; private matchFocused: IContextKey; private searchSubmitted: boolean; + private searching: boolean; private actions: SearchAction[] = []; private tree: ITree; @@ -785,6 +786,10 @@ export class SearchViewlet extends Viewlet { return this.searchSubmitted; } + public isSearching(): boolean { + return this.searching; + } + public hasSearchResults(): boolean { return !this.viewModel.searchResult.isEmpty(); } @@ -1066,11 +1071,17 @@ export class SearchViewlet extends Viewlet { this.progressService.show(progressTotal); this.searchWidget.searchInput.clearMessage(); + this.searching = true; + setTimeout(() => { + if (this.searching) { + this.changeActionAtPosition(0, this.instantiationService.createInstance(CancelSearchAction, CancelSearchAction.ID, CancelSearchAction.LABEL)); + } + }, 2000); this.showEmptyStage(); - let isDone = false; let onComplete = (completed?: ISearchComplete) => { - isDone = true; + this.searching = false; + this.changeActionAtPosition(0, this.instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL)); // Complete up to 100% as needed if (completed && !query.useRipgrep) { @@ -1201,7 +1212,8 @@ export class SearchViewlet extends Viewlet { if (errors.isPromiseCanceledError(e)) { onComplete(null); } else { - isDone = true; + this.searching = false; + this.changeActionAtPosition(0, this.instantiationService.createInstance(RefreshAction, RefreshAction.ID, RefreshAction.LABEL)); progressRunner.done(); this.searchWidget.searchInput.showMessage({ content: e.message, type: MessageType.ERROR }); this.viewModel.searchResult.clear(); @@ -1223,7 +1235,7 @@ export class SearchViewlet extends Viewlet { // Handle UI updates in an interval to show frequent progress and results let uiRefreshHandle = setInterval(() => { - if (isDone) { + if (!this.searching) { window.clearInterval(uiRefreshHandle); return; } @@ -1424,6 +1436,11 @@ export class SearchViewlet extends Viewlet { return this.actions; } + private changeActionAtPosition(index: number, newAction: SearchAction): void { + this.actions.splice(index, 1, newAction); + this.updateTitleArea(); + } + public shutdown(): void { const isRegex = this.searchWidget.searchInput.getRegex(); const isWholeWords = this.searchWidget.searchInput.getWholeWords(); From f41e690702caad3586e1d202b54f2f8a6b91486a Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Thu, 25 Jan 2018 22:17:21 -0800 Subject: [PATCH 708/710] node-debug2@1.20.2 --- build/builtInExtensions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/builtInExtensions.json b/build/builtInExtensions.json index b243154b548..034d02fcbbe 100644 --- a/build/builtInExtensions.json +++ b/build/builtInExtensions.json @@ -6,7 +6,7 @@ }, { "name": "ms-vscode.node-debug2", - "version": "1.20.1", + "version": "1.20.2", "repo": "https://github.com/Microsoft/vscode-node-debug2" } ] \ No newline at end of file From 5621d993e4d74e8e851f93ea26f9dbb4a328b258 Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Fri, 26 Jan 2018 08:18:49 +0100 Subject: [PATCH 709/710] Fixes #42108: [loc query] Is the "tasks" supposed to be singular "task" --- .../parts/tasks/electron-browser/jsonSchema_v2.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 abef17d3d28..17a2eb7f79e 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts @@ -133,10 +133,10 @@ const group: IJSONSchema = { 'none' ], enumDescriptions: [ - nls.localize('JsonSchema.tasks.group.defaultBuild', 'Marks the tasks as the default build task.'), - nls.localize('JsonSchema.tasks.group.defaultTest', 'Marks the tasks as the default test task.'), - nls.localize('JsonSchema.tasks.group.build', 'Marks the tasks as a build task accesible through the \'Run Build Task\' command.'), - nls.localize('JsonSchema.tasks.group.test', 'Marks the tasks as a test task accesible through the \'Run Test Task\' command.'), + nls.localize('JsonSchema.tasks.group.defaultBuild', 'Marks the task as the default build task.'), + nls.localize('JsonSchema.tasks.group.defaultTest', 'Marks the task as the default test task.'), + nls.localize('JsonSchema.tasks.group.build', 'Marks the task as a build task accesible through the \'Run Build Task\' command.'), + nls.localize('JsonSchema.tasks.group.test', 'Marks the task as a test task accesible through the \'Run Test Task\' command.'), nls.localize('JsonSchema.tasks.group.none', 'Assigns the task to no group') ], description: nls.localize('JsonSchema.tasks.group', 'Defines to which execution group this task belongs to. It supports "build" to add it to the build group and "test" to add it to the test group.') From 279c4d048a77efbbcd93d8a7e2712a6250082b08 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 26 Jan 2018 00:07:56 -0800 Subject: [PATCH 710/710] Forward stdin for loguploader Fixes #42055 --- src/vs/code/electron-main/logUploader.ts | 28 ++++++++++++++---------- src/vs/code/electron-main/main.ts | 3 +-- src/vs/code/node/cli.ts | 6 +++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/vs/code/electron-main/logUploader.ts b/src/vs/code/electron-main/logUploader.ts index 94280c83dcb..ce74d852eed 100644 --- a/src/vs/code/electron-main/logUploader.ts +++ b/src/vs/code/electron-main/logUploader.ts @@ -9,6 +9,7 @@ import * as os from 'os'; import * as cp from 'child_process'; import * as fs from 'fs'; import * as path from 'path'; +import * as readline from 'readline'; import { localize } from 'vs/nls'; import { ILaunchChannel } from 'vs/code/electron-main/launch'; @@ -16,8 +17,6 @@ import { TPromise } from 'vs/base/common/winjs.base'; import product from 'vs/platform/node/product'; import { IRequestService } from 'vs/platform/request/node/request'; import { IRequestContext } from 'vs/base/node/request'; -import { IChoiceService } from 'vs/platform/message/common/message'; -import Severity from 'vs/base/common/severity'; interface PostResult { readonly blob_id: string; @@ -36,8 +35,7 @@ class Endpoint { export async function uploadLogs( channel: ILaunchChannel, - requestService: IRequestService, - choiceService: IChoiceService + requestService: IRequestService ): TPromise { const endpoint = Endpoint.getFromProduct(); if (!endpoint) { @@ -47,7 +45,7 @@ export async function uploadLogs( const logsPath = await channel.call('get-logs-path', null); - if (await promptUserToConfirmLogUpload(logsPath, choiceService)) { + if (await promptUserToConfirmLogUpload(logsPath)) { console.log(localize('beginUploading', 'Uploading...')); const outZip = await zipLogs(logsPath); const result = await postLogs(endpoint, outZip, requestService); @@ -59,17 +57,23 @@ export async function uploadLogs( async function promptUserToConfirmLogUpload( logsPath: string, - choiceService: IChoiceService ): Promise { const message = localize('logUploadPromptHeader', 'Upload session logs to secure endpoint?') + '\n\n' + localize('logUploadPromptBody', 'Please review your log files here: \'{0}\'', logsPath) + '\n\n' + localize('logUploadPromptBodyDetails', 'Logs may contain personal information such as full paths and file contents.') - + '\n\n'; - const choice = await choiceService.choose(Severity.Info, message, [ - localize('logUploadPromptKey', 'I have reviewed my logs. Proceed with upload...'), - localize('logUploadPromptCancel', 'Cancel'), - ], 1); - return choice === 0; + + '\n\n' + localize('logUploadPromptKey', 'I have reviewed my logs (enter \'y\' to confirm upload)'); + + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout + }); + + return new TPromise(resolve => + rl.question(message, + (answer: string) => { + rl.close(); + resolve(answer && answer.trim()[0].toLowerCase() === 'y'); + })); } async function postLogs( diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 4cde51e4de3..8dd60aec8a2 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -109,7 +109,6 @@ function setupIPC(accessor: ServicesAccessor): TPromise { const logService = accessor.get(ILogService); const environmentService = accessor.get(IEnvironmentService); const requestService = accessor.get(IRequestService); - const choiceService = accessor.get(IChoiceService); function allowSetForegroundWindow(service: LaunchChannelClient): TPromise { let promise = TPromise.wrap(void 0); @@ -203,7 +202,7 @@ function setupIPC(accessor: ServicesAccessor): TPromise { // Log uploader if (environmentService.args['upload-logs']) { - return uploadLogs(channel, requestService, choiceService) + return uploadLogs(channel, requestService) .then(() => TPromise.wrapError(new ExpectedError())); } diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 03b86b8c36d..ca0c7cdb8ab 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -123,7 +123,7 @@ export async function main(argv: string[]): TPromise { const processCallbacks: ((child: ChildProcess) => Thenable)[] = []; - const verbose = args.verbose || args.status; + const verbose = args.verbose || args.status || args['upload-logs']; if (verbose) { env['ELECTRON_ENABLE_LOGGING'] = '1'; @@ -311,7 +311,9 @@ export async function main(argv: string[]): TPromise { env }; - if (!verbose) { + if (args['upload-logs']) { + options['stdio'] = [process.stdin, 'pipe', 'pipe']; + } else if (!verbose) { options['stdio'] = 'ignore'; }