@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js

@@ -1,18 +1,22 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorCommand, registerEditorAction, EditorCommand, EditorAction } from '../../../browser/editorExtensions.js';
 import { ReplaceCommand } from '../../../common/commands/replaceCommand.js';
-import { EditorOptions } from '../../../common/config/editorOptions.js';
+import { EditorOptions, EditorOption } from '../../../common/config/editorOptions.js';
 import { CursorState } from '../../../common/cursorCommon.js';
-import { WordOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
+import { WordNavigationType, WordOperations } from '../../../common/cursor/cursorWordOperations.js';
 import { getMapForWordSeparators } from '../../../common/core/wordCharacterClassifier.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { Selection } from '../../../common/core/selection.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from '../../../../platform/accessibility/common/accessibility.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IsWindowsContext } from '../../../../platform/contextkey/common/contextkeys.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/wordOperations/browser/wordOperations";
 class MoveWordCommand extends EditorCommand {
     constructor(opts) {
@@ -24,7 +28,7 @@ class MoveWordCommand extends EditorCommand {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(131 ), editor.getOption(130 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
         const model = editor.getModel();
         const selections = editor.getSelections();
         const result = ( (selections.map((sel) => {
@@ -33,10 +37,10 @@ class MoveWordCommand extends EditorCommand {
             return this._moveTo(sel, outPosition, this._inSelectionMode);
         })));
         model.pushStackElement();
-        editor._getViewModel().setCursorStates('moveWordCommand', 3 , ( (result.map(r => CursorState.fromModelSelection(r)))));
+        editor._getViewModel().setCursorStates('moveWordCommand', CursorChangeReason.Explicit, ( (result.map(r => CursorState.fromModelSelection(r)))));
         if (result.length === 1) {
             const pos = ( (new Position(result[0].positionLineNumber, result[0].positionColumn)));
-            editor.revealPosition(pos, 0 );
+            editor.revealPosition(pos, ScrollType.Smooth);
         }
     }
     _moveTo(from, to, inSelectionMode) {
@@ -71,7 +75,7 @@ class CursorWordStartLeft extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordStartLeft',
             precondition: undefined
         });
@@ -81,7 +85,7 @@ class CursorWordEndLeft extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordEndLeft',
             precondition: undefined
         });
@@ -91,7 +95,7 @@ class CursorWordLeft extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 1 ,
+            wordNavigationType: WordNavigationType.WordStartFast,
             id: 'cursorWordLeft',
             precondition: undefined,
             kbOpts: {
@@ -99,9 +103,9 @@ class CursorWordLeft extends WordLeftCommand {
                     EditorContextKeys.textInputFocus,
                     ( (ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext)))?.negate()
                 ))),
-                primary: 2048  | 15 ,
-                mac: { primary: 512  | 15  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.LeftArrow,
+                mac: { primary: KeyMod$1.Alt | KeyCode.LeftArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -110,7 +114,7 @@ class CursorWordStartLeftSelect extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordStartLeftSelect',
             precondition: undefined
         });
@@ -120,7 +124,7 @@ class CursorWordEndLeftSelect extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordEndLeftSelect',
             precondition: undefined
         });
@@ -130,7 +134,7 @@ class CursorWordLeftSelect extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 1 ,
+            wordNavigationType: WordNavigationType.WordStartFast,
             id: 'cursorWordLeftSelect',
             precondition: undefined,
             kbOpts: {
@@ -138,9 +142,9 @@ class CursorWordLeftSelect extends WordLeftCommand {
                     EditorContextKeys.textInputFocus,
                     ( (ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext)))?.negate()
                 ))),
-                primary: 2048  | 1024  | 15 ,
-                mac: { primary: 512  | 1024  | 15  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.LeftArrow,
+                mac: { primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.LeftArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -149,7 +153,7 @@ class CursorWordAccessibilityLeft extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 3 ,
+            wordNavigationType: WordNavigationType.WordAccessibility,
             id: 'cursorWordAccessibilityLeft',
             precondition: undefined
         });
@@ -162,7 +166,7 @@ class CursorWordAccessibilityLeftSelect extends WordLeftCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 3 ,
+            wordNavigationType: WordNavigationType.WordAccessibility,
             id: 'cursorWordAccessibilityLeftSelect',
             precondition: undefined
         });
@@ -175,7 +179,7 @@ class CursorWordStartRight extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordStartRight',
             precondition: undefined
         });
@@ -185,7 +189,7 @@ class CursorWordEndRight extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordEndRight',
             precondition: undefined,
             kbOpts: {
@@ -193,9 +197,9 @@ class CursorWordEndRight extends WordRightCommand {
                     EditorContextKeys.textInputFocus,
                     ( (ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext)))?.negate()
                 ))),
