@codingame/monaco-vscode-api 7.0.11 → 7.1.1

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editorstatus.css.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { runAtThisOrScheduleAtNextAnimationFrame, getWindowById } from '../../../../base/browser/dom.js';
 import { format, splitLines, compare } from '../../../../base/common/strings.js';
 import { extname, basename, isEqual } from '../../../../base/common/resources.js';
@@ -58,7 +58,6 @@ 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;
-const _moduleId = "vs/workbench/browser/parts/editor/editorStatus";
 class SideBySideEditorEncodingSupport {
     constructor(primary, secondary) {
         this.primary = primary;
@@ -243,12 +242,12 @@ let TabFocusMode = class TabFocusMode extends Disposable {
 TabFocusMode = ( (__decorate([
     ( (__param(0, IConfigurationService)))
 ], TabFocusMode)));
-const nlsSingleSelectionRange = ( localizeWithPath(_moduleId, 0, "Ln {0}, Col {1} ({2} selected)"));
-const nlsSingleSelection = ( localizeWithPath(_moduleId, 1, "Ln {0}, Col {1}"));
-const nlsMultiSelectionRange = ( localizeWithPath(_moduleId, 2, "{0} selections ({1} characters selected)"));
-const nlsMultiSelection = ( localizeWithPath(_moduleId, 3, "{0} selections"));
-const nlsEOLLF = ( localizeWithPath(_moduleId, 4, "LF"));
-const nlsEOLCRLF = ( localizeWithPath(_moduleId, 5, "CRLF"));
+const nlsSingleSelectionRange = ( localize(9534, "Ln {0}, Col {1} ({2} selected)"));
+const nlsSingleSelection = ( localize(9535, "Ln {0}, Col {1}"));
+const nlsMultiSelectionRange = ( localize(9536, "{0} selections ({1} characters selected)"));
+const nlsMultiSelection = ( localize(9537, "{0} selections"));
+const nlsEOLLF = ( localize(9538, "LF"));
+const nlsEOLCRLF = ( localize(9539, "CRLF"));
 let EditorStatus = class EditorStatus extends Disposable {
     constructor(targetWindowId, editorService, quickInputService, languageService, textFileService, statusbarService, instantiationService, configurationService) {
         super();
@@ -296,10 +295,10 @@ let EditorStatus = class EditorStatus extends Disposable {
     async showIndentationPicker() {
         const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            return this.quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 6, "No text editor active at this time")) }]);
+            return this.quickInputService.pick([{ label: ( localize(9540, "No text editor active at this time")) }]);
         }
         if (this.editorService.activeEditor?.isReadonly()) {
-            return this.quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 7, "The active code editor is read-only.")) }]);
+            return this.quickInputService.pick([{ label: ( localize(9541, "The active code editor is read-only.")) }]);
         }
         const picks = ( ([
             assertIsDefined(activeTextEditorControl.getAction(IndentUsingSpaces.ID)),
@@ -320,20 +319,20 @@ let EditorStatus = class EditorStatus extends Disposable {
                 }
             };
         })));
