@codingame/monaco-vscode-api 1.83.2 → 1.83.3-next.0

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -1,48 +1,123 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { Extensions as Extensions$1 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
+import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { registerColor, editorWidgetBackground, editorWidgetBorder, widgetShadow, editorHoverHighlight, focusBorder, inputPlaceholderForeground, inputBackground, transparent, diffInserted, diffRemoved } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { Extensions } from '../../../common/configuration.js';
 const IInlineChatService = ( createDecorator('IInlineChatService'));
+( new RawContextKey(
+    'inlineChatHasProvider',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatHasProvider', "Whether a provider for interactive editors exists")
+));
+( new RawContextKey(
+    'inlineChatVisible',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatVisible', "Whether the interactive editor input is visible")
+));
+( new RawContextKey(
+    'inlineChatFocused',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatFocused', "Whether the interactive editor input is focused")
+));
+( new RawContextKey(
+    'inlineChatResponseFocused',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatResponseFocused', "Whether the interactive widget's response is focused")
+));
+( new RawContextKey(
+    'inlineChatEmpty',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatEmpty', "Whether the interactive editor input is empty")
+));
+( new RawContextKey(
+    'inlineChatInnerCursorFirst',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInnerCursorFirst', "Whether the cursor of the iteractive editor input is on the first line")
+));
+( new RawContextKey(
+    'inlineChatInnerCursorLast',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInnerCursorLast', "Whether the cursor of the iteractive editor input is on the last line")
+));
+( new RawContextKey(
+    'inlineChatInnerCursorStart',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInnerCursorStart', "Whether the cursor of the iteractive editor input is on the start of the input")
+));
+( new RawContextKey(
+    'inlineChatInnerCursorEnd',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInnerCursorEnd', "Whether the cursor of the iteractive editor input is on the end of the input")
+));
+( new RawContextKey(
+    'inlineChatMarkdownMessageCropState',
+    'not_cropped',
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatMarkdownMessageCropState', "Whether the interactive editor message is cropped, not cropped or expanded")
+));
+( new RawContextKey(
+    'inlineChatOuterCursorPosition',
+    '',
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatOuterCursorPosition', "Whether the cursor of the outer editor is above or below the interactive editor input")
+));
+( new RawContextKey(
+    'inlineChatHasActiveRequest',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatHasActiveRequest', "Whether interactive editor has an active request")
+));
+( new RawContextKey(
+    'inlineChatHasStashedSession',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatHasStashedSession', "Whether interactive editor has kept a session for quick restore")
+));
+( new RawContextKey(
+    'inlineChatLastResponseType',
+    undefined,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatResponseType', "What type was the last response of the current interactive editor session")
+));
+( new RawContextKey(
+    'inlineChatResponseTypes',
+    undefined,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatResponseTypes', "What type was the responses have been receieved")
+));
+( new RawContextKey(
+    'inlineChatDidEdit',
+    undefined,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatDidEdit', "Whether interactive editor did change any code")
+));
+( new RawContextKey(
+    'inlineChatUserDidEdit',
+    undefined,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatUserDidEdit', "Whether the user did changes ontop of the inline chat")
+));
+( new RawContextKey(
+    'inlineChatLastFeedbackKind',
+    '',
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatLastFeedbackKind', "The last kind of feedback that was provided")
+));
+( new RawContextKey(
+    'inlineChatDocumentChanged',
+    false,
+    localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatDocumentChanged', "Whether the document has changed concurrently")
+));
 MenuId.for('inlineChatWidget');
 MenuId.for('inlineChatWidget.markdownMessage');
 MenuId.for('inlineChatWidget.status');
 MenuId.for('inlineChatWidget.feedback');
 MenuId.for('inlineChatWidget.undo');
 MenuId.for('inlineChatWidget.toggle');
-registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localize(
-    'inlineChat.background',
-    "Background color of the interactive editor widget"
-)));
-registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localize('inlineChat.border', "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localize('inlineChat.shadow', "Shadow color of the interactive editor widget")));
-registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localize(
-    'inlineChat.regionHighlight',
-    "Background highlighting of the current interactive region. Must be transparent."
-)), true);
-registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localize('inlineChatInput.border', "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, ( localize(
-    'inlineChatInput.focusBorder',
-    "Border color of the interactive editor input when focused"
-)));
-registerColor('inlineChatInput.placeholderForeground', { dark: inputPlaceholderForeground, light: inputPlaceholderForeground, hcDark: inputPlaceholderForeground, hcLight: inputPlaceholderForeground }, ( localize(
-    'inlineChatInput.placeholderForeground',
-    "Foreground color of the interactive editor input placeholder"
-)));
-registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localize(
-    'inlineChatInput.background',
-    "Background color of the interactive editor input"
-)));
-registerColor('inlineChatDiff.inserted', { dark: ( transparent(diffInserted, .5)), light: ( transparent(diffInserted, .5)), hcDark: ( transparent(diffInserted, .5)), hcLight: ( transparent(diffInserted, .5)) }, ( localize(
-    'inlineChatDiff.inserted',
-    "Background color of inserted text in the interactive editor input"
-)));
-registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)), light: ( transparent(diffRemoved, .5)), hcDark: ( transparent(diffRemoved, .5)), hcLight: ( transparent(diffRemoved, .5)) }, ( localize(
-    'inlineChatDiff.removed',
-    "Background color of removed text in the interactive editor input"
-)));
+registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChat.background', "Background color of the interactive editor widget"));
+registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChat.border', "Border color of the interactive editor widget"));
+registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChat.shadow', "Shadow color of the interactive editor widget"));
+registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChat.regionHighlight', "Background highlighting of the current interactive region. Must be transparent."), true);
+registerColor('inlineChatInput.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInput.border', "Border color of the interactive editor input"));
+registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInput.focusBorder', "Border color of the interactive editor input when focused"));
+registerColor('inlineChatInput.placeholderForeground', { dark: inputPlaceholderForeground, light: inputPlaceholderForeground, hcDark: inputPlaceholderForeground, hcLight: inputPlaceholderForeground }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInput.placeholderForeground', "Foreground color of the interactive editor input placeholder"));
+registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatInput.background', "Background color of the interactive editor input"));
+registerColor('inlineChatDiff.inserted', { dark: ( transparent(diffInserted, .5)), light: ( transparent(diffInserted, .5)), hcDark: ( transparent(diffInserted, .5)), hcLight: ( transparent(diffInserted, .5)) }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatDiff.inserted', "Background color of inserted text in the interactive editor input"));
+registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)), light: ( transparent(diffRemoved, .5)), hcDark: ( transparent(diffRemoved, .5)), hcLight: ( transparent(diffRemoved, .5)) }, localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'inlineChatDiff.removed', "Background color of removed text in the interactive editor input"));
 ( Registry.as(Extensions.ConfigurationMigration)).registerConfigurationMigrations([{
         key: 'interactiveEditor.editMode', migrateFn: (value) => {
             return [['inlineChat.mode', { value: value }]];
@@ -52,33 +127,18 @@ registerColor('inlineChatDiff.removed', { dark: ( transparent(diffRemoved, .5)),
     id: 'editor',
     properties: {
         'inlineChat.mode': {
-            description: ( localize(
-                'mode',
-                "Configure if changes crafted in the interactive editor are applied directly to the document or are previewed first."
-            )),
+            description: localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'mode', "Configure if changes crafted in the interactive editor are applied directly to the document or are previewed first."),
             default: "livePreview" ,
             type: 'string',
             enum: ["livePreview" , "preview" , "live" ],
             markdownEnumDescriptions: [
-                ( localize(
-                    'mode.livePreview',
-                    "Changes are applied directly to the document and are highlighted visually via inline or side-by-side diffs. Ending a session will keep the changes."
-                )),
-                ( localize(
-                    'mode.preview',
-                    "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
-                )),
-                ( localize(
-                    'mode.live',
-                    "Changes are applied directly to the document but can be highlighted via inline diffs. Ending a session will keep the changes."
-                )),
+                localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'mode.livePreview', "Changes are applied directly to the document and are highlighted visually via inline or side-by-side diffs. Ending a session will keep the changes."),
+                localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'mode.preview', "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."),
+                localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'mode.live', "Changes are applied directly to the document but can be highlighted via inline diffs. Ending a session will keep the changes."),
             ]
         },
         'inlineChat.showDiff': {
-            description: ( localize(
-                'showDiff',
-                "Enable/disable showing the diff when edits are generated. Works only with inlineChat.mode equal to live or livePreview."
-            )),
+            description: localizeWithPath('vs/workbench/contrib/inlineChat/common/inlineChat', 'showDiff', "Enable/disable showing the diff when edits are generated. Works only with inlineChat.mode equal to live or livePreview."),
             default: true,
             type: 'boolean'
         }

package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js

@@ -8,7 +8,7 @@ class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: { value: ( nls.localize('toggleKeybindingsLog', "Toggle Keyboard Shortcuts Troubleshooting")), original: 'Toggle Keyboard Shortcuts Troubleshooting' },
+            title: { value: nls.localizeWithPath('vs/workbench/contrib/keybindings/browser/keybindings.contribution', 'toggleKeybindingsLog', "Toggle Keyboard Shortcuts Troubleshooting"), original: 'Toggle Keyboard Shortcuts Troubleshooting' },
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -3,7 +3,7 @@ import { assertFn } from 'monaco-editor/esm/vs/base/common/assert.js';
 import { autorun } from 'monaco-editor/esm/vs/base/common/observable.js';
 import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
@@ -59,7 +59,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localize('name', "Merging: {0}", super.getName()));
+        return localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInput', 'name', "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -8,7 +8,7 @@ import { basename, isEqual } from 'monaco-editor/esm/vs/base/common/resources.js
 import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
 import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
 import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
@@ -101,29 +101,18 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany
-                ? ( localize(
-                'messageN',
-                'Do you want keep the merge result of {0} files?',
-                inputModels.length
-            ))
-                : ( localize(
-                'message1',
-                'Do you want keep the merge result of {0}?',
-                basename(inputModels[0].model.resultTextModel.uri)
-            ));
+                ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'messageN', 'Do you want keep the merge result of {0} files?', inputModels.length)
+                : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'message1', 'Do you want keep the merge result of {0}?', basename(inputModels[0].model.resultTextModel.uri));
             const hasUnhandledConflicts = ( inputModels.some((m) => m.model.hasUnhandledConflicts.get()));
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(
-                            { key: 'saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            "&&Save With Conflicts"
-                        )) :
-                        ( localize({ key: 'save', comment: ['&& denotes a mnemonic'] }, "&&Save")),
+                        localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'saveWithConflict', comment: ['&& denotes a mnemonic'] }, "&&Save With Conflicts") :
+                        localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'save', comment: ['&& denotes a mnemonic'] }, "&&Save"),
                     run: () => 0
                 },
                 {
-                    label: ( localize({ key: 'discard', comment: ['&& denotes a mnemonic'] }, "Do&&n't Save")),
+                    label: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'discard', comment: ['&& denotes a mnemonic'] }, "Do&&n't Save"),
                     run: () => 1
                 }
             ];
