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

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

@@ -1,14 +1,14 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from '../../../../base/common/event.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { OverviewRulerPart } from './overviewRulerPart.js';
-import { EditorOptions } from '../../../common/config/editorOptions.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { Position } from '../../../common/core/position.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorunHandleChanges } from '../../../../base/common/observableInternal/autorun.js';
+import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
+import { Emitter } from '../../../../../base/common/event.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
+import { EditorOptions } from '../../../../common/config/editorOptions.js';
+import { localizeWithPath } from '../../../../../nls.js';
+import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { Position } from '../../../../common/core/position.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
     constructor(originalEditorElement, modifiedEditorElement, _options, codeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {
@@ -57,7 +57,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     _constructInnerEditor(instantiationService, container, options, editorWidgetOptions) {
         const editor = this._createInnerEditor(instantiationService, container, options, editorWidgetOptions);
         this._register(editor.onDidContentSizeChange(e => {
-            const width = this.original.getContentWidth() + this.modified.getContentWidth() + OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH;
+            const width = this.original.getContentWidth() + this.modified.getContentWidth() + OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH;
             const height = Math.max(this.modified.getContentHeight(), this.original.getContentHeight());
             this._onDidContentSizeChange.fire({
                 contentHeight: height,
@@ -97,7 +97,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         }
         result.ariaLabel = this._updateAriaLabel(result.ariaLabel);
         result.wordWrapOverride1 = this._options.diffWordWrap.get();
-        result.revealHorizontalRightPadding = EditorOptions.revealHorizontalRightPadding.defaultValue + OverviewRulerPart.ENTIRE_DIFF_OVERVIEW_WIDTH;
+        result.revealHorizontalRightPadding = EditorOptions.revealHorizontalRightPadding.defaultValue + OverviewRulerFeature.ENTIRE_DIFF_OVERVIEW_WIDTH;
         result.scrollbar.verticalHasArrows = false;
         result.extraEditorClassName = 'modified-in-monaco-diff-editor';
         return result;
@@ -131,7 +131,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localizeWithPath(
-            'vs/editor/browser/widget/diffEditor/diffEditorEditors',
+            'vs/editor/browser/widget/diffEditor/components/diffEditorEditors',
             'diff-aria-navigation-tip',
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()

package/vscode/src/vs/editor/browser/widget/diffEditor/{diffEditorSash.js → components/diffEditorSash.js}

@@ -1,8 +1,8 @@
-import { Sash } from '../../../../base/browser/ui/sash/sash.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
+import { Sash } from '../../../../../base/browser/ui/sash/sash.js';
+import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { observableValue } from '../../../../../base/common/observableInternal/base.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 class DiffEditorSash extends Disposable {
     constructor(_options, _domNode, _dimensions, _sashes) {
         super();

package/vscode/src/vs/editor/browser/widget/diffEditor/{lineAlignment.js → components/diffEditorViewZones/diffEditorViewZones.js}

@@ -1,27 +1,27 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { addDisposableListener, $ } from '../../../../base/browser/dom.js';
-import { ArrayQueue } from '../../../../base/common/arrays.js';
-import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { assertIsDefined } from '../../../../base/common/types.js';
-import { applyFontInfo } from '../../config/domFontInfo.js';
-import { diffDeleteDecoration, diffRemoveIcon } from './decorations.js';
-import { DiffMapping } from './diffEditorViewModel.js';
+import { __decorate, __param } from '../../../../../../../../../external/tslib/tslib.es6.js';
+import { addDisposableListener, $ } from '../../../../../../base/browser/dom.js';
+import { ArrayQueue } from '../../../../../../base/common/arrays.js';
+import { RunOnceScheduler } from '../../../../../../base/common/async.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { assertIsDefined } from '../../../../../../base/common/types.js';
+import { applyFontInfo } from '../../../../config/domFontInfo.js';
+import { diffDeleteDecoration, diffRemoveIcon } from '../../registrations.contribution.js';
+import { DiffMapping } from '../../diffEditorViewModel.js';
 import { InlineDiffDeletedCodeMargin } from './inlineDiffDeletedCodeMargin.js';
 import { RenderOptions, LineSource, renderLines } from './renderLines.js';
-import { animatedObservable, joinCombine } from './utils.js';
-import { LineRange } from '../../../common/core/lineRange.js';
-import { Position } from '../../../common/core/position.js';
-import { InlineDecoration } from '../../../common/viewModel.js';
-import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-let ViewZoneManager = class ViewZoneManager extends Disposable {
+import { animatedObservable, joinCombine } from '../../utils.js';
+import { LineRange } from '../../../../../common/core/lineRange.js';
+import { Position } from '../../../../../common/core/position.js';
+import { InlineDecoration } from '../../../../../common/viewModel.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
+import { derivedWithStore, derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
+import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
     constructor(_targetWindow, _editors, _diffModel, _options, _diffEditorWidget, _canIgnoreViewZoneUpdateEvent, _origViewZonesToIgnore, _modViewZonesToIgnore, _clipboardService, _contextMenuService) {
         super();
         this._targetWindow = _targetWindow;
@@ -117,10 +117,14 @@ let ViewZoneManager = class ViewZoneManager extends Disposable {
             const renderSideBySide = this._options.renderSideBySide.read(reader);
             const deletedCodeLineBreaksComputer = !renderSideBySide ? this._editors.modified._getViewModel()?.createLineBreaksComputer() : undefined;
             if (deletedCodeLineBreaksComputer) {
+                const originalModel = this._editors.original.getModel();
                 for (const a of alignmentsVal) {
                     if (a.diff) {
                         for (let i = a.originalRange.startLineNumber; i < a.originalRange.endLineNumberExclusive; i++) {
-                            deletedCodeLineBreaksComputer?.addRequest(this._editors.original.getModel().getLineContent(i), null, null);
+                            if (i > originalModel.getLineCount()) {
+                                return { orig: origViewZones, mod: modViewZones };
+                            }
+                            deletedCodeLineBreaksComputer?.addRequest(originalModel.getLineContent(i), null, null);
                         }
                     }
                 }
@@ -138,8 +142,12 @@ let ViewZoneManager = class ViewZoneManager extends Disposable {
                         originalModelTokenizationCompleted.read(reader);
                         const deletedCodeDomNode = document.createElement('div');
                         deletedCodeDomNode.classList.add('view-lines', 'line-delete', 'monaco-mouse-cursor-text');
+                        const originalModel = this._editors.original.getModel();
+                        if (a.originalRange.endLineNumberExclusive - 1 > originalModel.getLineCount()) {
+                            return { orig: origViewZones, mod: modViewZones };
+                        }
                         const source = ( new LineSource(
-                            a.originalRange.mapToLineArray(l => this._editors.original.getModel().tokenization.getLineTokens(l)),
+                            a.originalRange.mapToLineArray(l => originalModel.tokenization.getLineTokens(l)),
                             a.originalRange.mapToLineArray(_ => lineBreakData[lineBreakDataIdx++]),
                             mightContainNonBasicASCII,
                             mightContainRTL
@@ -344,10 +352,10 @@ let ViewZoneManager = class ViewZoneManager extends Disposable {
         }));
     }
 };
-ViewZoneManager = ( __decorate([
+DiffEditorViewZones = ( __decorate([
     ( __param(8, IClipboardService)),
     ( __param(9, IContextMenuService))
-], ViewZoneManager));
+], DiffEditorViewZones));
 function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEditorAlignmentViewZones, modifiedEditorAlignmentViewZones, innerHunkAlignment) {
     const originalLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(originalEditor, originalEditorAlignmentViewZones)));
     const modifiedLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(modifiedEditor, modifiedEditorAlignmentViewZones)));
@@ -440,7 +448,9 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
                 if (i.originalRange.startColumn > 1 && i.modifiedRange.startColumn > 1) {
                     emitAlignment(i.originalRange.startLineNumber, i.modifiedRange.startLineNumber);
                 }
-                if (i.originalRange.endColumn < originalEditor.getModel().getLineMaxColumn(i.originalRange.endLineNumber)) {
+                const originalModel = originalEditor.getModel();
+                const maxColumn = i.originalRange.endLineNumber <= originalModel.getLineCount() ? originalModel.getLineMaxColumn(i.originalRange.endLineNumber) : Number.MAX_SAFE_INTEGER;
+                if (i.originalRange.endColumn < maxColumn) {
                     emitAlignment(i.originalRange.endLineNumber, i.modifiedRange.endLineNumber);
                 }
             }
@@ -476,4 +486,4 @@ function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const result = joinCombine(viewZoneHeights, wrappingZoneHeights, v => v.lineNumber, (v1, v2) => ({ lineNumber: v1.lineNumber, heightInPx: v1.heightInPx + v2.heightInPx }));
     return result;
 }
-export { ViewZoneManager };
+export { DiffEditorViewZones };

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

@@ -1,10 +1,10 @@
-import { addStandardDisposableListener, getDomNodePagePosition } from '../../../../base/browser/dom.js';
-import { Action } from '../../../../base/common/actions.js';
-import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
-import { isIOS } from '../../../../base/common/platform.js';
-import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { addStandardDisposableListener, getDomNodePagePosition } from '../../../../../../base/browser/dom.js';
+import { Action } from '../../../../../../base/common/actions.js';
+import { Codicon } from '../../../../../../base/common/codicons.js';
+import { Disposable } from '../../../../../../base/common/lifecycle.js';
+import { isIOS } from '../../../../../../base/common/platform.js';
+import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { localizeWithPath } from '../../../../../../nls.js';
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
         return this._visibility;
@@ -49,23 +49,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     actions.push(( new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
                             ? ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                         'diff.clipboard.copyDeletedLinesContent.label',
                         "Copy deleted lines"
                     ))
                             : ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                         'diff.clipboard.copyDeletedLinesContent.single.label',
                         "Copy deleted line"
                     )))
                         : (_diff.original.length > 1
                             ? ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                         'diff.clipboard.copyChangedLinesContent.label',
                         "Copy changed lines"
                     ))
                             : ( localizeWithPath(
-                        'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                        'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                         'diff.clipboard.copyChangedLinesContent.single.label',
                         "Copy changed line"
                     ))), undefined, true, async () => {
@@ -75,13 +75,13 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     if (_diff.original.length > 1) {
                         actions.push(( new Action('diff.clipboard.copyDeletedLineContent', isDeletion
                             ? ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                             'diff.clipboard.copyDeletedLineContent.label',
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                             'diff.clipboard.copyChangedLineContent.label',
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
@@ -97,7 +97,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const readOnly = _modifiedEditor.getOption(90 );
                     if (!readOnly) {
                         actions.push(( new Action('diff.inline.revertChange', ( localizeWithPath(
-                            'vs/editor/browser/widget/diffEditor/inlineDiffDeletedCodeMargin',
+                            'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin',
                             'diff.inline.revertChange.label',
                             "Revert this change"
                         )), undefined, true, async () => {

package/vscode/src/vs/editor/browser/widget/diffEditor/{renderLines.js → components/diffEditorViewZones/renderLines.js}

@@ -1,10 +1,10 @@
-import { createTrustedTypesPolicy } from '../../../../base/browser/trustedTypes.js';
-import { applyFontInfo } from '../../config/domFontInfo.js';
-import { EditorFontLigatures } from '../../../common/config/editorOptions.js';
-import { StringBuilder } from '../../../common/core/stringBuilder.js';
-import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
-import { renderViewLine, RenderLineInput } from '../../../common/viewLayout/viewLineRenderer.js';
-import { ViewLineRenderingData } from '../../../common/viewModel.js';
+import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
+import { applyFontInfo } from '../../../../config/domFontInfo.js';
+import { EditorFontLigatures } from '../../../../../common/config/editorOptions.js';
+import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
+import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
+import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
+import { ViewLineRenderingData } from '../../../../../common/viewModel.js';
 const ttPolicy = createTrustedTypesPolicy('diffEditorWidget', { createHTML: value => value });
 function renderLines(source, options, decorations, domNode) {
     applyFontInfo(domNode, options.fontInfo);

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

@@ -4,20 +4,21 @@ import { EditorAction2 } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { DiffEditorWidget } from './diffEditorWidget.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { registerAction2, MenuRegistry, MenuId, Action2 } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr, ContextKeyEqualsExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import './registrations.contribution.js';
 class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'toggleCollapseUnchangedRegions',
-                "Toggle Collapse Unchanged Regions"
-            )), original: 'Toggle Collapse Unchanged Regions' },
+                'Toggle Collapse Unchanged Regions'
+            )),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -40,11 +41,11 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'toggleShowMovedCodeBlocks',
-                "Toggle Show Moved Code Blocks"
-            )), original: 'Toggle Show Moved Code Blocks' },
+                'Toggle Show Moved Code Blocks'
+            )),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -59,11 +60,11 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'toggleUseInlineViewWhenSpaceIsLimited',
-                "Toggle Use Inline View When Space Is Limited"
-            )), original: 'Toggle Use Inline View When Space Is Limited' },
+                'Toggle Use Inline View When Space Is Limited'
+            )),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -120,11 +121,11 @@ class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'switchSide',
-                "Switch Side"
-            )), original: 'Switch Side' },
+                'Switch Side'
+            )),
             icon: Codicon.arrowSwap,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -149,11 +150,11 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'exitCompareMove',