-        picks.splice(3, 0, { type: 'separator', label: ( localizeWithPath(_moduleId, 8, "convert file")) });
-        picks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 9, "change view")) });
-        const action = await this.quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 10, "Select Action")), matchOnDetail: true });
+        picks.splice(3, 0, { type: 'separator', label: ( localize(9542, "convert file")) });
+        picks.unshift({ type: 'separator', label: ( localize(9543, "change view")) });
+        const action = await this.quickInputService.pick(picks, { placeHolder: ( localize(9544, "Select Action")), matchOnDetail: true });
         return action?.run();
     }
     updateTabFocusModeElement(visible) {
         if (visible) {
             if (!this.tabFocusModeElement.value) {
-                const text = ( localizeWithPath(_moduleId, 11, "Tab Moves Focus"));
+                const text = ( localize(9545, "Tab Moves Focus"));
                 this.tabFocusModeElement.value = this.statusbarService.addEntry({
-                    name: ( localizeWithPath(_moduleId, 12, "Accessibility Mode")),
+                    name: ( localize(9546, "Accessibility Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localizeWithPath(_moduleId, 13, "Disable Accessibility Mode")),
+                    tooltip: ( localize(9547, "Disable Accessibility Mode")),
                     command: 'editor.action.toggleTabFocusMode',
                     kind: 'prominent'
                 }, 'status.editor.tabFocusMode', StatusbarAlignment.RIGHT, 100.7);
@@ -346,12 +345,12 @@ let EditorStatus = class EditorStatus extends Disposable {
     updateColumnSelectionModeElement(visible) {
         if (visible) {
             if (!this.columnSelectionModeElement.value) {
-                const text = ( localizeWithPath(_moduleId, 14, "Column Selection"));
+                const text = ( localize(9548, "Column Selection"));
                 this.columnSelectionModeElement.value = this.statusbarService.addEntry({
-                    name: ( localizeWithPath(_moduleId, 15, "Column Selection Mode")),
+                    name: ( localize(9549, "Column Selection Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localizeWithPath(_moduleId, 16, "Disable Column Selection Mode")),
+                    tooltip: ( localize(9550, "Disable Column Selection Mode")),
                     command: 'editor.action.toggleColumnSelection',
                     kind: 'prominent'
                 }, 'status.editor.columnSelectionMode', StatusbarAlignment.RIGHT, 100.8);
@@ -372,10 +371,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 17, "Editor Selection")),
+            name: ( localize(9551, "Editor Selection")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 18, "Go to Line/Column")),
+            tooltip: ( localize(9552, "Go to Line/Column")),
             command: 'workbench.action.gotoLine'
         };
         this.updateElement(this.selectionElement, props, 'status.editor.selection', StatusbarAlignment.RIGHT, 100.5);
@@ -391,10 +390,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 19, "Editor Indentation")),
+            name: ( localize(9553, "Editor Indentation")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 20, "Select Indentation")),
+            tooltip: ( localize(9554, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
         this.updateElement(this.indentationElement, props, 'status.editor.indentation', StatusbarAlignment.RIGHT, 100.4);
@@ -405,10 +404,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 21, "Editor Encoding")),
+            name: ( localize(9555, "Editor Encoding")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 22, "Select Encoding")),
+            tooltip: ( localize(9556, "Select Encoding")),
             command: 'workbench.action.editor.changeEncoding'
         };
         this.updateElement(this.encodingElement, props, 'status.editor.encoding', StatusbarAlignment.RIGHT, 100.3);
@@ -419,10 +418,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 23, "Editor End of Line")),
+            name: ( localize(9557, "Editor End of Line")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 24, "Select End of Line Sequence")),
+            tooltip: ( localize(9558, "Select End of Line Sequence")),
             command: 'workbench.action.editor.changeEOL'
         };
         this.updateElement(this.eolElement, props, 'status.editor.eol', StatusbarAlignment.RIGHT, 100.2);
@@ -433,10 +432,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 25, "Editor Language")),
+            name: ( localize(9559, "Editor Language")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 26, "Select Language Mode")),
+            tooltip: ( localize(9560, "Select Language Mode")),
             command: 'workbench.action.editor.changeLanguageMode'
         };
         this.updateElement(this.languageElement, props, 'status.editor.mode', StatusbarAlignment.RIGHT, 100.1);
@@ -447,10 +446,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localizeWithPath(_moduleId, 27, "File Information")),
+            name: ( localize(9561, "File Information")),
             text,
             ariaLabel: text,
-            tooltip: ( localizeWithPath(_moduleId, 28, "File Information"))
+            tooltip: ( localize(9562, "File Information"))
         };
         this.updateElement(this.metadataElement, props, 'status.editor.info', StatusbarAlignment.RIGHT, 100);
     }
