@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -0,0 +1,281 @@
+import { getActiveElement } from '../../../../base/browser/dom.js';
+import { Codicon } from '../../../../base/common/codicons.js';
+import { EditorAction2 } from '../../editorExtensions.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { DiffEditorWidget } from './diffEditorWidget.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { localize2WithPath } from '../../../../nls.js';
+import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import './registrations.contribution.js';
+class ToggleCollapseUnchangedRegions extends Action2 {
+    constructor() {
+        super({
+            id: 'diffEditor.toggleCollapseUnchangedRegions',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'toggleCollapseUnchangedRegions',
+                'Toggle Collapse Unchanged Regions'
+            )),
+            icon: Codicon.map,
+            toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            menu: {
+                when: ( ContextKeyExpr.has('isInDiffEditor')),
+                id: MenuId.EditorTitle,
+                order: 22,
+                group: 'navigation',
+            },
+        });
+    }
+    run(accessor, ...args) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.hideUnchangedRegions.enabled');
+        configurationService.updateValue('diffEditor.hideUnchangedRegions.enabled', newValue);
+    }
+}
+class ToggleShowMovedCodeBlocks extends Action2 {
+    constructor() {
+        super({
+            id: 'diffEditor.toggleShowMovedCodeBlocks',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'toggleShowMovedCodeBlocks',
+                'Toggle Show Moved Code Blocks'
+            )),
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        });
+    }
+    run(accessor, ...args) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.experimental.showMoves');
+        configurationService.updateValue('diffEditor.experimental.showMoves', newValue);
+    }
+}
+class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
+    constructor() {
+        super({
+            id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'toggleUseInlineViewWhenSpaceIsLimited',
+                'Toggle Use Inline View When Space Is Limited'
+            )),
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+        });
+    }
+    run(accessor, ...args) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.useInlineViewWhenSpaceIsLimited');
+        configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
+    }
+}
+const diffEditorCategory = ( localize2WithPath(
+    'vs/editor/browser/widget/diffEditor/commands',
+    'diffEditor',
+    "Diff Editor"
+));
+class SwitchSide extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'diffEditor.switchSide',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'switchSide',
+                'Switch Side'
+            )),
+            icon: Codicon.arrowSwap,
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            f1: true,
+            category: diffEditorCategory,
+        });
+    }
+    runEditorCommand(accessor, editor, arg) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        if (diffEditor instanceof DiffEditorWidget) {
+            if (arg && arg.dryRun) {
+                return { destinationSelection: diffEditor.mapToOtherSide().destinationSelection };
+            }
+            else {
+                diffEditor.switchSide();
+            }
+        }
+        return undefined;
+    }
+}
+class ExitCompareMove extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'diffEditor.exitCompareMove',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'exitCompareMove',
+                'Exit Compare Move'
+            )),
+            icon: Codicon.close,
+            precondition: EditorContextKeys.comparingMovedCode,
+            f1: false,
+            category: diffEditorCategory,
+            keybinding: {
+                weight: 10000,
+                primary: 9 ,
+            }
+        });
+    }
+    runEditorCommand(accessor, editor, ...args) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        if (diffEditor instanceof DiffEditorWidget) {
+            diffEditor.exitCompareMove();
+        }
+    }
+}
+class CollapseAllUnchangedRegions extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'diffEditor.collapseAllUnchangedRegions',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'collapseAllUnchangedRegions',
+                'Collapse All Unchanged Regions'
+            )),
+            icon: Codicon.fold,
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            f1: true,
+            category: diffEditorCategory,
+        });
+    }
+    runEditorCommand(accessor, editor, ...args) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        if (diffEditor instanceof DiffEditorWidget) {
+            diffEditor.collapseAllUnchangedRegions();
+        }
+    }
+}
+class ShowAllUnchangedRegions extends EditorAction2 {
+    constructor() {
+        super({
+            id: 'diffEditor.showAllUnchangedRegions',
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'showAllUnchangedRegions',
+                'Show All Unchanged Regions'
+            )),
+            icon: Codicon.unfold,
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            f1: true,
+            category: diffEditorCategory,
+        });
+    }
+    runEditorCommand(accessor, editor, ...args) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        if (diffEditor instanceof DiffEditorWidget) {
+            diffEditor.showAllUnchangedRegions();
+        }
+    }
+}
+class RevertHunkOrSelection extends Action2 {
+    constructor() {
+        super({
+            id: 'diffEditor.revert',
+            title: ( localize2WithPath('vs/editor/browser/widget/diffEditor/commands', 'revert', 'Revert')),
+            f1: false,
+            category: diffEditorCategory,
+        });
+    }
+    run(accessor, arg) {
+        const diffEditor = findDiffEditor(accessor, arg.originalUri, arg.modifiedUri);
+        if (diffEditor instanceof DiffEditorWidget) {
+            diffEditor.revertRangeMappings(arg.mapping.innerChanges ?? []);
+        }
+        return undefined;
+    }
+}
+const accessibleDiffViewerCategory = ( localize2WithPath(
+    'vs/editor/browser/widget/diffEditor/commands',
+    'accessibleDiffViewer',
+    "Accessible Diff Viewer"
+));
+class AccessibleDiffViewerNext extends Action2 {
+    static { this.id = 'editor.action.accessibleDiffViewer.next'; }
+    constructor() {
+        super({
+            id: AccessibleDiffViewerNext.id,
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'editor.action.accessibleDiffViewer.next',
+                'Go to Next Difference'
+            )),
+            category: accessibleDiffViewerCategory,
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            keybinding: {
+                primary: 65 ,
+                weight: 100
+            },
+            f1: true,
+        });
+    }
+    run(accessor) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        diffEditor?.accessibleDiffViewerNext();
+    }
+}
+class AccessibleDiffViewerPrev extends Action2 {
+    static { this.id = 'editor.action.accessibleDiffViewer.prev'; }
+    constructor() {
+        super({
+            id: AccessibleDiffViewerPrev.id,
+            title: ( localize2WithPath(
+                'vs/editor/browser/widget/diffEditor/commands',
+                'editor.action.accessibleDiffViewer.prev',
+                'Go to Previous Difference'
+            )),
+            category: accessibleDiffViewerCategory,
+            precondition: ( ContextKeyExpr.has('isInDiffEditor')),
+            keybinding: {
+                primary: 1024  | 65 ,
+                weight: 100
+            },
+            f1: true,
+        });
+    }
+    run(accessor) {
+        const diffEditor = findFocusedDiffEditor(accessor);
+        diffEditor?.accessibleDiffViewerPrev();
+    }
+}
+function findDiffEditor(accessor, originalUri, modifiedUri) {
+    const codeEditorService = accessor.get(ICodeEditorService);
+    const diffEditors = codeEditorService.listDiffEditors();
+    return diffEditors.find(diffEditor => {
+        const modified = diffEditor.getModifiedEditor();
+        const original = diffEditor.getOriginalEditor();
+        return modified && modified.getModel()?.uri.toString() === ( modifiedUri.toString())
+            && original && original.getModel()?.uri.toString() === ( originalUri.toString());
+    }) || null;
+}
+function findFocusedDiffEditor(accessor) {
+    const codeEditorService = accessor.get(ICodeEditorService);
+    const diffEditors = codeEditorService.listDiffEditors();
+    const activeElement = getActiveElement();
+    if (activeElement) {
+        for (const d of diffEditors) {
+            const container = d.getContainerDomNode();
+            if (isElementOrParentOf(container, activeElement)) {
+                return d;
+            }
+        }
+    }
+    return null;
+}
+function isElementOrParentOf(elementOrParent, element) {
+    let e = element;
+    while (e) {
+        if (e === elementOrParent) {
+            return true;
+        }
+        e = e.parentElement;
+    }
+    return false;
+}
+export { AccessibleDiffViewerNext, AccessibleDiffViewerPrev, CollapseAllUnchangedRegions, ExitCompareMove, RevertHunkOrSelection, ShowAllUnchangedRegions, SwitchSide, ToggleCollapseUnchangedRegions, ToggleShowMovedCodeBlocks, ToggleUseInlineViewWhenSpaceIsLimited, findDiffEditor, findFocusedDiffEditor };

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

@@ -7,6 +7,11 @@ import { Action } from '../../../../../base/common/actions.js';
 import { groupAdjacentBy, forEachAdjacent } from '../../../../../base/common/arrays.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
+import { transaction, observableValue, subtransaction } from '../../../../../base/common/observableInternal/base.js';
+import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { applyStyle } from '../utils.js';
@@ -25,9 +30,6 @@ import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../..
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';
-import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
-import { transaction, observableValue, subtransaction } from '../../../../../base/common/observableInternal/base.js';
-import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
 const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localizeWithPath(
     'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer',
     'accessibleDiffViewerInsertIcon',
@@ -446,9 +448,9 @@ let View = class View extends Disposable {
         this._scrollbar.scanDomNode();
     }
     _createRow(item, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts) {
-        const originalLayoutInfo = originalOptions.get(144 );
+        const originalLayoutInfo = originalOptions.get(145 );
         const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
-        const modifiedLayoutInfo = modifiedOptions.get(144 );
+        const modifiedLayoutInfo = modifiedOptions.get(145 );
         const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
         let rowClassName = 'diff-review-row';
         let lineNumbersExtraClassName = '';

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

@@ -1,8 +1,11 @@
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/observableInternal/autorun.js';
+import '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { MovedBlocksLinesFeature } from '../features/movedBlocksLinesFeature.js';
 import { diffLineDeleteDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineAddDecorationBackground, diffWholeLineDeleteDecoration, diffWholeLineAddDecoration, diffDeleteDecorationEmpty, diffDeleteDecoration, diffAddDecorationEmpty, diffAddDecoration } from '../registrations.contribution.js';
 import { applyObservableDecorations } from '../utils.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
 class DiffEditorDecorations extends Disposable {
     constructor(_editors, _diffModel, _options, widget) {
         super();

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

@@ -1,34 +1,40 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from '../../../../../base/common/event.js';
+import { Emitter, Event } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
+import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
+import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
+import { Position } from '../../../../common/core/position.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 { derivedOpts } from '../../../../../base/common/observableInternal/derived.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) {
+    constructor(originalEditorElement, modifiedEditorElement, _options, _argCodeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {
         super();
         this.originalEditorElement = originalEditorElement;
         this.modifiedEditorElement = modifiedEditorElement;
         this._options = _options;
+        this._argCodeEditorWidgetOptions = _argCodeEditorWidgetOptions;
         this._createInnerEditor = _createInnerEditor;
         this._instantiationService = _instantiationService;
         this._keybindingService = _keybindingService;
+        this.original = this._register(this._createLeftHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.originalEditor || {}));
+        this.modified = this._register(this._createRightHandSideEditor(this._options.editorOptions.get(), this._argCodeEditorWidgetOptions.modifiedEditor || {}));
         this._onDidContentSizeChange = this._register(( new Emitter()));
-        this.original = this._register(this._createLeftHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.originalEditor || {}));
-        this.modified = this._register(this._createRightHandSideEditor(_options.editorOptions.get(), codeEditorWidgetOptions.modifiedEditor || {}));
-        this.modifiedModel = observableFromEvent(this.modified.onDidChangeModel, () =>  this.modified.getModel());
         this.modifiedScrollTop = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollTop());
         this.modifiedScrollHeight = observableFromEvent(this.modified.onDidScrollChange, () =>  this.modified.getScrollHeight());
+        this.modifiedModel = observableFromEvent(this.modified.onDidChangeModel, () =>  this.modified.getModel());
         this.modifiedSelections = observableFromEvent(this.modified.onDidChangeCursorSelection, () => this.modified.getSelections() ?? []);
         this.modifiedCursor = derivedOpts({ owner: this, equalityComparer: Position.equals }, reader => this.modifiedSelections.read(reader)[0]?.getPosition() ?? ( new Position(1, 1)));
         this.originalCursor = observableFromEvent(this.original.onDidChangeCursorPosition, () => this.original.getPosition() ?? ( new Position(1, 1)));
+        this.isOriginalFocused = observableFromEvent(Event.any(this.original.onDidFocusEditorWidget, this.original.onDidBlurEditorWidget), () => this.original.hasWidgetFocus());
+        this.isModifiedFocused = observableFromEvent(Event.any(this.modified.onDidFocusEditorWidget, this.modified.onDidBlurEditorWidget), () => this.modified.hasWidgetFocus());
+        this.isFocused = derived(this, reader => this.isOriginalFocused.read(reader) || this.isModifiedFocused.read(reader));
+        this._argCodeEditorWidgetOptions = null;
         this._register(autorunHandleChanges({
             createEmptyChangeSummary: () => ({}),
             handleChange: (ctx, changeSummary) => {

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

@@ -3,6 +3,8 @@ 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 '../../../../../base/common/observableInternal/utils.js';
+import '../../../../../base/common/cancellation.js';
 class DiffEditorSash extends Disposable {
     constructor(_options, _domNode, _dimensions, _sashes) {
         super();

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

@@ -4,6 +4,11 @@ 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 { observableValue } from '../../../../../../base/common/observableInternal/base.js';
+import { derivedWithStore, derived } from '../../../../../../base/common/observableInternal/derived.js';
+import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
+import '../../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { assertIsDefined } from '../../../../../../base/common/types.js';
 import { applyFontInfo } from '../../../../config/domFontInfo.js';
@@ -17,10 +22,6 @@ 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();
@@ -51,12 +52,12 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             updateImmediately.schedule();
         } }));
         this._register(this._editors.original.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(145 ) || args.hasChanged(67 )) {
+            if (args.hasChanged(146 ) || args.hasChanged(67 )) {
                 updateImmediately.schedule();
             }
         }));
         this._register(this._editors.modified.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(145 ) || args.hasChanged(67 )) {
+            if (args.hasChanged(146 ) || args.hasChanged(67 )) {
                 updateImmediately.schedule();
             }
         }));
@@ -247,7 +248,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                             return $('div', {}, arrow);
                         }
                         let marginDomNode = undefined;
-                        if (a.diff && a.diff.modified.isEmpty && this._options.shouldRenderRevertArrows.read(reader)) {
+                        if (a.diff && a.diff.modified.isEmpty && this._options.shouldRenderOldRevertArrows.read(reader)) {
                             marginDomNode = createViewZoneMarginArrow();
                         }
                         modViewZones.push({
@@ -465,7 +466,7 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
 function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const viewZoneHeights = [];
     const wrappingZoneHeights = [];
-    const hasWrapping = editor.getOption(145 ).wrappingColumn !== -1;
+    const hasWrapping = editor.getOption(146 ).wrappingColumn !== -1;
     const coordinatesConverter = editor._getViewModel().coordinatesConverter;
     const editorLineHeight = editor.getOption(67 );
     if (hasWrapping) {

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

@@ -57,7 +57,7 @@ class RenderOptions {
     static fromEditor(editor) {
         const modifiedEditorOptions = editor.getOptions();
         const fontInfo = modifiedEditorOptions.get(50 );
-        const layoutInfo = modifiedEditorOptions.get(144 );
+        const layoutInfo = modifiedEditorOptions.get(145 );
         return ( new RenderOptions(
             editor.getModel()?.getOptions().tabSize || 0,
             fontInfo,