@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -6,8 +6,11 @@ import { IEditorService } from '../../../services/editor/common/editorService.js
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.js';
 import { IWorkingCopyService } from '../../../services/workingCopy/common/workingCopyService.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.js';
+import { ResourceMap } from '../../../../base/common/map.js';
+import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 let EditorAutoSave = class EditorAutoSave extends Disposable {
-    constructor(filesConfigurationService, hostService, editorService, editorGroupService, workingCopyService, logService) {
+    constructor(filesConfigurationService, hostService, editorService, editorGroupService, workingCopyService, logService, markerService, uriIdentityService) {
         super();
         this.filesConfigurationService = filesConfigurationService;
         this.hostService = hostService;
@@ -15,11 +18,14 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
         this.editorGroupService = editorGroupService;
         this.workingCopyService = workingCopyService;
         this.logService = logService;
-        this.pendingAutoSavesAfterDelay = ( new Map());
+        this.markerService = markerService;
+        this.uriIdentityService = uriIdentityService;
+        this.scheduledAutoSavesAfterDelay = ( new Map());
         this.lastActiveEditor = undefined;
         this.lastActiveGroupId = undefined;
         this.lastActiveEditorControlDisposable = this._register(( new DisposableStore()));
-        this.onAutoSaveConfigurationChange(filesConfigurationService.getAutoSaveConfiguration(), false);
+        this.waitingOnConditionAutoSaveWorkingCopies = ( new ResourceMap(resource => this.uriIdentityService.extUri.getComparisonKey(resource)));
+        this.waitingOnConditionAutoSaveEditors = ( new ResourceMap(resource => this.uriIdentityService.extUri.getComparisonKey(resource)));
         for (const dirtyWorkingCopy of this.workingCopyService.dirtyWorkingCopies) {
             this.onDidRegister(dirtyWorkingCopy);
         }
@@ -29,11 +35,37 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
         this._register(this.hostService.onDidChangeFocus(focused => this.onWindowFocusChange(focused)));
         this._register(this.hostService.onDidChangeActiveWindow(() => this.onActiveWindowChange()));
         this._register(this.editorService.onDidActiveEditorChange(() => this.onDidActiveEditorChange()));
-        this._register(this.filesConfigurationService.onAutoSaveConfigurationChange(config => this.onAutoSaveConfigurationChange(config, true)));
+        this._register(this.filesConfigurationService.onDidChangeAutoSaveConfiguration(() => this.onDidChangeAutoSaveConfiguration()));
         this._register(this.workingCopyService.onDidRegister(workingCopy => this.onDidRegister(workingCopy)));
         this._register(this.workingCopyService.onDidUnregister(workingCopy => this.onDidUnregister(workingCopy)));
         this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.onDidChangeDirty(workingCopy)));
         this._register(this.workingCopyService.onDidChangeContent(workingCopy => this.onDidChangeContent(workingCopy)));
+        this._register(this.markerService.onMarkerChanged(e => this.onConditionChanged(e, 3 )));
+        this._register(this.filesConfigurationService.onDidChangeAutoSaveDisabled(resource => this.onConditionChanged([resource], 4 )));
+    }
+    onConditionChanged(resources, condition) {
+        for (const resource of resources) {
+            const workingCopyResult = this.waitingOnConditionAutoSaveWorkingCopies.get(resource);
+            if (workingCopyResult?.condition === condition) {
+                if (workingCopyResult.workingCopy.isDirty() &&
+                    this.filesConfigurationService.getAutoSaveMode(workingCopyResult.workingCopy.resource).mode !== 0 ) {
+                    this.discardAutoSave(workingCopyResult.workingCopy);
+                    this.logService.info(`[editor auto save] running auto save from condition change event`, ( workingCopyResult.workingCopy.resource.toString()), workingCopyResult.workingCopy.typeId);
+                    workingCopyResult.workingCopy.save({ reason: workingCopyResult.reason });
+                }
+            }
+            else {
+                const editorResult = this.waitingOnConditionAutoSaveEditors.get(resource);
+                if (editorResult?.condition === condition &&
+                    !editorResult.editor.editor.isDisposed() &&
+                    editorResult.editor.editor.isDirty() &&
+                    this.filesConfigurationService.getAutoSaveMode(editorResult.editor.editor).mode !== 0 ) {
+                    this.waitingOnConditionAutoSaveEditors.delete(resource);
+                    this.logService.info(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
+                    this.editorService.save(editorResult.editor, { reason: editorResult.reason });
+                }
+            }
+        }
     }
     onWindowFocusChange(focused) {
         if (!focused) {
@@ -59,46 +91,57 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
         }
     }
     maybeTriggerAutoSave(reason, editorIdentifier) {
-        if (editorIdentifier?.editor.isReadonly() || editorIdentifier?.editor.hasCapability(4 )) {
-            return;
-        }
-        const mode = this.filesConfigurationService.getAutoSaveMode();
-        if ((reason === 4  && ((mode === 3  || mode === 4) )) ||
-            ((reason === 3  && mode === 3) )) {
-            this.logService.trace(`[editor auto save] triggering auto save with reason ${reason}`);
-            if (editorIdentifier) {
-                this.editorService.save(editorIdentifier, { reason });
+        if (editorIdentifier) {
+            if (!editorIdentifier.editor.isDirty() ||
+                editorIdentifier.editor.isReadonly() ||
+                editorIdentifier.editor.hasCapability(4 )) {
+                return;
             }
-            else {
-                this.saveAllDirty({ reason });
+            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(editorIdentifier.editor);
+            if (autoSaveMode.mode !== 0 ) {
+                if ((reason === 4  && ((autoSaveMode.mode === 3  || autoSaveMode.mode === 4) )) ||
+                    ((reason === 3  && autoSaveMode.mode === 3) )) {
+                    this.logService.trace(`[editor auto save] triggering auto save with reason ${reason}`);
+                    this.editorService.save(editorIdentifier, { reason });
+                }
+            }
+            else if (editorIdentifier.editor.resource && ((autoSaveMode.reason === 3  || autoSaveMode.reason === 4) )) {
+                this.waitingOnConditionAutoSaveEditors.set(editorIdentifier.editor.resource, { editor: editorIdentifier, reason, condition: autoSaveMode.reason });
             }
         }
+        else {
+            this.saveAllDirtyAutoSaveables(reason);
+        }
     }
-    onAutoSaveConfigurationChange(config, fromEvent) {
-        this.autoSaveAfterDelay = (typeof config.autoSaveDelay === 'number') && config.autoSaveDelay >= 0 ? config.autoSaveDelay : undefined;
-        if (fromEvent) {
-            let reason = undefined;
-            switch (this.filesConfigurationService.getAutoSaveMode()) {
-                case 3 :
-                    reason = 3 ;
-                    break;
-                case 4 :
-                    reason = 4 ;
-                    break;
-                case 1 :
-                case 2 :
-                    reason = 2 ;
-                    break;
-            }
-            if (reason) {
-                this.saveAllDirty({ reason });
-            }
+    onDidChangeAutoSaveConfiguration() {
+        let reason = undefined;
+        switch (this.filesConfigurationService.getAutoSaveMode(undefined).mode) {
+            case 3 :
+                reason = 3 ;
+                break;
+            case 4 :
+                reason = 4 ;
+                break;
+            case 1 :
+            case 2 :
+                reason = 2 ;
+                break;
+        }
+        if (reason) {
+            this.saveAllDirtyAutoSaveables(reason);
         }
     }
-    saveAllDirty(options) {
+    saveAllDirtyAutoSaveables(reason) {
         for (const workingCopy of this.workingCopyService.dirtyWorkingCopies) {
-            if (!((workingCopy.capabilities & 2) )) {
-                workingCopy.save(options);
+            if (workingCopy.capabilities & 2 ) {
+                continue;
+            }
+            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource);
+            if (autoSaveMode.mode !== 0 ) {
+                workingCopy.save({ reason });
+            }
+            else if (autoSaveMode.reason === 3  || autoSaveMode.reason === 4 ) {
+                this.waitingOnConditionAutoSaveWorkingCopies.set(workingCopy.resource, { workingCopy, reason, condition: autoSaveMode.reason });
             }
         }
     }
@@ -124,29 +167,38 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
         }
     }
     scheduleAutoSave(workingCopy) {
-        if (typeof this.autoSaveAfterDelay !== 'number') {
+        if (workingCopy.capabilities & 2 ) {
             return;
         }
-        if (workingCopy.capabilities & 2 ) {
+        const autoSaveAfterDelay = this.filesConfigurationService.getAutoSaveConfiguration(workingCopy.resource).autoSaveDelay;
+        if (typeof autoSaveAfterDelay !== 'number') {
             return;
         }
         this.discardAutoSave(workingCopy);
-        this.logService.trace(`[editor auto save] scheduling auto save after ${this.autoSaveAfterDelay}ms`, ( workingCopy.resource.toString()), workingCopy.typeId);
+        this.logService.trace(`[editor auto save] scheduling auto save after ${autoSaveAfterDelay}ms`, ( workingCopy.resource.toString()), workingCopy.typeId);
         const handle = setTimeout(() => {
             this.discardAutoSave(workingCopy);
             if (workingCopy.isDirty()) {
-                this.logService.trace(`[editor auto save] running auto save`, ( workingCopy.resource.toString()), workingCopy.typeId);
-                workingCopy.save({ reason: 2  });
+                const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource);
+                if (autoSaveMode.mode !== 0 ) {
+                    this.logService.trace(`[editor auto save] running auto save`, ( workingCopy.resource.toString()), workingCopy.typeId);
+                    workingCopy.save({ reason: 2  });
+                }
+                else if (autoSaveMode.reason === 3  || autoSaveMode.reason === 4 ) {
+                    this.waitingOnConditionAutoSaveWorkingCopies.set(workingCopy.resource, { workingCopy, reason: 2 , condition: autoSaveMode.reason });
+                }
             }
-        }, this.autoSaveAfterDelay);
-        this.pendingAutoSavesAfterDelay.set(workingCopy, toDisposable(() => {
+        }, autoSaveAfterDelay);
+        this.scheduledAutoSavesAfterDelay.set(workingCopy, toDisposable(() => {
             this.logService.trace(`[editor auto save] clearing pending auto save`, ( workingCopy.resource.toString()), workingCopy.typeId);
             clearTimeout(handle);
         }));
     }
     discardAutoSave(workingCopy) {
-        dispose(this.pendingAutoSavesAfterDelay.get(workingCopy));
-        this.pendingAutoSavesAfterDelay.delete(workingCopy);
+        dispose(this.scheduledAutoSavesAfterDelay.get(workingCopy));
+        this.scheduledAutoSavesAfterDelay.delete(workingCopy);
+        this.waitingOnConditionAutoSaveWorkingCopies.delete(workingCopy.resource);
+        this.waitingOnConditionAutoSaveEditors.delete(workingCopy.resource);
     }
 };
 EditorAutoSave = ( __decorate([
@@ -155,6 +207,8 @@ EditorAutoSave = ( __decorate([
     ( __param(2, IEditorService)),
     ( __param(3, IEditorGroupsService)),
     ( __param(4, IWorkingCopyService)),
-    ( __param(5, ILogService))
+    ( __param(5, ILogService)),
+    ( __param(6, IMarkerService)),
+    ( __param(7, IUriIdentityService))
 ], EditorAutoSave));
 export { EditorAutoSave };

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

@@ -8,7 +8,7 @@ import { isObject, isString, isUndefined, isNumber } from '../../../../base/comm
 import { URI } from '../../../../base/common/uri.js';
 import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
@@ -62,6 +62,7 @@ const DIFF_FOCUS_SECONDARY_SIDE = 'workbench.action.compareEditor.focusSecondary
 const DIFF_FOCUS_OTHER_SIDE = 'workbench.action.compareEditor.focusOtherSide';
 const DIFF_OPEN_SIDE = 'workbench.action.compareEditor.openSide';
 const TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE = 'toggle.diff.ignoreTrimWhitespace';
+const DIFF_SWAP_SIDES = 'workbench.action.compareEditor.swapSides';
 const SPLIT_EDITOR = 'workbench.action.splitEditor';
 const SPLIT_EDITOR_UP = 'workbench.action.splitEditorUp';
 const SPLIT_EDITOR_DOWN = 'workbench.action.splitEditorDown';
@@ -354,11 +355,11 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_NEXT_CHANGE,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorCommands',
                 'compare.nextChange',
-                "Go to Next Change"
-            )), original: 'Go to Next Change' },
+                'Go to Next Change'
+            )),
         }
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -371,11 +372,11 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: GOTO_PREVIOUS_CHANGE,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorCommands',
                 'compare.previousChange',
-                "Go to Previous Change"
-            )), original: 'Go to Previous Change' },
+                'Go to Previous Change'
+            )),
         }
     });
     function getActiveTextDiffEditor(accessor) {
@@ -429,6 +430,43 @@ function registerDiffEditorCommands() {
         const newValue = !configurationService.getValue('diffEditor.ignoreTrimWhitespace');
         configurationService.updateValue('diffEditor.ignoreTrimWhitespace', newValue);
     }
+    async function swapDiffSides(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const diffEditor = getActiveTextDiffEditor(accessor);
+        const activeGroup = diffEditor?.group;
+        const diffInput = diffEditor?.input;
+        if (!diffEditor || typeof activeGroup === 'undefined' || !(diffInput instanceof DiffEditorInput) || !diffInput.modified.resource) {
+            return;
+        }
+        const untypedDiffInput = diffInput.toUntyped({ preserveViewState: activeGroup.id });
+        if (!untypedDiffInput) {
+            return;
+        }
+        if (diffInput.modified.isModified() && !editorService.isOpened({ resource: diffInput.modified.resource, typeId: diffInput.modified.typeId, editorId: diffInput.modified.editorId })) {
+            await editorService.openEditor({
+                ...untypedDiffInput.modified,
+                options: {
+                    ...untypedDiffInput.modified.options,
+                    pinned: true,
+                    inactive: true
+                }
+            }, activeGroup);
+        }
+        await editorService.replaceEditors([
+            {
+                editor: diffInput,
+                replacement: {
+                    ...untypedDiffInput,
+                    original: untypedDiffInput.modified,
+                    modified: untypedDiffInput.original,
+                    options: {
+                        ...untypedDiffInput.options,
+                        pinned: true
+                    }
+                }
+            }
+        ], activeGroup);
+    }
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: TOGGLE_DIFF_SIDE_BY_SIDE,
         weight: 200 ,
@@ -457,6 +495,20 @@ function registerDiffEditorCommands() {
         primary: undefined,
         handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Toggle)
     });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => toggleDiffIgnoreTrimWhitespace(accessor)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: DIFF_SWAP_SIDES,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => swapDiffSides(accessor)
