@codingame/monaco-vscode-api 4.5.2 → 5.0.1

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -1,12 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { h, scheduleAtNextAnimationFrame, getWindow } from '../../../../base/browser/dom.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
-import { findFirstMaxBy } from '../../../../base/common/arraysFind.js';
+import { compareBy, numberComparator } from '../../../../base/common/arrays.js';
+import { findFirstMax } from '../../../../base/common/arraysFind.js';
+import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
-import { transaction, globalTransaction, disposableObservableValue, observableValue } from '../../../../base/common/observableInternal/base.js';
+import { globalTransaction, transaction, disposableObservableValue, observableValue } from '../../../../base/common/observableInternal/base.js';
 import { derivedWithStore, derived } from '../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore, autorun } from '../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent, derivedObservableWithCache } from '../../../../base/common/observableInternal/utils.js';
+import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import { Scrollable } from '../../../../base/common/scrollable.js';
 import './style.css.js';
@@ -19,7 +21,6 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';
 import { ObjectPool } from './objectPool.js';
-import { BugIndicatingError } from '../../../../base/common/errors.js';
 let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposable {
     constructor(_element, _dimension, _viewModel, _workbenchUIElementFactory, _parentContextKeyService, _parentInstantiationService) {
         super();
@@ -55,13 +56,14 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         }, this._scrollable)));
         this.scrollTop = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollTop);
         this.scrollLeft = observableFromEvent(this._scrollableElement.onScroll, () =>  this._scrollableElement.getScrollPosition().scrollLeft);
-        this._viewItems = derivedWithStore(this, (reader, store) => {
+        this._viewItemsInfo = derivedWithStore(this, (reader, store) => {
             const vm = this._viewModel.read(reader);
             if (!vm) {
-                return [];
+                return { items: [], getItem: _d => { throw ( new BugIndicatingError()); } };
             }
-            const items = vm.items.read(reader);
-            return ( items.map(d => {
+            const viewModels = vm.items.read(reader);
+            const map = ( new Map());
+            const items = ( viewModels.map(d => {
                 const item = store.add(( new VirtualizedViewItem(d, this._objectPool, this.scrollLeft, delta => {
                     this._scrollableElement.setScrollPosition({ scrollTop: this._scrollableElement.getScrollPosition().scrollTop + delta });
                 })));
@@ -71,17 +73,25 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                         item.setViewState(data, tx);
                     });
                 }
+                map.set(d, item);
                 return item;
             }));
+            return { items, getItem: d => map.get(d) };
         });
+        this._viewItems = ( this._viewItemsInfo.map(this, items => items.items));
         this._spaceBetweenPx = 0;
         this._totalHeight = ( this._viewItems.map(
             this,
             (items, reader) => items.reduce((r, i) => r + i.contentHeight.read(reader) + this._spaceBetweenPx, 0)
         ));
-        this.activeDiffItem = derived(this, reader => this._viewItems.read(reader).find(i => i.template.read(reader)?.isFocused.read(reader)));
-        this.lastActiveDiffItem = derivedObservableWithCache((reader, lastValue) => this.activeDiffItem.read(reader) ?? lastValue);
-        this.activeControl = derived(this, reader => this.lastActiveDiffItem.read(reader)?.template.read(reader)?.editor);
+        this.activeControl = derived(this, reader => {
+            const activeDiffItem = this._viewModel.read(reader)?.activeDiffItem.read(reader);
+            if (!activeDiffItem) {
+                return undefined;
+            }
+            const viewItem = this._viewItemsInfo.read(reader).getItem(activeDiffItem);
+            return viewItem.template.read(reader)?.editor;
+        });
         this._contextKeyService = this._register(this._parentContextKeyService.createScoped(this._element));
         this._instantiationService = this._parentInstantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService])));
         this._lastDocStates = {};
@@ -104,12 +114,6 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
                 ctxAllCollapsed.set(allCollapsed);
             }
         }));
