@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { ModifierKeyEmitter } from '../../../../base/browser/dom.js';
+import { ModifierKeyEmitter, isHTMLElement } from '../../../../base/browser/dom.js';
 import { isNonEmptyArray } from '../../../../base/common/arrays.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
@@ -8,13 +8,14 @@ import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle
 import { LRUCache } from '../../../../base/common/map.js';
 import { assertType } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { DynamicCssRules } from '../../../browser/editorDom.js';
 import { StableEditorScrollState } from '../../../browser/stableEditorScroll.js';
-import { EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { Range } from '../../../common/core/range.js';
 import { Command, InlayHintKind } from '../../../common/languages.js';
-import { InjectedTextCursorStops } from '../../../common/model.js';
+import { TrackedRangeStickiness, InjectedTextCursorStops } from '../../../common/model.js';
 import { ModelDecorationInjectedTextOptions } from '../../../common/model/textModel.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
@@ -24,7 +25,7 @@ import { InlayHintsFragments, InlayHintAnchor } from './inlayHints.js';
 import { goToDefinitionWithLocation, showGoToContextMenu } from './inlayHintsLocations.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { IInstantiationService, createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
@@ -59,7 +60,7 @@ class InlayHintsCache {
     }
 }
 const IInlayHintsCache = ( createDecorator('IInlayHintsCache'));
