@codingame/monaco-vscode-api 10.1.4 → 11.0.0

package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js

@@ -1,11 +1,12 @@
 import { hookDomPurifyHrefAndSrcSanitizer, basicMarkupHtmlTags } from '../../../../base/browser/dom.js';
-import { sanitize as sanitize$1 } from '../../../../base/browser/dompurify/dompurify.js';
+import purify from '../../../../base/browser/dompurify/dompurify.js';
 import { allowedMarkdownAttr } from '../../../../base/browser/markdownRenderer.js';
 import { Marked } from 'marked';
 import { Schemas } from '../../../../base/common/network.js';
 import { escape } from '../../../../base/common/strings.js';
 import { tokenizeToString } from '../../../../editor/common/languages/textToHtmlTokenizer.js';
 import { markedGfmHeadingIdPlugin } from './markedGfmHeadingIdPlugin.js';
+
 const DEFAULT_MARKDOWN_STYLES = `
 body {
 	padding: 10px 20px;
@@ -151,7 +152,7 @@ const allowedProtocols = [Schemas.http, Schemas.https, Schemas.command];
 function sanitize(documentContent, allowUnknownProtocols) {
     const hook = hookDomPurifyHrefAndSrcSanitizer(allowedProtocols, true);
     try {
-        return sanitize$1(documentContent, {
+        return purify.sanitize(documentContent, {
             ...{
                 ALLOWED_TAGS: [
                     ...basicMarkupHtmlTags,
@@ -273,4 +274,5 @@ var MarkedHighlight;
         return html;
     }
 })(MarkedHighlight || (MarkedHighlight = {})));
+
 export { DEFAULT_MARKDOWN_STYLES, renderMarkdownDocument };

package/vscode/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.js

@@ -36,4 +36,5 @@ function markedGfmHeadingIdPlugin({ prefix = '', globalSlugs = false } = {}) {
         },
     };
 }
+
 export { markedGfmHeadingIdPlugin };

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

@@ -1,4 +1,5 @@
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+
 var Markers;
 ( (function(Markers) {
     Markers.MARKERS_CONTAINER_ID = 'workbench.panel.markers';
@@ -31,4 +32,5 @@ var MarkersContextKeys;
     MarkersContextKeys.ShowActiveFileFilterContextKey = ( new RawContextKey('problems.filter.activeFile', false));
     MarkersContextKeys.ShowExcludedFilesFilterContextKey = ( new RawContextKey('problems.filter.excludedFiles', true));
 })(MarkersContextKeys || (MarkersContextKeys = {})));
+
 export { Markers, MarkersContextKeys };

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

@@ -23,6 +23,7 @@ import { MergeEditorTelemetry } from './telemetry.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+
 var MergeEditorInput_1;
 class MergeEditorInputData {
     constructor(uri, title, detail, description) {
@@ -75,7 +76,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localize(8131, "Merging: {0}", super.getName()));
+        return ( localize(7773, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {
@@ -152,4 +153,5 @@ MergeEditorInput = MergeEditorInput_1 = ( (__decorate([
     ( (__param(11, ITextResourceConfigurationService))),
     ( (__param(12, ICustomEditorLabelService)))
 ], MergeEditorInput)));
+
 export { MergeEditorInput, MergeEditorInputData };

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

@@ -25,6 +25,7 @@ import { MergeEditorModel } from './model/mergeEditorModel.js';
 import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
+
 var WorkspaceMergeEditorModeFactory_1;
 let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
     constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, _modelService) {
@@ -106,12 +107,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10813,
+                10882,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10814,
+                10883,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -119,12 +120,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10815, "&&Save With Conflicts")) :
-                        ( localize(10816, "&&Save")),
+                        ( localize(10884, "&&Save With Conflicts")) :
+                        ( localize(10885, "&&Save")),
                     run: () => 0
                 },
                 {
-                    label: ( localize(10817, "Do&&n't Save")),
+                    label: ( localize(10886, "Do&&n't Save")),
                     run: () => 1
                 }
             ];
@@ -134,16 +135,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10818,
+                    10887,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10819,
+                    10888,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10820, "The merge results will be lost if you don't save them."))
-                        : ( localize(10821, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10889, "The merge results will be lost if you don't save them."))
+                        : ( localize(10890, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => 2
@@ -168,12 +169,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10822, "Do you want to accept the merge result?")),
+                message: ( localize(10891, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10823,
+                    10892,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10824, '&&Accept Merge'))
+                primaryButton: ( localize(10893, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -198,7 +199,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10825, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10894, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -308,12 +309,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10826,
+                10895,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10827,
+                10896,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -323,25 +324,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10828,
+                        10897,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10829,
+                        10898,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10830, "Your changes will be lost if you don't save them."))
-                        : ( localize(10831, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10899, "Your changes will be lost if you don't save them."))
+                        : ( localize(10900, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10832, '&&Save with Conflicts'))
-                            : ( localize(10833, '&&Save')),
+                            ? ( localize(10901, '&&Save with Conflicts'))
+                            : ( localize(10902, '&&Save')),
                         run: () => 0
                     },
                     {
-                        label: ( localize(10834, "Do&&n't Save")),
+                        label: ( localize(10903, "Do&&n't Save")),
                         run: () => 1
                     }
                 ],
@@ -354,21 +355,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10835, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10904, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10836,
+                    10905,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10837, "The files contain unhandled conflicts."))
-                        : ( localize(10838, "The file contains unhandled conflicts."))
+                        ? ( localize(10906, "The files contain unhandled conflicts."))
+                        : ( localize(10907, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10839, '&&Close with Conflicts'))
-                    : ( localize(10840, '&&Close')),
-                checkbox: { label: ( localize(10841, "Do not ask me again")) }
+                    ? ( localize(10908, '&&Close with Conflicts'))
+                    : ( localize(10909, '&&Close')),
+                checkbox: { label: ( localize(10910, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
@@ -394,4 +395,5 @@ async function toInputData(data, textModelService, store) {
         detail: data.detail,
     };
 }
+
 export { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -8,8 +8,10 @@ import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/observableInternal/utils.js';
 import '../model/lineRange.js';
 import '../../../../../nls.js';
+
 const conflictMarkers = {
     start: '<<<<<<<',
     end: '>>>>>>>',
 };
+
 export { conflictMarkers };

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

@@ -5,6 +5,7 @@ import { IConfigurationService } from '../../../../../platform/configuration/com
 import { LineRange } from './lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from './mapping.js';
 import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
+
 let MergeDiffComputer = class MergeDiffComputer {
     constructor(editorWorkerService, configurationService) {
         this.editorWorkerService = editorWorkerService;
@@ -87,4 +88,5 @@ function toLineRange(range) {
 function toRangeMapping(mapping) {
     return ( new RangeMapping(mapping.originalRange, mapping.modifiedRange));
 }
+
 export { MergeDiffComputer, toLineRange, toRangeMapping };

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

@@ -1,5 +1,6 @@
 import { equals } from '../../../../../base/common/arrays.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+
 class LineRangeEdit {
     constructor(range, newLines) {
         this.range = range;
@@ -51,4 +52,5 @@ class LineEdits {
         }));
     }
 }
+
 export { LineEdits, LineRangeEdit, RangeEdit };

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

@@ -1,6 +1,7 @@
 import { compareBy, numberComparator } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+
 class LineRange {
     static { this.compareByStart = compareBy(l => l.startLineNumber, numberComparator); }
     static join(ranges) {
@@ -105,4 +106,5 @@ class LineRange {
             && lineRange.startLineNumber <= this.endLineNumberExclusive;
     }
 }
+
 export { LineRange };

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

@@ -7,6 +7,7 @@ import { concatArrays } from '../utils.js';
 import { LineRangeEdit } from './editing.js';
 import { LineRange } from './lineRange.js';
 import { rangeIsBeforeOrTouching, rangeContainsPosition, lengthBetweenPositions, addLength } from './rangeUtils.js';
+
 class LineRangeMapping {
     static join(mappings) {
         return mappings.reduce((acc, cur) => acc ? acc.join(cur) : cur, undefined);
@@ -255,4 +256,5 @@ class DocumentRangeMap {
         return ( new DocumentRangeMap(( this.rangeMappings.map(m => m.reverse())), this.outputLineCount));
     }
 }
+
 export { DetailedLineRangeMapping, DocumentLineRangeMap, DocumentRangeMap, LineRangeMapping, MappingAlignment, RangeMapping };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { equals, CompareResult } from '../../../../../base/common/arrays.js';
+import { CompareResult, equals } from '../../../../../base/common/arrays.js';
 import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { transaction, observableValue } from '../../../../../base/common/observableInternal/base.js';
 import '../../../../../base/common/event.js';
@@ -19,6 +19,7 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
 import { TextModelDiffs } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from './modifiedBaseRange.js';
+
 let MergeEditorModel = class MergeEditorModel extends EditorModel {
     constructor(base, input1, input2, resultTextModel, diffComputer, options, telemetry, languageService, undoRedoService) {
         super();
@@ -387,7 +388,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: 0 ,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localize(11587, "Set Input Handled")),
+            label: ( localize(11711, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -596,7 +597,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localize(11588, 'Undo Mark As Handled'));
+        this.label = ( localize(11712, 'Undo Mark As Handled'));
         this.type = 0 ;
     }
     redo() {
@@ -628,4 +629,5 @@ class MarkAsHandledUndoRedoElement {
         });
     }
 }
+
 export { MergeEditorModel };

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

@@ -3,9 +3,10 @@ import { BugIndicatingError } from '../../../../../base/common/errors.js';
 import { splitLines } from '../../../../../base/common/strings.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
-import { LineRangeEdit, RangeEdit } from './editing.js';
+import { RangeEdit, LineRangeEdit } from './editing.js';
 import { MappingAlignment, DetailedLineRangeMapping } from './mapping.js';
 import { concatArrays } from '../utils.js';
+
 class ModifiedBaseRange {
     static fromDiffs(diffs1, diffs2, baseTextModel, input1TextModel, input2TextModel) {
         const alignments = MappingAlignment.compute(diffs1, diffs2);
@@ -304,4 +305,5 @@ var ModifiedBaseRangeState;
     ModifiedBaseRangeState.base = ( new ModifiedBaseRangeStateBase());
     ModifiedBaseRangeState.unrecognized = ( new ModifiedBaseRangeStateUnrecognized());
 })(ModifiedBaseRangeState || (ModifiedBaseRangeState = {})));
+
 export { AbstractModifiedBaseRangeState, ModifiedBaseRange, ModifiedBaseRangeState, ModifiedBaseRangeStateBase, ModifiedBaseRangeStateBoth, ModifiedBaseRangeStateInput1, ModifiedBaseRangeStateInput2, ModifiedBaseRangeStateKind, ModifiedBaseRangeStateUnrecognized, getOtherInputNumber };

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

@@ -1,5 +1,6 @@
 import { Position } from '../../../../../editor/common/core/position.js';
 import { TextLength } from '../../../../../editor/common/core/textLength.js';
+
 function rangeContainsPosition(range, position) {
     if (position.lineNumber < range.startLineNumber || position.lineNumber > range.endLineNumber) {
         return false;
@@ -41,4 +42,5 @@ function rangeIsBeforeOrTouching(range, other) {
         (range.endLineNumber === other.startLineNumber &&
             range.endColumn <= other.startColumn));
 }
+
 export { addLength, lengthBetweenPositions, lengthOfRange, rangeContainsPosition, rangeIsBeforeOrTouching };

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

@@ -11,6 +11,7 @@ import { autorun } from '../../../../../base/common/observableInternal/autorun.j
 import '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
 import { observableSignal } from '../../../../../base/common/observableInternal/utils.js';
+
 class TextModelDiffs extends Disposable {
     get isApplyingChange() {
         return this._barrier.isOccupied;
@@ -167,4 +168,5 @@ class TextModelDiffs extends Disposable {
         return LineRange.fromLineNumbers(start, endExclusive);
     }
 }
+
 export { TextModelDiffs };

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+
 let MergeEditorTelemetry = class MergeEditorTelemetry {
     constructor(telemetryService) {
         this.telemetryService = telemetryService;
@@ -75,4 +76,5 @@ let MergeEditorTelemetry = class MergeEditorTelemetry {
 MergeEditorTelemetry = ( __decorate([
     ( __param(0, ITelemetryService))
 ], MergeEditorTelemetry));
+
 export { MergeEditorTelemetry };

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

@@ -1,13 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { CompareResult, ArrayQueue } from '../../../../base/common/arrays.js';
+import { ArrayQueue, CompareResult } from '../../../../base/common/arrays.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/event.js';
 import { autorunOpts } from '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/cancellation.js';
 import '../../../../base/common/observableInternal/utils.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+
 function setStyle(element, style) {
     Object.entries(style).forEach(([key, value]) => {
         element.style.setProperty(key, toSize(value));
@@ -117,4 +118,5 @@ let PersistentStore = class PersistentStore {
 PersistentStore = ( __decorate([
     ( __param(1, IStorageService))
 ], PersistentStore));
+
 export { PersistentStore, applyObservableDecorations, concatArrays, deepMerge, join, leftJoin, setFields, setStyle, thenIfNotDisposed };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js

@@ -13,6 +13,7 @@ import { EDITOR_FONT_DEFAULTS } from '../../../../../editor/common/config/editor
 import { localize } from '../../../../../nls.js';
 import { ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from '../model/modifiedBaseRange.js';
 import { FixedZoneWidget } from './fixedZoneWidget.js';
+
 class ConflictActionsFactory extends Disposable {
     constructor(_editor) {
         super();
@@ -46,7 +47,7 @@ class ConflictActionsFactory extends Disposable {
         this._editor.getContainerDomNode().style?.setProperty(fontFeaturesVar, editorFontInfo.fontFeatureSettings);
     }
     _getLayoutInfo() {
-        const lineHeightFactor = Math.max(1.3, this._editor.getOption(69 ) / this._editor.getOption(54 ));
+        const lineHeightFactor = Math.max(1.3, this._editor.getOption(68 ) / this._editor.getOption(54 ));
         let fontSize = this._editor.getOption(19 );
         if (!fontSize || fontSize < 5) {
             fontSize = (this._editor.getOption(54 ) * .9) | 0;
@@ -85,15 +86,15 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(11472, "Manual Resolution")),
-                    tooltip: ( localize(11473, "This conflict has been resolved manually.")),
+                    text: ( localize(11590, "Manual Resolution")),
+                    tooltip: ( localize(11591, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(11474, 'No Changes Accepted')),
+                    text: ( localize(11592, 'No Changes Accepted')),
                     tooltip: ( localize(
-                        11475,
+                        11593,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -115,20 +116,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11594, 'Remove {0}', model.input1.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(11477, 'Remove {0} from the result document.', model.input1.title))));
+                }, ( localize(11595, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11594, 'Remove {0}', model.input2.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(11477, 'Remove {0} from the result document.', model.input2.title))));
+                }, ( localize(11595, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -136,13 +137,13 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11478, 'Reset to base')), async () => {
+                result.push(command(( localize(11596, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    11479,
+                    11597,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -174,16 +175,16 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(11480, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11598, "Accept {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11481, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11599, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localize(11482, "Accept Combination ({0} First)", inputData.title))
-                            : ( localize(11483, "Accept Combination"));
+                            ? ( localize(11600, "Accept Combination ({0} First)", inputData.title))
+                            : ( localize(11601, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -192,36 +193,36 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11484,
+                            11602,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localize(11485, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11603, "Append {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11486, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11604, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11487, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11605, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11484,
+                            11602,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11488, 'Ignore')), async () => {
+                    result.push(command(( localize(11606, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(11489, "Don't take this side of the conflict."))));
+                    }, ( localize(11607, "Don't take this side of the conflict."))));
                 }
             }
             return result;
@@ -267,4 +268,5 @@ class ActionsContentWidget extends FixedZoneWidget {
         reset(this._domNode, ...children);
     }
 }
+
 export { ActionsSource, ConflictActionsFactory };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js

@@ -1,6 +1,7 @@
 import { h } from '../../../../../base/browser/dom.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { Event } from '../../../../../base/common/event.js';
+
 class FixedZoneWidget extends Disposable {
     static { this.counter = 0; }
     constructor(editor, viewZoneAccessor, afterLineNumber, height, viewZoneIdsToCleanUp) {
@@ -37,4 +38,5 @@ class FixedZoneWidget extends Disposable {
         });
     }
 }
+
 export { FixedZoneWidget };