@codingame/monaco-vscode-api 9.0.3 → 10.0.0

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

@@ -1,14 +1,11 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { getLeadingWhitespace } from '../../../../base/common/strings.js';
-import { EditorAction, registerEditorContribution, registerEditorAction, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { EditorAction, registerEditorContribution, registerEditorAction } from '../../../browser/editorExtensions.js';
 import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
-import { EditorOption, EditorAutoIndentStrategy } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
-import { IndentConsts } from '../../../common/languages/supports/indentRules.js';
 import { IModelService } from '../../../common/services/model.js';
 import { getSpaceCnt, generateIndent } from '../common/indentUtils.js';
 import { localize, localize2 } from '../../../../nls.js';
@@ -21,11 +18,11 @@ class IndentationToSpacesAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToSpacesAction.ID,
-            label: ( localize(1462, "Convert Indentation to Spaces")),
+            label: ( localize(1474, "Convert Indentation to Spaces")),
             alias: 'Convert Indentation to Spaces',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1463, "Convert the tab indentation to spaces.")),
+                description: ( localize2(1475, "Convert the tab indentation to spaces.")),
             }
         });
     }
@@ -53,11 +50,11 @@ class IndentationToTabsAction extends EditorAction {
     constructor() {
         super({
             id: IndentationToTabsAction.ID,
-            label: ( localize(1464, "Convert Indentation to Tabs")),
+            label: ( localize(1476, "Convert Indentation to Tabs")),
             alias: 'Convert Indentation to Tabs',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1465, "Convert the spaces indentation to tabs.")),
+                description: ( localize2(1477, "Convert the spaces indentation to tabs.")),
             }
         });
     }
@@ -99,16 +96,16 @@ class ChangeIndentationSizeAction extends EditorAction {
             id: ( (n.toString())),
             label: ( (n.toString())),
             description: (n === creationOpts.tabSize && n === modelOpts.tabSize
-                ? ( localize(1466, "Configured Tab Size"))
+                ? ( localize(1478, "Configured Tab Size"))
                 : n === creationOpts.tabSize
-                    ? ( localize(1467, "Default Tab Size"))
+                    ? ( localize(1479, "Default Tab Size"))
                     : n === modelOpts.tabSize
-                        ? ( localize(1468, "Current Tab Size"))
+                        ? ( localize(1480, "Current Tab Size"))
                         : undefined)
         }))));
         const autoFocusIndex = Math.min(model.getOptions().tabSize - 1, 7);
         setTimeout(() => {
-            quickInputService.pick(picks, { placeHolder: ( localize(1469, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
+            quickInputService.pick(picks, { placeHolder: ( localize(1481, "Select Tab Size for Current File")), activeItem: picks[autoFocusIndex] }).then(pick => {
                 if (pick) {
                     if (model && !model.isDisposed()) {
                         const pickedVal = parseInt(pick.label, 10);
@@ -135,11 +132,11 @@ class IndentUsingTabs extends ChangeIndentationSizeAction {
     constructor() {
         super(false, false, {
             id: IndentUsingTabs.ID,
-            label: ( localize(1470, "Indent Using Tabs")),
+            label: ( localize(1482, "Indent Using Tabs")),
             alias: 'Indent Using Tabs',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1471, "Use indentation with tabs.")),
+                description: ( localize2(1483, "Use indentation with tabs.")),
             }
         });
     }
@@ -149,11 +146,11 @@ class IndentUsingSpaces extends ChangeIndentationSizeAction {
     constructor() {
         super(true, false, {
             id: IndentUsingSpaces.ID,
-            label: ( localize(1472, "Indent Using Spaces")),
+            label: ( localize(1484, "Indent Using Spaces")),
             alias: 'Indent Using Spaces',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1473, "Use indentation with spaces.")),
+                description: ( localize2(1485, "Use indentation with spaces.")),
             }
         });
     }
@@ -163,11 +160,11 @@ class ChangeTabDisplaySize extends ChangeIndentationSizeAction {
     constructor() {
         super(true, true, {
             id: ChangeTabDisplaySize.ID,
-            label: ( localize(1474, "Change Tab Display Size")),
+            label: ( localize(1486, "Change Tab Display Size")),
             alias: 'Change Tab Display Size',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1475, "Change the space size equivalent of the tab.")),
+                description: ( localize2(1487, "Change the space size equivalent of the tab.")),
             }
         });
     }
@@ -177,11 +174,11 @@ class DetectIndentation extends EditorAction {
     constructor() {
         super({
             id: DetectIndentation.ID,
-            label: ( localize(1476, "Detect Indentation from Content")),
+            label: ( localize(1488, "Detect Indentation from Content")),
             alias: 'Detect Indentation from Content',
             precondition: undefined,
             metadata: {
-                description: ( localize2(1477, "Detect the indentation from content.")),
+                description: ( localize2(1489, "Detect the indentation from content.")),
             }
         });
     }
@@ -199,11 +196,11 @@ class ReindentLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentlines',
-            label: ( localize(1478, "Reindent Lines")),
+            label: ( localize(1490, "Reindent Lines")),
             alias: 'Reindent Lines',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1479, "Reindent the lines of the editor.")),
+                description: ( localize2(1491, "Reindent the lines of the editor.")),
             }
         });
     }