@@ -132,17 +121,11 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 message,
                 detail: hasUnhandledConflicts
                     ? isMany
-                        ? ( localize(
-                    'detailNConflicts',
-                    "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
-                ))
-                        : ( localize(
-                    'detail1Conflicts',
-                    "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                ))
+                        ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'detailNConflicts', "The files contain unhandled conflicts. The merge results will be lost if you don't save them.")
+                        : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'detail1Conflicts', "The file contains unhandled conflicts. The merge result will be lost if you don't save it.")
                     : isMany
-                        ? ( localize('detailN', "The merge results will be lost if you don't save them."))
-                        : ( localize('detail1', "The merge result will be lost if you don't save it.")),
+                        ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'detailN', "The merge results will be lost if you don't save them.")
+                        : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'detail1', "The merge result will be lost if you don't save it."),
                 buttons,
                 cancelButton: {
                     run: () => 2
@@ -167,15 +150,9 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize('saveTempFile.message', "Do you want to accept the merge result?")),
-                detail: ( localize(
-                    'saveTempFile.detail',
-                    "This will write the merge result to the original file and close the merge editor."
-                )),
-                primaryButton: ( localize(
-                    { key: 'acceptMerge', comment: ['&& denotes a mnemonic'] },
-                    '&&Accept Merge'
-                ))
+                message: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'saveTempFile.message', "Do you want to accept the merge result?"),
+                detail: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'saveTempFile.detail', "This will write the merge result to the original file and close the merge editor."),
+                primaryButton: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'acceptMerge', comment: ['&& denotes a mnemonic'] }, '&&Accept Merge')
             });
             if (confirmed) {
                 await this.accept();
@@ -200,7 +177,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize('merge-editor.source', "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'merge-editor.source', "Before Resolving Conflicts In Merge Editor")); }
     async createInputModel(args) {
         const store = ( new DisposableStore());
         let resultTextFileModel = undefined;
@@ -309,53 +286,27 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
         if (someDirty) {
             const message = isMany
-                ? ( localize(
-                'workspace.messageN',
-                'Do you want to save the changes you made to {0} files?',
-                inputModels.length
-            ))
-                : ( localize(
-                'workspace.message1',
-                'Do you want to save the changes you made to {0}?',
-                basename(inputModels[0].resultUri)
-            ));
+                ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.messageN', 'Do you want to save the changes you made to {0} files?', inputModels.length)
+                : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.message1', 'Do you want to save the changes you made to {0}?', basename(inputModels[0].resultUri));
             const { result } = await this._dialogService.prompt({
                 type: Severity.Info,
                 message,
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(
-                        'workspace.detailN.unhandled',
-                        "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
-                        : ( localize(
-                        'workspace.detail1.unhandled',
-                        "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
+                        ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detailN.unhandled', "The files contain unhandled conflicts. Your changes will be lost if you don't save them.")
+                        : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detail1.unhandled', "The file contains unhandled conflicts. Your changes will be lost if you don't save them.")
                     : isMany
-                        ? ( localize(
-                    'workspace.detailN.handled',
-                    "Your changes will be lost if you don't save them."
-                ))
-                        : ( localize(
-                    'workspace.detail1.handled',
-                    "Your changes will be lost if you don't save them."
-                )),
+                        ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detailN.handled', "Your changes will be lost if you don't save them.")
+                        : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detail1.handled', "Your changes will be lost if you don't save them."),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(
-                            { key: 'workspace.saveWithConflict', comment: ['&& denotes a mnemonic'] },
-                            '&&Save with Conflicts'
-                        ))
-                            : ( localize({ key: 'workspace.save', comment: ['&& denotes a mnemonic'] }, '&&Save')),
+                            ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'workspace.saveWithConflict', comment: ['&& denotes a mnemonic'] }, '&&Save with Conflicts')
+                            : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'workspace.save', comment: ['&& denotes a mnemonic'] }, '&&Save'),
                         run: () => 0
                     },
                     {
-                        label: ( localize(
-                            { key: 'workspace.doNotSave', comment: ['&& denotes a mnemonic'] },
-                            "Do&&n't Save"
-                        )),
+                        label: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'workspace.doNotSave', comment: ['&& denotes a mnemonic'] }, "Do&&n't Save"),
                         run: () => 1
                     }
                 ],
