@codingame/monaco-vscode-api 24.3.0 → 25.0.0

package/vscode/src/vs/editor/browser/observableCodeEditor.js

@@ -1,5 +1,5 @@
 
-import { equalsIfDefined, itemsEquals } from '../../base/common/equals.js';
+import { equalsIfDefinedC, arrayEqualsC } from '../../base/common/equals.js';
 import { Disposable, DisposableStore, toDisposable } from '../../base/common/lifecycle.js';
 import '../../base/common/observableInternal/index.js';
 import { EditorOption } from '../common/config/editorOptions.js';
@@ -11,7 +11,7 @@ import { ContentWidgetPositionPreference } from './editorBrowser.js';
 import { Point } from '../common/core/2d/point.js';
 import { createElement } from '../../base/browser/dom.js';
 import { TransactionImpl } from '../../base/common/observableInternal/transaction.js';
-import { observableFromEvent } from '../../base/common/observableInternal/observables/observableFromEvent.js';
+import { observableFromEventOpts, observableFromEvent } from '../../base/common/observableInternal/observables/observableFromEvent.js';
 import { derivedOpts, derivedWithSetter, derived } from '../../base/common/observableInternal/observables/derived.js';
 import { observableSignalFromEvent } from '../../base/common/observableInternal/observables/observableSignalFromEvent.js';
 import { DebugLocation } from '../../base/common/observableInternal/debugLocation.js';
@@ -63,13 +63,13 @@ class ObservableCodeEditor extends Disposable {
         this._currentTransaction = undefined;
         this._model = observableValue(this, this.editor.getModel());
         this.model = this._model;
-        this.isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
+        this.isReadonly = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
         this._versionId = observableValueOpts({ owner: this, lazy: true }, this.editor.getModel()?.getVersionId() ?? null);
         this.versionId = this._versionId;
-        this._selections = observableValueOpts({ owner: this, equalsFn: equalsIfDefined(itemsEquals(Selection.selectionsEqual)), lazy: true }, this.editor.getSelections() ?? null);
+        this._selections = observableValueOpts({ owner: this, equalsFn: equalsIfDefinedC(arrayEqualsC(Selection.selectionsEqual)), lazy: true }, this.editor.getSelections() ?? null);
         this.selections = this._selections;
-        this.positions = derivedOpts({ owner: this, equalsFn: equalsIfDefined(itemsEquals(Position.equals)) }, reader => this.selections.read(reader)?.map(s => s.getStartPosition()) ?? null);
-        this.isFocused = observableFromEvent(this, e => {
+        this.positions = derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(arrayEqualsC(Position.equals)) }, reader => this.selections.read(reader)?.map(s => s.getStartPosition()) ?? null);
+        this.isFocused = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
             const d1 = this.editor.onDidFocusEditorWidget(e);
             const d2 = this.editor.onDidBlurEditorWidget(e);
             return {
@@ -79,7 +79,7 @@ class ObservableCodeEditor extends Disposable {
                 }
             };
         }, () => this.editor.hasWidgetFocus());
-        this.isTextFocused = observableFromEvent(this, e => {
+        this.isTextFocused = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
             const d1 = this.editor.onDidFocusEditorText(e);
             const d2 = this.editor.onDidBlurEditorText(e);
             return {
@@ -89,7 +89,7 @@ class ObservableCodeEditor extends Disposable {
                 }
             };
         }, () => this.editor.hasTextFocus());