-                primary: 2048  | 17 ,
-                mac: { primary: 512  | 17  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.RightArrow,
+                mac: { primary: KeyMod$1.Alt | KeyCode.RightArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -204,7 +208,7 @@ class CursorWordRight extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordRight',
             precondition: undefined
         });
@@ -214,7 +218,7 @@ class CursorWordStartRightSelect extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordStartRightSelect',
             precondition: undefined
         });
@@ -224,7 +228,7 @@ class CursorWordEndRightSelect extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordEndRightSelect',
             precondition: undefined,
             kbOpts: {
@@ -232,9 +236,9 @@ class CursorWordEndRightSelect extends WordRightCommand {
                     EditorContextKeys.textInputFocus,
                     ( (ContextKeyExpr.and(CONTEXT_ACCESSIBILITY_MODE_ENABLED, IsWindowsContext)))?.negate()
                 ))),
-                primary: 2048  | 1024  | 17 ,
-                mac: { primary: 512  | 1024  | 17  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.RightArrow,
+                mac: { primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.RightArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -243,7 +247,7 @@ class CursorWordRightSelect extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordRightSelect',
             precondition: undefined
         });
@@ -253,7 +257,7 @@ class CursorWordAccessibilityRight extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 3 ,
+            wordNavigationType: WordNavigationType.WordAccessibility,
             id: 'cursorWordAccessibilityRight',
             precondition: undefined
         });
@@ -266,7 +270,7 @@ class CursorWordAccessibilityRightSelect extends WordRightCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 3 ,
+            wordNavigationType: WordNavigationType.WordAccessibility,
             id: 'cursorWordAccessibilityRightSelect',
             precondition: undefined
         });