@@ -604,15 +603,14 @@ let EditorStatus = class EditorStatus extends Disposable {
                 const modelOpts = model.getOptions();
                 update.indentation = (modelOpts.insertSpaces
                     ? modelOpts.tabSize === modelOpts.indentSize
-                        ? ( localizeWithPath(_moduleId, 29, "Spaces: {0}", modelOpts.indentSize))
-                        : ( localizeWithPath(
-                    _moduleId,
-                    30,
+                        ? ( localize(9563, "Spaces: {0}", modelOpts.indentSize))
+                        : ( localize(
+                    9564,
                     "Spaces: {0} (Tab Size: {1})",
                     modelOpts.indentSize,
                     modelOpts.tabSize
                 ))
-                    : ( localizeWithPath(_moduleId, 31, "Tab Size: {0}", modelOpts.tabSize)));
+                    : ( localize(9565, "Tab Size: {0}", modelOpts.tabSize)));
             }
         }
         this.updateState(update);
@@ -758,9 +756,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: ( localizeWithPath(_moduleId, 32, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
+                    this.statusBarEntryAccessor.value = this.statusbarService.addEntry({ name: ( localize(9566, "Current Problem")), text: '', ariaLabel: '' }, 'statusbar.currentProblem', StatusbarAlignment.LEFT);
                 }
-                this.statusBarEntryAccessor.value.update({ name: ( localizeWithPath(_moduleId, 32, "Current Problem")), text, ariaLabel: text });
+                this.statusBarEntryAccessor.value.update({ name: ( localize(9566, "Current Problem")), text, ariaLabel: text });
             }
             else {
                 this.statusBarEntryAccessor.clear();
@@ -854,7 +852,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, ( localizeWithPath(_moduleId, 33, "Search Marketplace Extensions for '{0}'...", fileExtension)));
+        super(ShowLanguageExtensionsAction_1.ID, ( localize(9567, "Search Marketplace Extensions for '{0}'...", fileExtension)));
         this.fileExtension = fileExtension;
         this.commandService = commandService;
         this.enabled = galleryService.isEnabled();
@@ -872,7 +870,7 @@ class ChangeLanguageAction extends Action2 {
     constructor() {
         super({
             id: ChangeLanguageAction.ID,
-            title: ( localize2WithPath(_moduleId, 34, 'Change Language Mode')),
+            title: ( localize2(9568, 'Change Language Mode')),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -880,10 +878,10 @@ class ChangeLanguageAction extends Action2 {
             },
             precondition: ContextKeyExpr.not('notebookEditorFocused'),
             metadata: {
-                description: ( localizeWithPath(_moduleId, 35, "Change the language mode of the active text editor.")),
+                description: ( localize(9569, "Change the language mode of the active text editor.")),
                 args: [
                     {
-                        name: ( localizeWithPath(_moduleId, 36, "The name of the language mode to change to.")),
+                        name: ( localize(9570, "The name of the language mode to change to.")),
                         constraint: (value) => typeof value === 'string',
                     }
                 ]
@@ -902,7 +900,7 @@ class ChangeLanguageAction extends Action2 {
         const telemetryService = accessor.get(ITelemetryService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 6, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9570, "No text editor active at this time")) }]);
             return;
         }
         const textModel = activeTextEditorControl.getModel();
@@ -923,10 +921,10 @@ class ChangeLanguageAction extends Action2 {
             const extensions = languageService.getExtensions(languageId).join(' ');
             let description;
             if (currentLanguageName === languageName) {
-                description = ( localizeWithPath(_moduleId, 37, "({0}) - Configured Language", languageId));
+                description = ( localize(9571, "({0}) - Configured Language", languageId));
             }
             else {
-                description = ( localizeWithPath(_moduleId, 38, "({0})", languageId));
+                description = ( localize(9572, "({0})", languageId));
             }
             return {
                 label: languageName,
@@ -935,7 +933,7 @@ class ChangeLanguageAction extends Action2 {
                 description
             };
         })));
-        picks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 39, "languages (identifier)")) });
+        picks.unshift({ type: 'separator', label: ( localize(9573, "languages (identifier)")) });
         let configureLanguageAssociations;
         let configureLanguageSettings;
         let galleryAction;