-        this.inComposition = observableFromEvent(this, e => {
+        this.inComposition = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, e => {
             const d1 = this.editor.onDidCompositionStart(() => {
                 e(undefined);
             });
@@ -112,22 +112,22 @@ class ObservableCodeEditor extends Disposable {
             }
         });
         this.valueIsEmpty = derived(this, reader => { this.versionId.read(reader); return this.editor.getModel()?.getValueLength() === 0; });
-        this.cursorSelection = derivedOpts({ owner: this, equalsFn: equalsIfDefined(Selection.selectionsEqual) }, reader => this.selections.read(reader)?.[0] ?? null);
+        this.cursorSelection = derivedOpts({ owner: this, equalsFn: equalsIfDefinedC(Selection.selectionsEqual) }, reader => this.selections.read(reader)?.[0] ?? null);
         this.cursorPosition = derivedOpts({ owner: this, equalsFn: Position.equals }, reader => this.selections.read(reader)?.[0]?.getPosition() ?? null);
         this.cursorLineNumber = derived(this, reader => this.cursorPosition.read(reader)?.lineNumber ?? null);
         this.onDidType = observableSignal(this);
         this.onDidPaste = observableSignal(this);
-        this.scrollTop = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollTop());
-        this.scrollLeft = observableFromEvent(this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
-        this.layoutInfo = observableFromEvent(this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
+        this.scrollTop = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidScrollChange, () => this.editor.getScrollTop());
+        this.scrollLeft = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidScrollChange, () => this.editor.getScrollLeft());
+        this.layoutInfo = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidLayoutChange, () => this.editor.getLayoutInfo());
         this.layoutInfoContentLeft = ( this.layoutInfo.map(l => l.contentLeft));
         this.layoutInfoDecorationsLeft = ( this.layoutInfo.map(l => l.decorationsLeft));
         this.layoutInfoWidth = ( this.layoutInfo.map(l => l.width));
         this.layoutInfoHeight = ( this.layoutInfo.map(l => l.height));
         this.layoutInfoMinimap = ( this.layoutInfo.map(l => l.minimap));
         this.layoutInfoVerticalScrollbarWidth = ( this.layoutInfo.map(l => l.verticalScrollbarWidth));
-        this.contentWidth = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
-        this.contentHeight = observableFromEvent(this.editor.onDidContentSizeChange, () => this.editor.getContentHeight());
+        this.contentWidth = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidContentSizeChange, () => this.editor.getContentWidth());
+        this.contentHeight = observableFromEventOpts({ owner: this, getTransaction: () => this._currentTransaction }, this.editor.onDidContentSizeChange, () => this.editor.getContentHeight());
         this._onDidChangeViewZones = observableSignalFromEvent(this, this.editor.onDidChangeViewZones);
         this._onDidHiddenAreasChanged = observableSignalFromEvent(this, this.editor.onDidChangeHiddenAreas);
         this._onDidLineHeightChanged = observableSignalFromEvent(this, this.editor.onDidChangeLineHeight);
@@ -190,6 +190,15 @@ class ObservableCodeEditor extends Disposable {
             return this.editor.getDomNode();
         });
     }
