@codingame/monaco-vscode-scm-service-override 17.2.1 → 18.0.1

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

@@ -35,7 +35,7 @@ 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-bb83fe45-f4c7-5673-b9f1-5c409a63f19c-common/vscode/vs/workbench/contrib/scm/common/quickDiff';
+import { getModifiedEndLineNumber, getChangeHeight, getChangeType, getChangeTypeColor, lineIntersectsChange, ChangeType } from '@codingame/monaco-vscode-f338ac19-278c-5fe1-bec8-b588de04a788-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';
@@ -56,23 +56,24 @@ import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color'
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { getOuterEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget';
 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));
 let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectActionViewItem {
-    constructor(action, contextViewService, themeService) {
+    constructor(action, contextViewService, themeService, configurationService) {
         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(9080, 'Switch quick diff base')) });
+        super(null, action, [], 0, contextViewService, styles, { ariaLabel: ( localize(9317, 'Switch quick diff base')), useCustomDrawn: !hasNativeContextMenu(configurationService) });
         this.optionsItems = [];
     }
-    setSelection(providers, provider) {
-        this.optionsItems = ( providers.map(provider => ({ provider, text: provider })));
-        const index = this.optionsItems.findIndex(item => item.provider === provider);
+    setSelection(quickDiffs, providerId) {
+        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);
     }
     getActionContext(_, index) {
@@ -85,11 +86,12 @@ let QuickDiffPickerViewItem = class QuickDiffPickerViewItem extends SelectAction
 };
 QuickDiffPickerViewItem = ( __decorate([
     ( __param(1, IContextViewService)),
-    ( __param(2, IThemeService))
+    ( __param(2, IThemeService)),
+    ( __param(3, IConfigurationService))
 ], QuickDiffPickerViewItem));
 class QuickDiffPickerBaseAction extends Action {
     static { this.ID = 'quickDiff.base.switch'; }
-    static { this.LABEL = ( localize(9081, "Switch Quick Diff Base")); }
+    static { this.LABEL = ( localize(9318, "Switch Quick Diff Base")); }
     constructor(callback) {
         super(QuickDiffPickerBaseAction.ID, QuickDiffPickerBaseAction.LABEL, undefined, undefined);
         this.callback = callback;
@@ -132,7 +134,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         this.contextKeyService = contextKeyService;
         this.quickDiffService = quickDiffService;
         this._index = 0;
-        this._provider = '';
+        this._providerId = '';
         this.height = undefined;
         this._disposables.add(themeService.onDidColorThemeChange(this._applyTheme, this));
         this._applyTheme(themeService.getColorTheme());
@@ -151,8 +153,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         this.setTitle(this.title);
     }
-    get provider() {
-        return this._provider;
+    get providerId() {
+        return this._providerId;
     }
     get index() {
         return this._index;
@@ -168,8 +170,8 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         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;
         this.change = change;
+        this._providerId = labeledChange.providerId;
         if (Iterable.isEmpty(this.model.originalTextModels)) {
             return;
         }
@@ -184,16 +186,16 @@ 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) +  8, Math.floor(editorHeightInLines / 3));
-        this.updateDropdown(labeledChange.label);
-        this.renderTitle(labeledChange.label);
+        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 });
         const providerSpecificChanges = [];
         let contextIndex = index;
         for (const change of this.model.changes) {
-            if (change.label === this.model.changes[this._index].label) {
+            if (change.providerId === this.model.changes[this._index].providerId) {
                 providerSpecificChanges.push(change.change);
                 if (labeledChange === change) {
                     contextIndex = providerSpecificChanges.length - 1;
@@ -202,26 +204,28 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         this._actionbarWidget.context = [diffEditorModel.modified.uri, providerSpecificChanges, contextIndex];
         if (usePosition) {
-            this.show(position, height);
+            this.show(position, height + (1 / lineHeight));
             this.editor.setPosition(position);
             this.editor.focus();
         }
     }
-    renderTitle(label) {
-        const providerChanges = this.model.quickDiffChanges.get(label);
+    renderTitle() {
+        const providerChanges = this.model.quickDiffChanges.get(this._providerId);
         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(
-                9082,
+                9319,
                 "{0} - {1} of {2} changes",
                 label,
                 providerIndex + 1,
                 providerChanges.length
             ))
                 : ( localize(
-                9083,
+                9320,
                 "{0} - {1} of {2} change",
                 label,
                 providerIndex + 1,
@@ -231,27 +235,27 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
         }
         else {
             detail = this.model.changes.length > 1
-                ? ( localize(9084, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
-                : ( localize(9085, "{0} of {1} change", providerIndex + 1, providerChanges.length));
+                ? ( localize(9321, "{0} of {1} changes", providerIndex + 1, providerChanges.length))
+                : ( localize(9322, "{0} of {1} change", providerIndex + 1, providerChanges.length));
             this.dropdownContainer.style.display = 'inherit';
         }
         this.setTitle(this.title, detail);
     }
     switchQuickDiff(event) {
-        const newProvider = event?.provider;
-        if (newProvider === this.model.changes[this._index].label) {
+        const newProviderId = event?.providerId;
+        if (newProviderId === this.model.changes[this._index].providerId) {
             return;
         }
         let closestGreaterIndex = this._index < this.model.changes.length - 1 ? this._index + 1 : 0;
         for (let i = closestGreaterIndex; i !== this._index; i < this.model.changes.length - 1 ? i++ : i = 0) {
-            if (this.model.changes[i].label === newProvider) {
+            if (this.model.changes[i].providerId === newProviderId) {
                 closestGreaterIndex = i;
                 break;
             }
         }
         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) {
-            if (this.model.changes[i].label === newProvider) {
+            if (this.model.changes[i].providerId === newProviderId) {
                 closestLesserIndex = i;
                 break;
             }
@@ -281,16 +285,16 @@ 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(9086, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
+        this._actionbarWidget.push(this._disposables.add(( new Action('peekview.close', ( localize(9323, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => this.dispose()))), { label: false, icon: true });
     }
-    updateDropdown(label) {
+    updateDropdown() {
         const quickDiffs = this.getQuickDiffsContainingChange();
-        this.dropdown?.setSelection(( quickDiffs.map(quickDiff => quickDiff.label)), label);
+        this.dropdown?.setSelection(quickDiffs, this._providerId);
     }
     getQuickDiffsContainingChange() {
         const change = this.model.changes[this._index];
         const quickDiffsWithChange = ( this.model.changes
-            .filter(c => change.change2.modified.overlapOrTouch(c.change2.modified))
+            .filter(c => change.change2.modified.intersectsOrTouches(c.change2.modified))
             .map(c => c.providerId));
         return this.model.quickDiffs
             .filter(quickDiff => quickDiffsWithChange.includes(quickDiff.id) &&
@@ -317,7 +321,15 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
     }
     _fillBody(container) {
         const options = {
-            scrollBeyondLastLine: true,
+            diffAlgorithm: 'advanced',
+            fixedOverflowWidgets: true,
+            ignoreTrimWhitespace: false,
+            minimap: { enabled: false },
+            readOnly: false,
+            renderGutterMenu: false,
+            renderIndicators: false,
+            renderOverviewRuler: false,
+            renderSideBySide: false,
             scrollbar: {
                 verticalScrollbarSize: 14,
                 horizontal: 'auto',
@@ -325,14 +337,7 @@ let QuickDiffWidget = class QuickDiffWidget extends PeekViewWidget {
                 verticalHasArrows: false,
                 horizontalHasArrows: false
             },
-            overviewRulerLanes: 2,
-            fixedOverflowWidgets: true,
-            minimap: { enabled: false },
-            renderSideBySide: false,
-            readOnly: false,
-            renderIndicators: false,
-            diffAlgorithm: 'advanced',
-            ignoreTrimWhitespace: false,
+            scrollBeyondLastLine: false,
             stickyScroll: { enabled: false }
         };
         this.diffEditor = this.instantiationService.createInstance(EmbeddedDiffEditorWidget, container, options, {}, this.editor);
@@ -466,11 +471,11 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
             return;
         }
         let index;
-        if (this.editor.hasModel() && (typeof lineNumber === 'number' || !this.widget.provider)) {
-            index = this.model.findNextClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
+        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.provider) ?? ( this.model.quickDiffChanges.values()).next().value;
+            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)];
         }
@@ -484,11 +489,11 @@ let QuickDiffEditorController = class QuickDiffEditorController extends Disposab
             return;
         }
         let index;
-        if (this.editor.hasModel() && (typeof lineNumber === 'number')) {
-            index = this.model.findPreviousClosestChange(typeof lineNumber === 'number' ? lineNumber : this.editor.getPosition().lineNumber, true, this.widget.provider);
+        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.provider) ?? ( this.model.quickDiffChanges.values()).next().value;
+            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)];
         }
@@ -631,7 +636,7 @@ class ShowPreviousChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.previous',
-            label: ( localize2(9087, "Show Previous Change")),
+            label: ( localize2(9324, "Show Previous Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -657,7 +662,7 @@ class ShowNextChangeAction extends EditorAction {
     constructor(outerEditor) {
         super({
             id: 'editor.action.dirtydiff.next',
-            label: ( localize2(9088, "Show Next Change")),
+            label: ( localize2(9325, "Show Next Change")),
             precondition: ( TextCompareEditorActiveContext.toNegated()),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
@@ -683,7 +688,7 @@ class GotoPreviousChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.previousChange',
-            label: ( localize2(9089, "Go to Previous Change")),
+            label: ( localize2(9326, "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 }
         });
@@ -718,7 +723,7 @@ class GotoNextChangeAction extends EditorAction {
     constructor() {
         super({
             id: 'workbench.action.editor.nextChange',
-            label: ( localize2(9090, "Go to Next Change")),
+            label: ( localize2(9327, "Go to Next Change")),
             precondition: ( ContextKeyExpr.and(( TextCompareEditorActiveContext.toNegated()), ( quickDiffDecorationCount.notEqualsTo(0)))),
             kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
@@ -753,7 +758,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.next',
-        title: ( localize(9091, "Next &&Change"))
+        title: ( localize(9328, "Next &&Change"))
     },
     order: 1
 });
@@ -761,7 +766,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '7_change_nav',
     command: {
         id: 'editor.action.dirtydiff.previous',
-        title: ( localize(9092, "Previous &&Change"))
+        title: ( localize(9329, "Previous &&Change"))
     },
     order: 2
 });