+    });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: TOGGLE_DIFF_SIDE_BY_SIDE,
@@ -472,12 +524,20 @@ function registerDiffEditorCommands() {
         },
         when: TextCompareEditorActiveContext
     });
-    KeybindingsRegistry.registerCommandAndKeybindingRule({
-        id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
-        weight: 200 ,
-        when: undefined,
-        primary: undefined,
-        handler: accessor => toggleDiffIgnoreTrimWhitespace(accessor)
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: DIFF_SWAP_SIDES,
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/parts/editor/editorCommands',
+                    'swapDiffSides',
+                    "Swap Left and Right Editor Side"
+                )),
+                original: 'Compare: Swap Left and Right Editor Side'
+            },
+            category: ( localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare"))
+        },
+        when: TextCompareEditorActiveContext
     });
 }
 function registerOpenEditorAPICommands() {
@@ -597,6 +657,14 @@ function registerOpenEditorAPICommands() {
         }
         await editorService.openEditor({ resources: editor, label: title });
     });
+    CommandsRegistry.registerCommand('_workbench.openMultiDiffEditor', async (accessor, options) => {
+        const editorService = accessor.get(IEditorService);
+        await editorService.openEditor({
+            multiDiffSource: options.multiDiffSourceUri ? URI.revive(options.multiDiffSourceUri) : undefined,
+            resources: options.resources?.map(r => ({ original: { resource: URI.revive(r.originalUri) }, modified: { resource: URI.revive(r.modifiedUri) } })),
+            label: options.title,
+        });
+    });
 }
 function registerOpenEditorAtIndexCommands() {
     const openEditorAtIndex = (accessor, editorIndex) => {
@@ -969,11 +1037,11 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'splitEditorInGroup',
-                    "Split Editor in Group"
-                )), original: 'Split Editor in Group' },
+                    'Split Editor in Group'
+                )),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1014,11 +1082,11 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'joinEditorInGroup',
-                    "Join Editor in Group"
-                )), original: 'Join Editor in Group' },
+                    'Join Editor in Group'
+                )),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1037,11 +1105,11 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'toggleJoinEditorInGroup',
-                    "Toggle Split Editor in Group"
-                )), original: 'Toggle Split Editor in Group' },
+                    'Toggle Split Editor in Group'
+                )),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1062,11 +1130,11 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'toggleSplitEditorInGroupLayout',
-                    "Toggle Layout of Split Editor in Group"
-                )), original: 'Toggle Layout of Split Editor in Group' },
+                    'Toggle Layout of Split Editor in Group'
+                )),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1091,11 +1159,11 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'focusLeftSideEditor',
-                    "Focus First Side in Active Editor"
-                )), original: 'Focus First Side in Active Editor' },
+                    'Focus First Side in Active Editor'
+                )),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1117,11 +1185,11 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'focusRightSideEditor',
-                    "Focus Second Side in Active Editor"
-                )), original: 'Focus Second Side in Active Editor' },
+                    'Focus Second Side in Active Editor'
+                )),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1143,11 +1211,11 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'focusOtherSideEditor',
-                    "Focus Other Side in Active Editor"
-                )), original: 'Focus Other Side in Active Editor' },
+                    'Focus Other Side in Active Editor'
+                )),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1203,13 +1271,12 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'toggleEditorGroupLock',
-                    "Toggle Editor Group Lock"
-                )), original: 'Toggle Editor Group Lock' },
+                    'Toggle Editor Group Lock'
+                )),
                 category: Categories.View,
-                precondition: MultipleEditorGroupsContext,
                 f1: true
             });
         }
@@ -1221,13 +1288,13 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'lockEditorGroup',
-                    "Lock Editor Group"
-                )), original: 'Lock Editor Group' },
+                    'Lock Editor Group'
+                )),
                 category: Categories.View,
-                precondition: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ( ActiveEditorGroupLockedContext.toNegated()))),
+                precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
             });
         }
@@ -1239,12 +1306,12 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: { value: ( localizeWithPath(
+                title: ( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorCommands',
                     'unlockEditorGroup',
-                    "Unlock Editor Group"
-                )), original: 'Unlock Editor Group' },
-                precondition: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ActiveEditorGroupLockedContext)),
+                    'Unlock Editor Group'
+                )),
+                precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
             });
@@ -1398,4 +1465,4 @@ function setup() {
     registerSplitEditorCommands();
     registerFocusEditorGroupWihoutWrapCommands();
 }
-export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, getCommandsContext, getMultiSelectedEditorContexts, resolveCommandsContext, setup, splitEditor };
+export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, DIFF_SWAP_SIDES, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, getCommandsContext, getMultiSelectedEditorContexts, resolveCommandsContext, setup, splitEditor };