+    transaction(cb) {
+        this._beginUpdate();
+        try {
+            return cb(this._currentTransaction);
+        }
+        finally {
+            this._endUpdate();
+        }
+    }
     forceUpdate(cb) {
         this._beginUpdate();
         try {
@@ -302,7 +311,7 @@ class ObservableCodeEditor extends Disposable {
     }
     observePosition(position, store) {
         let pos = position.get();
-        const result = observableValueOpts({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefined(Point.equals) }, ( new Point(0, 0)));
+        const result = observableValueOpts({ owner: this, debugName: () => `topLeftOfPosition${pos?.toString()}`, equalsFn: equalsIfDefinedC(Point.equals) }, ( new Point(0, 0)));
         const contentWidgetId = `observablePositionWidget` + (this._widgetCounter++);
         const domNode = createElement('div');
         const w = {

package/vscode/src/vs/editor/browser/services/editorWorkerService.js

@@ -63,7 +63,8 @@ let EditorWorkerService = class EditorWorkerService extends Disposable {
             configurationService,
             this._modelService,
             this._languageConfigurationService,
-            this._logService
+            this._logService,
+            languageFeaturesService
         ))));
     }
     dispose() {
@@ -195,9 +196,10 @@ EditorWorkerService = ( __decorate([
     ( __param(5, IWebWorkerService))
 ], EditorWorkerService));
 class WordBasedCompletionItemProvider {
-    constructor(workerManager, configurationService, modelService, languageConfigurationService, logService) {
+    constructor(workerManager, configurationService, modelService, languageConfigurationService, logService, languageFeaturesService) {
         this.languageConfigurationService = languageConfigurationService;
         this.logService = logService;
+        this.languageFeaturesService = languageFeaturesService;
         this._debugDisplayName = 'wordbasedCompletions';
         this._workerManager = workerManager;
         this._configurationService = configurationService;
@@ -208,6 +210,9 @@ class WordBasedCompletionItemProvider {
         if (config.wordBasedSuggestions === 'off') {
             return undefined;
         }
+        if (config.wordBasedSuggestions === 'offWithInlineSuggestions' && ( this.languageFeaturesService.inlineCompletionsProvider.has(model))) {
+            return undefined;
+        }
         const models = [];
         if (config.wordBasedSuggestions === 'currentDocument') {
             if (canSyncModel(this._modelService, model.uri)) {

package/vscode/src/vs/editor/browser/services/inlineCompletionsService.js

@@ -16,7 +16,7 @@ import { ITelemetryService } from '../../../platform/telemetry/common/telemetry.
 import { IInlineCompletionsService } from './inlineCompletionsService.service.js';
 
 var InlineCompletionsService_1;
-const InlineCompletionsSnoozing = ( new RawContextKey('inlineCompletions.snoozed', false, ( localize(145, "Whether inline completions are currently snoozed"))));
+const InlineCompletionsSnoozing = ( new RawContextKey('inlineCompletions.snoozed', false, ( localize(147, "Whether inline completions are currently snoozed"))));
 let InlineCompletionsService = class InlineCompletionsService extends Disposable {
     static { InlineCompletionsService_1 = this; }
     static { this.SNOOZE_DURATION = 300_000; }
@@ -106,7 +106,7 @@ class SnoozeInlineCompletion extends Action2 {
     constructor() {
         super({
             id: SnoozeInlineCompletion.ID,
-            title: ( localize2(146, "Snooze Inline Suggestions")),
+            title: ( localize2(148, "Snooze Inline Suggestions")),
             precondition: ContextKeyExpr.true(),
             f1: true,
         });
@@ -137,7 +137,7 @@ class SnoozeInlineCompletion extends Action2 {
             { label: '60 minutes', id: '60', value: 3_600_000 }
         ];
         const picked = await quickInputService.pick(items, {
-            placeHolder: ( localize(147, "Select snooze duration for Inline Suggestions")),
+            placeHolder: ( localize(149, "Select snooze duration for Inline Suggestions")),
             activeItem: items.find(item => item.value === lastSelectedDuration),
         });
         if (picked) {
@@ -152,7 +152,7 @@ class CancelSnoozeInlineCompletion extends Action2 {
     constructor() {
         super({
             id: CancelSnoozeInlineCompletion.ID,
-            title: ( localize2(148, "Cancel Snooze Inline Suggestions")),
+            title: ( localize2(150, "Cancel Snooze Inline Suggestions")),
             precondition: InlineCompletionsSnoozing,
             f1: true,
         });

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -1387,7 +1387,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
                         const message = ( localize(
-                            149,
+                            151,
                             "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.",
                             multiCursorLimit
                         ));
@@ -1399,7 +1399,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localize(150, 'Increase Multi Cursor Limit')),
+                                label: ( localize(152, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'

package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js

@@ -18,7 +18,7 @@ class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(151, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(153, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -40,7 +40,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(152, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(154, 'Toggle Show Moved Code Blocks')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -54,7 +54,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(153, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(155, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -64,12 +64,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(154, "Diff Editor"));
+const diffEditorCategory = ( localize2(156, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(155, 'Switch Side')),
+            title: ( localize2(157, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -93,7 +93,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(156, 'Exit Compare Move')),
+            title: ( localize2(158, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -115,7 +115,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(157, 'Collapse All Unchanged Regions')),
+            title: ( localize2(159, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -133,7 +133,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(158, 'Show All Unchanged Regions')),
+            title: ( localize2(160, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -151,7 +151,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(159, 'Revert')),
+            title: ( localize2(161, 'Revert')),
             f1: true,
             category: diffEditorCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -175,13 +175,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(160, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(162, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(161, 'Go to Next Difference')),
+            title: ( localize2(163, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {
@@ -201,7 +201,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(162, 'Go to Previous Difference')),
+            title: ( localize2(164, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {

package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js

@@ -36,9 +36,9 @@ import { observableValue } from '../../../../../base/common/observableInternal/o
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(accessibleDiffViewer);
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(163, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(164, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(165, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(165, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(166, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(167, 'Icon for \'Close\' in accessible diff viewer.')));
 let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
     static { this._ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value }); }
     constructor(_parentNode, _visible, _setVisible, _canClose, _width, _height, _diffs, _models, _instantiationService) {
@@ -305,7 +305,7 @@ let View = class View extends Disposable {
             if (this._model.canClose.read(reader)) {
                 this._actionBar.push(toAction({
                     id: 'diffreview.close',
-                    label: ( localize(166, "Close")),
+                    label: ( localize(168, "Close")),
                     class: 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon),
                     enabled: true,
                     run: async () => _model.close()
@@ -362,7 +362,7 @@ let View = class View extends Disposable {
         const container = createElement('div');
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
-        container.setAttribute('aria-label', ( localize(167, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(169, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
         applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -386,13 +386,13 @@ let View = class View extends Disposable {
                 const r = group.range;
                 const diffIndex = this._model.currentGroupIndex.get();
                 const diffsLength = this._model.groups.get().length;
-                const getAriaLines = (lines) => lines === 0 ? ( localize(168, "no lines changed"))
-                    : lines === 1 ? ( localize(169, "1 line changed"))
-                        : ( localize(170, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(170, "no lines changed"))
+                    : lines === 1 ? ( localize(171, "1 line changed"))
+                        : ( localize(172, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    171,
+                    173,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -508,17 +508,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(172, "blank"));
+            lineContent = ( localize(174, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(173, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(175, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        174,
+                        176,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -527,10 +527,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(175, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(177, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(176, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(178, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -155,7 +155,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localize(
-            177,
+            179,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js

@@ -56,23 +56,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(178, "Copy deleted lines"))
-                            : ( localize(179, "Copy deleted line")))
+                            ? ( localize(180, "Copy deleted lines"))
+                            : ( localize(181, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(180, "Copy changed lines"))
-                            : ( localize(181, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(182, "Copy changed lines"))
+                            : ( localize(183, "Copy changed line"))), undefined, true, async () => {
                         const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
                         await this._clipboardService.writeText(originalText);
                     })));
                     if (_diff.original.length > 1) {
                         actions.push(( new Action('diff.clipboard.copyDeletedLineContent', isDeletion
                             ? ( localize(
-                            182,
+                            184,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            183,
+                            185,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -86,7 +86,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( new Action('diff.inline.revertChange', ( localize(184, "Revert this change")), undefined, true, async () => {
+                        actions.push(( new Action('diff.inline.revertChange', ( localize(186, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         })));
                     }

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js

@@ -14,7 +14,7 @@ registerAction2(ToggleUseInlineViewWhenSpaceIsLimited);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleUseInlineViewWhenSpaceIsLimited()).desc.id,
-        title: ( localize(185, "Use Inline View When Space Is Limited")),
+        title: ( localize(187, "Use Inline View When Space Is Limited")),
         toggled: ( ContextKeyExpr.has('config.diffEditor.useInlineViewWhenSpaceIsLimited')),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
     },
@@ -28,7 +28,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: ( new ToggleShowMovedCodeBlocks()).desc.id,
-        title: ( localize(186, "Show Moved Code Blocks")),
+        title: ( localize(188, "Show Moved Code Blocks")),
         icon: Codicon.move,
         toggled: ContextKeyEqualsExpr.create('config.diffEditor.experimental.showMoves', true),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -45,7 +45,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorHunkToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(187, "Revert Block")),
+            title: ( localize(189, "Revert Block")),
             icon: ctx.icon,
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -55,7 +55,7 @@ for (const ctx of [
     MenuRegistry.appendMenuItem(MenuId.DiffEditorSelectionToolbar, {
         command: {
             id: ( new RevertHunkOrSelection()).desc.id,
-            title: ( localize(188, "Revert Selection")),
+            title: ( localize(190, "Revert Selection")),
             icon: ctx.icon,
         },
         when: ( ContextKeyExpr.and(EditorContextKeys.diffEditorModifiedWritable, ctx.key)),
@@ -70,7 +70,7 @@ registerAction2(ShowAllUnchangedRegions);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: AccessibleDiffViewerNext.id,
-        title: ( localize(189, "Open Accessible Diff Viewer")),
+        title: ( localize(191, "Open Accessible Diff Viewer")),
         precondition: ( ContextKeyExpr.has('isInDiffEditor')),
     },
     order: 10,

package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js

@@ -157,7 +157,7 @@ let HideUnchangedRegionsFeature = class HideUnchangedRegionsFeature extends Disp
         const unchangedLinesDecorationShow = {
             description: 'Fold Unchanged',
             glyphMarginHoverMessage: ( new MarkdownString(undefined, { isTrusted: true, supportThemeIcons: true }))
-                .appendMarkdown(( localize(190, 'Fold Unchanged Region'))),
+                .appendMarkdown(( localize(192, 'Fold Unchanged Region'))),
             glyphMarginClassName: 'fold-unchanged ' + ThemeIcon.asClassName(Codicon.fold),
             zIndex: 10001,
         };
@@ -259,7 +259,7 @@ class CompactCollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._register(autorun(reader => {
             if (!this._hide) {
                 const lineCount = this._unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(191, '{0} hidden lines', lineCount));
+                const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
                 this._nodes.text.innerText = linesHiddenText;
             }
         }));
@@ -277,12 +277,12 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
         this._revealModifiedHiddenLine = _revealModifiedHiddenLine;
         this._options = _options;
         this._nodes = h('div.diff-hidden-lines', [
-            h('div.top@top', { title: ( localize(192, 'Click or drag to show more above')) }),
+            h('div.top@top', { title: ( localize(194, 'Click or drag to show more above')) }),
             h('div.center@content', { style: { display: 'flex' } }, [
-                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(193, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
+                h('div@first', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center', flexShrink: '0' } }, [$('a', { title: ( localize(195, 'Show Unchanged Region')), role: 'button', onclick: () => { this._unchangedRegion.showAll(undefined); } }, ...renderLabelWithIcons('$(unfold)'))]),
                 h('div@others', { style: { display: 'flex', justifyContent: 'center', alignItems: 'center' } }),
             ]),
-            h('div.bottom@bottom', { title: ( localize(194, 'Click or drag to show more below')), role: 'button' }),
+            h('div.bottom@bottom', { title: ( localize(196, 'Click or drag to show more below')), role: 'button' }),
         ]);
         root.root.appendChild(this._nodes.root);
         if (!this._hide) {
@@ -392,8 +392,8 @@ class CollapsedCodeOverlayWidget extends ViewZoneOverlayWidget {
             const children = [];
             if (!this._hide) {
                 const lineCount = _unchangedRegion.getHiddenModifiedRange(reader).length;
-                const linesHiddenText = ( localize(191, '{0} hidden lines', lineCount));
-                const span = $('span', { title: ( localize(195, 'Double click to unfold')) }, linesHiddenText);
+                const linesHiddenText = ( localize(193, '{0} hidden lines', lineCount));
+                const span = $('span', { title: ( localize(197, 'Double click to unfold')) }, linesHiddenText);
                 span.addEventListener('dblclick', e => {
                     if (e.button !== 0) {
                         return;

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -251,12 +251,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         let text;
         if (_move.changes.length > 0) {
             text = this._kind === 'original' ? ( localize(
-                196,
+                198,
                 'Code moved with changes to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                197,
+                199,
                 'Code moved with changes from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1
@@ -264,12 +264,12 @@ class MovedBlockOverlayWidget extends ViewZoneOverlayWidget {
         }
         else {
             text = this._kind === 'original' ? ( localize(
-                198,
+                200,
                 'Code moved to line {0}-{1}',
                 this._move.lineRangeMapping.modified.startLineNumber,
                 this._move.lineRangeMapping.modified.endLineNumberExclusive - 1
             )) : ( localize(
-                199,
+                201,
                 'Code moved from line {0}-{1}',
                 this._move.lineRangeMapping.original.startLineNumber,
                 this._move.lineRangeMapping.original.endLineNumberExclusive - 1

package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js

@@ -102,8 +102,8 @@ class RevertButton extends Disposable {
         this._id = `revertButton${RevertButton.counter++}`;
         this._domNode = h('div.revertButton', {
             title: this._revertSelection
-                ? ( localize(200, 'Revert Selected Changes'))
-                : ( localize(201, 'Revert Change'))
+                ? ( localize(202, 'Revert Selected Changes'))
+                : ( localize(203, 'Revert Change'))
         }, [renderIcon(Codicon.arrowRight)]).root;
         this._register(addDisposableListener(this._domNode, EventType.MOUSE_DOWN, e => {
             if (e.button !== 2) {

package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js

@@ -16,11 +16,11 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(202, 'The border color for text that got moved in the diff editor.')));
-registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(203, 'The active border color for text that got moved in the diff editor.')));
-registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(204, 'The color of the shadow around unchanged region widgets.')));
-const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(205, 'Line decoration for inserts in the diff editor.')));
-const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(206, 'Line decoration for removals in the diff editor.')));
+registerColor('diffEditor.move.border', '#8b8b8b9c', ( localize(204, 'The border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.moveActive.border', '#FFA500', ( localize(205, 'The active border color for text that got moved in the diff editor.')));
+registerColor('diffEditor.unchangedRegionShadow', { dark: '#000000', light: '#737373BF', hcDark: '#000000', hcLight: '#737373BF', }, ( localize(206, 'The color of the shadow around unchanged region widgets.')));
+const diffInsertIcon = registerIcon('diff-insert', Codicon.add, ( localize(207, 'Line decoration for inserts in the diff editor.')));
+const diffRemoveIcon = registerIcon('diff-remove', Codicon.remove, ( localize(208, 'Line decoration for removals in the diff editor.')));
 const diffLineAddDecorationBackgroundWithIndicator = ModelDecorationOptions.register({
     className: 'line-insert',
     description: 'line-insert',

package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js

@@ -1,6 +1,6 @@
 
 import { h, reset, createElement } from '../../../../../base/browser/dom.js';
-import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap, toDisposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/observableInternal/index.js';
 import { LineRange } from '../../../../common/core/ranges/lineRange.js';
 import { OffsetRange } from '../../../../common/core/ranges/offsetRange.js';
@@ -23,7 +23,7 @@ class EditorGutter extends Disposable {
         this.editorOnDidChangeViewZones = observableSignalFromEvent('onDidChangeViewZones', this._editor.onDidChangeViewZones);
         this.editorOnDidContentSizeChange = observableSignalFromEvent('onDidContentSizeChange', this._editor.onDidContentSizeChange);
         this.domNodeSizeChanged = observableSignal('domNodeSizeChanged');
-        this.views = ( new Map());
+        this.views = this._register(( new DisposableMap()));
         this._domNode.className = 'gutter monaco-editor';
         const scrollDecoration = this._domNode.appendChild(h('div.scroll-decoration', { role: 'presentation', ariaHidden: 'true', style: { width: '100%' } })
             .root);
@@ -93,10 +93,7 @@ class EditorGutter extends Disposable {
             }
         }
         for (const id of unusedIds) {
-            const view = this.views.get(id);
-            view.gutterItemView.dispose();
-            view.domNode.remove();
-            this.views.delete(id);
+            this.views.deleteAndDispose(id);
         }
     }
 }
@@ -106,6 +103,10 @@ class ManagedGutterItemView {
         this.gutterItemView = gutterItemView;
         this.domNode = domNode;
     }
+    dispose() {
+        this.gutterItemView.dispose();
+        this.domNode.remove();
+    }
 }
 
 export { EditorGutter };