@codingame/monaco-vscode-scm-service-override 25.1.2 → 26.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.js

@@ -59,20 +59,28 @@ import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 import { hasNativeContextMenu } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 
 var QuickDiffEditorController_1;
-const isQuickDiffVisible = ( new RawContextKey('dirtyDiffVisible', false));
+const isQuickDiffVisible = ( new RawContextKey("dirtyDiffVisible", false));
 let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectActionViewItem {
     constructor(action, contextViewService, themeService, configurationService) {
-        const styles = { ...defaultSelectBoxStyles };
+        const styles = {
+            ...defaultSelectBoxStyles
+        };
         const theme = themeService.getColorTheme();
         const editorBackgroundColor = theme.getColor(editorBackground);
         const peekTitleColor = theme.getColor(peekViewTitleBackground);
         const opaqueTitleColor = peekTitleColor?.makeOpaque(editorBackgroundColor) ?? editorBackgroundColor;
         styles.selectBackground = ( ( opaqueTitleColor.lighten(.6)).toString());
-        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(10445, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
+        super(null, action, [], 0, contextViewService, styles, {
+            ariaLabel: ( localize(10763, "Switch quick diff base")),
+            useCustomDrawn: !hasNativeContextMenu(configurationService)
+        });
         this.optionsItems = [];
     }
     setSelection(quickDiffs, providerId) {
-        this.optionsItems = ( quickDiffs.map(quickDiff => ({ providerId: quickDiff.id, text: quickDiff.label })));
+        this.optionsItems = ( quickDiffs.map(quickDiff => ({
+            providerId: quickDiff.id,
+            text: quickDiff.label
+        })));
         const index = this.optionsItems.findIndex(item => item.providerId === providerId);
         this.setOptions(this.optionsItems, index);
     }
@@ -84,16 +92,21 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
         this.setFocusable(true);
     }
 };
-QuickDiffPickerViewItem = ( __decorate([
-    ( __param(1, IContextViewService)),
-    ( __param(2, IThemeService)),
-    ( __param(3, IConfigurationService))
-], QuickDiffPickerViewItem));
+QuickDiffPickerViewItem = ( __decorate([( __param(1, IContextViewService)), ( __param(2, IThemeService)), ( __param(3, IConfigurationService))], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
-    static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(10446, "Switch Quick Diff Base")); }
+    static {
+        this.ID = "quickDiff.base.switch";
+    }
+    static {
+        this.LABEL = ( localize(10764, "Switch Quick Diff Base"));
+    }
     constructor(callback) {
-        super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
+        super(
+            QuickDiffPickerBaseAction.ID,
+            QuickDiffPickerBaseAction.LABEL,
+            undefined,
+            undefined
+        );
         this.callback = callback;
     }
     async run(event) {
@@ -110,46 +123,56 @@ class QuickDiffWidgetActionRunner extends ActionRunner {
 }
 let QuickDiffWidgetEditorAction = class QuickDiffWidgetEditorAction extends Action {
     constructor(editor, action, cssClass, keybindingService, instantiationService) {
-        const keybinding = keybindingService.lookupKeybinding(action.id);
-        const label = action.label + (keybinding ? ` (${keybinding.getLabel()})` : '');
+        const label = keybindingService.appendKeybinding(action.label, action.id);
         super(action.id, label, cssClass);
         this.instantiationService = instantiationService;
         this.action = action;
         this.editor = editor;
     }
     run() {
-        return Promise.resolve(this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null)));
+        return Promise.resolve(
+            this.instantiationService.invokeFunction(accessor => this.action.run(accessor, this.editor, null))
+        );
     }
 };
-QuickDiffWidgetEditorAction = ( __decorate([
-    ( __param(3, IKeybindingService)),
-    ( __param(4, IInstantiationService))
-], QuickDiffWidgetEditorAction));
+QuickDiffWidgetEditorAction = ( __decorate([( __param(3, IKeybindingService)), ( __param(4, IInstantiationService))], QuickDiffWidgetEditorAction));
 let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
