@codingame/monaco-vscode-api 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js

@@ -54,9 +54,7 @@ import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { KeyChord, KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { TabFocus } from '../../../../editor/browser/config/tabFocus.js';
-import { mainWindow } from '../../../../base/browser/window.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
-import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 var ShowLanguageExtensionsAction_1;
 class SideBySideEditorEncodingSupport {
     constructor(primary, secondary) {
@@ -242,12 +240,12 @@ let TabFocusMode = class TabFocusMode extends Disposable {
 TabFocusMode = ( (__decorate([
     ( (__param(0, IConfigurationService)))
 ], TabFocusMode)));
-const nlsSingleSelectionRange = ( localize(9541, "Ln {0}, Col {1} ({2} selected)"));
-const nlsSingleSelection = ( localize(9542, "Ln {0}, Col {1}"));
-const nlsMultiSelectionRange = ( localize(9543, "{0} selections ({1} characters selected)"));
-const nlsMultiSelection = ( localize(9544, "{0} selections"));
-const nlsEOLLF = ( localize(9545, "LF"));
-const nlsEOLCRLF = ( localize(9546, "CRLF"));
+const nlsSingleSelectionRange = ( localize(9568, "Ln {0}, Col {1} ({2} selected)"));
+const nlsSingleSelection = ( localize(9569, "Ln {0}, Col {1}"));
+const nlsMultiSelectionRange = ( localize(9570, "{0} selections ({1} characters selected)"));
+const nlsMultiSelection = ( localize(9571, "{0} selections"));
+const nlsEOLLF = ( localize(9572, "LF"));
+const nlsEOLCRLF = ( localize(9573, "CRLF"));
 let EditorStatus = class EditorStatus extends Disposable {
     constructor(targetWindowId, editorService, quickInputService, languageService, textFileService, statusbarService, instantiationService, configurationService) {
         super();
@@ -295,10 +293,10 @@ let EditorStatus = class EditorStatus extends Disposable {
     async showIndentationPicker() {
         const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            return this.quickInputService.pick([{ label: ( localize(9547, "No text editor active at this time")) }]);
+            return this.quickInputService.pick([{ label: ( localize(9574, "No text editor active at this time")) }]);
         }
         if (this.editorService.activeEditor?.isReadonly()) {
-            return this.quickInputService.pick([{ label: ( localize(9548, "The active code editor is read-only.")) }]);
+            return this.quickInputService.pick([{ label: ( localize(9575, "The active code editor is read-only.")) }]);
         }
         const picks = ( ([
             assertIsDefined(activeTextEditorControl.getAction(IndentUsingSpaces.ID)),
@@ -319,20 +317,20 @@ let EditorStatus = class EditorStatus extends Disposable {
                 }
             };
         })));
-        picks.splice(3, 0, { type: 'separator', label: ( localize(9549, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localize(9550, "change view")) });
-        const action = await this.quickInputService.pick(picks, { placeHolder: ( localize(9551, "Select Action")), matchOnDetail: true });
+        picks.splice(3, 0, { type: 'separator', label: ( localize(9576, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(9577, "change view")) });
+        const action = await this.quickInputService.pick(picks, { placeHolder: ( localize(9578, "Select Action")), matchOnDetail: true });
         return action?.run();
     }
     updateTabFocusModeElement(visible) {
         if (visible) {
             if (!this.tabFocusModeElement.value) {
-                const text = ( localize(9552, "Tab Moves Focus"));
+                const text = ( localize(9579, "Tab Moves Focus"));
                 this.tabFocusModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(9553, "Accessibility Mode")),
+                    name: ( localize(9580, "Accessibility Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(9554, "Disable Accessibility Mode")),
+                    tooltip: ( localize(9581, "Disable Accessibility Mode")),
                     command: 'editor.action.toggleTabFocusMode',
                     kind: 'prominent'
                 }, 'status.editor.tabFocusMode', StatusbarAlignment.RIGHT, 100.7);
@@ -345,12 +343,12 @@ let EditorStatus = class EditorStatus extends Disposable {
     updateColumnSelectionModeElement(visible) {
         if (visible) {
             if (!this.columnSelectionModeElement.value) {
-                const text = ( localize(9555, "Column Selection"));
+                const text = ( localize(9582, "Column Selection"));
                 this.columnSelectionModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(9556, "Column Selection Mode")),
+                    name: ( localize(9583, "Column Selection Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(9557, "Disable Column Selection Mode")),
+                    tooltip: ( localize(9584, "Disable Column Selection Mode")),
                     command: 'editor.action.toggleColumnSelection',
                     kind: 'prominent'
                 }, 'status.editor.columnSelectionMode', StatusbarAlignment.RIGHT, 100.8);
@@ -371,10 +369,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9558, "Editor Selection")),
+            name: ( localize(9585, "Editor Selection")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9559, "Go to Line/Column")),
+            tooltip: ( localize(9586, "Go to Line/Column")),
             command: 'workbench.action.gotoLine'
         };
         this.updateElement(this.selectionElement, props, 'status.editor.selection', StatusbarAlignment.RIGHT, 100.5);
@@ -390,10 +388,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9560, "Editor Indentation")),
+            name: ( localize(9587, "Editor Indentation")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9561, "Select Indentation")),
+            tooltip: ( localize(9588, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
         this.updateElement(this.indentationElement, props, 'status.editor.indentation', StatusbarAlignment.RIGHT, 100.4);
@@ -404,10 +402,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9562, "Editor Encoding")),
+            name: ( localize(9589, "Editor Encoding")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9563, "Select Encoding")),
+            tooltip: ( localize(9590, "Select Encoding")),
             command: 'workbench.action.editor.changeEncoding'
         };
         this.updateElement(this.encodingElement, props, 'status.editor.encoding', StatusbarAlignment.RIGHT, 100.3);
@@ -418,10 +416,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9564, "Editor End of Line")),
+            name: ( localize(9591, "Editor End of Line")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9565, "Select End of Line Sequence")),
+            tooltip: ( localize(9592, "Select End of Line Sequence")),
             command: 'workbench.action.editor.changeEOL'
         };
         this.updateElement(this.eolElement, props, 'status.editor.eol', StatusbarAlignment.RIGHT, 100.2);