-registerSingleton(IInlayHintsCache, InlayHintsCache, 1 );
+registerSingleton(IInlayHintsCache, InlayHintsCache, InstantiationType.Delayed);
 class RenderedInlayHintLabelPart {
     constructor(item, index) {
         this.item = item;
@@ -81,6 +82,11 @@ class ActiveInlayHintInfo {
         this.hasTriggerModifier = hasTriggerModifier;
     }
 }
+var RenderMode;
+( (function(RenderMode) {
+    RenderMode[RenderMode["Normal"] = 0] = "Normal";
+    RenderMode[RenderMode["Invisible"] = 1] = "Invisible";
+})(RenderMode || (RenderMode = {})));
 let InlayHintsController = class InlayHintsController {
     static { InlayHintsController_1 = this; }
     static { this.ID = 'editor.contrib.InlayHints'; }
@@ -100,13 +106,13 @@ let InlayHintsController = class InlayHintsController {
         this._sessionDisposables = ( new DisposableStore());
         this._decorationsMetadata = ( new Map());
         this._ruleFactory = ( new DynamicCssRules(this._editor));
-        this._activeRenderMode = 0 ;
+        this._activeRenderMode = RenderMode.Normal;
         this._debounceInfo = _featureDebounce.for(_languageFeaturesService.inlayHintsProvider, 'InlayHint', { min: 25 });
         this._disposables.add(_languageFeaturesService.inlayHintsProvider.onDidChange(() => this._update()));
         this._disposables.add(_editor.onDidChangeModel(() => this._update()));
         this._disposables.add(_editor.onDidChangeModelLanguage(() => this._update()));
         this._disposables.add(_editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(141 )) {
+            if (e.hasChanged(EditorOption.inlayHints)) {
                 this._update();
             }
         }));
@@ -120,7 +126,7 @@ let InlayHintsController = class InlayHintsController {
     _update() {
         this._sessionDisposables.clear();
         this._removeAllDecorations();
-        const options = this._editor.getOption(141 );
+        const options = this._editor.getOption(EditorOption.inlayHints);
         if (options.enabled === 'off') {
             return;
         }
@@ -129,18 +135,18 @@ let InlayHintsController = class InlayHintsController {
             return;
         }
         if (options.enabled === 'on') {
-            this._activeRenderMode = 0 ;
+            this._activeRenderMode = RenderMode.Normal;
         }
         else {
             let defaultMode;
             let altMode;
             if (options.enabled === 'onUnlessPressed') {
-                defaultMode = 0 ;
-                altMode = 1 ;
+                defaultMode = RenderMode.Normal;
+                altMode = RenderMode.Invisible;
             }
             else {
-                defaultMode = 1 ;
-                altMode = 0 ;
+                defaultMode = RenderMode.Invisible;
+                altMode = RenderMode.Normal;
             }
             this._activeRenderMode = defaultMode;
             this._sessionDisposables.add(ModifierKeyEmitter.getInstance().event(e => {
@@ -292,7 +298,7 @@ let InlayHintsController = class InlayHintsController {
     }
     _installContextMenu() {
         return this._editor.onContextMenu(async (e) => {
-            if (!(e.event.target instanceof HTMLElement)) {
+            if (!(isHTMLElement(e.event.target))) {
                 return;
             }
             const part = this._getInlayHintLabelPart(e);
@@ -302,7 +308,7 @@ let InlayHintsController = class InlayHintsController {
         });
     }
     _getInlayHintLabelPart(e) {
-        if (e.target.type !== 6 ) {
+        if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
             return undefined;
         }
         const options = e.target.detail.injectedText?.options;
@@ -382,8 +388,8 @@ let InlayHintsController = class InlayHintsController {
                         description: 'InlayHint',
                         showIfCollapsed: item.anchor.range.isEmpty(),
                         collapseOnReplaceEdit: !item.anchor.range.isEmpty(),
-                        stickiness: 0 ,
-                        [item.anchor.direction]: this._activeRenderMode === 0  ? opts : undefined
+                        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
+                        [item.anchor.direction]: this._activeRenderMode === RenderMode.Normal ? opts : undefined
                     }
                 }
             });
@@ -504,10 +510,10 @@ let InlayHintsController = class InlayHintsController {
         }
     }
     _getLayoutInfo() {
-        const options = this._editor.getOption(141 );
+        const options = this._editor.getOption(EditorOption.inlayHints);
         const padding = options.padding;
-        const editorFontSize = this._editor.getOption(52 );
-        const editorFontFamily = this._editor.getOption(49 );
+        const editorFontSize = this._editor.getOption(EditorOption.fontSize);
+        const editorFontFamily = this._editor.getOption(EditorOption.fontFamily);
         let fontSize = options.fontSize;
         if (!fontSize || fontSize < 5 || fontSize > editorFontSize) {
             fontSize = editorFontSize;

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { AsyncIterableObject } from '../../../../base/common/async.js';
 import { MarkdownString, isEmptyMarkdownString } from '../../../../base/common/htmlContent.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
 import { Position } from '../../../common/core/position.js';
 import { ModelDecorationInjectedTextOptions } from '../../../common/model/textModel.js';
 import { HoverForeignElementAnchor } from '../../hover/browser/hoverTypes.js';
@@ -12,6 +13,7 @@ import { InlayHintsController, RenderedInlayHintLabelPart } from './inlayHintsCo
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { asCommandLink } from './inlayHints.js';
@@ -36,7 +38,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
         if (!controller) {
             return null;
         }
-        if (mouseEvent.target.type !== 6 ) {
+        if (mouseEvent.target.type !== MouseTargetType.CONTENT_TEXT) {
             return null;
         }
         const options = mouseEvent.target.detail.injectedText?.options;
@@ -92,7 +94,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 }
                 if (part.part.location || part.part.command) {
                     let linkHint;
-                    const useMetaKey = this._editor.getOption(78 ) === 'altKey';
+                    const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
                     const kb = useMetaKey
                         ? isMacintosh
                             ? ( localizeWithPath(_moduleId, 1, "cmd + click"))

package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.js

@@ -2,6 +2,7 @@ import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
 import { Action, Separator } from '../../../../base/common/actions.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ITextModelService } from '../../../common/services/resolverService.js';
 import { SymbolNavigationAction, SymbolNavigationAnchor, DefinitionAction } from '../../gotoSymbol/browser/goToCommands.js';
@@ -65,7 +66,7 @@ async function showGoToContextMenu(accessor, editor, anchor, part) {
             }
         })));
     }
-    const useShadowDOM = editor.getOption(127 );
+    const useShadowDOM = editor.getOption(EditorOption.useShadowDOM);
     contextMenuService.showContextMenu({
         domForShadowRoot: useShadowDOM ? editor.getDomNode() ?? undefined : undefined,
         getAnchor: () => {
@@ -86,7 +87,7 @@ async function goToDefinitionWithLocation(accessor, event, editor, location) {
         const openToSide = event.hasSideBySideModifier;
         const contextKeyService = accessor.get(IContextKeyService);
         const isInPeek = PeekContext.inPeekEditor.getValue(contextKeyService);
-        const canPeek = !openToSide && editor.getOption(88 ) && !isInPeek;
+        const canPeek = !openToSide && editor.getOption(EditorOption.definitionLinkOpensInPeek) && !isInPeek;
         const action = ( new DefinitionAction(
             { openToSide, openInPeek: canPeek, muteMessage: true },
             { title: { value: '', original: '' }, id: '', precondition: undefined }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js

@@ -1,3 +1,4 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { transaction, asyncTransaction } from '../../../../base/common/observableInternal/base.js';
 import '../../../../base/common/observableInternal/derived.js';
 import '../../../../base/common/observableInternal/autorun.js';
@@ -14,6 +15,7 @@ import { localizeWithPath } from '../../../../nls.js';
 import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 const _moduleId = "vs/editor/contrib/inlineCompletions/browser/commands";
 class ShowNextInlineSuggestionAction extends EditorAction {
     static { this.ID = showNextInlineSuggestionActionId; }
@@ -28,7 +30,7 @@ class ShowNextInlineSuggestionAction extends EditorAction {
             ))),
             kbOpts: {
                 weight: 100,
-                primary: 512  | 94 ,
+                primary: KeyMod$1.Alt | KeyCode.BracketRight,
             },
         });
     }
@@ -50,7 +52,7 @@ class ShowPreviousInlineSuggestionAction extends EditorAction {
             ))),
             kbOpts: {
                 weight: 100,
-                primary: 512  | 92 ,
+                primary: KeyMod$1.Alt | KeyCode.BracketLeft,
             },
         });
     }
@@ -87,8 +89,8 @@ class AcceptNextWordOfInlineCompletion extends EditorAction {
                 InlineCompletionContextKeys.inlineSuggestionVisible
             ))),
             kbOpts: {
-                weight: 100  + 1,
-                primary: 2048  | 17 ,
+                weight: KeybindingWeight.EditorContrib + 1,
+                primary: KeyMod$1.CtrlCmd | KeyCode.RightArrow,
                 kbExpr: ( (ContextKeyExpr.and(
                     EditorContextKeys.writable,
                     InlineCompletionContextKeys.inlineSuggestionVisible
@@ -118,7 +120,7 @@ class AcceptNextLineOfInlineCompletion extends EditorAction {
                 InlineCompletionContextKeys.inlineSuggestionVisible
             ))),
             kbOpts: {
-                weight: 100  + 1,
+                weight: KeybindingWeight.EditorContrib + 1,
             },
             menuOpts: [{
                     menuId: MenuId.InlineSuggestionToolbar,
@@ -147,7 +149,7 @@ class AcceptInlineCompletion extends EditorAction {
                     order: 1,
                 }],
             kbOpts: {
-                primary: 2 ,
+                primary: KeyCode.Tab,
                 weight: 200,
                 kbExpr: ( (ContextKeyExpr.and(
                     InlineCompletionContextKeys.inlineSuggestionVisible,
@@ -177,7 +179,7 @@ class HideInlineCompletion extends EditorAction {
             precondition: InlineCompletionContextKeys.inlineSuggestionVisible,
             kbOpts: {
                 weight: 100,
-                primary: 9 ,
+                primary: KeyCode.Escape,
             }
         });
     }

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostText.js

@@ -44,7 +44,6 @@ class GhostTextPart {
         this.preview = preview;
         this.lines = splitLines(this.text);
     }
-    ;
     equals(other) {
         return this.column === other.column &&
             this.lines.length === other.lines.length &&

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.js

@@ -11,15 +11,16 @@ import '../../../../base/common/arrays.js';
 import { containsRTL, isBasicASCII } from '../../../../base/common/strings.js';
 import './ghostText.css.js';
 import { applyFontInfo } from '../../../browser/config/domFontInfo.js';
-import { EditorFontLigatures } from '../../../common/config/editorOptions.js';
+import { EditorOption, EditorFontLigatures } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { StringBuilder } from '../../../common/core/stringBuilder.js';
 import { ILanguageService } from '../../../common/languages/language.js';
-import { InjectedTextCursorStops } from '../../../common/model.js';
+import { PositionAffinity, InjectedTextCursorStops } from '../../../common/model.js';
 import { LineTokens } from '../../../common/tokens/lineTokens.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
 import { renderViewLine, RenderLineInput } from '../../../common/viewLayout/viewLineRenderer.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
 import { GhostTextReplacement } from './ghostText.js';
 import { ColumnRange, applyObservableDecorations } from './utils.js';
 const GHOST_TEXT_DESCRIPTION = 'ghost-text';
@@ -54,7 +55,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
                             lastLine.content.length + 1,
                             lastLine.content.length + 1 + lines[0].length,
                             className,
-                            0
+                            InlineDecorationType.Regular
                         )));
                     }
                     lastLine.content += lines[0];
@@ -63,7 +64,7 @@ let GhostTextWidget = class GhostTextWidget extends Disposable {
                 for (const line of lines) {
                     additionalLines.push({
                         content: line,
-                        decorations: className ? [( new LineDecoration(1, line.length + 1, className, 0 ))] : []
+                        decorations: className ? [( new LineDecoration(1, line.length + 1, className, InlineDecorationType.Regular))] : []
                     });
                 }
             }
@@ -162,13 +163,13 @@ class AdditionalLinesWidget extends Disposable {
         this.languageIdCodec = languageIdCodec;
         this.lines = lines;
         this._viewZoneId = undefined;
-        this.editorOptionsChanged = observableSignalFromEvent('editorOptionChanged', Event.filter(this.editor.onDidChangeConfiguration, e => e.hasChanged(33 )
-            || e.hasChanged(117 )
-            || e.hasChanged(99 )
-            || e.hasChanged(94 )
-            || e.hasChanged(51 )
-            || e.hasChanged(50 )
-            || e.hasChanged(67 )));
+        this.editorOptionsChanged = observableSignalFromEvent('editorOptionChanged', Event.filter(this.editor.onDidChangeConfiguration, e => e.hasChanged(EditorOption.disableMonospaceOptimizations)
+            || e.hasChanged(EditorOption.stopRenderingLineAfter)
+            || e.hasChanged(EditorOption.renderWhitespace)
+            || e.hasChanged(EditorOption.renderControlCharacters)
+            || e.hasChanged(EditorOption.fontLigatures)
+            || e.hasChanged(EditorOption.fontInfo)
+            || e.hasChanged(EditorOption.lineHeight)));
         this._register(autorun(reader => {
             const lines = this.lines.read(reader);
             this.editorOptionsChanged.read(reader);
@@ -211,20 +212,20 @@ class AdditionalLinesWidget extends Disposable {
                     afterLineNumber: lineNumber,
                     heightInLines: heightInLines,
                     domNode,
-                    afterColumnAffinity: 1
+                    afterColumnAffinity: PositionAffinity.Right
                 });
             }
         });
     }
 }
 function renderLines(domNode, tabSize, lines, opts, languageIdCodec) {
-    const disableMonospaceOptimizations = opts.get(33 );
-    const stopRenderingLineAfter = opts.get(117 );
+    const disableMonospaceOptimizations = opts.get(EditorOption.disableMonospaceOptimizations);
+    const stopRenderingLineAfter = opts.get(EditorOption.stopRenderingLineAfter);
     const renderWhitespace = 'none';
-    const renderControlCharacters = opts.get(94 );
-    const fontLigatures = opts.get(51 );
-    const fontInfo = opts.get(50 );
-    const lineHeight = opts.get(67 );
+    const renderControlCharacters = opts.get(EditorOption.renderControlCharacters);
+    const fontLigatures = opts.get(EditorOption.fontLigatures);
+    const fontInfo = opts.get(EditorOption.fontInfo);
+    const lineHeight = opts.get(EditorOption.lineHeight);
     const sb = ( new StringBuilder(10000));
     sb.appendString('<div class="suggest-preview-text">');
     for (let i = 0, len = lines.length; i < len; i++) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js

@@ -7,9 +7,11 @@ import '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import { constObservable } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
+import { MouseTargetType } from '../../../browser/editorBrowser.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { ILanguageService } from '../../../common/languages/language.js';
-import { HoverForeignElementAnchor } from '../../hover/browser/hoverTypes.js';
+import { HoverForeignElementAnchor, HoverAnchorType } from '../../hover/browser/hoverTypes.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
 import { InlineSuggestionHintsContentWidget } from './inlineCompletionsHintsWidget.js';
 import { MarkdownRenderer } from '../../../browser/widget/markdownRenderer/browser/markdownRenderer.js';
@@ -26,7 +28,7 @@ class InlineCompletionsHover {
         this.controller = controller;
     }
     isValidForHoverAnchor(anchor) {
-        return (anchor.type === 1
+        return (anchor.type === HoverAnchorType.Range
             && this.range.startColumn <= anchor.range.startColumn
             && this.range.endColumn >= anchor.range.endColumn);
     }
@@ -47,7 +49,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
             return null;
         }
         const target = mouseEvent.target;
-        if (target.type === 8 ) {
+        if (target.type === MouseTargetType.CONTENT_VIEW_ZONE) {
             const viewZoneData = target.detail;
             if (controller.shouldShowHoverAtViewZone(viewZoneData.viewZoneId)) {
                 return (
@@ -62,7 +64,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
                 );
             }
         }
-        if (target.type === 7 ) {
+        if (target.type === MouseTargetType.CONTENT_EMPTY) {
             if (controller.shouldShowHoverAt(target.range)) {
                 return (
                      (new HoverForeignElementAnchor(
@@ -76,7 +78,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
                 );
             }
         }
-        if (target.type === 6 ) {
+        if (target.type === MouseTargetType.CONTENT_TEXT) {
             const mightBeForeignElement = target.detail.mightBeForeignElement;
             if (mightBeForeignElement && controller.shouldShowHoverAt(target.range)) {
                 return (
@@ -94,7 +96,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         return null;
     }
     computeSync(anchor, lineDecorations) {
-        if (this._editor.getOption(62 ).showToolbar !== 'onHover') {
+        if (this._editor.getOption(EditorOption.inlineSuggest).showToolbar !== 'onHover') {
             return [];
         }
         const controller = InlineCompletionsController.get(this._editor);
@@ -107,7 +109,7 @@ let InlineCompletionsHoverParticipant = class InlineCompletionsHoverParticipant
         const disposableStore = ( (new DisposableStore()));
         const part = hoverParts[0];
         this._telemetryService.publicLog2('inlineCompletionHover.shown');
-        if (this.accessibilityService.isScreenReaderOptimized() && !this._editor.getOption(8 )) {
+        if (this.accessibilityService.isScreenReaderOptimized() && !this._editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
             this.renderScreenReaderText(context, part, disposableStore);
         }
         const model = part.controller.model.get();

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js

@@ -1,10 +1,12 @@
-import { registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution, registerEditorAction, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 import { TriggerInlineSuggestionAction, ShowNextInlineSuggestionAction, ShowPreviousInlineSuggestionAction, AcceptNextWordOfInlineCompletion, AcceptNextLineOfInlineCompletion, AcceptInlineCompletion, HideInlineCompletion, ToggleAlwaysShowInlineSuggestionToolbar } from './commands.js';
 import { InlineCompletionsHoverParticipant } from './hoverParticipant.js';
+import { InlineCompletionsAccessibleView } from './inlineCompletionsAccessibleView.js';
 import { InlineCompletionsController } from './inlineCompletionsController.js';
+import { AccessibleViewRegistry } from '../../../../platform/accessibility/browser/accessibleViewRegistry.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
-registerEditorContribution(InlineCompletionsController.ID, InlineCompletionsController, 3 );
+registerEditorContribution(InlineCompletionsController.ID, InlineCompletionsController, EditorContributionInstantiation.Eventually);
 registerEditorAction(TriggerInlineSuggestionAction);
 registerEditorAction(ShowNextInlineSuggestionAction);
 registerEditorAction(ShowPreviousInlineSuggestionAction);
@@ -14,3 +16,4 @@ registerEditorAction(AcceptInlineCompletion);
 registerEditorAction(HideInlineCompletion);
 registerAction2(ToggleAlwaysShowInlineSuggestionToolbar);
 HoverParticipantRegistry.register(InlineCompletionsHoverParticipant);
+AccessibleViewRegistry.register(( new InlineCompletionsAccessibleView()));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js

@@ -0,0 +1,55 @@
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ICodeEditorService } from '../../../browser/services/codeEditorService.js';
+import { InlineCompletionContextKeys } from './inlineCompletionContextKeys.js';
+import { InlineCompletionsController } from './inlineCompletionsController.js';
+import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+class InlineCompletionsAccessibleView extends Disposable {
+    getProvider(accessor) {
+        const codeEditorService = accessor.get(ICodeEditorService);
+        function resolveProvider() {
+            const editor = codeEditorService.getActiveCodeEditor() || codeEditorService.getFocusedCodeEditor();
+            if (!editor) {
+                return;
+            }
+            const model = InlineCompletionsController.get(editor)?.model.get();
+            const state = model?.state.get();
+            if (!model || !state) {
+                return;
+            }
+            const lineText = model.textModel.getLineContent(state.primaryGhostText.lineNumber);
+            const ghostText = state.primaryGhostText.renderForScreenReader(lineText);
+            if (!ghostText) {
+                return;
+            }
+            const language = editor.getModel()?.getLanguageId() ?? undefined;
+            return {
+                id: AccessibleViewProviderId.InlineCompletions,
+                verbositySettingKey: 'accessibility.verbosity.inlineCompletions',
+                provideContent() { return lineText + ghostText; },
+                onClose() {
+                    model.stop();
+                    editor.focus();
+                },
+                next() {
+                    model.next();
+                    setTimeout(() => resolveProvider(), 50);
+                },
+                previous() {
+                    model.previous();
+                    setTimeout(() => resolveProvider(), 50);
+                },
+                options: { language, type: AccessibleViewType.View }
+            };
+        }
+        return resolveProvider();
+    }
+    constructor() {
+        super();
+        this.type = AccessibleViewType.View;
+        this.priority = 95;
+        this.name = 'inline-completions';
+        this.when = ( ContextKeyExpr.and(InlineCompletionContextKeys.inlineSuggestionVisible));
+    }
+}
+export { InlineCompletionsAccessibleView };

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js

@@ -12,7 +12,9 @@ import { observableFromEvent, mapObservableArrayCached, observableSignal, constO
 import { waitForState } from '../../../../base/common/observableInternal/promise.js';
 import { isUndefined } from '../../../../base/common/types.js';
 import { CoreEditingCommands } from '../../../browser/coreCommands.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
+import { CursorChangeReason } from '../../../common/cursorEvents.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { inlineSuggestCommitId } from './commandIds.js';
@@ -64,11 +66,11 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 });
             }
         ))));
-        this._enabledInConfig = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(62 ).enabled);
+        this._enabledInConfig = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).enabled);
         this._isScreenReaderEnabled = observableFromEvent(this._accessibilityService.onDidChangeScreenReaderOptimized, () => this._accessibilityService.isScreenReaderOptimized());
         this._editorDictationInProgress = observableFromEvent(this._contextKeyService.onDidChangeContext, () => this._contextKeyService.getContext(this.editor.getDomNode()).getValue('editorDictation.inProgress') === true);
         this._enabled = derived(this, reader => this._enabledInConfig.read(reader) && (!this._isScreenReaderEnabled.read(reader) || !this._editorDictationInProgress.read(reader)));
-        this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(62 ).fontFamily);
+        this._fontFamily = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.inlineSuggest).fontFamily);
         this._ghostTexts = derived(this, (reader) => {
             const model = this.model.read(reader);
             return model?.ghostTexts.read(reader) ?? [];
@@ -83,7 +85,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }).recomputeInitiallyAndOnChange(this._store);
         this._debounceValue = this._debounceService.for(this._languageFeaturesService.inlineCompletionsProvider, 'InlineCompletionsDebounce', { min: 50, max: 50 });
         this._playAccessibilitySignal = observableSignal(this);