@@ -945,21 +943,16 @@ class ChangeLanguageAction extends Action2 {
             if (galleryAction.enabled) {
                 picks.unshift(galleryAction);
             }
-            configureLanguageSettings = { label: ( localizeWithPath(
-                _moduleId,
-                40,
-                "Configure '{0}' language based settings...",
-                currentLanguageName
-            )) };
+            configureLanguageSettings = { label: ( localize(9574, "Configure '{0}' language based settings...", currentLanguageName)) };
             picks.unshift(configureLanguageSettings);
-            configureLanguageAssociations = { label: ( localizeWithPath(_moduleId, 41, "Configure File Association for '{0}'...", ext)) };
+            configureLanguageAssociations = { label: ( localize(9575, "Configure File Association for '{0}'...", ext)) };
             picks.unshift(configureLanguageAssociations);
         }
         const autoDetectLanguage = {
-            label: ( localizeWithPath(_moduleId, 42, "Auto Detect"))
+            label: ( localize(9576, "Auto Detect"))
         };
         picks.unshift(autoDetectLanguage);
-        const pick = typeof languageMode === 'string' ? { label: languageMode } : await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 43, "Select Language Mode")), matchOnDescription: true });
+        const pick = typeof languageMode === 'string' ? { label: languageMode } : await quickInputService.pick(picks, { placeHolder: ( localize(9577, "Select Language Mode")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -1041,16 +1034,11 @@ class ChangeLanguageAction extends Action2 {
                 id: languageId,
                 label: languageName,
                 iconClasses: getIconClassesForLanguageId(languageId),
-                description: (languageId === currentAssociation) ? ( localizeWithPath(_moduleId, 44, "Current Association")) : undefined
+                description: (languageId === currentAssociation) ? ( localize(9578, "Current Association")) : undefined
             };
         })));
         setTimeout(async () => {
-            const language = await quickInputService.pick(picks, { placeHolder: ( localizeWithPath(
-                _moduleId,
-                45,
-                "Select Language Mode to Associate with '{0}'",
-                extension || base
-            )) });
+            const language = await quickInputService.pick(picks, { placeHolder: ( localize(9579, "Select Language Mode to Associate with '{0}'", extension || base)) });
             if (language) {
                 const fileAssociationsConfig = configurationService.inspect(FILES_ASSOCIATIONS_CONFIG);
                 let associationKey;
@@ -1075,7 +1063,7 @@ class ChangeEOLAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.editor.changeEOL',
-            title: ( localize2WithPath(_moduleId, 46, 'Change End of Line Sequence')),
+            title: ( localize2(9580, 'Change End of Line Sequence')),
             f1: true
         });
     }
@@ -1084,11 +1072,11 @@ class ChangeEOLAction extends Action2 {
         const quickInputService = accessor.get(IQuickInputService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 6, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9580, "No text editor active at this time")) }]);
             return;
         }
         if (editorService.activeEditor?.isReadonly()) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 7, "The active code editor is read-only.")) }]);
+            await quickInputService.pick([{ label: ( localize(9580, "The active code editor is read-only.")) }]);
             return;
         }
         let textModel = activeTextEditorControl.getModel();
@@ -1097,7 +1085,7 @@ class ChangeEOLAction extends Action2 {
             { label: nlsEOLCRLF, eol: EndOfLineSequence.CRLF },
         ];
         const selectedIndex = (textModel?.getEOL() === '\n') ? 0 : 1;
-        const eol = await quickInputService.pick(EOLOptions, { placeHolder: ( localizeWithPath(_moduleId, 47, "Select End of Line Sequence")), activeItem: EOLOptions[selectedIndex] });
+        const eol = await quickInputService.pick(EOLOptions, { placeHolder: ( localize(9581, "Select End of Line Sequence")), activeItem: EOLOptions[selectedIndex] });
         if (eol) {
             const activeCodeEditor = getCodeEditor(editorService.activeTextEditorControl);
             if (activeCodeEditor?.hasModel() && !editorService.activeEditor?.isReadonly()) {
@@ -1114,7 +1102,7 @@ class ChangeEncodingAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.editor.changeEncoding',
-            title: ( localize2WithPath(_moduleId, 48, 'Change File Encoding')),
+            title: ( localize2(9582, 'Change File Encoding')),
             f1: true
         });
     }