@@ -432,10 +430,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9566, "Editor Language")),
+            name: ( localize(9593, "Editor Language")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9567, "Select Language Mode")),
+            tooltip: ( localize(9594, "Select Language Mode")),
             command: 'workbench.action.editor.changeLanguageMode'
         };
         this.updateElement(this.languageElement, props, 'status.editor.mode', StatusbarAlignment.RIGHT, 100.1);
@@ -446,10 +444,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(9568, "File Information")),
+            name: ( localize(9595, "File Information")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(9569, "File Information"))
+            tooltip: ( localize(9596, "File Information"))
         };
         this.updateElement(this.metadataElement, props, 'status.editor.info', StatusbarAlignment.RIGHT, 100);
     }
@@ -603,14 +601,14 @@ let EditorStatus = class EditorStatus extends Disposable {
                 const modelOpts = model.getOptions();
                 update.indentation = (modelOpts.insertSpaces
                     ? modelOpts.tabSize === modelOpts.indentSize
-                        ? ( localize(9570, "Spaces: {0}", modelOpts.indentSize))
+                        ? ( localize(9597, "Spaces: {0}", modelOpts.indentSize))
                         : ( localize(
-                    9571,
+                    9598,
                     "Spaces: {0} (Tab Size: {1})",
                     modelOpts.indentSize,
                     modelOpts.tabSize
                 ))
-                    : ( localize(9572, "Tab Size: {0}", modelOpts.tabSize)));
+                    : ( localize(9599, "Tab Size: {0}", modelOpts.tabSize)));
             }
         }
         this.updateState(update);