-        this._isReadonly = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(91 ));
+        this._isReadonly = observableFromEvent(this.editor.onDidChangeConfiguration, () => this.editor.getOption(EditorOption.readOnly));
         this._textModel = observableFromEvent(this.editor.onDidChangeModel, () => this.editor.getModel());
         this._textModelIfWritable = derived(reader => this._isReadonly.read(reader) ? undefined : this._textModel.read(reader));
         this._register(( (new InlineCompletionContextKeys(this._contextKeyService, this.model))));
@@ -93,7 +95,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 this.model.set(undefined, tx);
                 this.updateObservables(tx, VersionIdChangeReason.Other);
                 if (textModel) {
-                    const model = _instantiationService.createInstance(InlineCompletionsModel, textModel, this._suggestWidgetAdaptor.selectedItem, this._textModelVersionId, this._positions, this._debounceValue, observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(118 ).preview), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(118 ).previewMode), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(62 ).mode), this._enabled);
+                    const model = _instantiationService.createInstance(InlineCompletionsModel, textModel, this._suggestWidgetAdaptor.selectedItem, this._textModelVersionId, this._positions, this._debounceValue, observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.suggest).preview), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.suggest).previewMode), observableFromEvent(editor.onDidChangeConfiguration, () => editor.getOption(EditorOption.inlineSuggest).mode), this._enabled);
                     this.model.set(model, tx);
                 }
             });