@@ -368,34 +319,17 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(
-                    'workspace.messageN.nonDirty',
-                    'Do you want to close {0} merge editors?',
-                    inputModels.length
-                ))
-                    : ( localize(
-                    'workspace.message1.nonDirty',
-                    'Do you want to close the merge editor for {0}?',
-                    basename(inputModels[0].resultUri)
-                )),
+                    ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.messageN.nonDirty', 'Do you want to close {0} merge editors?', inputModels.length)
+                    : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.message1.nonDirty', 'Do you want to close the merge editor for {0}?', basename(inputModels[0].resultUri)),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(
-                        'workspace.detailN.unhandled.nonDirty',
-                        "The files contain unhandled conflicts."
-                    ))
-                        : ( localize(
-                        'workspace.detail1.unhandled.nonDirty',
-                        "The file contains unhandled conflicts."
-                    ))
+                        ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detailN.unhandled.nonDirty', "The files contain unhandled conflicts.")
+                        : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'workspace.detail1.unhandled.nonDirty', "The file contains unhandled conflicts.")
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(
-                    { key: 'workspace.closeWithConflicts', comment: ['&& denotes a mnemonic'] },
-                    '&&Close with Conflicts'
-                ))
-                    : ( localize({ key: 'workspace.close', comment: ['&& denotes a mnemonic'] }, '&&Close')),
-                checkbox: { label: ( localize('noMoreWarn', "Don't ask again")) }
+                    ? localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'workspace.closeWithConflicts', comment: ['&& denotes a mnemonic'] }, '&&Close with Conflicts')
+                    : localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', { key: 'workspace.close', comment: ['&& denotes a mnemonic'] }, '&&Close'),
+                checkbox: { label: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel', 'noMoreWarn', "Don't ask again") }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -4,7 +4,7 @@ import { BugIndicatingError } from 'monaco-editor/esm/vs/base/common/errors.js';
 import { derived, waitForState, keepObserved, autorunHandleChanges, transaction, observableValue } from 'monaco-editor/esm/vs/base/common/observable.js';
 import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
 import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IUndoRedoService, UndoRedoGroup } from 'monaco-editor/esm/vs/platform/undoRedo/common/undoRedo.js';
 import { EditorModel } from '../../../../common/editor/editorModel.js';
 import { LineRange } from './lineRange.js';