-    constructor(editor, model, themeService, instantiationService, menuService, contextKeyService, quickDiffService) {
-        super(editor, { isResizeable: true, frameWidth: 1, keepEditorSelection: true, className: 'dirty-diff' }, instantiationService);
+    constructor(
+        editor,
+        model,
+        themeService,
+        instantiationService,
+        menuService,
+        contextKeyService,
+        quickDiffService
+    ) {
+        super(editor, {
+            isResizeable: true,
+            frameWidth: 1,
+            keepEditorSelection: true,
+            className: "dirty-diff"
+        }, instantiationService);
         this.model = model;
         this.themeService = themeService;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
         this.quickDiffService = quickDiffService;
         this._index = 0;
-        this._providerId = '';
+        this._providerId = "";
         this.height = undefined;
         this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
         this._applyTheme(themeService.getColorTheme());
         if (!Iterable.isEmpty(this.model.originalTextModels)) {
-            contextKeyService = contextKeyService.createOverlay([
-                ['originalResourceScheme', Iterable.first(this.model.originalTextModels)?.uri.scheme],
-                ['originalResourceSchemes', ( Iterable.map(this.model.originalTextModels, textModel => textModel.uri.scheme))]
-            ]);
+            contextKeyService = contextKeyService.createOverlay([[
+                "originalResourceScheme",
+                Iterable.first(this.model.originalTextModels)?.uri.scheme
+            ], ["originalResourceSchemes", ( Iterable.map(this.model.originalTextModels, textModel => textModel.uri.scheme))]]);
         }
         this.create();
         if (editor.hasModel()) {
             this.title = basename(editor.getModel().uri);
-        }
-        else {
-            this.title = '';
+        } else {
+            this.title = "";
         }
         this.setTitle(this.title);
     }
@@ -167,8 +190,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         const labeledChange = this.model.changes[index];
         const change = labeledChange.change;
         this._index = index;
-        this.contextKeyService.createKey('originalResource', ( this.model.changes[index].original.toString()));
-        this.contextKeyService.createKey('originalResourceScheme', this.model.changes[index].original.scheme);
+        this.contextKeyService.createKey("originalResource", ( this.model.changes[index].original.toString()));
+        this.contextKeyService.createKey("originalResourceScheme", this.model.changes[index].original.scheme);
         this.updateActions();
         this.change = change;
         this._providerId = labeledChange.providerId;
@@ -186,12 +209,18 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         const lineHeight = this.editor.getOption(EditorOption.lineHeight);
         const editorHeight = this.editor.getLayoutInfo().height;
         const editorHeightInLines = Math.floor(editorHeight / lineHeight);
-        const height = Math.min(getChangeHeight(change) + 2  + 6 , Math.floor(editorHeightInLines / 3));
+        const height = Math.min(
+            getChangeHeight(change) + 2  + 6,
+            Math.floor(editorHeightInLines / 3)
+        );
         this.renderTitle();
         this.updateDropdown();
         const changeType = getChangeType(change);
         const changeTypeColor = getChangeTypeColor(this.themeService.getColorTheme(), changeType);
-        this.style({ frameColor: changeTypeColor, arrowColor: changeTypeColor });
+        this.style({
+            frameColor: changeTypeColor,
+            arrowColor: changeTypeColor
+        });
         const providerSpecificChanges = [];
         let contextIndex = index;
         for (const change of this.model.changes) {
@@ -214,30 +243,24 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         const providerIndex = providerChanges.indexOf(this._index);
         let detail;
         if (!this.shouldUseDropdown()) {
-            const label = this.model.quickDiffs
-                .find(quickDiff => quickDiff.id === this._providerId)?.label ?? '';
-            detail = this.model.changes.length > 1
-                ? ( localize(
-                10447,
+            const label = this.model.quickDiffs.find(quickDiff => quickDiff.id === this._providerId)?.label ?? "";
+            detail = this.model.changes.length > 1 ? ( localize(
+                10765,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
-            ))
-                : ( localize(
-                10448,
+            )) : ( localize(
+                10766,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ));
-            this.dropdownContainer.style.display = 'none';
-        }
-        else {
-            detail = this.model.changes.length > 1
-                ? ( localize(10449, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(10450, "{0} of {1} change", providerIndex + 1, providerChanges.length));
-            this.dropdownContainer.style.display = 'inherit';
+            this.dropdownContainer.style.display = "none";
+        } else {
+            detail = this.model.changes.length > 1 ? ( localize(10767, "{0} of {1} changes", providerIndex + 1, providerChanges.length)) : ( localize(10768, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+            this.dropdownContainer.style.display = "inherit";
         }
         this.setTitle(this.title, detail);
     }
@@ -260,9 +283,11 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
                 break;
             }
         }
-        const closestIndex = Math.abs(this.model.changes[closestGreaterIndex].change.modifiedEndLineNumber - this.model.changes[this._index].change.modifiedEndLineNumber)
-            < Math.abs(this.model.changes[closestLesserIndex].change.modifiedEndLineNumber - this.model.changes[this._index].change.modifiedEndLineNumber)
-            ? closestGreaterIndex : closestLesserIndex;
+        const closestIndex = Math.abs(
+            this.model.changes[closestGreaterIndex].change.modifiedEndLineNumber - this.model.changes[this._index].change.modifiedEndLineNumber
+        ) < Math.abs(
+            this.model.changes[closestLesserIndex].change.modifiedEndLineNumber - this.model.changes[this._index].change.modifiedEndLineNumber
+        ) ? closestGreaterIndex : closestLesserIndex;
         this.showChange(closestIndex, false);
     }
     shouldUseDropdown() {
@@ -281,11 +306,22 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             this.menu.dispose();
         }
         this.menu = this.menuService.createMenu(MenuId.SCMChangeContext, this.contextKeyService);
-        const actions = getFlatActionBarActions(this.menu.getActions({ shouldForwardArgs: true }));
+        const actions = getFlatActionBarActions(this.menu.getActions({
+            shouldForwardArgs: true
+        }));
         this._actionbarWidget.clear();
-        this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
-        this._actionbarWidget.push([next, previous], { label: false, icon: true });
-        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(10451, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(actions.reverse(), {
+            label: false,
+            icon: true
+        });
+        this._actionbarWidget.push([next, previous], {
+            label: false,
+            icon: true
+        });
+        this._actionbarWidget.push(this._disposables.add(( new Action("peekview.close", ( localize(10769, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), {
+            label: false,
+            icon: true
+        });
     }
     updateDropdown() {
         const quickDiffs = this.getQuickDiffsContainingChange();
@@ -293,18 +329,16 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     }
     getQuickDiffsContainingChange() {
         const change = this.model.changes[this._index];
-        const quickDiffsWithChange = ( this.model.changes
-            .filter(c => change.change2.modified.intersectsOrTouches(c.change2.modified))
-            .map(c => c.providerId));
-        return this.model.quickDiffs
-            .filter(quickDiff => quickDiffsWithChange.includes(quickDiff.id) &&
-            this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id));
+        const quickDiffsWithChange = ( this.model.changes.filter(c => change.change2.modified.intersectsOrTouches(c.change2.modified)).map(c => c.providerId));
+        return this.model.quickDiffs.filter(
+            quickDiff => quickDiffsWithChange.includes(quickDiff.id) && this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)
+        );
     }
     _fillHead(container) {
         super._fillHead(container, true);
-        const action = ( new QuickDiffPickerBaseAction((event) => this.switchQuickDiff(event)));
+        const action = ( new QuickDiffPickerBaseAction(event => this.switchQuickDiff(event)));
         this._disposables.add(action);
-        this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
+        this.dropdownContainer = prepend(this._titleElement, $(".dropdown"));
         this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, action);
         this.dropdown.render(this.dropdownContainer);
     }
@@ -323,10 +357,12 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     }
     _fillBody(container) {
         const options = {
-            diffAlgorithm: 'advanced',
+            diffAlgorithm: "advanced",
             fixedOverflowWidgets: true,
             ignoreTrimWhitespace: false,
-            minimap: { enabled: false },
+            minimap: {
+                enabled: false
+            },
             readOnly: false,
             renderGutterMenu: false,
             renderIndicators: false,
@@ -334,27 +370,35 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             renderSideBySide: false,
             scrollbar: {
                 verticalScrollbarSize: 14,
-                horizontal: 'auto',
+                horizontal: "auto",
                 useShadows: true,
                 verticalHasArrows: false,
                 horizontalHasArrows: false
             },
             scrollBeyondLastLine: false,
-            stickyScroll: { enabled: false }
+            stickyScroll: {
+                enabled: false
+            }
         };
         this.diffEditor = this.instantiationService.createInstance(EmbeddedDiffEditorWidget, container, options, {}, this.editor);
         this._disposables.add(this.diffEditor);
     }
     _onWidth(width) {
-        if (typeof this.height === 'undefined') {
+        if (typeof this.height === "undefined") {
             return;
         }
-        this.diffEditor.layout({ height: this.height, width });
+        this.diffEditor.layout({
+            height: this.height,
+            width
+        });
     }
     _doLayoutBody(height, width) {
         super._doLayoutBody(height, width);
-        this.diffEditor.layout({ height, width });
-        if (typeof this.height === 'undefined' && this.change) {
+        this.diffEditor.layout({
+            height,
+            width
+        });
+        if (typeof this.height === "undefined" && this.change) {
             this.revealChange(this.change);
         }
         this.height = height;
@@ -364,12 +408,10 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         if (change.modifiedEndLineNumber === 0) {
             start = change.modifiedStartLineNumber;
             end = change.modifiedStartLineNumber + 1;
-        }
-        else if (change.originalEndLineNumber > 0) {
+        } else if (change.originalEndLineNumber > 0) {
             start = change.modifiedStartLineNumber - 1;
             end = change.modifiedEndLineNumber + 1;
-        }
-        else {
+        } else {
             start = change.modifiedStartLineNumber;
             end = change.modifiedEndLineNumber;
         }
@@ -394,8 +436,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     toggleFocus() {
         if (this.diffEditor.hasTextFocus()) {
             this.editor.focus();
-        }
-        else {
+        } else {
             this.diffEditor.focus();
         }
     }
@@ -405,20 +446,24 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         super.dispose();
     }
 };
-QuickDiffWidget = ( __decorate([
-    ( __param(2, IThemeService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IMenuService)),
-    ( __param(5, IContextKeyService)),
-    ( __param(6, IQuickDiffService))
-], QuickDiffWidget));
+QuickDiffWidget = ( __decorate([( __param(2, IThemeService)), ( __param(3, IInstantiationService)), ( __param(4, IMenuService)), ( __param(5, IContextKeyService)), ( __param(6, IQuickDiffService))], QuickDiffWidget));
 let QuickDiffEditorController = class QuickDiffEditorController extends Disposable {
-    static { QuickDiffEditorController_1 = this; }
-    static { this.ID = 'editor.contrib.quickdiff'; }
+    static {
+        QuickDiffEditorController_1 = this;
+    }
+    static {
+        this.ID = "editor.contrib.quickdiff";
+    }
     static get(editor) {
         return editor.getContribution(QuickDiffEditorController_1.ID);
     }
-    constructor(editor, contextKeyService, configurationService, quickDiffModelService, instantiationService) {
+    constructor(
+        editor,
+        contextKeyService,
+        configurationService,
+        quickDiffModelService,
+        instantiationService
+    ) {
         super();
         this.editor = editor;
         this.configurationService = configurationService;
@@ -430,41 +475,43 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         this.mouseDownInfo = null;
         this.enabled = false;
         this.gutterActionDisposables = ( new DisposableStore());
-        this.enabled = !contextKeyService.getContextKeyValue('isInDiffEditor');
+        this.enabled = !contextKeyService.getContextKeyValue("isInDiffEditor");
         this.stylesheet = createStyleSheet(undefined, undefined, this._store);
         if (this.enabled) {
             this.isQuickDiffVisible = isQuickDiffVisible.bindTo(contextKeyService);
             this._register(editor.onDidChangeModel(() => this.close()));
-            const onDidChangeGutterAction = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorationsGutterAction'));
+            const onDidChangeGutterAction = Event.filter(
+                configurationService.onDidChangeConfiguration,
+                e => e.affectsConfiguration("scm.diffDecorationsGutterAction")
+            );
             this._register(onDidChangeGutterAction(this.onDidChangeGutterAction, this));
             this.onDidChangeGutterAction();
         }
     }
     onDidChangeGutterAction() {
-        const gutterAction = this.configurationService.getValue('scm.diffDecorationsGutterAction');
+        const gutterAction = this.configurationService.getValue("scm.diffDecorationsGutterAction");
         this.gutterActionDisposables.clear();
-        if (gutterAction === 'diff') {
+        if (gutterAction === "diff") {
             this.gutterActionDisposables.add(this.editor.onMouseDown(e => this.onEditorMouseDown(e)));
             this.gutterActionDisposables.add(this.editor.onMouseUp(e => this.onEditorMouseUp(e)));
             this.stylesheet.textContent = `
-				.monaco-editor .dirty-diff-glyph {
-					cursor: pointer;
-				}
+                .monaco-editor .dirty-diff-glyph {
+                    cursor: pointer;
+                }
 
-				.monaco-editor .margin-view-overlays .dirty-diff-glyph:hover::before {
-					height: 100%;
-					width: 6px;
-					left: -6px;
-				}
+                .monaco-editor .margin-view-overlays .dirty-diff-glyph:hover::before {
+                    height: 100%;
+                    width: 6px;
+                    left: -6px;
+                }
 
-				.monaco-editor .margin-view-overlays .dirty-diff-deleted:hover::after {
-					bottom: 0;
-					border-top-width: 0;
-					border-bottom-width: 0;
-				}
-			`;
-        }
-        else {
+                .monaco-editor .margin-view-overlays .dirty-diff-deleted:hover::after {
+                    bottom: 0;
+                    border-top-width: 0;
+                    border-bottom-width: 0;
+                }
+            `;
+        } else {
             this.stylesheet.textContent = ``;
         }
     }
@@ -487,10 +534,13 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
             return;
         }
         let index;
-        if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.providerId)) {
-            index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.providerId);
-        }
-        else {
+        if (this.editor.hasModel() && (typeof lineNumber === "number" || !this.widget.providerId)) {
+            index = this.model.findNextClosestChange(
+                typeof lineNumber === "number" ? lineNumber : this.editor.getPosition().lineNumber,
+                true,
+                this.widget.providerId
+            );
+        } else {
             const providerChanges = this.model.quickDiffChanges.get(this.widget.providerId) ?? ( this.model.quickDiffChanges.values()).next().value;
             const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
             index = providerChanges[rot(mapIndex + 1, providerChanges.length)];
@@ -505,10 +555,13 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
             return;
         }
         let index;
-        if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.providerId)) {
-            index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.providerId);
-        }
-        else {
+        if (this.editor.hasModel() && (typeof lineNumber === "number" || !this.widget.providerId)) {
+            index = this.model.findPreviousClosestChange(
+                typeof lineNumber === "number" ? lineNumber : this.editor.getPosition().lineNumber,
+                true,
+                this.widget.providerId
+            );
+        } else {
             const providerChanges = this.model.quickDiffChanges.get(this.widget.providerId) ?? ( this.model.quickDiffChanges.values()).next().value;
             const mapIndex = providerChanges.findIndex(value => value === this.widget.index);
             index = providerChanges[rot(mapIndex - 1, providerChanges.length)];
@@ -547,8 +600,7 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         this.isQuickDiffVisible.set(true);
         const disposables = ( new DisposableStore());
         disposables.add(Event.once(this.widget.onDidClose)(this.close, this));
-        const onDidModelChange = Event.chain(this.model.onDidChange, $ => ( $.filter(e => e.diff.length > 0)
-            .map(e => e.diff)));
+        const onDidModelChange = Event.chain(this.model.onDidChange, $ => ( $.filter(e => e.diff.length > 0).map(e => e.diff)));
         onDidModelChange(this.onDidModelChange, this, disposables);
         disposables.add(modelRef);
         disposables.add(this.widget);
@@ -588,7 +640,7 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         if (!e.target.element) {
             return;
         }
-        if (e.target.element.className.indexOf('dirty-diff-glyph') < 0) {
+        if (e.target.element.className.indexOf("dirty-diff-glyph") < 0) {
             return;
         }
         const data = e.target.detail;
@@ -597,13 +649,17 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         if (gutterOffsetX < -3 || gutterOffsetX > 3) {
             return;
         }
-        this.mouseDownInfo = { lineNumber: range.startLineNumber };
+        this.mouseDownInfo = {
+            lineNumber: range.startLineNumber
+        };
     }
     onEditorMouseUp(e) {
         if (!this.mouseDownInfo) {
             return;
         }
-        const { lineNumber } = this.mouseDownInfo;
+        const {
+            lineNumber
+        } = this.mouseDownInfo;
         this.mouseDownInfo = null;
         const range = e.target.range;
         if (!range || range.startLineNumber !== lineNumber) {
@@ -621,19 +677,16 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
             return;
         }
         try {
-            const index = modelRef.object.changes
-                .findIndex(change => lineIntersectsChange(lineNumber, change.change));
+            const index = modelRef.object.changes.findIndex(change => lineIntersectsChange(lineNumber, change.change));
             if (index < 0) {
                 return;
             }
             if (index === this.widget?.index) {
                 this.close();
-            }
-            else {
+            } else {
                 this.next(lineNumber);
             }
-        }
-        finally {
+        } finally {
             modelRef.dispose();
         }
     }
@@ -642,19 +695,18 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
         super.dispose();
     }
 };
-QuickDiffEditorController = QuickDiffEditorController_1 = ( __decorate([
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IQuickDiffModelService)),
-    ( __param(4, IInstantiationService))
-], QuickDiffEditorController));
+QuickDiffEditorController = QuickDiffEditorController_1 = ( __decorate([( __param(1, IContextKeyService)), ( __param(2, IConfigurationService)), ( __param(3, IQuickDiffModelService)), ( __param(4, IInstantiationService))], QuickDiffEditorController));
 class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
-            id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(10452, "Show Previous Change")),
+            id: "editor.action.dirtydiff.previous",
+            label: ( localize2(10770, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
+            kbOpts: {
+                kbExpr: EditorContextKeys.editorTextFocus,
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.EditorContrib
+            }
         });
         this.outerEditor = outerEditor;
     }
@@ -677,10 +729,14 @@ registerEditorAction(ShowPreviousChangeAction);
 class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
-            id: 'editor.action.dirtydiff.next',
-            label: ( localize2(10453, "Show Next Change")),
+            id: "editor.action.dirtydiff.next",
+            label: ( localize2(10771, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
+            kbOpts: {
+                kbExpr: EditorContextKeys.editorTextFocus,
+                primary: KeyMod.Alt | KeyCode.F3,
+                weight: KeybindingWeight.EditorContrib
+            }
         });
         this.outerEditor = outerEditor;
     }
@@ -703,10 +759,14 @@ registerEditorAction(ShowNextChangeAction);
 class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
-            id: 'workbench.action.editor.previousChange',
-            label: ( localize2(10454, "Go to Previous Change")),
+            id: "workbench.action.editor.previousChange",
+            label: ( localize2(10772, "Go to Previous Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
+            kbOpts: {
+                kbExpr: EditorContextKeys.editorTextFocus,
+                primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F5,
+                weight: KeybindingWeight.EditorContrib
+            }
         });
     }
     async run(accessor) {
@@ -728,8 +788,7 @@ class GotoPreviousChangeAction extends EditorAction {
             const change = modelRef.object.changes[index];
             await playAccessibilitySymbolForChange(change.change, accessibilitySignalService);
             setPositionAndSelection(change.change, outerEditor, accessibilityService, codeEditorService);
-        }
-        finally {
+        } finally {
             modelRef?.dispose();
         }
     }
@@ -738,10 +797,14 @@ registerEditorAction(GotoPreviousChangeAction);
 class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
-            id: 'workbench.action.editor.nextChange',
-            label: ( localize2(10455, "Go to Next Change")),
+            id: "workbench.action.editor.nextChange",
+            label: ( localize2(10773, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
+            kbOpts: {
+                kbExpr: EditorContextKeys.editorTextFocus,
+                primary: KeyMod.Alt | KeyCode.F5,
+                weight: KeybindingWeight.EditorContrib
+            }
         });
     }
     async run(accessor) {
@@ -763,36 +826,35 @@ class GotoNextChangeAction extends EditorAction {
             const change = modelRef.object.changes[index].change;
             await playAccessibilitySymbolForChange(change, accessibilitySignalService);
             setPositionAndSelection(change, outerEditor, accessibilityService, codeEditorService);
-        }
-        finally {
+        } finally {
             modelRef?.dispose();
         }
     }
 }
 registerEditorAction(GotoNextChangeAction);
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
-    group: '7_change_nav',
+    group: "7_change_nav",
     command: {
-        id: 'editor.action.dirtydiff.next',
-        title: ( localize(10456, "Next &&Change"))
+        id: "editor.action.dirtydiff.next",
+        title: ( localize(10774, "Next &&Change"))
     },
     order: 1
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
-    group: '7_change_nav',
+    group: "7_change_nav",
     command: {
-        id: 'editor.action.dirtydiff.previous',
-        title: ( localize(10457, "Previous &&Change"))
+        id: "editor.action.dirtydiff.previous",
+        title: ( localize(10775, "Previous &&Change"))
     },
     order: 2
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: 'closeQuickDiff',
+    id: "closeQuickDiff",
     weight: KeybindingWeight.EditorContrib + 50,
     primary: KeyCode.Escape,
     secondary: [KeyMod.Shift | KeyCode.Escape],
     when: ( ContextKeyExpr.and(isQuickDiffVisible)),
-    handler: (accessor) => {
+    handler: accessor => {
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
         if (!outerEditor) {
             return;
@@ -805,11 +867,11 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
-    id: 'togglePeekWidgetFocus',
+    id: "togglePeekWidgetFocus",
     weight: KeybindingWeight.EditorContrib,
     primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
     when: isQuickDiffVisible,
-    handler: (accessor) => {
+    handler: accessor => {
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
         if (!outerEditor) {
             return;
@@ -826,22 +888,36 @@ function setPositionAndSelection(change, editor, accessibilityService, codeEdito
     editor.setPosition(position);
     editor.revealPositionInCenter(position);
     if (accessibilityService.isScreenReaderOptimized()) {
-        editor.setSelection({ startLineNumber: change.modifiedStartLineNumber, startColumn: 0, endLineNumber: change.modifiedStartLineNumber, endColumn: Number.MAX_VALUE });
-        codeEditorService.getActiveCodeEditor()?.writeScreenReaderContent('diff-navigation');
+        editor.setSelection({
+            startLineNumber: change.modifiedStartLineNumber,
+            startColumn: 0,
+            endLineNumber: change.modifiedStartLineNumber,
+            endColumn: Number.MAX_VALUE
+        });
+        codeEditorService.getActiveCodeEditor()?.writeScreenReaderContent("diff-navigation");
     }
 }
 async function playAccessibilitySymbolForChange(change, accessibilitySignalService) {
     const changeType = getChangeType(change);
     switch (changeType) {
-        case ChangeType.Add:
-            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, { allowManyInParallel: true, source: 'quickDiffDecoration' });
-            break;
-        case ChangeType.Delete:
-            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, { allowManyInParallel: true, source: 'quickDiffDecoration' });
-            break;
-        case ChangeType.Modify:
-            accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, { allowManyInParallel: true, source: 'quickDiffDecoration' });
-            break;
+    case ChangeType.Add:
+        accessibilitySignalService.playSignal(AccessibilitySignal.diffLineInserted, {
+            allowManyInParallel: true,
+            source: "quickDiffDecoration"
+        });
+        break;
+    case ChangeType.Delete:
+        accessibilitySignalService.playSignal(AccessibilitySignal.diffLineDeleted, {
+            allowManyInParallel: true,
+            source: "quickDiffDecoration"
+        });
+        break;
+    case ChangeType.Modify:
+        accessibilitySignalService.playSignal(AccessibilitySignal.diffLineModified, {
+            allowManyInParallel: true,
+            source: "quickDiffDecoration"
+        });
+        break;
     }
 }
 function getOuterEditorFromDiffEditor(accessor) {