@@ -1126,21 +1114,21 @@ class ChangeEncodingAction extends Action2 {
         const textResourceConfigurationService = accessor.get(ITextResourceConfigurationService);
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 6, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9582, "No text editor active at this time")) }]);
             return;
         }
         const activeEditorPane = editorService.activeEditorPane;
         if (!activeEditorPane) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 6, "No text editor active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9582, "No text editor active at this time")) }]);
             return;
         }
         const encodingSupport = toEditorWithEncodingSupport(activeEditorPane.input);
         if (!encodingSupport) {
-            await quickInputService.pick([{ label: ( localizeWithPath(_moduleId, 49, "No file active at this time")) }]);
+            await quickInputService.pick([{ label: ( localize(9583, "No file active at this time")) }]);
             return;
         }
-        const saveWithEncodingPick = { label: ( localizeWithPath(_moduleId, 50, "Save with Encoding")) };
-        const reopenWithEncodingPick = { label: ( localizeWithPath(_moduleId, 51, "Reopen with Encoding")) };
+        const saveWithEncodingPick = { label: ( localize(9584, "Save with Encoding")) };
+        const reopenWithEncodingPick = { label: ( localize(9585, "Reopen with Encoding")) };
         if (!Language.isDefaultVariant()) {
             const saveWithEncodingAlias = 'Save with Encoding';
             if (saveWithEncodingAlias !== saveWithEncodingPick.label) {
@@ -1159,7 +1147,7 @@ class ChangeEncodingAction extends Action2 {
             action = reopenWithEncodingPick;
         }
         else {
-            action = await quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: ( localizeWithPath(_moduleId, 10, "Select Action")), matchOnDetail: true });
+            action = await quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], { placeHolder: ( localize(9585, "Select Action")), matchOnDetail: true });
         }
         if (!action) {
             return;
@@ -1209,10 +1197,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: ( localizeWithPath(_moduleId, 52, "Guessed from content")) });
+            picks.unshift({ id: guessedEncoding, label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong, description: ( localize(9586, "Guessed from content")) });
         }
         const encoding = await quickInputService.pick(picks, {
-            placeHolder: isReopenWithEncoding ? ( localizeWithPath(_moduleId, 53, "Select File Encoding to Reopen File")) : ( localizeWithPath(_moduleId, 54, "Select File Encoding to Save with")),
+            placeHolder: isReopenWithEncoding ? ( localize(9587, "Select File Encoding to Reopen File")) : ( localize(9588, "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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/editortabscontrol.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { DataTransfers, applyDragImage } from '../../../../base/browser/dnd.js';
 import { getActiveWindow, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
@@ -47,7 +47,6 @@ import { IHostService } from '../../../services/host/browser/host.service.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var EditorTabsControl_1;
-const _moduleId = "vs/workbench/browser/parts/editor/editorTabsControl";
 class EditorCommandsContextActionRunner extends ActionRunner {
     constructor(context) {
         super();
@@ -136,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: ( localizeWithPath(_moduleId, 0, "Editor actions")),
+            ariaLabel: ( localize(6987, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( (new EditorCommandsContextActionRunner(context)))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -208,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 = ( localizeWithPath(_moduleId, 1, "{0} (+{1})", label, this.groupView.count - 1));
+                label = ( localize(6988, "{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

@@ -38,7 +38,7 @@ import { DraggedEditorIdentifier, DraggedEditorGroupIdentifier, isWindowDraggedO
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { Dimension, addDisposableListener, EventType as EventType$1, DragAndDropObserver, clearNode, scheduleAtNextAnimationFrame, getWindow, isMouseEvent, findParentWithClass, EventHelper } from '../../../../base/browser/dom.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { CloseEditorTabAction, UnpinEditorAction } from './editorActions.js';
 import { assertAllDefined, assertIsDefined } from '../../../../base/common/types.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
@@ -61,7 +61,6 @@ import { IHostService } from '../../../services/host/browser/host.service.js';
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { applyDragImage } from '../../../../base/browser/dnd.js';
 var MultiEditorTabsControl_1;
-const _moduleId = "vs/workbench/browser/parts/editor/multiEditorTabsControl";
 let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsControl {
     static { MultiEditorTabsControl_1 = this; }
     static { this.SCROLLBAR_SIZES = {
@@ -547,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: ( localizeWithPath(_moduleId, 0, "Tab actions")), actionRunner: tabActionRunner })));
+        const tabActionBar = ( (new ActionBar(tabActionsContainer, { ariaLabel: ( localize(11518, "Tab actions")), actionRunner: tabActionRunner })));
         const tabActionListener = tabActionBar.onWillRun(e => {
             if (e.action.id === this.closeEditorAction.id) {
                 this.blockRevealActiveTabOnce();
@@ -749,7 +748,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
                         e.dataTransfer.setDragImage(tab, 0, 0);
                     }
                 }
-                this.doFillResourceDataTransfers([editor], e, isNewWindowOperation);
+                this.doFillResourceDataTransfers(selectedEditors, e, isNewWindowOperation);
                 scheduleAtNextAnimationFrame(getWindow(this.parent), () => this.updateDropFeedback(tab, false, e, tabIndex));
             },
             onDrag: e => {
@@ -895,28 +894,28 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
         if (editorIndex === -1) {
             throw ( (new BugIndicatingError()));
         }
-        const anchorIndex = this.groupView.getIndexOfEditor(anchor);
-        if (anchorIndex === -1) {
+        const anchorEditorIndex = this.groupView.getIndexOfEditor(anchor);
+        if (anchorEditorIndex === -1) {
             throw ( (new BugIndicatingError()));
         }
         let selection = this.groupView.selectedEditors;
-        let currentIndex = anchorIndex;
-        while (currentIndex >= 0 && currentIndex <= this.groupView.count - 1) {
-            currentIndex = anchorIndex < editorIndex ? currentIndex - 1 : currentIndex + 1;
-            if (!this.tabsModel.isSelected(currentIndex)) {
+        let currentEditorIndex = anchorEditorIndex;
+        while (currentEditorIndex >= 0 && currentEditorIndex <= this.groupView.count - 1) {
+            currentEditorIndex = anchorEditorIndex < editorIndex ? currentEditorIndex - 1 : currentEditorIndex + 1;
+            const currentEditor = this.groupView.getEditorByIndex(currentEditorIndex);
+            if (!currentEditor) {
                 break;
             }
-            const currentEditor = this.groupView.getEditorByIndex(currentIndex);
-            if (!currentEditor) {
+            if (!this.groupView.isSelected(currentEditor)) {
                 break;
             }
             selection = selection.filter(editor => !editor.matches(currentEditor));
         }
-        const fromIndex = anchorIndex < editorIndex ? anchorIndex : editorIndex;
-        const toIndex = anchorIndex < editorIndex ? editorIndex : anchorIndex;
-        const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromIndex, toIndex + 1);
+        const fromEditorIndex = anchorEditorIndex < editorIndex ? anchorEditorIndex : editorIndex;
+        const toEditorIndex = anchorEditorIndex < editorIndex ? editorIndex : anchorEditorIndex;
+        const editorsToSelect = this.groupView.getEditors(EditorsOrder.SEQUENTIAL).slice(fromEditorIndex, toEditorIndex + 1);
         for (const editor of editorsToSelect) {
-            if (!this.tabsModel.isSelected(editor)) {
+            if (!this.groupView.isSelected(editor)) {
                 selection.push(editor);
             }
         }
@@ -933,7 +932,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             const recentEditors = this.groupView.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE);
             for (let i = 1; i < recentEditors.length; i++) {
                 const recentEditor = recentEditors[i];
-                if (this.tabsModel.isSelected(recentEditor)) {
+                if (this.groupView.isSelected(recentEditor)) {
                     newActiveEditor = recentEditor;
                     break;
                 }

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

@@ -33,10 +33,8 @@ let MultiRowEditorControl = class MultiRowEditorControl extends Disposable {
         return this.model.isSticky(editor) ? this.stickyEditorTabsControl : this.unstickyEditorTabsControl;
     }
     openEditor(editor, options) {
-        const [editorTabController, otherTabController] = this.model.isSticky(editor) ? [this.stickyEditorTabsControl, this.unstickyEditorTabsControl] : [this.unstickyEditorTabsControl, this.stickyEditorTabsControl];
-        const didChange = editorTabController.openEditor(editor, options);
+        const didChange = this.getEditorTabsController(editor).openEditor(editor, options);
         if (didChange) {
-            otherTabController.openEditors([]);
             this.handleOpenedEditors();
         }
         return didChange;

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/sidebysideeditor.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Dimension, $, multibyteAwareBtoa, clearNode } from '../../../../base/browser/dom.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { SIDE_BY_SIDE_EDITOR_ID, SideBySideEditor as SideBySideEditor$1, EditorExtensions, isEditorPaneWithSelection, EditorPaneSelectionCompareResult } from '../../../common/editor.js';
@@ -24,7 +24,6 @@ import { isEqual } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 var SideBySideEditor_1;
-const _moduleId = "vs/workbench/browser/parts/editor/sideBySideEditor";
 function isSideBySideEditorViewState(thing) {
     const candidate = thing;
     return typeof candidate?.primary === 'object' && typeof candidate.secondary === 'object';
@@ -146,7 +145,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(_moduleId, 0, "Side by Side Editor"));
+        return ( localize(8675, "Side by Side Editor"));
     }
     async setInput(input, options, context, token) {
         const oldInput = this.input;

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { applyTextEditorOptions } from '../../../common/editor/editorOptions.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -7,7 +7,6 @@ import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/c
 import { ScrollType } from '../../../../editor/common/editorCommon.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
 import { AbstractTextEditor } from './textEditor.js';
-const _moduleId = "vs/workbench/browser/parts/editor/textCodeEditor";
 class AbstractTextCodeEditor extends AbstractTextEditor {
     constructor() {
         super(...arguments);
@@ -20,7 +19,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(_moduleId, 0, "Text Editor"));
+        return ( localize(10787, "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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { deepClone } from '../../../../base/common/objects.js';
 import { assertIsDefined, isObject } from '../../../../base/common/types.js';
 import '../../../../../../../override/vs/workbench/browser/parts/editor/textEditor.js';
@@ -29,7 +29,6 @@ import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { DiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
 import { AbstractTextEditor } from './textEditor.js';
 var TextDiffEditor_1;
-const _moduleId = "vs/workbench/browser/parts/editor/textDiffEditor";
 let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
     static { TextDiffEditor_1 = this; }
     static { this.ID = TEXT_DIFF_EDITOR_ID; }
@@ -52,7 +51,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localizeWithPath(_moduleId, 0, "Text Diff Editor"));
+        return ( localize(9530, "Text Diff Editor"));
     }
     createEditorControl(parent, configuration) {
         this.diffEditorControl = this._register(this.instantiationService.createInstance(DiffEditorWidget, parent, configuration, {}));
@@ -114,17 +113,15 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (error.fileOperationResult === FileOperationResult.FILE_TOO_LARGE) {
             let message;
             if (error instanceof TooLargeFileOperationError) {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    1,
+                message = ( localize(
+                    9531,
                     "At least one file is not displayed in the text compare editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    2,
+                message = ( localize(
+                    9532,
                     "At least one file is not displayed in the text compare editor because it is very large."
                 ));
             }