@@ -124,7 +126,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         this.updateObservables(tx, getReason(e)))));
         this._register(editor.onDidChangeCursorPosition(e => transaction(tx => {
             this.updateObservables(tx, VersionIdChangeReason.Other);
-            if (e.reason === 3  || e.source === 'api') {
+            if (e.reason === CursorChangeReason.Explicit || e.source === 'api') {
                 this.model.get()?.stop(tx);
             }
         })));
@@ -150,7 +152,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         }));
         this._register(this.editor.onDidBlurEditorWidget(() => {
             if (this._contextKeyService.getContextKeyValue('accessibleViewIsShown') || this._configurationService.getValue('editor.inlineSuggest.keepOnBlur') ||
-                editor.getOption(62 ).keepOnBlur) {
+                editor.getOption(EditorOption.inlineSuggest).keepOnBlur) {
                 return;
             }
             if (InlineSuggestionHintsContentWidget.dropDownVisible) {
@@ -198,7 +200,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
                 await timeout(50, cancelOnDispose(cancellationStore));
                 await waitForState(this._suggestWidgetAdaptor.selectedItem, isUndefined, () => false, cancelOnDispose(cancellationStore));
                 await this._accessibilitySignalService.playSignal(AccessibilitySignal.inlineSuggestion);
-                if (this.editor.getOption(8 )) {
+                if (this.editor.getOption(EditorOption.screenReaderAnnounceInlineSuggestion)) {
                     this.provideScreenReaderUpdate(state.primaryGhostText.renderForScreenReader(lineText));
                 }
             }
@@ -218,7 +220,7 @@ let InlineCompletionsController = class InlineCompletionsController extends Disp
         const accessibleViewShowing = this._contextKeyService.getContextKeyValue('accessibleViewIsShown');
         const accessibleViewKeybinding = this._keybindingService.lookupKeybinding('editor.action.accessibleView');
         let hint;
-        if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(149 )) {
+        if (!accessibleViewShowing && accessibleViewKeybinding && this.editor.getOption(EditorOption.inlineCompletionsAccessibilityVerbose)) {
             hint = ( localizeWithPath(
                 _moduleId,
                 0,