@@ -716,19 +714,23 @@ EditorStatus = ( (__decorate([
 ], EditorStatus)));
 let EditorStatusContribution = class EditorStatusContribution extends Disposable {
     static { this.ID = 'workbench.contrib.editorStatus'; }
-    constructor(instantiationService, editorGroupService, editorService) {
+    constructor(editorGroupService) {
         super();
-        const mainInstantiationService = this._register(instantiationService.createChild(( (new ServiceCollection([IEditorService, editorService.createScoped('main', this._store)])))));
-        this._register(mainInstantiationService.createInstance(EditorStatus, mainWindow.vscodeWindowId));
-        this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(({ part, instantiationService, disposables }) => {
-            disposables.add(instantiationService.createInstance(EditorStatus, part.windowId));
-        }));
+        this.editorGroupService = editorGroupService;
+        for (const part of editorGroupService.parts) {
+            this.createEditorStatus(part);
+        }
+        this._register(editorGroupService.onDidCreateAuxiliaryEditorPart(part => this.createEditorStatus(part)));
+    }
+    createEditorStatus(part) {
+        const disposables = ( (new DisposableStore()));
+        Event.once(part.onWillDispose)(() => disposables.dispose());
+        const scopedInstantiationService = this.editorGroupService.getScopedInstantiationService(part);
+        disposables.add(scopedInstantiationService.createInstance(EditorStatus, part.windowId));
     }
 };
 EditorStatusContribution = ( (__decorate([
-    ( (__param(0, IInstantiationService))),
-    ( (__param(1, IEditorGroupsService))),
-    ( (__param(2, IEditorService)))
+    ( (__param(0, IEditorGroupsService)))
 ], EditorStatusContribution)));
 let ShowCurrentMarkerInStatusbarContribution = class ShowCurrentMarkerInStatusbarContribution extends Disposable {
     constructor(statusbarService, markerService, configurationService) {
@@ -756,9 +758,9 @@ let ShowCurrentMarkerInStatusbarContribution = class ShowCurrentMarkerInStatusba
                 const line = splitLines(this.currentMarker.message)[0];
                 const text = `${this.getType(this.currentMarker)} ${line}`;
                 if (!this.statusBarEntryAccessor.value) {
-                    this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: ( localize(9573, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
+                    this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: ( localize(9600, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
                 }
-                this.statusBarEntryAccessor.value.update({ name: ( localize(9573, "Current Problem")), text, ariaLabel: text });
+                this.statusBarEntryAccessor.value.update({ name: ( localize(9600, "Current Problem")), text, ariaLabel: text });
             }
             else {
                 this.statusBarEntryAccessor.clear();
@@ -852,7 +854,7 @@ let ShowLanguageExtensionsAction = class ShowLanguageExtensionsAction extends Ac
     static { ShowLanguageExtensionsAction_1 = this; }
     static { this.ID = 'workbench.action.showLanguageExtensions'; }
     constructor(fileExtension, commandService, galleryService) {
-        super(ShowLanguageExtensionsAction_1.ID, ( localize(9574, "Search Marketplace Extensions for '{0}'...", fileExtension)));
+        super(ShowLanguageExtensionsAction_1.ID, ( localize(9601, "Search Marketplace Extensions for '{0}'...", fileExtension)));
         this.fileExtension = fileExtension;
         this.commandService = commandService;
         this.enabled = galleryService.isEnabled();
@@ -870,7 +872,7 @@ class ChangeLanguageAction extends Action2 {
     constructor() {
         super({
             id: ChangeLanguageAction.ID,
-            title: ( localize2(9575, 'Change Language Mode')),
+            title: ( localize2(9602, 'Change Language Mode')),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -878,10 +880,10 @@ class ChangeLanguageAction extends Action2 {
             },
             precondition: ContextKeyExpr.not('notebookEditorFocused'),
             metadata: {
-                description: ( localize(9576, "Change the language mode of the active text editor.")),
+                description: ( localize(9603, "Change the language mode of the active text editor.")),
                 args: [
                     {
-                        name: ( localize(9577, "The name of the language mode to change to.")),
+                        name: ( localize(9604, "The name of the language mode to change to.")),
                         constraint: (value) => typeof value === 'string',
                     }
                 ]
@@ -900,7 +902,7 @@ class ChangeLanguageAction extends Action2 {
         const telemetryService = accessor.get(ITelemetryService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localize(9547, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9574, "No text editor active at this time")) }]);
             return;
         }
         const textModel = activeTextEditorControl.getModel();
@@ -921,10 +923,10 @@ class ChangeLanguageAction extends Action2 {
             const extensions = languageService.getExtensions(languageId).join(' ');
             let description;
             if (currentLanguageName === languageName) {
-                description = ( localize(9578, "({0}) - Configured Language", languageId));
+                description = ( localize(9605, "({0}) - Configured Language", languageId));
             }
             else {
-                description = ( localize(9579, "({0})", languageId));
+                description = ( localize(9606, "({0})", languageId));
             }
             return {
                 label: languageName,
@@ -933,7 +935,7 @@ class ChangeLanguageAction extends Action2 {
                 description
             };
         })));
-        picks.unshift({ type: 'separator', label: ( localize(9580, "languages (identifier)")) });
+        picks.unshift({ type: 'separator', label: ( localize(9607, "languages (identifier)")) });
         let configureLanguageAssociations;
         let configureLanguageSettings;
         let galleryAction;
@@ -943,16 +945,16 @@ class ChangeLanguageAction extends Action2 {
             if (galleryAction.enabled) {
                 picks.unshift(galleryAction);
             }
-            configureLanguageSettings = { label: ( localize(9581, "Configure '{0}' language based settings...", currentLanguageName)) };
+            configureLanguageSettings = { label: ( localize(9608, "Configure '{0}' language based settings...", currentLanguageName)) };
             picks.unshift(configureLanguageSettings);
-            configureLanguageAssociations = { label: ( localize(9582, "Configure File Association for '{0}'...", ext)) };
+            configureLanguageAssociations = { label: ( localize(9609, "Configure File Association for '{0}'...", ext)) };
             picks.unshift(configureLanguageAssociations);
         }
         const autoDetectLanguage = {
-            label: ( localize(9583, "Auto Detect"))
+            label: ( localize(9610, "Auto Detect"))
         };
         picks.unshift(autoDetectLanguage);
-        const pick = typeof languageMode === 'string' ? { label: languageMode } : await quickInputService.pick(picks, { placeHolder: ( localize(9584, "Select Language Mode")), matchOnDescription: true });
+        const pick = typeof languageMode === 'string' ? { label: languageMode } : await quickInputService.pick(picks, { placeHolder: ( localize(9611, "Select Language Mode")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -1034,11 +1036,11 @@ class ChangeLanguageAction extends Action2 {
                 id: languageId,
                 label: languageName,
                 iconClasses: getIconClassesForLanguageId(languageId),
-                description: (languageId === currentAssociation) ? ( localize(9585, "Current Association")) : undefined
+                description: (languageId === currentAssociation) ? ( localize(9612, "Current Association")) : undefined
             };
         })));
         setTimeout(async () => {
-            const language = await quickInputService.pick(picks, { placeHolder: ( localize(9586, "Select Language Mode to Associate with '{0}'", extension || base)) });
+            const language = await quickInputService.pick(picks, { placeHolder: ( localize(9613, "Select Language Mode to Associate with '{0}'", extension || base)) });
             if (language) {
                 const fileAssociationsConfig = configurationService.inspect(FILES_ASSOCIATIONS_CONFIG);
                 let associationKey;
@@ -1063,7 +1065,7 @@ class ChangeEOLAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.editor.changeEOL',
-            title: ( localize2(9587, 'Change End of Line Sequence')),
+            title: ( localize2(9614, 'Change End of Line Sequence')),
             f1: true
         });
     }
@@ -1072,11 +1074,11 @@ class ChangeEOLAction extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localize(9547, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9574, "No text editor active at this time")) }]);
             return;
         }
         if (editorService.activeEditor?.isReadonly()) {
-            await quickInputService.pick([{ label: ( localize(9548, "The active code editor is read-only.")) }]);
+            await quickInputService.pick([{ label: ( localize(9575, "The active code editor is read-only.")) }]);
             return;
         }
         let textModel = activeTextEditorControl.getModel();
@@ -1085,7 +1087,7 @@ class ChangeEOLAction extends Action2 {
             { label: nlsEOLCRLF, eol: EndOfLineSequence.CRLF },
         ];
         const selectedIndex = (textModel?.getEOL() === '\n') ? 0 : 1;
-        const eol = await quickInputService.pick(EOLOptions, { placeHolder: ( localize(9588, "Select End of Line Sequence")), activeItem: EOLOptions[selectedIndex] });
+        const eol = await quickInputService.pick(EOLOptions, { placeHolder: ( localize(9615, "Select End of Line Sequence")), activeItem: EOLOptions[selectedIndex] });
         if (eol) {
             const activeCodeEditor = getCodeEditor(editorService.activeTextEditorControl);
             if (activeCodeEditor?.hasModel() && !editorService.activeEditor?.isReadonly()) {
@@ -1102,7 +1104,7 @@ class ChangeEncodingAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.editor.changeEncoding',
-            title: ( localize2(9589, 'Change File Encoding')),
+            title: ( localize2(9616, 'Change File Encoding')),
             f1: true
         });
     }
