@codingame/monaco-vscode-api 4.5.1 → 4.5.2

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

@@ -15,103 +15,52 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { Extensions } from '../../../common/configuration.js';
+const _moduleId = "vs/workbench/contrib/inlineChat/common/inlineChat";
 const INLINE_CHAT_ID = 'interactiveEditor';
 const INTERACTIVE_EDITOR_ACCESSIBILITY_HELP_ID = 'interactiveEditorAccessiblityHelp';
-const CTX_INLINE_CHAT_HAS_PROVIDER = ( new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatHasProvider',
-    "Whether a provider for interactive editors exists"
-))));
-const CTX_INLINE_CHAT_VISIBLE = ( new RawContextKey('inlineChatVisible', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatVisible',
-    "Whether the interactive editor input is visible"
-))));
-const CTX_INLINE_CHAT_FOCUSED = ( new RawContextKey('inlineChatFocused', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatFocused',
-    "Whether the interactive editor input is focused"
-))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatResponseFocused',
-    "Whether the interactive widget's response is focused"
-))));
-const CTX_INLINE_CHAT_EMPTY = ( new RawContextKey('inlineChatEmpty', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatEmpty',
-    "Whether the interactive editor input is empty"
-))));
-const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( new RawContextKey('inlineChatInnerCursorFirst', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatInnerCursorFirst',
+const CTX_INLINE_CHAT_HAS_PROVIDER = ( (new RawContextKey('inlineChatHasProvider', false, ( localizeWithPath(_moduleId, 0, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localizeWithPath(_moduleId, 1, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localizeWithPath(_moduleId, 2, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localizeWithPath(_moduleId, 3, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localizeWithPath(_moduleId, 4, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localizeWithPath(
+    _moduleId,
+    5,
     "Whether the cursor of the iteractive editor input is on the first line"
-))));
-const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( new RawContextKey('inlineChatInnerCursorLast', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatInnerCursorLast',
+)))));
+const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localizeWithPath(
+    _moduleId,
+    6,
     "Whether the cursor of the iteractive editor input is on the last line"
-))));
-const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatOuterCursorPosition',
+)))));
+const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localizeWithPath(
+    _moduleId,
+    9,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
-))));
-const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( new RawContextKey('inlineChatHasStashedSession', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatHasStashedSession',
+)))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localizeWithPath(
+    _moduleId,
+    11,
     "Whether interactive editor has kept a session for quick restore"
-))));
-const CTX_INLINE_CHAT_LAST_RESPONSE_TYPE = ( new RawContextKey('inlineChatLastResponseType', undefined, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatResponseType',
+)))));
+const CTX_INLINE_CHAT_LAST_RESPONSE_TYPE = ( (new RawContextKey('inlineChatLastResponseType', undefined, ( localizeWithPath(
+    _moduleId,
+    12,
     "What type was the last response of the current interactive editor session"
-))));
-const CTX_INLINE_CHAT_RESPONSE_TYPES = ( new RawContextKey(
+)))));
+const CTX_INLINE_CHAT_RESPONSE_TYPES = ( (new RawContextKey(
     'inlineChatResponseTypes',
     "empty" ,
-    ( localizeWithPath(
-        'vs/workbench/contrib/inlineChat/common/inlineChat',
-        'inlineChatResponseTypes',
-        "What type was the responses have been receieved"
-    ))
-));
-const CTX_INLINE_CHAT_DID_EDIT = ( new RawContextKey('inlineChatDidEdit', undefined, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatDidEdit',
-    "Whether interactive editor did change any code"
-))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatUserDidEdit',
-    "Whether the user did changes ontop of the inline chat"
-))));
-const CTX_INLINE_CHAT_LAST_FEEDBACK = ( new RawContextKey('inlineChatLastFeedbackKind', '', ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatLastFeedbackKind',
-    "The last kind of feedback that was provided"
-))));
-const CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING = ( new RawContextKey('inlineChatSupportIssueReporting', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatSupportIssueReporting',
-    "Whether the interactive editor supports issue reporting"
-))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatDocumentChanged',
-    "Whether the document has changed concurrently"
-))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatChangeHasDiff',
-    "Whether the current change supports showing a diff"
-))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChatChangeShowsDiff',
-    "Whether the current change showing a diff"
-))));
-const CTX_INLINE_CHAT_EDIT_MODE = ( new RawContextKey('config.inlineChat.mode', "live" ));
+    ( localizeWithPath(_moduleId, 13, "What type was the responses have been receieved"))
+)));
+const CTX_INLINE_CHAT_DID_EDIT = ( (new RawContextKey('inlineChatDidEdit', undefined, ( localizeWithPath(_moduleId, 14, "Whether interactive editor did change any code")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localizeWithPath(_moduleId, 15, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_LAST_FEEDBACK = ( (new RawContextKey('inlineChatLastFeedbackKind', '', ( localizeWithPath(_moduleId, 16, "The last kind of feedback that was provided")))));
+const CTX_INLINE_CHAT_SUPPORT_ISSUE_REPORTING = ( (new RawContextKey('inlineChatSupportIssueReporting', false, ( localizeWithPath(_moduleId, 17, "Whether the interactive editor supports issue reporting")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localizeWithPath(_moduleId, 18, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localizeWithPath(_moduleId, 19, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localizeWithPath(_moduleId, 20, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', "live" )));
 const ACTION_ACCEPT_CHANGES = 'inlineChat.acceptChanges';
 const ACTION_REGENERATE_RESPONSE = 'inlineChat.regenerate';
 const ACTION_VIEW_IN_CHAT = 'inlineChat.viewInChat';
@@ -120,78 +69,54 @@ const MENU_INLINE_CHAT_WIDGET = MenuId.for('inlineChatWidget');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
 const MENU_INLINE_CHAT_WIDGET_FEEDBACK = MenuId.for('inlineChatWidget.feedback');
 const MENU_INLINE_CHAT_WIDGET_DISCARD = MenuId.for('inlineChatWidget.undo');
-const inlineChatBackground = 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"
-)));
+const inlineChatBackground = registerColor('inlineChat.background', { dark: editorWidgetBackground, light: editorWidgetBackground, hcDark: editorWidgetBackground, hcLight: editorWidgetBackground }, ( localizeWithPath(_moduleId, 21, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 22, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', { dark: widgetShadow, light: widgetShadow, hcDark: widgetShadow, hcLight: widgetShadow }, ( localizeWithPath(_moduleId, 23, "Shadow color of the interactive editor widget")));
 const inlineChatRegionHighlight = registerColor('inlineChat.regionHighlight', { dark: editorHoverHighlight, light: editorHoverHighlight, hcDark: editorHoverHighlight, hcLight: editorHoverHighlight }, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'inlineChat.regionHighlight',
+    _moduleId,
+    24,
     "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.border', { dark: editorWidgetBorder, light: editorWidgetBorder, hcDark: editorWidgetBorder, hcLight: editorWidgetBorder }, ( localizeWithPath(_moduleId, 25, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', { dark: focusBorder, light: focusBorder, hcDark: focusBorder, hcLight: focusBorder }, ( localizeWithPath(_moduleId, 26, "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',
+    _moduleId,
+    27,
     "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',
+registerColor('inlineChatInput.background', { dark: inputBackground, light: inputBackground, hcDark: inputBackground, hcLight: inputBackground }, ( localizeWithPath(_moduleId, 28, "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(
+    _moduleId,
+    29,
     "Background color of inserted text in the interactive editor input"
 )));
-const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( transparent(diffInserted, 0.6)), light: ( transparent(diffInserted, 0.8)), hcDark: ( transparent(diffInserted, 0.6)), hcLight: ( transparent(diffInserted, 0.8)) }, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'editorOverviewRuler.inlineChatInserted',
+const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localizeWithPath(
+    _moduleId,
+    30,
     'Overview ruler marker color for inline chat inserted content.'
 )));
-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',
+registerColor('inlineChatDiff.removed', { dark: ( (transparent(diffRemoved, .5))), light: ( (transparent(diffRemoved, .5))), hcDark: ( (transparent(diffRemoved, .5))), hcLight: ( (transparent(diffRemoved, .5))) }, ( localizeWithPath(
+    _moduleId,
+    31,
     "Background color of removed text in the interactive editor input"
 )));
-registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(diffRemoved, 0.6)), light: ( transparent(diffRemoved, 0.8)), hcDark: ( transparent(diffRemoved, 0.6)), hcLight: ( transparent(diffRemoved, 0.8)) }, ( localizeWithPath(
-    'vs/workbench/contrib/inlineChat/common/inlineChat',
-    'editorOverviewRuler.inlineChatRemoved',
+registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localizeWithPath(
+    _moduleId,
+    32,
     'Overview ruler marker color for inline chat removed content.'
 )));
-( Registry.as(Extensions.ConfigurationMigration)).registerConfigurationMigrations([{
+( (Registry.as(Extensions.ConfigurationMigration))).registerConfigurationMigrations([{
         key: 'interactiveEditor.editMode', migrateFn: (value) => {
             return [['inlineChat.mode', { value: value }]];
         }
     }]);
-( Registry.as(Extensions$1.Configuration)).registerConfiguration({
+( (Registry.as(Extensions$1.Configuration))).registerConfiguration({
     id: 'editor',
     properties: {
         ["inlineChat.mode" ]: {
             description: ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'mode',
+                _moduleId,
+                33,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: "live" ,
@@ -199,13 +124,13 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
             enum: ["live" , "preview" ],
             markdownEnumDescriptions: [
                 ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'mode.live',
+                    _moduleId,
+                    34,
                     "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
                 ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'mode.preview',
+                    _moduleId,
+                    35,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -213,26 +138,22 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
         },
         ["inlineChat.finishOnType" ]: {
             description: ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'finishOnType',
+                _moduleId,
+                36,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
-            description: ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'acceptedOrDiscardBeforeSave',
-                "Whether pending inline chat sessions prevent saving."
-            )),
+            description: ( localizeWithPath(_moduleId, 37, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         ["inlineChat.holdToSpeech" ]: {
             description: ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'holdToSpeech',
+                _moduleId,
+                38,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -240,8 +161,8 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
         },
         ["inlineChat.accessibleDiffView" ]: {
             description: ( localizeWithPath(
-                'vs/workbench/contrib/inlineChat/common/inlineChat',
-                'accessibleDiffView',
+                _moduleId,
+                39,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -249,20 +170,12 @@ registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( transparent(dif
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'accessibleDiffView.auto',
+                    _moduleId,
+                    40,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'accessibleDiffView.on',
-                    "The accessible diff viewer is always enabled."
-                )),
-                ( localizeWithPath(
-                    'vs/workbench/contrib/inlineChat/common/inlineChat',
-                    'accessibleDiffView.off',
-                    "The accessible diff viewer is never enabled."
-                )),
+                ( localizeWithPath(_moduleId, 41, "The accessible diff viewer is always enabled.")),
+                ( localizeWithPath(_moduleId, 42, "The accessible diff viewer is never enabled.")),
             ],
         }
     }

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

@@ -21,6 +21,7 @@ import { IEditorService } from '../../../services/editor/common/editorService.se
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 var MergeEditorInput_1;
+const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditorInput";
 class MergeEditorInputData {
     constructor(uri, title, detail, description) {
         this.uri = uri;
@@ -47,7 +48,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
             showConfirm: () => this._inputModel?.shouldConfirmClose() ?? false,
             confirm: async (editors) => {
                 assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput_1));
-                const inputModels = ( editors.map(e => e.editor._inputModel)).filter(isDefined);
+                const inputModels = ( (editors.map(e => e.editor._inputModel))).filter(isDefined);
                 return await this._inputModel.confirmClose(inputModels);
             },
         };
@@ -72,12 +73,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localizeWithPath(
-            'vs/workbench/contrib/mergeEditor/browser/mergeEditorInput',
-            'name',
-            "Merging: {0}",
-            super.getName()
-        ));
+        return ( localizeWithPath(_moduleId, 0, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {
@@ -143,15 +139,15 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         this._inputModel?.model.setLanguageId(languageId, source);
     }
 };
-MergeEditorInput = MergeEditorInput_1 = ( __decorate([
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, ITextFileService)),
-    ( __param(7, ILabelService)),
-    ( __param(8, IFileService)),
-    ( __param(9, IConfigurationService)),
-    ( __param(10, IFilesConfigurationService)),
-    ( __param(11, ITextResourceConfigurationService)),
-    ( __param(12, ICustomEditorLabelService))
-], MergeEditorInput));
+MergeEditorInput = MergeEditorInput_1 = ( (__decorate([
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IEditorService))),
+    ( (__param(6, ITextFileService))),
+    ( (__param(7, ILabelService))),
+    ( (__param(8, IFileService))),
+    ( (__param(9, IConfigurationService))),
+    ( (__param(10, IFilesConfigurationService))),
+    ( (__param(11, ITextResourceConfigurationService))),
+    ( (__param(12, ICustomEditorLabelService)))
+], MergeEditorInput)));
 export { MergeEditorInput, MergeEditorInputData };