-        this._register(autorun((reader) => {
-            const lastActiveDiffItem = this.lastActiveDiffItem.read(reader);
-            transaction(tx => {
-                this._viewModel.read(reader)?.activeDiffItem.set(lastActiveDiffItem?.viewModel, tx);
-            });
-        }));
         this._register(autorun((reader) => {
             const dimension = this._dimension.read(reader);
             this._sizeObserver.observe(dimension);
@@ -123,7 +127,7 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
             const width = this._sizeObserver.width.read(reader);
             let scrollWidth = width;
             const viewItems = this._viewItems.read(reader);
-            const max = findFirstMaxBy(viewItems, i => i.maxScroll.read(reader).maxScroll);
+            const max = findFirstMax(viewItems, compareBy(i => i.maxScroll.read(reader).maxScroll, numberComparator));
             if (max) {
                 const maxScroll = max.maxScroll.read(reader);
                 scrollWidth = width + maxScroll.maxScroll;
@@ -155,12 +159,14 @@ let MultiDiffEditorWidgetImpl = class MultiDiffEditorWidgetImpl extends Disposab
         if (index === -1) {
             throw ( new BugIndicatingError('Resource not found in diff editor'));
         }
+        const viewItem = viewItems[index];
+        this._viewModel.get().activeDiffItem.setCache(viewItem.viewModel, undefined);
         let scrollTop = 0;
         for (let i = 0; i < index; i++) {
             scrollTop += viewItems[i].contentHeight.get() + this._spaceBetweenPx;
         }
         this._scrollableElement.setScrollPosition({ scrollTop });
-        const diffEditor = viewItems[index].template.get()?.editor;
+        const diffEditor = viewItem.template.get()?.editor;
         const editor = 'original' in resource ? diffEditor?.getOriginalEditor() : diffEditor?.getModifiedEditor();
         if (editor && options?.range) {
             editor.revealRangeInCenter(options.range);
@@ -261,6 +267,8 @@ class VirtualizedViewItem extends Disposable {
         this.maxScroll = derived(this, reader => this._templateRef.read(reader)?.object.maxScroll.read(reader) ?? { maxScroll: 0, scrollWidth: 0 });
         this.template = derived(this, reader => this._templateRef.read(reader)?.object);
         this._isHidden = observableValue(this, false);
+        this._isFocused = derived(this, reader => this.template.read(reader)?.isFocused.read(reader) ?? false);
+        this.viewModel.setIsFocused(this._isFocused, undefined);
         this._register(autorun((reader) => {
             const scrollLeft = this._scrollLeft.read(reader);
             this._templateRef.read(reader)?.object.setScrollLeft(scrollLeft);

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/style.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden;.focused{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-left:1px solid var(--vscode-multiDiffEditor-border);border-right:1px solid var(--vscode-multiDiffEditor-border);border-top:1px solid var(--vscode-multiDiffEditor-border);border-top-left-radius:2px;border-top-right-radius:2px;color:var(--vscode-foreground);display:flex;margin:8px 8px 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);border-left:1px solid var(--vscode-multiDiffEditor-border);border-radius:2px;border-right:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;margin-left:8px;margin-right:8px;overflow:hidden}.editorContainer{flex:1}}}";
+var css = ".monaco-component.multiDiffEditor{background:var(--vscode-multiDiffEditor-background);overflow-y:hidden;.active{--vscode-multiDiffEditor-border:var(--vscode-focusBorder)}.multiDiffEntry{display:flex;flex:1;flex-direction:column;overflow:hidden;.collapse-button{cursor:pointer;margin:0 5px;a{display:block}}.header{background:var(--vscode-editor-background);z-index:1000;&:not(.collapsed) .header-content{border-bottom:1px solid var(--vscode-sideBarSectionHeader-border)}.header-content{align-items:center;background:var(--vscode-multiDiffEditor-headerBackground);border-top:1px solid var(--vscode-multiDiffEditor-border);color:var(--vscode-foreground);display:flex;margin:8px 0 0;padding:4px 5px;&.shadow{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px}.file-path{display:flex;flex:1;min-width:0;.title{font-size:14px;line-height:22px;&.original{flex:1;min-width:0;text-overflow:ellipsis}}.status{font-weight:600;line-height:22px;margin:0 10px;opacity:.75}}.actions{padding:0 8px}}}.editorParent{border-bottom:1px solid var(--vscode-multiDiffEditor-border);display:flex;flex:1;flex-direction:column;overflow:hidden}.editorContainer{flex:1}}}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/common/core/editorColorRegistry.js

@@ -28,13 +28,13 @@ const editorRangeHighlight = registerColor('editor.rangeHighlightBackground', {
  2,
  'Background color of highlighted ranges, like by quick open and find features. The color must not be opaque so as not to hide underlying decorations.'
 )), true);
-registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localizeWithPath(_moduleId, 3, 'Background color of the border around highlighted ranges.')), true);
+registerColor('editor.rangeHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localizeWithPath(_moduleId, 3, 'Background color of the border around highlighted ranges.')));
 registerColor('editor.symbolHighlightBackground', { dark: editorFindMatchHighlight, light: editorFindMatchHighlight, hcDark: null, hcLight: null }, ( localizeWithPath(
  _moduleId,
  4,
  'Background color of highlighted symbol, like for go to definition or go next/previous symbol. The color must not be opaque so as not to hide underlying decorations.'
 )), true);
-registerColor('editor.symbolHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localizeWithPath(_moduleId, 5, 'Background color of the border around highlighted symbols.')), true);
+registerColor('editor.symbolHighlightBorder', { dark: null, light: null, hcDark: activeContrastBorder, hcLight: activeContrastBorder }, ( localizeWithPath(_moduleId, 5, 'Background color of the border around highlighted symbols.')));
 const editorCursorForeground = registerColor('editorCursor.foreground', { dark: '#AEAFAD', light: Color.black, hcDark: Color.white, hcLight: '#0F4A85' }, ( localizeWithPath(_moduleId, 6, 'Color of the editor cursor.')));
 const editorCursorBackground = registerColor('editorCursor.background', null, ( localizeWithPath(
  _moduleId,
@@ -102,7 +102,7 @@ registerColor('editorBracketMatch.background', { dark: '#0064001a', light: '#006
 registerColor('editorBracketMatch.border', { dark: '#888', light: '#B9B9B9', hcDark: contrastBorder, hcLight: contrastBorder }, ( localizeWithPath(_moduleId, 36, 'Color for matching brackets boxes')));
 const editorOverviewRulerBorder = registerColor('editorOverviewRuler.border', { dark: '#7f7f7f4d', light: '#7f7f7f4d', hcDark: '#7f7f7f4d', hcLight: '#666666' }, ( localizeWithPath(_moduleId, 37, 'Color of the overview ruler border.')));
 const editorOverviewRulerBackground = registerColor('editorOverviewRuler.background', null, ( localizeWithPath(_moduleId, 38, 'Background color of the editor overview ruler.')));
-const editorGutter = registerColor('editorGutter.background', { dark: editorBackground, light: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, ( localizeWithPath(
+registerColor('editorGutter.background', { dark: editorBackground, light: editorBackground, hcDark: editorBackground, hcLight: editorBackground }, ( localizeWithPath(
  _moduleId,
  39,
  'Background color of the editor gutter. The gutter contains the glyph margins and the line numbers.'
@@ -230,4 +230,4 @@ registerThemingParticipant((theme, collector) => {
         collector.addRule(`.monaco-editor .inputarea.ime-input { background-color: ${imeBackground}; }`);
     }
 });
-export { deprecatedEditorActiveIndentGuides, deprecatedEditorIndentGuides, editorActiveIndentGuide1, editorActiveIndentGuide2, editorActiveIndentGuide3, editorActiveIndentGuide4, editorActiveIndentGuide5, editorActiveIndentGuide6, editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketHighlightingUnexpectedBracketForeground, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6, editorCursorBackground, editorCursorForeground, editorDimmedLineNumber, editorGutter, editorIndentGuide1, editorIndentGuide2, editorIndentGuide3, editorIndentGuide4, editorIndentGuide5, editorIndentGuide6, editorLineHighlight, editorLineHighlightBorder, editorLineNumbers, editorMultiCursorPrimaryBackground, editorMultiCursorPrimaryForeground, editorMultiCursorSecondaryBackground, editorMultiCursorSecondaryForeground, editorOverviewRulerBackground, editorOverviewRulerBorder, editorRangeHighlight, editorUnnecessaryCodeOpacity, editorWhitespaces, overviewRulerError, overviewRulerInfo, overviewRulerRangeHighlight, overviewRulerWarning };
+export { deprecatedEditorActiveIndentGuides, deprecatedEditorIndentGuides, editorActiveIndentGuide1, editorActiveIndentGuide2, editorActiveIndentGuide3, editorActiveIndentGuide4, editorActiveIndentGuide5, editorActiveIndentGuide6, editorBracketHighlightingForeground1, editorBracketHighlightingForeground2, editorBracketHighlightingForeground3, editorBracketHighlightingForeground4, editorBracketHighlightingForeground5, editorBracketHighlightingForeground6, editorBracketHighlightingUnexpectedBracketForeground, editorBracketPairGuideActiveBackground1, editorBracketPairGuideActiveBackground2, editorBracketPairGuideActiveBackground3, editorBracketPairGuideActiveBackground4, editorBracketPairGuideActiveBackground5, editorBracketPairGuideActiveBackground6, editorBracketPairGuideBackground1, editorBracketPairGuideBackground2, editorBracketPairGuideBackground3, editorBracketPairGuideBackground4, editorBracketPairGuideBackground5, editorBracketPairGuideBackground6, editorCursorBackground, editorCursorForeground, editorDimmedLineNumber, editorIndentGuide1, editorIndentGuide2, editorIndentGuide3, editorIndentGuide4, editorIndentGuide5, editorIndentGuide6, editorLineHighlight, editorLineHighlightBorder, editorLineNumbers, editorMultiCursorPrimaryBackground, editorMultiCursorPrimaryForeground, editorMultiCursorSecondaryBackground, editorMultiCursorSecondaryForeground, editorOverviewRulerBackground, editorOverviewRulerBorder, editorRangeHighlight, editorUnnecessaryCodeOpacity, editorWhitespaces, overviewRulerError, overviewRulerInfo, overviewRulerRangeHighlight, overviewRulerWarning };

package/vscode/src/vs/editor/common/core/lineRange.d.ts

@@ -1,5 +1,6 @@
 import { OffsetRange } from './offsetRange.js';
 import { Range } from './range.js';
+import { ITextModel } from '../model.js';
 
 /**
  * A range of lines (1-based).
@@ -18,6 +19,14 @@ declare class LineRange {
      * @internal
      */
     static deserialize(lineRange: ISerializedLineRange): LineRange;
+    /**
+     * @internal
+     */
+    static invert(range: LineRange, model: ITextModel): LineRange[];
+    /**
+     * @internal
+     */
+    static asRange(lineRange: LineRange, model: ITextModel): Range;
     /**
      * The start line number.
      */
@@ -58,6 +67,9 @@ declare class LineRange {
     overlapOrTouch(other: LineRange): boolean;
     equals(b: LineRange): boolean;
     toInclusiveRange(): Range | null;
+    /**
+     * @deprecated Using this function is discouraged because it might lead to bugs: The end position is not guaranteed to be a valid position!
+    */
     toExclusiveRange(): Range;
     mapToLineArray<T>(f: (lineNumber: number) => T): T[];
     forEach(f: (lineNumber: number) => void): void;

package/vscode/src/vs/editor/common/core/lineRange.js

@@ -60,6 +60,34 @@ class LineRange {
     static deserialize(lineRange) {
         return ( new LineRange(lineRange[0], lineRange[1]));
     }
+    static invert(range, model) {
+        if (range.isEmpty) {
+            return [];
+        }
+        const result = [];
+        if (range.startLineNumber > 1) {
+            result.push(( new LineRange(1, range.startLineNumber)));
+        }
+        if (range.endLineNumberExclusive < model.getLineCount() + 1) {
+            result.push(( new LineRange(range.endLineNumberExclusive, model.getLineCount() + 1)));
+        }
+        return result.filter(r => !r.isEmpty);
+    }
+    static asRange(lineRange, model) {
+        return lineRange.isEmpty
+            ? ( new Range(
+            lineRange.startLineNumber,
+            1,
+            lineRange.startLineNumber,
+            model.getLineLength(lineRange.startLineNumber)
+        ))
+            : ( new Range(
+            lineRange.startLineNumber,
+            1,
+            lineRange.endLineNumberExclusive - 1,
+            model.getLineLength(lineRange.endLineNumberExclusive - 1)
+        ));
+    }
     constructor(startLineNumber, endLineNumberExclusive) {
         if (startLineNumber > endLineNumberExclusive) {
             throw ( new BugIndicatingError(

package/vscode/src/vs/editor/common/core/textEdit.d.ts

@@ -0,0 +1,21 @@
+import { ISingleEditOperation } from './editOperation.js';
+import { Position } from './position.js';
+import { Range } from './range.js';
+import { TextLength } from './textLength.js';
+
+declare class SingleTextEdit {
+    readonly range: Range;
+    readonly text: string;
+    constructor(range: Range, text: string);
+    get isEmpty(): boolean;
+    static equals(first: SingleTextEdit, second: SingleTextEdit): boolean;
+    toSingleEditOperation(): ISingleEditOperation;
+}
+declare abstract class AbstractText {
+    abstract getValueOfRange(range: Range): string;
+    abstract readonly length: TextLength;
+    get endPositionExclusive(): Position;
+    getValue(): string;
+}
+
+export { AbstractText, SingleTextEdit };

package/vscode/src/vs/editor/common/core/textEdit.js

@@ -5,6 +5,9 @@ import { PositionOffsetTransformer } from './positionToOffset.js';
 import { Range } from './range.js';
 import { TextLength } from './textLength.js';
 class TextEdit {
+    static single(originalRange, newText) {
+        return ( new TextEdit([( new SingleTextEdit(originalRange, newText))]));
+    }
     constructor(edits) {
         this.edits = edits;
         assertFn(() => checkAdjacentItems(edits, (a, b) => a.range.getEndPosition().isBeforeOrEqual(b.range.getStartPosition())));
@@ -138,9 +141,18 @@ class SingleTextEdit {
     static equals(first, second) {
         return first.range.equalsRange(second.range) && first.text === second.text;
     }
+    toSingleEditOperation() {
+        return {
+            range: this.range,
+            text: this.text,
+        };
+    }
 }
 function rangeFromPositions(start, end) {
-    if (!start.isBeforeOrEqual(end)) {
+    if (start.lineNumber === end.lineNumber && start.column === Number.MAX_SAFE_INTEGER) {
+        return Range.fromPositions(end, end);
+    }
+    else if (!start.isBeforeOrEqual(end)) {
         throw ( new BugIndicatingError('start must be before end'));
     }
     return ( new Range(start.lineNumber, start.column, end.lineNumber, end.column));

package/vscode/src/vs/editor/common/core/textLength.d.ts

@@ -0,0 +1,29 @@
+import { Position } from './position.js';
+import { Range } from './range.js';
+
+/**
+ * Represents a non-negative length of text in terms of line and column count.
+*/
+declare class TextLength {
+    readonly lineCount: number;
+    readonly columnCount: number;
+    static zero: TextLength;
+    static lengthDiffNonNegative(start: TextLength, end: TextLength): TextLength;
+    static betweenPositions(position1: Position, position2: Position): TextLength;
+    static ofRange(range: Range): TextLength;
+    static ofText(text: string): TextLength;
+    constructor(lineCount: number, columnCount: number);
+    isZero(): boolean;
+    isLessThan(other: TextLength): boolean;
+    isGreaterThan(other: TextLength): boolean;
+    isGreaterThanOrEqualTo(other: TextLength): boolean;
+    equals(other: TextLength): boolean;
+    compare(other: TextLength): number;
+    add(other: TextLength): TextLength;
+    createRange(startPosition: Position): Range;
+    toRange(): Range;
+    addToPosition(position: Position): Position;
+    toString(): string;
+}
+
+export { TextLength };

package/vscode/src/vs/editor/common/core/textLength.js

@@ -57,6 +57,12 @@ class TextLength {
         }
         return this.columnCount > other.columnCount;
     }
+    isGreaterThanOrEqualTo(other) {
+        if (this.lineCount !== other.lineCount) {
+            return this.lineCount > other.lineCount;
+        }
+        return this.columnCount >= other.columnCount;
+    }
     equals(other) {
         return this.lineCount === other.lineCount && this.columnCount === other.columnCount;
     }

package/vscode/src/vs/editor/common/cursor/cursorCollection.js

@@ -1,5 +1,5 @@
 import { compareBy } from '../../../base/common/arrays.js';
-import { findFirstMinBy, findLastMaxBy } from '../../../base/common/arraysFind.js';
+import { findFirstMin, findLastMax } from '../../../base/common/arraysFind.js';
 import { CursorState } from '../cursorCommon.js';
 import { Cursor } from './oneCursor.js';
 import { Position } from '../core/position.js';
@@ -44,10 +44,10 @@ class CursorCollection {
         return ( this.cursors.map(c => c.viewState.position));
     }
     getTopMostViewPosition() {
-        return findFirstMinBy(this.cursors, compareBy(c => c.viewState.position, Position.compare)).viewState.position;
+        return findFirstMin(this.cursors, compareBy(c => c.viewState.position, Position.compare)).viewState.position;
     }
     getBottomMostViewPosition() {
-        return findLastMaxBy(this.cursors, compareBy(c => c.viewState.position, Position.compare)).viewState.position;
+        return findLastMax(this.cursors, compareBy(c => c.viewState.position, Position.compare)).viewState.position;
     }
     getSelections() {
         return ( this.cursors.map(c => c.modelState.selection));

package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js

@@ -24,7 +24,17 @@ class DefaultLinesDiffComputer {
         if (originalLines.length === 1 && originalLines[0].length === 0 || modifiedLines.length === 1 && modifiedLines[0].length === 0) {
             return ( new LinesDiff([
                 ( new DetailedLineRangeMapping(( new LineRange(1, originalLines.length + 1)), ( new LineRange(1, modifiedLines.length + 1)), [
-                    ( new RangeMapping(( new Range(1, 1, originalLines.length, originalLines[0].length + 1)), ( new Range(1, 1, modifiedLines.length, modifiedLines[0].length + 1))))
+                    ( new RangeMapping(( new Range(
+                        1,
+                        1,
+                        originalLines.length,
+                        originalLines[originalLines.length - 1].length + 1
+                    )), ( new Range(
+                        1,
+                        1,
+                        modifiedLines.length,
+                        modifiedLines[modifiedLines.length - 1].length + 1
+                    ))))
                 ]))
             ], [], false));
         }

package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts

@@ -1,5 +1,6 @@
 import { LineRange } from '../core/lineRange.js';
 import { Range } from '../core/range.js';
+import { AbstractText, SingleTextEdit } from '../core/textEdit.js';
 
 /**
  * Maps a line range in the original text model to a line range in the modified text model.
@@ -20,6 +21,12 @@ declare class LineRangeMapping {
     flip(): LineRangeMapping;
     join(other: LineRangeMapping): LineRangeMapping;
     get changedLineCount(): number;
+    /**
+     * This method assumes that the LineRangeMapping describes a valid diff!
+     * I.e. if one range is empty, the other range cannot be the entire document.
+     * It avoids various problems when the line range points to non-existing line-numbers.
+    */
+    toRangeMapping(): RangeMapping;
 }
 /**
  * Maps a line range in the original text model to a line range in the modified text model.
@@ -53,6 +60,10 @@ declare class RangeMapping {
     constructor(originalRange: Range, modifiedRange: Range);
     toString(): string;
     flip(): RangeMapping;
+    /**
+     * Creates a single text edit that describes the change from the original to the modified text.
+    */
+    toTextEdit(modified: AbstractText): SingleTextEdit;
 }
 
 export { DetailedLineRangeMapping, LineRangeMapping, RangeMapping };

package/vscode/src/vs/editor/common/diff/rangeMapping.js

@@ -1,4 +1,7 @@
+import { BugIndicatingError } from '../../../base/common/errors.js';
 import { LineRange } from '../core/lineRange.js';
+import { Range } from '../core/range.js';
+import { SingleTextEdit } from '../core/textEdit.js';
 class LineRangeMapping {
     static inverse(mapping, originalLineCount, modifiedLineCount) {
         const result = [];
@@ -45,6 +48,32 @@ class LineRangeMapping {
     get changedLineCount() {
         return Math.max(this.original.length, this.modified.length);
     }
+    toRangeMapping() {
+        const origInclusiveRange = this.original.toInclusiveRange();
+        const modInclusiveRange = this.modified.toInclusiveRange();
+        if (origInclusiveRange && modInclusiveRange) {
+            return ( new RangeMapping(origInclusiveRange, modInclusiveRange));
+        }
+        else if (this.original.startLineNumber === 1 || this.modified.startLineNumber === 1) {
+            if (!(this.modified.startLineNumber === 1 && this.original.startLineNumber === 1)) {
+                throw ( new BugIndicatingError('not a valid diff'));
+            }
+            return ( new RangeMapping(( new Range(this.original.startLineNumber, 1, this.original.endLineNumberExclusive, 1)), ( new Range(this.modified.startLineNumber, 1, this.modified.endLineNumberExclusive, 1))));
+        }
+        else {
+            return ( new RangeMapping(( new Range(
+                this.original.startLineNumber - 1,
+                Number.MAX_SAFE_INTEGER,
+                this.original.endLineNumberExclusive - 1,
+                Number.MAX_SAFE_INTEGER
+            )), ( new Range(
+                this.modified.startLineNumber - 1,
+                Number.MAX_SAFE_INTEGER,
+                this.modified.endLineNumberExclusive - 1,
+                Number.MAX_SAFE_INTEGER
+            ))));
+        }
+    }
 }
 class DetailedLineRangeMapping extends LineRangeMapping {
     static fromRangeMappings(rangeMappings) {
@@ -60,9 +89,7 @@ class DetailedLineRangeMapping extends LineRangeMapping {
         return ( new DetailedLineRangeMapping(this.modified, this.original, this.innerChanges?.map(c => c.flip())));
     }
     withInnerChangesFromLineRanges() {
-        return ( new DetailedLineRangeMapping(this.original, this.modified, [
-            ( new RangeMapping(this.original.toExclusiveRange(), this.modified.toExclusiveRange())),
-        ]));
+        return ( new DetailedLineRangeMapping(this.original, this.modified, [this.toRangeMapping()]));
     }
 }
 class RangeMapping {
@@ -76,5 +103,9 @@ class RangeMapping {
     flip() {
         return ( new RangeMapping(this.modifiedRange, this.originalRange));
     }
+    toTextEdit(modified) {
+        const newText = modified.getValueOfRange(this.modifiedRange);
+        return ( new SingleTextEdit(this.originalRange, newText));
+    }
 }
 export { DetailedLineRangeMapping, LineRangeMapping, RangeMapping };

package/vscode/src/vs/editor/common/languages.d.ts

@@ -2,6 +2,7 @@ import { VSBuffer } from '../../base/common/buffer.js';
 import { CancellationToken } from '../../base/common/cancellation.js';
 import { IReadonlyVSDataTransfer } from '../../base/common/dataTransfer.js';
 import { Event } from '../../base/common/event.js';
+import { HierarchicalKind } from '../../base/common/hierarchicalKind.js';
 import { IMarkdownString } from '../../base/common/htmlContent.js';
 import { IDisposable } from '../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../base/common/themables.js';
@@ -11,11 +12,10 @@ import { Position, IPosition } from './core/position.js';
 import { Range, IRange } from './core/range.js';
 import { Selection } from './core/selection.js';
 import { LanguageId } from './encodedTokenAttributes.js';
+import { LanguageFilter } from './languageSelector.js';
 import { ITextModel, EndOfLineSequence } from './model.js';
 import { ExtensionIdentifier } from '../../platform/extensions/common/extensions.js';
 import { IMarkerData } from '../../platform/markers/common/markers.js';
-import { LanguageFilter } from './languageSelector.js';
-import { HierarchicalKind } from '../../base/common/hierarchicalKind.js';
 
 /**
  * @internal
@@ -46,18 +46,52 @@ interface Hover {
      * current position itself.
      */
     range?: IRange;
+    /**
+     * Can increase the verbosity of the hover
+     */
+    canIncreaseVerbosity?: boolean;
+    /**
+     * Can decrease the verbosity of the hover
+     */
+    canDecreaseVerbosity?: boolean;
 }
 /**
  * The hover provider interface defines the contract between extensions and
  * the [hover](https://code.visualstudio.com/docs/editor/intellisense)-feature.
  */
-interface HoverProvider {
+interface HoverProvider<THover = Hover> {
     /**
-     * Provide a hover for the given position and document. Multiple hovers at the same
+     * Provide a hover for the given position, context and document. Multiple hovers at the same
      * position will be merged by the editor. A hover can have a range which defaults
      * to the word range at the position when omitted.
      */
-    provideHover(model: ITextModel, position: Position, token: CancellationToken): ProviderResult<Hover>;
+    provideHover(model: ITextModel, position: Position, token: CancellationToken, context?: HoverContext<THover>): ProviderResult<THover>;
+}
+interface HoverContext<THover = Hover> {
+    /**
+     * Hover verbosity request
+     */
+    verbosityRequest?: HoverVerbosityRequest<THover>;
+}
+interface HoverVerbosityRequest<THover = Hover> {
+    /**
+     * Whether to increase or decrease the hover's verbosity
+     */
+    action: HoverVerbosityAction;
+    /**
+     * The previous hover for the same position
+     */
+    previousHover: THover;
+}
+declare enum HoverVerbosityAction {
+    /**
+     * Increase the verbosity of the hover
+     */
+    Increase = 0,
+    /**
+     * Decrease the verbosity of the hover
+     */
+    Decrease = 1
 }
 /**
  * An evaluatable expression represents additional information for an expression in a document. Evaluatable expressions are
@@ -1205,12 +1239,17 @@ interface RenameProvider {
 declare enum NewSymbolNameTag {
     AIGenerated = 1
 }
+declare enum NewSymbolNameTriggerKind {
+    Invoke = 0,
+    Automatic = 1
+}
 interface NewSymbolName {
     readonly newSymbolName: string;
     readonly tags?: readonly NewSymbolNameTag[];
 }
 interface NewSymbolNamesProvider {
-    provideNewSymbolNames(model: ITextModel, range: IRange, token: CancellationToken): ProviderResult<NewSymbolName[]>;
+    supportsAutomaticNewSymbolNamesTriggerKind?: Promise<boolean | undefined>;
+    provideNewSymbolNames(model: ITextModel, range: IRange, triggerKind: NewSymbolNameTriggerKind, token: CancellationToken): ProviderResult<NewSymbolName[]>;
 }
 interface Command {
     id: string;
@@ -1308,7 +1347,7 @@ type DropYieldTo = {
 /**
  * @internal
  */
-interface DocumentOnDropEdit {
+interface DocumentDropEdit {
     readonly title: string;
     readonly kind: HierarchicalKind | undefined;
     readonly handledMimeType?: string;
@@ -1321,10 +1360,11 @@ interface DocumentOnDropEdit {
 /**
  * @internal
  */
-interface DocumentOnDropEditProvider {
+interface DocumentDropEditProvider {
     readonly id?: string;
     readonly dropMimeTypes?: readonly string[];
-    provideDocumentOnDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentOnDropEdit[]>;
+    provideDocumentDropEdits(model: ITextModel, position: IPosition, dataTransfer: IReadonlyVSDataTransfer, token: CancellationToken): ProviderResult<DocumentDropEdit[]>;
+    resolveDocumentDropEdit?(edit: DocumentDropEdit, token: CancellationToken): Promise<DocumentDropEdit>;
 }
 interface DocumentContextItem {
     readonly uri: URI;
@@ -1366,4 +1406,4 @@ interface InlineEditProvider<T extends IInlineEdit = IInlineEdit> {
     freeInlineEdit(edit: T): void;
 }
 
-export { type CodeAction, type CodeActionContext, type CodeActionList, type CodeActionProvider, CodeActionTriggerType, type CodeLens, type CodeLensList, type CodeLensProvider, Command, type CompletionContext, type CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, type CompletionItemLabel, type CompletionItemProvider, type CompletionItemRanges, CompletionItemTag, type CompletionList, CompletionTriggerKind, type DeclarationProvider, type Definition, type DefinitionProvider, type DocumentColorProvider, type DocumentContextItem, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentOnDropEdit, type DocumentOnDropEditProvider, type DocumentPasteContext, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentPasteEditsSession, DocumentPasteTriggerKind, type DocumentRangeFormattingEditProvider, type DocumentRangeSemanticTokensProvider, type DocumentSemanticTokensProvider, type DocumentSymbol, type DocumentSymbolProvider, type DropYieldTo, type EvaluatableExpression, type EvaluatableExpressionProvider, type FoldingContext, type FoldingRange, FoldingRangeKind, type FoldingRangeProvider, type FormattingOptions, type Hover, type HoverProvider, type IColor, type IColorInformation, type IColorPresentation, type IInlineEdit, type IInlineEditContext, type IInplaceReplaceSupportResult, type ILanguageIdCodec, type ILink, type ILinksList, type IWorkspaceFileEdit, type IWorkspaceTextEdit, type ImplementationProvider, type InlayHint, InlayHintKind, type InlayHintLabelPart, type InlayHintList, type InlayHintsProvider, type InlineCompletion, type InlineCompletionContext, type InlineCompletionProviderGroupId, InlineCompletionTriggerKind, type InlineCompletions, type InlineCompletionsProvider, type InlineEditProvider, InlineEditTriggerKind, type InlineValue, type InlineValueContext, type InlineValueExpression, type InlineValueText, type InlineValueVariableLookup, type InlineValuesProvider, type LinkProvider, type LinkedEditingRangeProvider, type LinkedEditingRanges, type Location, type LocationLink, type MappedEditsContext, type MappedEditsProvider, type MultiDocumentHighlightProvider, type NewSymbolName, NewSymbolNameTag, type NewSymbolNamesProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type PartialAcceptInfo, PartialAcceptTriggerKind, type ProviderResult, type ReferenceContext, type ReferenceProvider, type Rejection, type RenameLocation, type RenameProvider, SelectedSuggestionInfo, type SelectionRange, type SelectionRangeProvider, type SemanticTokens, type SemanticTokensEdit, type SemanticTokensEdits, type SemanticTokensLegend, type SignatureHelp, type SignatureHelpContext, type SignatureHelpProvider, type SignatureHelpResult, SignatureHelpTriggerKind, type SignatureInformation, SymbolKind, SymbolTag, TextEdit, type TypeDefinitionProvider, type WorkspaceEdit, type WorkspaceEditMetadata, type WorkspaceFileEditOptions };
+export { type CodeAction, type CodeActionContext, type CodeActionList, type CodeActionProvider, CodeActionTriggerType, type CodeLens, type CodeLensList, type CodeLensProvider, Command, type CompletionContext, type CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, type CompletionItemLabel, type CompletionItemProvider, type CompletionItemRanges, CompletionItemTag, type CompletionList, CompletionTriggerKind, type DeclarationProvider, type Definition, type DefinitionProvider, type DocumentColorProvider, type DocumentContextItem, type DocumentDropEdit, type DocumentDropEditProvider, type DocumentFormattingEditProvider, type DocumentHighlight, DocumentHighlightKind, type DocumentHighlightProvider, type DocumentPasteContext, type DocumentPasteEdit, type DocumentPasteEditProvider, type DocumentPasteEditsSession, DocumentPasteTriggerKind, type DocumentRangeFormattingEditProvider, type DocumentRangeSemanticTokensProvider, type DocumentSemanticTokensProvider, type DocumentSymbol, type DocumentSymbolProvider, type DropYieldTo, type EvaluatableExpression, type EvaluatableExpressionProvider, type FoldingContext, type FoldingRange, FoldingRangeKind, type FoldingRangeProvider, type FormattingOptions, type Hover, type HoverContext, type HoverProvider, HoverVerbosityAction, type HoverVerbosityRequest, type IColor, type IColorInformation, type IColorPresentation, type IInlineEdit, type IInlineEditContext, type IInplaceReplaceSupportResult, type ILanguageIdCodec, type ILink, type ILinksList, type IWorkspaceFileEdit, type IWorkspaceTextEdit, type ImplementationProvider, type InlayHint, InlayHintKind, type InlayHintLabelPart, type InlayHintList, type InlayHintsProvider, type InlineCompletion, type InlineCompletionContext, type InlineCompletionProviderGroupId, InlineCompletionTriggerKind, type InlineCompletions, type InlineCompletionsProvider, type InlineEditProvider, InlineEditTriggerKind, type InlineValue, type InlineValueContext, type InlineValueExpression, type InlineValueText, type InlineValueVariableLookup, type InlineValuesProvider, type LinkProvider, type LinkedEditingRangeProvider, type LinkedEditingRanges, type Location, type LocationLink, type MappedEditsContext, type MappedEditsProvider, type MultiDocumentHighlightProvider, type NewSymbolName, NewSymbolNameTag, NewSymbolNameTriggerKind, type NewSymbolNamesProvider, type OnTypeFormattingEditProvider, type ParameterInformation, type PartialAcceptInfo, PartialAcceptTriggerKind, type ProviderResult, type ReferenceContext, type ReferenceProvider, type Rejection, type RenameLocation, type RenameProvider, SelectedSuggestionInfo, type SelectionRange, type SelectionRangeProvider, type SemanticTokens, type SemanticTokensEdit, type SemanticTokensEdits, type SemanticTokensLegend, type SignatureHelp, type SignatureHelpContext, type SignatureHelpProvider, type SignatureHelpResult, SignatureHelpTriggerKind, type SignatureInformation, SymbolKind, SymbolTag, TextEdit, type TypeDefinitionProvider, type WorkspaceEdit, type WorkspaceEditMetadata, type WorkspaceFileEditOptions };

package/vscode/src/vs/editor/common/languages.js

@@ -31,6 +31,11 @@ class EncodedTokenizationResult {
         this._encodedTokenizationResultBrand = undefined;
     }
 }
+var HoverVerbosityAction;
+( ((function(HoverVerbosityAction) {
+    HoverVerbosityAction[HoverVerbosityAction["Increase"] = 0] = "Increase";
+    HoverVerbosityAction[HoverVerbosityAction["Decrease"] = 1] = "Decrease";
+})(HoverVerbosityAction || (HoverVerbosityAction = {}))));
 var CompletionItemKinds;
 ( ((function(CompletionItemKinds) {
     const byKind = ( (new Map()));
@@ -251,6 +256,11 @@ var NewSymbolNameTag;
 ( ((function(NewSymbolNameTag) {
     NewSymbolNameTag[NewSymbolNameTag["AIGenerated"] = 1] = "AIGenerated";
 })(NewSymbolNameTag || (NewSymbolNameTag = {}))));
+var NewSymbolNameTriggerKind;
+( ((function(NewSymbolNameTriggerKind) {
+    NewSymbolNameTriggerKind[NewSymbolNameTriggerKind["Invoke"] = 0] = "Invoke";
+    NewSymbolNameTriggerKind[NewSymbolNameTriggerKind["Automatic"] = 1] = "Automatic";
+})(NewSymbolNameTriggerKind || (NewSymbolNameTriggerKind = {}))));
 var Command;
 ( ((function(Command) {
     function is(obj) {
@@ -321,4 +331,4 @@ var InlineEditTriggerKind;
     InlineEditTriggerKind[InlineEditTriggerKind["Invoke"] = 0] = "Invoke";
     InlineEditTriggerKind[InlineEditTriggerKind["Automatic"] = 1] = "Automatic";
 })(InlineEditTriggerKind || (InlineEditTriggerKind = {}))));
-export { Command, CommentMode, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItemKinds, DocumentHighlightKind, DocumentPasteTriggerKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, LazyTokenizationSupport, NewSymbolNameTag, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKinds, TextEdit, Token, TokenizationRegistry, TokenizationResult, getAriaLabelForSymbol, isLocationLink, symbolKindNames };
+export { Command, CommentMode, CommentThreadApplicability, CommentThreadCollapsibleState, CommentThreadState, CompletionItemKinds, DocumentHighlightKind, DocumentPasteTriggerKind, EncodedTokenizationResult, ExternalUriOpenerPriority, FoldingRangeKind, HoverVerbosityAction, InlayHintKind, InlineCompletionTriggerKind, InlineEditTriggerKind, LazyTokenizationSupport, NewSymbolNameTag, NewSymbolNameTriggerKind, SelectedSuggestionInfo, SignatureHelpTriggerKind, SymbolKinds, TextEdit, Token, TokenizationRegistry, TokenizationResult, getAriaLabelForSymbol, isLocationLink, symbolKindNames };

package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js

@@ -94,7 +94,7 @@ let LanguageFeatureDebounceService = class LanguageFeatureDebounceService {
         const key = `${IdentityHash.of(feature)},${min}${extra ? ',' + extra : ''}`;
         let info = this._data.get(key);
         if (!info) {
-            if (!this._isDev) {
+            if (this._isDev) {
                 this._logService.debug(`[DEBOUNCE: ${name}] is disabled in developed mode`);
                 info = ( new NullDebounceInformation(min * 1.5));
             }