@@ -1114,21 +1116,21 @@ class ChangeEncodingAction extends Action2 {
         const textResourceConfigurationService = accessor.get(ITextResourceConfigurationService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localize(9547, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9574, "No text editor active at this time")) }]);
             return;
         }
         const activeEditorPane = editorService.activeEditorPane;
         if (!activeEditorPane) {
-            await quickInputService.pick([{ label: ( localize(9547, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9574, "No text editor active at this time")) }]);
             return;
         }
         const encodingSupport = toEditorWithEncodingSupport(activeEditorPane.input);
         if (!encodingSupport) {
-            await quickInputService.pick([{ label: ( localize(9590, "No file active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9617, "No file active at this time")) }]);
             return;
         }
-        const saveWithEncodingPick = { label: ( localize(9591, "Save with Encoding")) };
-        const reopenWithEncodingPick = { label: ( localize(9592, "Reopen with Encoding")) };
+        const saveWithEncodingPick = { label: ( localize(9618, "Save with Encoding")) };
+        const reopenWithEncodingPick = { label: ( localize(9619, "Reopen with Encoding")) };
         if (!Language.isDefaultVariant()) {
             const saveWithEncodingAlias = 'Save with Encoding';
             if (saveWithEncodingAlias !== saveWithEncodingPick.label) {
@@ -1147,7 +1149,7 @@ class ChangeEncodingAction extends Action2 {
             action = reopenWithEncodingPick;
         }
         else {
-            action = await quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: ( localize(9551, "Select Action")), matchOnDetail: true });
+            action = await quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: ( localize(9578, "Select Action")), matchOnDetail: true });
         }
         if (!action) {
             return;
@@ -1197,10 +1199,10 @@ class ChangeEncodingAction extends Action2 {
         const items = picks.slice();
         if (guessedEncoding && configuredEncoding !== guessedEncoding && SUPPORTED_ENCODINGS[guessedEncoding]) {
             picks.unshift({ type: 'separator' });
-            picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: ( localize(9593, "Guessed from content")) });
+            picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: ( localize(9620, "Guessed from content")) });
         }
         const encoding = await quickInputService.pick(picks, {
-            placeHolder: isReopenWithEncoding ? ( localize(9594, "Select File Encoding to Reopen File")) : ( localize(9595, "Select File Encoding to Save with")),
+            placeHolder: isReopenWithEncoding ? ( localize(9621, "Select File Encoding to Reopen File")) : ( localize(9622, "Select File Encoding to Save with")),
             activeItem: items[typeof directMatchIndex === 'number' ? directMatchIndex : typeof aliasMatchIndex === 'number' ? aliasMatchIndex : -1]
         });
         if (!encoding) {

package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js

@@ -135,7 +135,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorActionsToolbar = this.editorActionsToolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, container, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
             orientation: ActionsOrientation.HORIZONTAL,
-            ariaLabel: ( localize(6987, "Editor actions")),
+            ariaLabel: ( localize(6926, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( (new EditorCommandsContextActionRunner(context)))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -207,7 +207,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         if (this.groupView.activeEditor) {
             let label = this.groupView.activeEditor.getName();
             if (this.groupsView.partOptions.showTabs === 'multiple' && this.groupView.count > 1) {
-                label = ( localize(6988, "{0} (+{1})", label, this.groupView.count - 1));
+                label = ( localize(6927, "{0} (+{1})", label, this.groupView.count - 1));
             }
             applyDragImage(e, label, 'monaco-editor-group-drag-image', this.getColor(listActiveSelectionBackground), this.getColor(listActiveSelectionForeground));
         }

package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js

@@ -546,7 +546,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             groupId: this.groupView.id,
             get editorIndex() { return that.toEditorIndex(tabIndex); }
         })));