-                "Exit Compare Move"
-            )), original: 'Exit Compare Move' },
+                'Exit Compare Move'
+            )),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -176,11 +177,11 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'collapseAllUnchangedRegions',
-                "Collapse All Unchanged Regions"
-            )), original: 'Collapse All Unchanged Regions' },
+                'Collapse All Unchanged Regions'
+            )),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -199,11 +200,11 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'showAllUnchangedRegions',
-                "Show All Unchanged Regions"
-            )), original: 'Show All Unchanged Regions' },
+                'Show All Unchanged Regions'
+            )),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -231,11 +232,11 @@ class AccessibleDiffViewerNext extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'editor.action.accessibleDiffViewer.next',
-                "Go to Next Difference"
-            )), original: 'Go to Next Difference' },
+                'Go to Next Difference'
+            )),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {
@@ -269,11 +270,11 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/browser/widget/diffEditor/diffEditor.contribution',
                 'editor.action.accessibleDiffViewer.prev',
-                "Go to Previous Difference"
-            )), original: 'Go to Previous Difference' },
+                'Go to Previous Difference'
+            )),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {
@@ -291,16 +292,6 @@ class AccessibleDiffViewerPrev extends Action2 {
 function findFocusedDiffEditor(accessor) {
     const codeEditorService = accessor.get(ICodeEditorService);
     const diffEditors = codeEditorService.listDiffEditors();
-    const activeCodeEditor = codeEditorService.getFocusedCodeEditor() ?? codeEditorService.getActiveCodeEditor();
-    if (!activeCodeEditor) {
-        return null;
-    }
-    for (let i = 0, len = diffEditors.length; i < len; i++) {
-        const diffEditor = diffEditors[i];
-        if (diffEditor.getModifiedEditor().getId() === activeCodeEditor.getId() || diffEditor.getOriginalEditor().getId() === activeCodeEditor.getId()) {
-            return diffEditor;
-        }
-    }
     const activeElement = getActiveElement();
     if (activeElement) {
         for (const d of diffEditors) {