@codingame/monaco-vscode-scm-service-override 16.1.0 → 17.0.0

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

@@ -2,14 +2,14 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { isTextFileEditorModel, EncodingMode } from '@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/textfile/common/textfiles';
+import { isTextFileEditorModel, EncodingMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles';
 import { ITextFileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { ReferenceCollection, Disposable, DisposableStore, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IEditorWorkerService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/editorWorker.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { shouldSynchronizeModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { compareChanges, getModifiedEndLineNumber } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { ISCMService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/scm.service';
@@ -21,7 +21,7 @@ import { toLineChanges } from '@codingame/monaco-vscode-api/vscode/vs/editor/bro
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { ProgressLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from '@codingame/monaco-vscode-api/vscode/vs/platform/progress/common/progress.service';
-import { WorkingSetEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
+import { ModifiedFileEntryState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -127,9 +127,8 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
     getQuickDiffResults() {
         return ( this._quickDiffs.map(quickDiff => {
             const changes = this.changes
-                .filter(change => change.label === quickDiff.label);
+                .filter(change => change.providerId === quickDiff.id);
             return {
-                label: quickDiff.label,
                 original: quickDiff.originalResource,
                 modified: this._model.resource,
                 changes: ( changes.map(change => change.change)),
@@ -180,20 +179,38 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
             if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
                 return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
             }
-            const filteredToDiffable = originalURIs.filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
-            if (filteredToDiffable.length === 0) {
+            const quickDiffs = originalURIs
+                .filter(quickDiff => this.editorWorkerService.canComputeDirtyDiff(quickDiff.originalResource, this._model.resource));
+            if (quickDiffs.length === 0) {
                 return Promise.resolve({ changes: [], mapChanges: ( new Map()) });
             }
+            const quickDiffPrimary = quickDiffs.find(quickDiff => quickDiff.kind === 'primary');
             const ignoreTrimWhitespaceSetting = this.configurationService.getValue('scm.diffDecorationsIgnoreTrimWhitespace');
             const ignoreTrimWhitespace = ignoreTrimWhitespaceSetting === 'inherit'
                 ? this.configurationService.getValue('diffEditor.ignoreTrimWhitespace')
                 : ignoreTrimWhitespaceSetting !== 'false';
             const allDiffs = [];
-            for (const quickDiff of filteredToDiffable) {
+            for (const quickDiff of quickDiffs) {
                 const diff = await this._diff(quickDiff.originalResource, this._model.resource, ignoreTrimWhitespace);
                 if (diff.changes && diff.changes2 && diff.changes.length === diff.changes2.length) {
                     for (let index = 0; index < diff.changes.length; index++) {
+                        const change2 = diff.changes2[index];
+                        if (quickDiffPrimary && quickDiff.kind === 'secondary') {
+                            const primaryQuickDiffChange = allDiffs
+                                .find(d => d.change2.modified.equals(change2.modified) &&
+                                d.change2.original.length === change2.original.length);
+                            if (primaryQuickDiffChange) {
+                                const primaryModel = this._originalEditorModels.get(quickDiffPrimary.originalResource)?.textEditorModel;
+                                const primaryContent = primaryModel?.getValueInRange(primaryQuickDiffChange.change2.toRangeMapping().originalRange);
+                                const secondaryModel = this._originalEditorModels.get(quickDiff.originalResource)?.textEditorModel;
+                                const secondaryContent = secondaryModel?.getValueInRange(change2.toRangeMapping().originalRange);
+                                if (primaryContent === secondaryContent) {
+                                    continue;
+                                }
+                            }
+                        }
                         allDiffs.push({
+                            providerId: quickDiff.id,
                             label: quickDiff.label,
                             original: quickDiff.originalResource,
                             modified: this._model.resource,
@@ -235,7 +252,9 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
                 this._originalEditorModels.clear();
                 return [];
             }
-            if (equals(this._quickDiffs, quickDiffs, (a, b) => ( a.originalResource.toString()) === ( b.originalResource.toString()) && a.label === b.label)) {
+            if (equals(this._quickDiffs, quickDiffs, (a, b) => a.id === b.id &&
+                ( a.originalResource.toString()) === ( b.originalResource.toString()) &&
+                this.quickDiffService.isQuickDiffProviderVisible(a.id) === this.quickDiffService.isQuickDiffProviderVisible(b.id))) {
                 return quickDiffs;
             }
             this._quickDiffs = quickDiffs;
@@ -275,7 +294,7 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         const uri = this._model.resource;
         const isBeingModifiedByChatEdits = ( this._chatEditingService.editingSessionsObs.get()
             .some(
-            session => session.getEntry(uri)?.state.get() === WorkingSetEntryState.Modified
+            session => session.getEntry(uri)?.state.get() === ModifiedFileEntryState.Modified
         ));
         if (isBeingModifiedByChatEdits) {
             return Promise.resolve([]);
@@ -284,47 +303,38 @@ let QuickDiffModel = class QuickDiffModel extends Disposable {
         return this.quickDiffService.getQuickDiffs(uri, this._model.getLanguageId(), isSynchronized);
     }
     findNextClosestChange(lineNumber, inclusive = true, provider) {
-        let preferredProvider;
-        if (!provider && inclusive) {
-            preferredProvider = this.quickDiffs.find(value => value.isSCM)?.label;
+        const visibleQuickDiffLabels = ( this.quickDiffs
+            .filter(quickDiff => (!provider || quickDiff.label === provider) &&
+            this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id))
+            .map(quickDiff => quickDiff.label));
+        if (!inclusive) {
+            const nextChange = this.changes
+                .findIndex(change => visibleQuickDiffLabels.includes(change.label) &&
+                change.change.modifiedStartLineNumber > lineNumber);
+            return nextChange !== -1 ? nextChange : 0;
         }
-        const possibleChanges = [];
-        for (let i = 0; i < this.changes.length; i++) {
-            if (provider && this.changes[i].label !== provider) {
-                continue;
-            }
-            if (!this.quickDiffs.find(quickDiff => quickDiff.label === this.changes[i].label)?.visible) {
-                continue;
-            }
-            const change = this.changes[i];
-            const possibleChangesLength = possibleChanges.length;
-            if (inclusive) {
-                if (getModifiedEndLineNumber(change.change) >= lineNumber) {
-                    if (preferredProvider && change.label !== preferredProvider) {
-                        possibleChanges.push(i);
-                    }
-                    else {
-                        return i;
-                    }
-                }
-            }
-            else {
-                if (change.change.modifiedStartLineNumber > lineNumber) {
-                    return i;
-                }
-            }
-            if ((possibleChanges.length > 0) && (possibleChanges.length === possibleChangesLength)) {
-                return possibleChanges[0];
-            }
+        const primaryQuickDiffId = this.quickDiffs
+            .find(quickDiff => quickDiff.kind === 'primary')?.id;
+        const primaryInclusiveChangeIndex = this.changes
+            .findIndex(change => change.providerId === primaryQuickDiffId &&
+            change.change.modifiedStartLineNumber <= lineNumber &&
+            getModifiedEndLineNumber(change.change) >= lineNumber);
+        if (primaryInclusiveChangeIndex !== -1) {
+            return primaryInclusiveChangeIndex;
         }
-        return possibleChanges.length > 0 ? possibleChanges[0] : 0;
+        const inclusiveChangeIndex = this.changes
+            .findIndex(change => visibleQuickDiffLabels.includes(change.label) &&
+            change.change.modifiedStartLineNumber <= lineNumber &&
+            getModifiedEndLineNumber(change.change) >= lineNumber);
+        return inclusiveChangeIndex !== -1 ? inclusiveChangeIndex : 0;
     }
     findPreviousClosestChange(lineNumber, inclusive = true, provider) {
         for (let i = this.changes.length - 1; i >= 0; i--) {
             if (provider && this.changes[i].label !== provider) {
                 continue;
             }
-            if (!this.quickDiffs.find(quickDiff => quickDiff.label === this.changes[i].label)?.visible) {
+            const quickDiff = this.quickDiffs.find(quickDiff => quickDiff.id === this.changes[i].providerId);
+            if (!quickDiff || !this.quickDiffService.isQuickDiffProviderVisible(quickDiff.id)) {
                 continue;
             }
             const change = this.changes[i].change;

package/vscode/src/vs/workbench/contrib/scm/browser/quickDiffWidget.d.ts

@@ -17,9 +17,9 @@ export interface IQuickDiffSelectItem extends ISelectOptionItem {
     provider: string;
 }
 export declare class QuickDiffPickerViewItem extends SelectActionViewItem<IQuickDiffSelectItem> {
-    private readonly optionsItems;
-    constructor(action: IAction, providers: string[], selected: string, contextViewService: IContextViewService, themeService: IThemeService);
-    setSelection(provider: string): void;
+    private optionsItems;
+    constructor(action: IAction, contextViewService: IContextViewService, themeService: IThemeService);
+    setSelection(providers: string[], provider: string): void;
     protected getActionContext(_: string, index: number): IQuickDiffSelectItem;
     render(container: HTMLElement): void;
 }

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

@@ -35,7 +35,8 @@ import { RawContextKey, ContextKeyExpr } from '@codingame/monaco-vscode-api/vsco
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { rot } from '@codingame/monaco-vscode-api/vscode/vs/base/common/numbers';
-import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { IQuickDiffService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service';
 import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service';
 import { TextCompareEditorActiveContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorContextKeys';
@@ -59,24 +60,20 @@ import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 var QuickDiffEditorController_1;
 const isQuickDiffVisible = ( new RawContextKey('dirtyDiffVisible', false));
 let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectActionViewItem {
-    constructor(action, providers, selected, contextViewService, themeService) {
-        const items = ( providers.map(provider => ({ provider, text: provider })));
-        let startingSelection = providers.indexOf(selected);
-        if (startingSelection === -1) {
-            startingSelection = 0;
-        }
+    constructor(action, contextViewService, themeService) {
         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, items, startingSelection, contextViewService, styles, { ariaLabel: ( localize(8979, 'Switch quick diff base')) });
-        this.optionsItems = items;
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9080, 'Switch quick diff base')) });
+        this.optionsItems = [];
     }
-    setSelection(provider) {
+    setSelection(providers, provider) {
+        this.optionsItems = ( providers.map(provider => ({ provider, text: provider })));
         const index = this.optionsItems.findIndex(item => item.provider === provider);
-        this.select(index);
+        this.setOptions(this.optionsItems, index);
     }
     getActionContext(_, index) {
         return this.optionsItems[index];
@@ -87,12 +84,12 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
     }
 };
 QuickDiffPickerViewItem = ( __decorate([
-    ( __param(3, IContextViewService)),
-    ( __param(4, IThemeService))
+    ( __param(1, IContextViewService)),
+    ( __param(2, IThemeService))
 ], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(8980, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(9081, "Switch Quick Diff Base")); }
     constructor(callback) {
         super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
         this.callback = callback;
@@ -127,12 +124,13 @@ QuickDiffWidgetEditorAction = ( __decorate([
     ( __param(4, IInstantiationService))
 ], QuickDiffWidgetEditorAction));
 let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
-    constructor(editor, model, themeService, instantiationService, menuService, contextKeyService) {
+    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._provider = '';
         this.height = undefined;
@@ -167,6 +165,7 @@ 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.updateActions();
         this._provider = labeledChange.label;
@@ -181,12 +180,12 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             return;
         }
         this.diffEditor.setModel(diffEditorModel);
-        this.dropdown?.setSelection(labeledChange.label);
         const position = ( new Position(getModifiedEndLineNumber(change), 1));
         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) +  8, Math.floor(editorHeightInLines / 3));
+        this.updateDropdown(labeledChange.label);
         this.renderTitle(labeledChange.label);
         const changeType = getChangeType(change);
         const changeTypeColor = getChangeTypeColor(this.themeService.getColorTheme(), changeType);
@@ -215,14 +214,14 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         if (!this.shouldUseDropdown()) {
             detail = this.model.changes.length > 1
                 ? ( localize(
-                8981,
+                9082,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                8982,
+                9083,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -232,8 +231,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localize(8983, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(8984, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(9084, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(9085, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
@@ -251,7 +250,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
             }
         }
         let closestLesserIndex = this._index > 0 ? this._index - 1 : this.model.changes.length - 1;
-        for (let i = closestLesserIndex; i !== this._index; i >= 0 ? i-- : i = this.model.changes.length - 1) {
+        for (let i = closestLesserIndex; i !== this._index; i > 0 ? i-- : i = this.model.changes.length - 1) {
             if (this.model.changes[i].label === newProvider) {
                 closestLesserIndex = i;
                 break;
@@ -263,11 +262,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         this.showChange(closestIndex, false);
     }
     shouldUseDropdown() {
-        const visibleQuickDiffs = this.model.quickDiffs.filter(quickDiff => quickDiff.visible);
-        const visibleQuickDiffResults = this.model.getQuickDiffResults()
-            .filter(result => ( visibleQuickDiffs.some(quickDiff => quickDiff.label === result.label)));
-        return visibleQuickDiffResults
-            .filter(quickDiff => quickDiff.changes.length > 0).length > 1;
+        const quickDiffs = this.getQuickDiffsContainingChange();
+        return quickDiffs.length > 1;
     }
     updateActions() {
         if (!this._actionbarWidget) {
@@ -285,15 +281,26 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         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(8985, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9086, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+    }
+    updateDropdown(label) {
+        const quickDiffs = this.getQuickDiffsContainingChange();
+        this.dropdown?.setSelection(( quickDiffs.map(quickDiff => quickDiff.label)), label);
+    }
+    getQuickDiffsContainingChange() {
+        const change = this.model.changes[this._index];
+        const quickDiffsWithChange = ( this.model.changes
+            .filter(c => change.change2.modified.overlapOrTouch(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 visibleQuickDiffs = this.model.quickDiffs.filter(quickDiff => quickDiff.visible);
         this.dropdownContainer = prepend(this._titleElement, $('.dropdown'));
-        this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, ( new QuickDiffPickerBaseAction((event) => this.switchQuickDiff(event))), ( visibleQuickDiffs.map(quickDiff => quickDiff.label)), this.model.changes[this._index].label);
+        this.dropdown = this.instantiationService.createInstance(QuickDiffPickerViewItem, ( new QuickDiffPickerBaseAction((event) => this.switchQuickDiff(event))));
         this.dropdown.render(this.dropdownContainer);
-        this.updateActions();
     }
     _getActionBarOptions() {
         const actionRunner = ( new QuickDiffWidgetActionRunner());
@@ -386,7 +393,8 @@ QuickDiffWidget = ( __decorate([
     ( __param(2, IThemeService)),
     ( __param(3, IInstantiationService)),
     ( __param(4, IMenuService)),
-    ( __param(5, IContextKeyService))
+    ( __param(5, IContextKeyService)),
+    ( __param(6, IQuickDiffService))
 ], QuickDiffWidget));
 let QuickDiffEditorController = class QuickDiffEditorController extends Disposable {
     static { QuickDiffEditorController_1 = this; }
@@ -623,7 +631,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(8986, "Show Previous Change")),
+            label: ( localize2(9087, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -649,7 +657,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localize2(8987, "Show Next Change")),
+            label: ( localize2(9088, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -675,7 +683,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localize2(8988, "Go to Previous Change")),
+            label: ( localize2(9089, "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 }
         });
@@ -710,7 +718,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localize2(8989, "Go to Next Change")),
+            label: ( localize2(9090, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -745,7 +753,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localize(8990, "Next &&Change"))
+        title: ( localize(9091, "Next &&Change"))
     },
     order: 1
 });
@@ -753,7 +761,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(8991, "Previous &&Change"))
+        title: ( localize(9092, "Previous &&Change"))
     },
     order: 2
 });