-        const tabActionBar = ( (new ActionBar(tabActionsContainer, { ariaLabel: ( localize(11518, "Tab actions")), actionRunner: tabActionRunner })));
+        const tabActionBar = ( (new ActionBar(tabActionsContainer, { ariaLabel: ( localize(11581, "Tab actions")), actionRunner: tabActionRunner })));
         const tabActionListener = tabActionBar.onWillRun(e => {
             if (e.action.id === this.closeEditorAction.id) {
                 this.blockRevealActiveTabOnce();

package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js

@@ -16,9 +16,13 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         const unstickyModel = this._register(( new UnstickyEditorGroupModel(this.model)));
         this.stickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, stickyModel));
         this.unstickyEditorTabsControl = this._register(this.instantiationService.createInstance(MultiEditorTabsControl, this.parent, editorPartsView, this.groupsView, this.groupView, unstickyModel));
-        this.handlePinnedTabsLayoutChange();
+        this.handleTabBarsStateChange();
     }
-    handlePinnedTabsLayoutChange() {
+    handleTabBarsStateChange() {
+        this.activeControl = this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined;
+        this.handleTabBarsLayoutChange();
+    }
+    handleTabBarsLayoutChange() {
         if (this.groupView.count === 0) {
             return;
         }
@@ -29,11 +33,16 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
             this.groupView.relayout();
         }
     }