@@ -362,7 +362,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: 0 ,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize('setInputHandled', "Set Input Handled")),
+            label: localizeWithPath('vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel', 'setInputHandled', "Set Input Handled"),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -571,7 +571,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize('undoMarkAsHandled', 'Undo Mark As Handled'));
+        this.label = localizeWithPath('vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel', 'undoMarkAsHandled', 'Undo Mark As Handled');
         this.type = 0 ;
     }
     redo() {

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,2 +1,44 @@
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+( new RawContextKey(
+ 'isMergeEditor',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'is', 'The editor is a merge editor') }
+));
+( new RawContextKey(
+ 'isMergeResultEditor',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'isr', 'The editor is a the result editor of a merge editor.') }
+));
+( new RawContextKey(
+ 'mergeEditorLayout',
+ 'mixed',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'editorLayout', 'The layout mode of a merge editor') }
+));
+( new RawContextKey(
+ 'mergeEditorShowBase',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showBase', 'If the merge editor shows the base version') }
+));
+( new RawContextKey(
+ 'mergeEditorShowBaseAtTop',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showBaseAtTop', 'If base should be shown at the top') }
+));
+( new RawContextKey(
+ 'mergeEditorShowNonConflictingChanges',
+ false,
+ { type: 'boolean', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'showNonConflictingChanges', 'If the merge editor shows non-conflicting changes') }
+));
+( new RawContextKey(
+ 'mergeEditorBaseUri',
+ '',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'baseUri', 'The uri of the baser of a merge editor') }
+));
+( new RawContextKey(
+ 'mergeEditorResultUri',
+ '',
+ { type: 'string', description: localizeWithPath('vs/workbench/contrib/mergeEditor/common/mergeEditor', 'resultUri', 'The uri of the result of a merge editor') }
+));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts };