@codingame/monaco-vscode-api 21.5.1 → 22.0.0

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

@@ -314,16 +314,16 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
         this._modifiedScrollTop = observableFromEvent(this._editors.modified.onDidScrollChange, () =>  this._editors.modified.getScrollTop());
         this._register(autorun(reader => {
             const newScrollTopModified = this._originalScrollTop.read(reader)
-                - (this._originalScrollOffsetAnimated.get() - this._modifiedScrollOffsetAnimated.read(reader))
-                - (this._originalTopPadding.get() - this._modifiedTopPadding.read(reader));
+                - (this._originalScrollOffsetAnimated.read(undefined) - this._modifiedScrollOffsetAnimated.read(reader))
+                - (this._originalTopPadding.read(undefined) - this._modifiedTopPadding.read(reader));
             if (newScrollTopModified !== this._editors.modified.getScrollTop()) {
                 this._editors.modified.setScrollTop(newScrollTopModified, ScrollType.Immediate);
             }
         }));
         this._register(autorun(reader => {
             const newScrollTopOriginal = this._modifiedScrollTop.read(reader)
-                - (this._modifiedScrollOffsetAnimated.get() - this._originalScrollOffsetAnimated.read(reader))
-                - (this._modifiedTopPadding.get() - this._originalTopPadding.read(reader));
+                - (this._modifiedScrollOffsetAnimated.read(undefined) - this._originalScrollOffsetAnimated.read(reader))
+                - (this._modifiedTopPadding.read(undefined) - this._originalTopPadding.read(reader));
             if (newScrollTopOriginal !== this._editors.original.getScrollTop()) {
                 this._editors.original.setScrollTop(newScrollTopOriginal, ScrollType.Immediate);
             }
@@ -332,8 +332,8 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             const m = this._diffModel.read(reader)?.movedTextToCompare.read(reader);
             let deltaOrigToMod = 0;
             if (m) {
-                const trueTopOriginal = this._editors.original.getTopForLineNumber(m.lineRangeMapping.original.startLineNumber, true) - this._originalTopPadding.get();
-                const trueTopModified = this._editors.modified.getTopForLineNumber(m.lineRangeMapping.modified.startLineNumber, true) - this._modifiedTopPadding.get();
+                const trueTopOriginal = this._editors.original.getTopForLineNumber(m.lineRangeMapping.original.startLineNumber, true) - this._originalTopPadding.read(undefined);
+                const trueTopModified = this._editors.modified.getTopForLineNumber(m.lineRangeMapping.modified.startLineNumber, true) - this._modifiedTopPadding.read(undefined);
                 deltaOrigToMod = trueTopModified - trueTopOriginal;
             }
             if (deltaOrigToMod > 0) {
@@ -351,10 +351,10 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                 }, 400);
             }
             if (this._editors.modified.hasTextFocus()) {
-                this._originalScrollOffset.set(this._modifiedScrollOffset.get() - deltaOrigToMod, undefined, true);
+                this._originalScrollOffset.set(this._modifiedScrollOffset.read(undefined) - deltaOrigToMod, undefined, true);
             }
             else {
-                this._modifiedScrollOffset.set(this._originalScrollOffset.get() + deltaOrigToMod, undefined, true);
+                this._modifiedScrollOffset.set(this._originalScrollOffset.read(undefined) + deltaOrigToMod, undefined, true);
             }
         }));
     }

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

@@ -54,7 +54,7 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             }
             else {
                 transaction(tx => {
-                    for (const r of this._unchangedRegions.get()?.regions || []) {
+                    for (const r of this._unchangedRegions.read(undefined)?.regions || []) {
                         r.collapseAll(tx);
                     }
                 });
@@ -110,8 +110,8 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
                         touching[0].originalLineNumber,
                         touching[0].modifiedLineNumber,
                         sumLineCount,
-                        touching[0].visibleLineCountTop.get(),
-                        touching[touching.length - 1].visibleLineCountBottom.get()
+                        touching[0].visibleLineCountTop.read(undefined),
+                        touching[touching.length - 1].visibleLineCountBottom.read(undefined)
                     ));
                     newRanges.push(r);
                 }
@@ -240,7 +240,7 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
                 const state = DiffState.fromDiffResult(result);
                 this._diff.set(state, tx);
                 this._isDiffUpToDate.set(true, tx);
-                const currentSyncedMovedText = this.movedTextToCompare.get();
+                const currentSyncedMovedText = this.movedTextToCompare.read(undefined);
                 this.movedTextToCompare.set(currentSyncedMovedText ? this._lastDiff.moves.find(m => m.lineRangeMapping.modified.intersect(currentSyncedMovedText.lineRangeMapping.modified)) : undefined, tx);
             });
         }));

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.d.ts

@@ -96,6 +96,7 @@ export declare class DiffEditorWidget extends DelegatingEditor implements IDiffE
     getDiffComputationResult(): IDiffComputationResult | null;
     revert(diff: LineRangeMapping): void;
     revertRangeMappings(diffs: RangeMapping[]): void;
+    revertFocusedRangeMappings(): void;
     private _goTo;
     goToDiff(target: "previous" | "next"): void;
     revealFirstDiff(): void;

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

@@ -16,6 +16,7 @@ import { ServiceCollection } from '../../../../platform/instantiation/common/ser
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { bindContextKey } from '../../../../platform/observable/common/platformObservableUtils.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
+import { LineRange } from '../../../common/core/ranges/lineRange.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { CursorChangeReason } from '../../../common/cursorEvents.js';
@@ -174,7 +175,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         const origViewZoneIdsToIgnore = ( new Set());
         const modViewZoneIdsToIgnore = ( new Set());
         let isUpdatingViewZones = false;
-        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.get().isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
+        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.read(undefined).isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
         const originalViewZones = derived(this, (reader) => {
             const orig = viewZoneManager.read(reader).viewZones.read(reader).orig;
             const orig2 = unchangedRangesFeature.read(reader).viewZones.read(reader).origViewZones;
@@ -391,6 +392,30 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         })));
         this._editors.modified.executeEdits('diffEditor', changes);
     }
+    revertFocusedRangeMappings() {
+        const model = this._diffModel.get();
+        if (!model || !model.isDiffUpToDate.get()) {
+            return;
+        }
+        const diffs = this._diffModel.get()?.diff.get()?.mappings;
+        if (!diffs || diffs.length === 0) {
+            return;
+        }
+        const modifiedEditor = this._editors.modified;
+        if (!modifiedEditor.hasTextFocus()) {
+            return;
+        }
+        const curLineNumber = modifiedEditor.getPosition().lineNumber;
+        const selection = modifiedEditor.getSelection();
+        const selectedRange = LineRange.fromRange(selection || ( new Range(curLineNumber, 0, curLineNumber, 0)));
+        const diffsToRevert = diffs.filter(d => {
+            return d.lineRangeMapping.modified.intersect(selectedRange);
+        });
+        modifiedEditor.executeEdits('diffEditor', ( diffsToRevert.map(d => ({
+            range: d.lineRangeMapping.modified.toExclusiveRange(),
+            text: model.model.original.getValueInRange(d.lineRangeMapping.original.toExclusiveRange())
+        }))));
+    }
     _goTo(diff) {
         this._editors.modified.setPosition(( new Position(diff.lineRangeMapping.modified.startLineNumber, 1)));
         this._editors.modified.revealRangeInCenter(diff.lineRangeMapping.modified.toExclusiveRange());

package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js

@@ -203,7 +203,7 @@ let DiffToolBar = class DiffToolBar extends Disposable {
                 overflowBehavior: { maxItems: this._isSmall.read(reader) ? 1 : 3 },
                 hiddenItemStrategy: HiddenItemStrategy.Ignore,
                 actionRunner: store.add(( new ActionRunnerWithContext(() => {
-                    const item = this._item.get();
+                    const item = this._item.read(undefined);
                     const mapping = item.mapping;
                     return {
                         mapping,

package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js

@@ -192,7 +192,7 @@ class MovedBlocksLinesFeature extends Disposable {
                     movedText = diff.movedTexts.find(m => m.lineRangeMapping.modified.contains(modifiedPos.lineNumber));
                 }
             }
-            if (movedText !== m.movedTextToCompare.get()) {
+            if (movedText !== m.movedTextToCompare.read(undefined)) {
                 m.movedTextToCompare.set(undefined, undefined);
             }
             m.setActiveMovedText(movedText);

package/vscode/src/vs/editor/common/config/editorOptions.d.ts

@@ -1090,6 +1090,7 @@ export interface IInlineSuggestOptions {
     syntaxHighlightingEnabled?: boolean;
     suppressSuggestions?: boolean;
     minShowDelay?: number;
+    suppressInSnippetMode?: boolean;
     /**
      * Does not clear active inline suggestions when the editor loses focus.
      */
@@ -1119,6 +1120,10 @@ export interface IInlineSuggestOptions {
         * @internal
         */
         suppressInlineSuggestions?: string;
+        /**
+        * @internal
+        */
+        emptyResponseInformation?: boolean;
         showOnSuggestConflict?: "always" | "never" | "whenSuggestListIsIncomplete";
     };
 }
@@ -1518,91 +1523,92 @@ export declare enum EditorOption {
     mouseWheelZoom = 84,
     multiCursorMergeOverlapping = 85,
     multiCursorModifier = 86,
-    multiCursorPaste = 87,
-    multiCursorLimit = 88,
-    occurrencesHighlight = 89,
-    occurrencesHighlightDelay = 90,
-    overtypeCursorStyle = 91,
-    overtypeOnPaste = 92,
-    overviewRulerBorder = 93,
-    overviewRulerLanes = 94,
-    padding = 95,
-    pasteAs = 96,
-    parameterHints = 97,
-    peekWidgetDefaultFocus = 98,
-    placeholder = 99,
-    definitionLinkOpensInPeek = 100,
-    quickSuggestions = 101,
-    quickSuggestionsDelay = 102,
-    readOnly = 103,
-    readOnlyMessage = 104,
-    renameOnType = 105,
-    renderRichScreenReaderContent = 106,
-    renderControlCharacters = 107,
-    renderFinalNewline = 108,
-    renderLineHighlight = 109,
-    renderLineHighlightOnlyWhenFocus = 110,
-    renderValidationDecorations = 111,
-    renderWhitespace = 112,
-    revealHorizontalRightPadding = 113,
-    roundedSelection = 114,
-    rulers = 115,
-    scrollbar = 116,
-    scrollBeyondLastColumn = 117,
-    scrollBeyondLastLine = 118,
-    scrollPredominantAxis = 119,
-    selectionClipboard = 120,
-    selectionHighlight = 121,
-    selectionHighlightMaxLength = 122,
-    selectionHighlightMultiline = 123,
-    selectOnLineNumbers = 124,
-    showFoldingControls = 125,
-    showUnused = 126,
-    snippetSuggestions = 127,
-    smartSelect = 128,
-    smoothScrolling = 129,
-    stickyScroll = 130,
-    stickyTabStops = 131,
-    stopRenderingLineAfter = 132,
-    suggest = 133,
-    suggestFontSize = 134,
-    suggestLineHeight = 135,
-    suggestOnTriggerCharacters = 136,
-    suggestSelection = 137,
-    tabCompletion = 138,
-    tabIndex = 139,
-    trimWhitespaceOnDelete = 140,
-    unicodeHighlighting = 141,
-    unusualLineTerminators = 142,
-    useShadowDOM = 143,
-    useTabStops = 144,
-    wordBreak = 145,
-    wordSegmenterLocales = 146,
-    wordSeparators = 147,
-    wordWrap = 148,
-    wordWrapBreakAfterCharacters = 149,
-    wordWrapBreakBeforeCharacters = 150,
-    wordWrapColumn = 151,
-    wordWrapOverride1 = 152,
-    wordWrapOverride2 = 153,
-    wrappingIndent = 154,
-    wrappingStrategy = 155,
-    showDeprecated = 156,
-    inertialScroll = 157,
-    inlayHints = 158,
-    wrapOnEscapedLineFeeds = 159,
-    effectiveCursorStyle = 160,
-    editorClassName = 161,
-    pixelRatio = 162,
-    tabFocusMode = 163,
-    layoutInfo = 164,
-    wrappingInfo = 165,
-    defaultColorDecorators = 166,
-    colorDecoratorsActivatedOn = 167,
-    inlineCompletionsAccessibilityVerbose = 168,
-    effectiveEditContext = 169,
-    scrollOnMiddleClick = 170,
-    effectiveAllowVariableFonts = 171
+    mouseMiddleClickAction = 87,
+    multiCursorPaste = 88,
+    multiCursorLimit = 89,
+    occurrencesHighlight = 90,
+    occurrencesHighlightDelay = 91,
+    overtypeCursorStyle = 92,
+    overtypeOnPaste = 93,
+    overviewRulerBorder = 94,
+    overviewRulerLanes = 95,
+    padding = 96,
+    pasteAs = 97,
+    parameterHints = 98,
+    peekWidgetDefaultFocus = 99,
+    placeholder = 100,
+    definitionLinkOpensInPeek = 101,
+    quickSuggestions = 102,
+    quickSuggestionsDelay = 103,
+    readOnly = 104,
+    readOnlyMessage = 105,
+    renameOnType = 106,
+    renderRichScreenReaderContent = 107,
+    renderControlCharacters = 108,
+    renderFinalNewline = 109,
+    renderLineHighlight = 110,
+    renderLineHighlightOnlyWhenFocus = 111,
+    renderValidationDecorations = 112,
+    renderWhitespace = 113,
+    revealHorizontalRightPadding = 114,
+    roundedSelection = 115,
+    rulers = 116,
+    scrollbar = 117,
+    scrollBeyondLastColumn = 118,
+    scrollBeyondLastLine = 119,
+    scrollPredominantAxis = 120,
+    selectionClipboard = 121,
+    selectionHighlight = 122,
+    selectionHighlightMaxLength = 123,
+    selectionHighlightMultiline = 124,
+    selectOnLineNumbers = 125,
+    showFoldingControls = 126,
+    showUnused = 127,
+    snippetSuggestions = 128,
+    smartSelect = 129,
+    smoothScrolling = 130,
+    stickyScroll = 131,
+    stickyTabStops = 132,
+    stopRenderingLineAfter = 133,
+    suggest = 134,
+    suggestFontSize = 135,
+    suggestLineHeight = 136,
+    suggestOnTriggerCharacters = 137,
+    suggestSelection = 138,
+    tabCompletion = 139,
+    tabIndex = 140,
+    trimWhitespaceOnDelete = 141,
+    unicodeHighlighting = 142,
+    unusualLineTerminators = 143,
+    useShadowDOM = 144,
+    useTabStops = 145,
+    wordBreak = 146,
+    wordSegmenterLocales = 147,
+    wordSeparators = 148,
+    wordWrap = 149,
+    wordWrapBreakAfterCharacters = 150,
+    wordWrapBreakBeforeCharacters = 151,
+    wordWrapColumn = 152,
+    wordWrapOverride1 = 153,
+    wordWrapOverride2 = 154,
+    wrappingIndent = 155,
+    wrappingStrategy = 156,
+    showDeprecated = 157,
+    inertialScroll = 158,
+    inlayHints = 159,
+    wrapOnEscapedLineFeeds = 160,
+    effectiveCursorStyle = 161,
+    editorClassName = 162,
+    pixelRatio = 163,
+    tabFocusMode = 164,
+    layoutInfo = 165,
+    wrappingInfo = 166,
+    defaultColorDecorators = 167,
+    colorDecoratorsActivatedOn = 168,
+    inlineCompletionsAccessibilityVerbose = 169,
+    effectiveEditContext = 170,
+    scrollOnMiddleClick = 171,
+    effectiveAllowVariableFonts = 172
 }
 export declare const EditorOptions: {
     acceptSuggestionOnCommitCharacter: IEditorOption<EditorOption.acceptSuggestionOnCommitCharacter, boolean>;
@@ -1697,6 +1703,7 @@ export declare const EditorOptions: {
     mouseWheelZoom: IEditorOption<EditorOption.mouseWheelZoom, boolean>;
     multiCursorMergeOverlapping: IEditorOption<EditorOption.multiCursorMergeOverlapping, boolean>;
     multiCursorModifier: IEditorOption<EditorOption.multiCursorModifier, "ctrlKey" | "altKey" | "metaKey">;
+    mouseMiddleClickAction: IEditorOption<EditorOption.mouseMiddleClickAction, MouseMiddleClickAction>;
     multiCursorPaste: IEditorOption<EditorOption.multiCursorPaste, "spread" | "full">;
     multiCursorLimit: IEditorOption<EditorOption.multiCursorLimit, number>;
     occurrencesHighlight: IEditorOption<EditorOption.occurrencesHighlight, "off" | "singleFile" | "multiFile">;
@@ -1784,4 +1791,5 @@ type FindEditorOptionsKeyById<T extends EditorOption> = {
 }[keyof EditorOptionsType];
 type ComputedEditorOptionValue<T extends IEditorOption<any, any>> = T extends IEditorOption<any, infer R> ? R : never;
 export type FindComputedEditorOptionValueById<T extends EditorOption> = NonNullable<ComputedEditorOptionValue<EditorOptionsType[FindEditorOptionsKeyById<T>]>>;
+export type MouseMiddleClickAction = "default" | "openLink" | "ctrlLeftClick";
 export {};