+    didActiveControlChange() {
+        return this.activeControl !== (this.model.activeEditor ? this.getEditorTabsController(this.model.activeEditor) : undefined);
+    }
     getEditorTabsController(editor) {
         return this.model.isSticky(editor) ? this.stickyEditorTabsControl : this.unstickyEditorTabsControl;
     }
     openEditor(editor, options) {
-        const didChange = this.getEditorTabsController(editor).openEditor(editor, options);
+        const didActiveControlChange = this.didActiveControlChange();
+        const didOpenEditorChange = this.getEditorTabsController(editor).openEditor(editor, options);
+        const didChange = didOpenEditorChange || didActiveControlChange;
         if (didChange) {
             this.handleOpenedEditors();
         }
@@ -42,16 +51,17 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
     openEditors(editors) {
         const stickyEditors = editors.filter(e => this.model.isSticky(e));
         const unstickyEditors = editors.filter(e => !this.model.isSticky(e));
+        const didActiveControlChange = this.didActiveControlChange();
         const didChangeOpenEditorsSticky = this.stickyEditorTabsControl.openEditors(stickyEditors);
         const didChangeOpenEditorsUnSticky = this.unstickyEditorTabsControl.openEditors(unstickyEditors);
-        const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky;
+        const didChange = didChangeOpenEditorsSticky || didChangeOpenEditorsUnSticky || didActiveControlChange;
         if (didChange) {
             this.handleOpenedEditors();
         }
         return didChange;
     }
     handleOpenedEditors() {
-        this.handlePinnedTabsLayoutChange();
+        this.handleTabBarsStateChange();
     }
     beforeCloseEditor(editor) {
         this.getEditorTabsController(editor).beforeCloseEditor(editor);
@@ -69,7 +79,7 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         this.handleClosedEditors();
     }
     handleClosedEditors() {
-        this.handlePinnedTabsLayoutChange();
+        this.handleTabBarsStateChange();
     }
     moveEditor(editor, fromIndex, targetIndex, stickyStateChange) {
         if (stickyStateChange) {
@@ -81,7 +91,7 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
                 this.stickyEditorTabsControl.closeEditor(editor);
                 this.unstickyEditorTabsControl.openEditor(editor);
             }
-            this.handlePinnedTabsLayoutChange();
+            this.handleTabBarsStateChange();
         }
         else {
             if (this.model.isSticky(editor)) {
@@ -98,12 +108,12 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
     stickEditor(editor) {
         this.unstickyEditorTabsControl.closeEditor(editor);
         this.stickyEditorTabsControl.openEditor(editor);
-        this.handlePinnedTabsLayoutChange();
+        this.handleTabBarsStateChange();
     }
     unstickEditor(editor) {
         this.stickyEditorTabsControl.closeEditor(editor);
         this.unstickyEditorTabsControl.openEditor(editor);
-        this.handlePinnedTabsLayoutChange();
+        this.handleTabBarsStateChange();
     }
     setActive(isActive) {
         this.stickyEditorTabsControl.setActive(isActive);

package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js

@@ -145,7 +145,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(8675, "Side by Side Editor"));
+        return ( localize(8690, "Side by Side Editor"));
     }
     async setInput(input, options, context, token) {
         const oldInput = this.input;

package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js

@@ -19,7 +19,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(10794, "Text Editor"));
+        return ( localize(10835, "Text Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.editorControl = this._register(this.instantiationService.createInstance(CodeEditorWidget, parent, initialOptions, this.getCodeEditorWidgetOptions()));

package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js

@@ -51,7 +51,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9537, "Text Diff Editor"));
+        return ( localize(9564, "Text Diff Editor"));
     }
     createEditorControl(parent, configuration) {
         this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {}));
@@ -114,14 +114,14 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localize(
-                    9538,
+                    9565,
                     "At least one file is not displayed in the text compare editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             }
             else {
                 message = ( localize(
-                    9539,
+                    9566,
                     "At least one file is not displayed in the text compare editor because it is very large."
                 ));
             }

package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js

@@ -65,7 +65,7 @@ let AbstractTextEditor = class AbstractTextEditor extends AbstractEditorWithView
         return editorConfiguration;
     }
     computeAriaLabel() {
-        return this.input ? computeEditorAriaLabel(this.input, undefined, this.group, this.editorGroupService.count) : ( localize(11473, "Editor"));
+        return this.input ? computeEditorAriaLabel(this.input, undefined, this.group, this.editorGroupService.count) : ( localize(11554, "Editor"));
     }
     onDidChangeFileSystemProvider(scheme) {
         if (!this.input) {