@@ -225,11 +222,11 @@ class ReindentSelectedLinesAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.reindentselectedlines',
-            label: ( localize(1480, "Reindent Selected Lines")),
+            label: ( localize(1492, "Reindent Selected Lines")),
             alias: 'Reindent Selected Lines',
             precondition: EditorContextKeys.writable,
             metadata: {
-                description: ( localize2(1481, "Reindent the selected lines of the editor.")),
+                description: ( localize2(1493, "Reindent the selected lines of the editor.")),
             }
         });
     }
@@ -317,7 +314,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
     }
     update() {
         this.callOnModel.clear();
-        if (this.editor.getOption(EditorOption.autoIndent) < EditorAutoIndentStrategy.Full || this.editor.getOption(EditorOption.formatOnPaste)) {
+        if (this.editor.getOption(12 ) < 4  || this.editor.getOption(57 )) {
             return;
         }
         if (!this.editor.hasModel()) {
@@ -346,7 +343,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
         if (!model.tokenization.isCheapToTokenize(range.getStartPosition().lineNumber)) {
             return;
         }
-        const autoIndent = this.editor.getOption(EditorOption.autoIndent);
+        const autoIndent = this.editor.getOption(12 );
         const { tabSize, indentSize, insertSpaces } = model.getOptions();
         const textEdits = [];
         const indentConverter = {
@@ -385,7 +382,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
                 }
                 else {
                     const indentMetadata = getIndentMetadata(model, startLineNumber, this._languageConfigurationService);
-                    if (indentMetadata === 0 || indentMetadata === IndentConsts.UNINDENT_MASK) {
+                    if (indentMetadata === 0 || indentMetadata === 8 ) {
                         return;
                     }
                 }
@@ -490,7 +487,7 @@ let AutoIndentOnPaste = class AutoIndentOnPaste {
         const tokens = model.tokenization.getLineTokens(lineNumber);
         if (tokens.getCount() > 0) {
             const firstNonWhitespaceTokenIndex = tokens.findTokenIndexAtOffset(nonWhitespaceColumn);
-            if (firstNonWhitespaceTokenIndex >= 0 && tokens.getStandardTokenType(firstNonWhitespaceTokenIndex) === StandardTokenType.Comment) {
+            if (firstNonWhitespaceTokenIndex >= 0 && tokens.getStandardTokenType(firstNonWhitespaceTokenIndex) === 1 ) {
                 return true;
             }
         }
@@ -507,7 +504,7 @@ AutoIndentOnPaste = ( (__decorate([
 function isStartOrEndInString(model, range) {
     const isPositionInString = (position) => {
         const tokenType = getStandardTokenTypeAtPosition(model, position);
-        return tokenType === StandardTokenType.String;
+        return tokenType === 2 ;
     };
     return isPositionInString(range.getStartPosition()) || isPositionInString(range.getEndPosition());
 }
@@ -564,7 +561,7 @@ class IndentationToTabsCommand {
         return helper.getTrackedSelection(this.selectionId);
     }
 }
-registerEditorContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste, EditorContributionInstantiation.BeforeFirstInteraction);
+registerEditorContribution(AutoIndentOnPaste.ID, AutoIndentOnPaste, 2 );
 registerEditorAction(IndentationToSpacesAction);
 registerEditorAction(IndentationToTabsAction);
 registerEditorAction(IndentUsingTabs);

package/vscode/src/vs/editor/contrib/indentation/common/indentation.js

@@ -3,7 +3,6 @@ import { ShiftCommand } from '../../../common/commands/shiftCommand.js';
 import { EditOperation } from '../../../common/core/editOperation.js';
 import { normalizeIndentation } from '../../../common/core/indentation.js';
 import { Selection } from '../../../common/core/selection.js';
-import { StandardTokenType } from '../../../common/encodedTokenAttributes.js';
 import { ProcessedIndentRulesSupport } from '../../../common/languages/supports/indentationLineProcessor.js';
 function getReindentEditOperations(model, languageConfigurationService, startLineNumber, endLineNumber) {
     if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) {
@@ -80,6 +79,6 @@ function doesLineStartWithString(model, lineNumber) {
         return false;
     }
     const lineTokens = model.tokenization.getLineTokens(lineNumber);
-    return lineTokens.getStandardTokenType(0) === StandardTokenType.String;
+    return lineTokens.getStandardTokenType(0) === 2 ;
 }
 export { getReindentEditOperations };

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

@@ -1,6 +1,6 @@
-import { registerEditorContribution, EditorContributionInstantiation } from '../../../browser/editorExtensions.js';
+import { registerEditorContribution } from '../../../browser/editorExtensions.js';
 import { HoverParticipantRegistry } from '../../hover/browser/hoverTypes.js';
 import { InlayHintsController } from './inlayHintsController.js';
 import { InlayHintsHover } from './inlayHintsHover.js';
-registerEditorContribution(InlayHintsController.ID, InlayHintsController, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(InlayHintsController.ID, InlayHintsController, 1 );
 HoverParticipantRegistry.register(InlayHintsHover);

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

@@ -1,21 +1,20 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { ModifierKeyEmitter, isHTMLElement } from '../../../../base/browser/dom.js';
 import { isNonEmptyArray } from '../../../../base/common/arrays.js';
-import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { RunOnceScheduler, disposableTimeout } from '../../../../base/common/async.js';
 import { CancellationToken, CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { DisposableStore, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 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 { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
+import { 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 { TrackedRangeStickiness, InjectedTextCursorStops } from '../../../common/model.js';
+import { 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';
@@ -25,7 +24,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, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton } 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';
@@ -60,7 +59,7 @@ class InlayHintsCache {
     }
 }
 const IInlayHintsCache = ( createDecorator('IInlayHintsCache'));
-registerSingleton(IInlayHintsCache, InlayHintsCache, InstantiationType.Delayed);
+registerSingleton(IInlayHintsCache, InlayHintsCache, 1 );
 class RenderedInlayHintLabelPart {
     constructor(item, index) {
         this.item = item;
@@ -82,16 +81,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'; }
     static { this._MAX_DECORATORS = 1500; }
-    static { this._MAX_LABEL_LEN = 43; }
+    static { this._whitespaceData = {}; }
     static get(editor) {
         return editor.getContribution(InlayHintsController_1.ID) ?? undefined;
     }
@@ -106,13 +100,13 @@ let InlayHintsController = class InlayHintsController {
         this._sessionDisposables = ( new DisposableStore());
         this._decorationsMetadata = ( new Map());
         this._ruleFactory = ( new DynamicCssRules(this._editor));
-        this._activeRenderMode = RenderMode.Normal;
+        this._activeRenderMode = 0 ;
         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(EditorOption.inlayHints)) {
+            if (e.hasChanged(144 )) {
                 this._update();
             }
         }));
@@ -126,7 +120,7 @@ let InlayHintsController = class InlayHintsController {
     _update() {
         this._sessionDisposables.clear();
         this._removeAllDecorations();
-        const options = this._editor.getOption(EditorOption.inlayHints);
+        const options = this._editor.getOption(144 );
         if (options.enabled === 'off') {
             return;
         }
@@ -135,18 +129,18 @@ let InlayHintsController = class InlayHintsController {
             return;
         }
         if (options.enabled === 'on') {
-            this._activeRenderMode = RenderMode.Normal;
+            this._activeRenderMode = 0 ;
         }
         else {
             let defaultMode;
             let altMode;
             if (options.enabled === 'onUnlessPressed') {
-                defaultMode = RenderMode.Normal;
-                altMode = RenderMode.Invisible;
+                defaultMode = 0 ;
+                altMode = 1 ;
             }
             else {
-                defaultMode = RenderMode.Invisible;
-                altMode = RenderMode.Normal;
+                defaultMode = 1 ;
+                altMode = 0 ;
             }
             this._activeRenderMode = defaultMode;
             this._sessionDisposables.add(ModifierKeyEmitter.getInstance().event(e => {
@@ -217,10 +211,18 @@ let InlayHintsController = class InlayHintsController {
                 scheduler.schedule();
             }
         }));
+        const cursor = this._sessionDisposables.add(( new MutableDisposable()));
         this._sessionDisposables.add(this._editor.onDidChangeModelContent((e) => {
             cts?.cancel();
-            const delay = Math.max(scheduler.delay, 1250);
-            scheduler.schedule(delay);
+            const delay = Math.max(scheduler.delay, 800);
+            this._cursorInfo = { position: this._editor.getPosition(), notEarlierThan: Date.now() + delay };
+            cursor.value = disposableTimeout(() => scheduler.schedule(0), delay);
+            scheduler.schedule();
+        }));
+        this._sessionDisposables.add(this._editor.onDidChangeConfiguration(e => {
+            if (e.hasChanged(144 )) {
+                scheduler.schedule();
+            }
         }));
         this._sessionDisposables.add(this._installDblClickGesture(() => scheduler.schedule(0)));
         this._sessionDisposables.add(this._installLinkGesture());
@@ -308,7 +310,7 @@ let InlayHintsController = class InlayHintsController {
         });
     }
     _getInlayHintLabelPart(e) {
-        if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
+        if (e.target.type !== 6 ) {
             return undefined;
         }
         const options = e.target.detail.injectedText?.options;
@@ -370,6 +372,46 @@ let InlayHintsController = class InlayHintsController {
         return result;
     }
     _updateHintsDecorators(ranges, items) {
+        const itemFixedLengths = ( new Map());
+        if (this._cursorInfo
+            && this._cursorInfo.notEarlierThan > Date.now()
+            && ( ranges.some(range => range.containsPosition(this._cursorInfo.position)))) {
+            const { position } = this._cursorInfo;
+            this._cursorInfo = undefined;
+            const lengths = ( new Map());
+            for (const deco of this._editor.getLineDecorations(position.lineNumber) ?? []) {
+                const data = this._decorationsMetadata.get(deco.id);
+                if (deco.range.startColumn > position.column) {
+                    continue;
+                }
+                const opts = data?.decoration.options[data.item.anchor.direction];
+                if (opts && opts.attachedData !== InlayHintsController_1._whitespaceData) {
+                    const len = lengths.get(data.item) ?? 0;
+                    lengths.set(data.item, len + opts.content.length);
+                }
+            }
+            const newItemsWithFixedLength = items.filter(item => item.anchor.range.startLineNumber === position.lineNumber && item.anchor.range.endColumn <= position.column);
+            const fixedLengths = Array.from(( lengths.values()));
+            let lastItem;
+            while (true) {
+                const targetItem = newItemsWithFixedLength.shift();
+                const fixedLength = fixedLengths.shift();
+                if (!fixedLength && !targetItem) {
+                    break;
+                }
+                if (targetItem) {
+                    itemFixedLengths.set(targetItem, fixedLength ?? 0);
+                    lastItem = targetItem;
+                }
+                else if (lastItem && fixedLength) {
+                    let len = itemFixedLengths.get(lastItem);
+                    len += fixedLength;
+                    len += fixedLengths.reduce((p, c) => p + c, 0);
+                    fixedLengths.length = 0;
+                    break;
+                }
+            }
+        }
         const newDecorationsData = [];
         const addInjectedText = (item, ref, content, cursorStops, attachedData) => {
             const opts = {
@@ -388,8 +430,8 @@ let InlayHintsController = class InlayHintsController {
                         description: 'InlayHint',
                         showIfCollapsed: item.anchor.range.isEmpty(),
                         collapseOnReplaceEdit: !item.anchor.range.isEmpty(),
-                        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
-                        [item.anchor.direction]: this._activeRenderMode === RenderMode.Normal ? opts : undefined
+                        stickiness: 0 ,
+                        [item.anchor.direction]: this._activeRenderMode === 0  ? opts : undefined
                     }
                 }
             });
@@ -399,17 +441,19 @@ let InlayHintsController = class InlayHintsController {
                 width: `${(fontSize / 3) | 0}px`,
                 display: 'inline-block'
             });
-            addInjectedText(item, marginRule, '\u200a', isLast ? InjectedTextCursorStops.Right : InjectedTextCursorStops.None);
+            addInjectedText(item, marginRule, '\u200a', isLast ? InjectedTextCursorStops.Right : InjectedTextCursorStops.None, InlayHintsController_1._whitespaceData);
         };
         const { fontSize, fontFamily, padding, isUniform } = this._getLayoutInfo();
+        const maxLength = this._editor.getOption(144 ).maximumLength;
         const fontFamilyVar = '--code-editorInlayHintsFontFamily';
         this._editor.getContainerDomNode().style.setProperty(fontFamilyVar, fontFamily);
         let currentLineInfo = { line: 0, totalLen: 0 };
-        for (const item of items) {
+        for (let i = 0; i < items.length; i++) {
+            const item = items[i];
             if (currentLineInfo.line !== item.anchor.range.startLineNumber) {
                 currentLineInfo = { line: item.anchor.range.startLineNumber, totalLen: 0 };
             }
-            if (currentLineInfo.totalLen > InlayHintsController_1._MAX_LABEL_LEN) {
+            if (maxLength && currentLineInfo.totalLen > maxLength) {
                 continue;
             }
             if (item.hint.paddingLeft) {
@@ -418,6 +462,8 @@ let InlayHintsController = class InlayHintsController {
             const parts = typeof item.hint.label === 'string'
                 ? [{ label: item.hint.label }]
                 : item.hint.label;
+            const itemFixedLength = itemFixedLengths.get(item);
+            let itemActualLength = 0;
             for (let i = 0; i < parts.length; i++) {
                 const part = parts[i];
                 const isFirst = i === 0;
@@ -439,8 +485,25 @@ let InlayHintsController = class InlayHintsController {
                         cssProperties.cursor = 'pointer';
                     }
                 }
+                let textlabel = part.label;
+                currentLineInfo.totalLen += textlabel.length;
+                let tooLong = false;
+                const over = maxLength !== 0 ? (currentLineInfo.totalLen - maxLength) : 0;
+                if (over > 0) {
+                    textlabel = textlabel.slice(0, -over) + '…';
+                    tooLong = true;
+                }
+                itemActualLength += textlabel.length;
+                if (itemFixedLength !== undefined) {
+                    const overFixedLength = itemActualLength - itemFixedLength;
+                    if (overFixedLength >= 0) {
+                        itemActualLength -= overFixedLength;
+                        textlabel = textlabel.slice(0, -(1 + overFixedLength)) + '…';
+                        tooLong = true;
+                    }
+                }
                 if (padding) {
-                    if (isFirst && isLast) {
+                    if (isFirst && (isLast || tooLong)) {
                         cssProperties.padding = `1px ${Math.max(1, fontSize / 4) | 0}px`;
                         cssProperties.borderRadius = `${(fontSize / 4) | 0}px`;
                     }
@@ -448,7 +511,7 @@ let InlayHintsController = class InlayHintsController {
                         cssProperties.padding = `1px 0 1px ${Math.max(1, fontSize / 4) | 0}px`;
                         cssProperties.borderRadius = `${(fontSize / 4) | 0}px 0 0 ${(fontSize / 4) | 0}px`;
                     }
-                    else if (isLast) {
+                    else if ((isLast || tooLong)) {
                         cssProperties.padding = `1px ${Math.max(1, fontSize / 4) | 0}px 1px 0`;
                         cssProperties.borderRadius = `0 ${(fontSize / 4) | 0}px ${(fontSize / 4) | 0}px 0`;
                     }
@@ -456,19 +519,15 @@ let InlayHintsController = class InlayHintsController {
                         cssProperties.padding = `1px 0 1px 0`;
                     }
                 }
-                let textlabel = part.label;
-                currentLineInfo.totalLen += textlabel.length;
-                let tooLong = false;
-                const over = currentLineInfo.totalLen - InlayHintsController_1._MAX_LABEL_LEN;
-                if (over > 0) {
-                    textlabel = textlabel.slice(0, -over) + '…';
-                    tooLong = true;
-                }
                 addInjectedText(item, this._ruleFactory.createClassNameRef(cssProperties), fixSpace(textlabel), isLast && !item.hint.paddingRight ? InjectedTextCursorStops.Right : InjectedTextCursorStops.None, ( new RenderedInlayHintLabelPart(item, i)));
                 if (tooLong) {
                     break;
                 }
             }
+            if (itemFixedLength !== undefined && itemActualLength < itemFixedLength) {
+                const pad = (itemFixedLength - itemActualLength);
+                addInjectedText(item, this._ruleFactory.createClassNameRef({}), '\u200a'.repeat(pad), InjectedTextCursorStops.None);
+            }
             if (item.hint.paddingRight) {
                 addInjectedWhitespace(item, true);
             }
@@ -510,10 +569,10 @@ let InlayHintsController = class InlayHintsController {
         }
     }
     _getLayoutInfo() {
-        const options = this._editor.getOption(EditorOption.inlayHints);
+        const options = this._editor.getOption(144 );
         const padding = options.padding;
-        const editorFontSize = this._editor.getOption(EditorOption.fontSize);
-        const editorFontFamily = this._editor.getOption(EditorOption.fontFamily);
+        const editorFontSize = this._editor.getOption(54 );
+        const editorFontFamily = this._editor.getOption(51 );
         let fontSize = options.fontSize;
         if (!fontSize || fontSize < 5 || fontSize > editorFontSize) {
             fontSize = editorFontSize;

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

@@ -1,7 +1,6 @@
 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';
@@ -13,7 +12,6 @@ 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 { localize } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { asCommandLink } from './inlayHints.js';
@@ -38,7 +36,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
         if (!controller) {
             return null;
         }
-        if (mouseEvent.target.type !== MouseTargetType.CONTENT_TEXT) {
+        if (mouseEvent.target.type !== 6 ) {
             return null;
         }
         const options = mouseEvent.target.detail.injectedText?.options;
@@ -77,7 +75,7 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                     executor.emitOne(( (new MarkdownHover(
                         this,
                         anchor.range,
-                        [( (new MarkdownString())).appendText(( localize(5155, "Double-click to insert")))],
+                        [( (new MarkdownString())).appendText(( localize(5196, "Double-click to insert")))],
                         false,
                         10001
                     ))));
@@ -94,22 +92,22 @@ let InlayHintsHover = class InlayHintsHover extends MarkdownHoverParticipant {
                 }
                 if (part.part.location || part.part.command) {
                     let linkHint;
-                    const useMetaKey = this._editor.getOption(EditorOption.multiCursorModifier) === 'altKey';
+                    const useMetaKey = this._editor.getOption(80 ) === 'altKey';
                     const kb = useMetaKey
                         ? isMacintosh
-                            ? ( localize(5156, "cmd + click"))
-                            : ( localize(5157, "ctrl + click"))
+                            ? ( localize(5197, "cmd + click"))
+                            : ( localize(5198, "ctrl + click"))
                         : isMacintosh
-                            ? ( localize(5158, "option + click"))
-                            : ( localize(5159, "alt + click"));
+                            ? ( localize(5199, "option + click"))
+                            : ( localize(5200, "alt + click"));
                     if (part.part.location && part.part.command) {
-                        linkHint = ( (new MarkdownString())).appendText(( localize(5160, 'Go to Definition ({0}), right click for more', kb)));
+                        linkHint = ( (new MarkdownString())).appendText(( localize(5201, 'Go to Definition ({0}), right click for more', kb)));
                     }
                     else if (part.part.location) {
-                        linkHint = ( (new MarkdownString())).appendText(( localize(5161, 'Go to Definition ({0})', kb)));
+                        linkHint = ( (new MarkdownString())).appendText(( localize(5202, 'Go to Definition ({0})', kb)));
                     }
                     else if (part.part.command) {
-                        linkHint = ( (new MarkdownString(`[${( localize(5162, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true })));
+                        linkHint = ( (new MarkdownString(`[${( localize(5203, "Execute Command"))}](${asCommandLink(part.part.command)} "${part.part.command.title}") (${kb})`, { isTrusted: true })));
                     }
                     if (linkHint) {
                         executor.emitOne(( (new MarkdownHover(this, anchor.range, [linkHint], false, 10000))));

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

@@ -2,7 +2,6 @@ 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';
@@ -66,7 +65,7 @@ async function showGoToContextMenu(accessor, editor, anchor, part) {
             }
         })));
     }
-    const useShadowDOM = editor.getOption(EditorOption.useShadowDOM);
+    const useShadowDOM = editor.getOption(130 );
     contextMenuService.showContextMenu({
         domForShadowRoot: useShadowDOM ? editor.getDomNode() ?? undefined : undefined,
         getAnchor: () => {
@@ -87,7 +86,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(EditorOption.definitionLinkOpensInPeek) && !isInPeek;
+        const canPeek = !openToSide && editor.getOption(91 ) && !isInPeek;
         const action = ( new DefinitionAction(
             { openToSide, openInPeek: canPeek, muteMessage: true },
             { title: { value: '', original: '' }, id: '', precondition: undefined }