@@ -286,11 +290,11 @@ class DeleteWordCommand extends EditorCommand {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(131 ), editor.getOption(130 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
         const model = editor.getModel();
         const selections = editor.getSelections();
-        const autoClosingBrackets = editor.getOption(6 );
-        const autoClosingQuotes = editor.getOption(11 );
+        const autoClosingBrackets = editor.getOption(EditorOption.autoClosingBrackets);
+        const autoClosingQuotes = editor.getOption(EditorOption.autoClosingQuotes);
         const autoClosingPairs = languageConfigurationService.getLanguageConfiguration(model.getLanguageId()).getAutoClosingPairs();
         const viewModel = editor._getViewModel();
         const commands = ( (selections.map((sel) => {
@@ -299,7 +303,7 @@ class DeleteWordCommand extends EditorCommand {
                 model,
                 selection: sel,
                 whitespaceHeuristics: this._whitespaceHeuristics,
-                autoClosingDelete: editor.getOption(9 ),
+                autoClosingDelete: editor.getOption(EditorOption.autoClosingDelete),
                 autoClosingBrackets,
                 autoClosingQuotes,
                 autoClosingPairs,
@@ -342,7 +346,7 @@ class DeleteWordStartLeft extends DeleteWordLeftCommand {
     constructor() {
         super({
             whitespaceHeuristics: false,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'deleteWordStartLeft',
             precondition: EditorContextKeys.writable
         });
@@ -352,7 +356,7 @@ class DeleteWordEndLeft extends DeleteWordLeftCommand {
     constructor() {
         super({
             whitespaceHeuristics: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'deleteWordEndLeft',
             precondition: EditorContextKeys.writable
         });
@@ -362,14 +366,14 @@ class DeleteWordLeft extends DeleteWordLeftCommand {
     constructor() {
         super({
             whitespaceHeuristics: true,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'deleteWordLeft',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 1 ,
-                mac: { primary: 512  | 1  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Backspace,
+                mac: { primary: KeyMod$1.Alt | KeyCode.Backspace },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -378,7 +382,7 @@ class DeleteWordStartRight extends DeleteWordRightCommand {
     constructor() {
         super({
             whitespaceHeuristics: false,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'deleteWordStartRight',
             precondition: EditorContextKeys.writable
         });
@@ -388,7 +392,7 @@ class DeleteWordEndRight extends DeleteWordRightCommand {
     constructor() {
         super({
             whitespaceHeuristics: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'deleteWordEndRight',
             precondition: EditorContextKeys.writable
         });
@@ -398,14 +402,14 @@ class DeleteWordRight extends DeleteWordRightCommand {
     constructor() {
         super({
             whitespaceHeuristics: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'deleteWordRight',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
-                primary: 2048  | 20 ,
-                mac: { primary: 512  | 20  },
-                weight: 100
+                primary: KeyMod$1.CtrlCmd | KeyCode.Delete,
+                mac: { primary: KeyMod$1.Alt | KeyCode.Delete },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -423,7 +427,7 @@ class DeleteInsideWord extends EditorAction {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(131 ), editor.getOption(130 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(EditorOption.wordSeparators), editor.getOption(EditorOption.wordSegmenterLocales));
         const model = editor.getModel();
         const selections = editor.getSelections();
         const commands = ( (selections.map((sel) => {

package/vscode/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.js

@@ -1,21 +1,23 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { registerEditorCommand } from '../../../browser/editorExtensions.js';
-import { WordPartOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { WordNavigationType, WordPartOperations } from '../../../common/cursor/cursorWordOperations.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { DeleteWordCommand, MoveWordCommand } from '../../wordOperations/browser/wordOperations.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 class DeleteWordPartLeft extends DeleteWordCommand {
     constructor() {
         super({
             whitespaceHeuristics: true,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'deleteWordPartLeft',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 1  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyCode.Backspace },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -31,14 +33,14 @@ class DeleteWordPartRight extends DeleteWordCommand {
     constructor() {
         super({
             whitespaceHeuristics: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'deleteWordPartRight',
             precondition: EditorContextKeys.writable,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 20  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyCode.Delete },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -61,14 +63,14 @@ class CursorWordPartLeft extends WordPartLeftCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordPartLeft',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 15  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyCode.LeftArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -78,14 +80,14 @@ class CursorWordPartLeftSelect extends WordPartLeftCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 0 ,
+            wordNavigationType: WordNavigationType.WordStart,
             id: 'cursorWordPartLeftSelect',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 1024  | 15  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.LeftArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -100,14 +102,14 @@ class CursorWordPartRight extends WordPartRightCommand {
     constructor() {
         super({
             inSelectionMode: false,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordPartRight',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 17  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyCode.RightArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -116,14 +118,14 @@ class CursorWordPartRightSelect extends WordPartRightCommand {
     constructor() {
         super({
             inSelectionMode: true,
-            wordNavigationType: 2 ,
+            wordNavigationType: WordNavigationType.WordEnd,
             id: 'cursorWordPartRightSelect',
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.textInputFocus,
                 primary: 0,
-                mac: { primary: 256  | 512  | 1024  | 17  },
-                weight: 100
+                mac: { primary: KeyMod$1.WinCtrl | KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.RightArrow },
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }

package/vscode/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.js

@@ -1,11 +1,14 @@
 import { removeCSSRulesContainingSelector, createCSSRule, getActiveElement } from '../../../../base/browser/dom.js';
-import { Sash } from '../../../../base/browser/ui/sash/sash.js';
+import { Sash, Orientation, SashState } from '../../../../base/browser/ui/sash/sash.js';
 import { Color, RGBA } from '../../../../base/common/color.js';
 import { IdGenerator } from '../../../../base/common/idGenerator.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { deepClone, mixin } from '../../../../base/common/objects.js';
 import './zoneWidget.css.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { TrackedRangeStickiness } from '../../../common/model.js';
 import { ModelDecorationOptions } from '../../../common/model/textModel.js';
 const defaultColor = ( new Color(( new RGBA(0, 122, 204))));
 const defaultOptions = {
@@ -89,7 +92,7 @@ class Arrow {
                 options: {
                     description: 'zone-widget-arrow',
                     className: this._ruleName,
-                    stickiness: 1
+                    stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges
                 }
             }]);
     }
@@ -245,7 +248,7 @@ class ZoneWidget {
         this._positionMarkerId.clear();
     }
     _decoratingElementsHeight() {
-        const lineHeight = this.editor.getOption(67 );
+        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
         let result = 0;
         if (this.options.showArrow) {
             const arrowHeight = Math.round(lineHeight / 3);
@@ -265,7 +268,7 @@ class ZoneWidget {
         this.domNode.style.left = this._getLeft(layoutInfo) + 'px';
         const viewZoneDomNode = document.createElement('div');
         viewZoneDomNode.style.overflow = 'hidden';
-        const lineHeight = this.editor.getOption(67 );
+        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
         if (!this.options.allowUnlimitedHeight) {
             const maxHeightInLines = Math.max(12, (this.editor.getLayoutInfo().height / lineHeight) * 0.8);
             heightInLines = Math.min(heightInLines, maxHeightInLines);
@@ -326,10 +329,10 @@ class ZoneWidget {
     }
     revealRange(range, isLastLine) {
         if (isLastLine) {
-            this.editor.revealLineNearTop(range.endLineNumber, 0 );
+            this.editor.revealLineNearTop(range.endLineNumber, ScrollType.Smooth);
         }
         else {
-            this.editor.revealRange(range, 0 );
+            this.editor.revealRange(range, ScrollType.Smooth);
         }
     }
     setCssClass(className, classToReplace) {
@@ -359,9 +362,9 @@ class ZoneWidget {
         if (this._resizeSash) {
             return;
         }
-        this._resizeSash = this._disposables.add(( new Sash(this.domNode, this, { orientation: 1  })));
+        this._resizeSash = this._disposables.add(( new Sash(this.domNode, this, { orientation: Orientation.HORIZONTAL })));
         if (!this.options.isResizeable) {
-            this._resizeSash.state = 0 ;
+            this._resizeSash.state = SashState.Disabled;
         }
         let data;
         this._disposables.add(this._resizeSash.onDidStart((e) => {
@@ -377,7 +380,7 @@ class ZoneWidget {
         }));
         this._disposables.add(this._resizeSash.onDidChange((evt) => {
             if (data) {
-                const lineDelta = (evt.currentY - data.startY) / this.editor.getOption(67 );
+                const lineDelta = (evt.currentY - data.startY) / this.editor.getOption(EditorOption.lineHeight);
                 const roundedLineDelta = lineDelta < 0 ? Math.ceil(lineDelta) : Math.floor(lineDelta);
                 const newHeightInLines = data.heightInLines + roundedLineDelta;
                 if (newHeightInLines > 5 && newHeightInLines < 35) {

package/vscode/src/vs/editor/editor.api.d.ts

@@ -6839,19 +6839,56 @@ export namespace languages {
          * 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.
      */
-    export interface HoverProvider {
+    export 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: editor.ITextModel, position: Position, token: CancellationToken): ProviderResult<Hover>;
+        provideHover(model: editor.ITextModel, position: Position, token: CancellationToken, context?: HoverContext<THover>): ProviderResult<THover>;
+    }
+
+    export interface HoverContext<THover = Hover> {
+        /**
+         * Hover verbosity request
+         */
+        verbosityRequest?: HoverVerbosityRequest<THover>;
+    }
+
+    export interface HoverVerbosityRequest<THover = Hover> {
+        /**
+         * Whether to increase or decrease the hover's verbosity
+         */
+        action: HoverVerbosityAction;
+        /**
+         * The previous hover for the same position
+         */
+        previousHover: THover;
+    }
+
+    export enum HoverVerbosityAction {
+        /**
+         * Increase the verbosity of the hover
+         */
+        Increase = 0,
+        /**
+         * Decrease the verbosity of the hover
+         */
+        Decrease = 1
     }
 
     export enum CompletionItemKind {
@@ -7862,13 +7899,19 @@ export namespace languages {
         AIGenerated = 1
     }
 
+    export enum NewSymbolNameTriggerKind {
+        Invoke = 0,
+        Automatic = 1
+    }
+
     export interface NewSymbolName {
         readonly newSymbolName: string;
         readonly tags?: readonly NewSymbolNameTag[];
     }
 
     export interface NewSymbolNamesProvider {
-        provideNewSymbolNames(model: editor.ITextModel, range: IRange, token: CancellationToken): ProviderResult<NewSymbolName[]>;
+        supportsAutomaticNewSymbolNamesTriggerKind?: Promise<boolean | undefined>;
+        provideNewSymbolNames(model: editor.ITextModel, range: IRange, triggerKind: NewSymbolNameTriggerKind, token: CancellationToken): ProviderResult<NewSymbolName[]>;
     }
 
     export interface Command {

package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js

@@ -1,7 +1,9 @@
 import './iPadShowKeyboard.css.js';
 import { addDisposableListener } from '../../../../base/browser/dom.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution } from '../../../browser/editorExtensions.js';
+import { OverlayWidgetPositionPreference } from '../../../browser/editorBrowser.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { isIOS } from '../../../../base/common/platform.js';
 class IPadShowKeyboard extends Disposable {
     static { this.ID = 'editor.contrib.iPadShowKeyboard'; }
@@ -15,7 +17,7 @@ class IPadShowKeyboard extends Disposable {
         }
     }
     update() {
-        const shouldHaveWidget = (!this.editor.getOption(91 ));
+        const shouldHaveWidget = (!this.editor.getOption(EditorOption.readOnly));
         if (!this.widget && shouldHaveWidget) {
             this.widget = ( new ShowKeyboardWidget(this.editor));
         }
@@ -59,9 +61,9 @@ class ShowKeyboardWidget extends Disposable {
     }
     getPosition() {
         return {
-            preference: 1
+            preference: OverlayWidgetPositionPreference.BOTTOM_RIGHT_CORNER
         };
     }
 }
-registerEditorContribution(IPadShowKeyboard.ID, IPadShowKeyboard, 3 );
+registerEditorContribution(IPadShowKeyboard.ID, IPadShowKeyboard, EditorContributionInstantiation.Eventually);
 export { IPadShowKeyboard };