@codingame/monaco-vscode-api 16.1.0 → 17.0.0

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

@@ -25,10 +25,12 @@ import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations
 import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
 import { InlineDecorationType } from '../../../../../common/viewModel.js';
 import { GhostTextReplacement } from '../../model/ghostText.js';
-import { ColumnRange } from '../../utils.js';
+import { RangeSingleLine } from '../../../../../common/core/rangeSingleLine.js';
+import { ColumnRange } from '../../../../../common/core/columnRange.js';
 import * as ghostTextView from './ghostTextView.css';
 import { StandardMouseEvent } from '../../../../../../base/browser/mouseEvent.js';
 import { CodeEditorWidget } from '../../../../../browser/widget/codeEditor/codeEditorWidget.js';
+import { TokenWithTextArray } from '../../../../../common/tokens/tokenWithTextArray.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore, autorun } from '../../../../../../base/common/observableInternal/autorun.js';
@@ -90,7 +92,7 @@ let GhostTextView = class GhostTextView extends Disposable {
             const replacedRange = ghostText instanceof GhostTextReplacement ? ghostText.columnRange : undefined;
             const syntaxHighlightingEnabled = this._useSyntaxHighlighting.read(reader);
             const extraClassNames = this._extraClassNames.read(reader);
-            const { inlineTexts, additionalLines, hiddenRange } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
+            const { inlineTexts, additionalLines, hiddenRange, additionalLinesOriginalSuffix } = computeGhostTextViewData(ghostText, textModel, GHOST_TEXT_CLASS_NAME + extraClassNames);
             const currentLine = textModel.getLineContent(ghostText.lineNumber);
             const edit = ( new OffsetEdit(( inlineTexts.map(t => SingleOffsetEdit.insert(t.column - 1, t.text)))));
             const tokens = syntaxHighlightingEnabled ? textModel.tokenization.tokenizeLinesAt(ghostText.lineNumber, [edit.apply(currentLine), ...( additionalLines.map(l => l.content))]) : undefined;
@@ -98,10 +100,18 @@ let GhostTextView = class GhostTextView extends Disposable {
             const inlineTextsWithTokens = ( inlineTexts.map(
                 (t, idx) => ({ ...t, tokens: tokens?.[0]?.getTokensInRange(newRanges[idx]) })
             ));
-            const tokenizedAdditionalLines = ( additionalLines.map((l, idx) => ({
-                content: tokens?.[idx + 1] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec),
-                decorations: l.decorations,
-            })));
+            const tokenizedAdditionalLines = ( additionalLines.map((l, idx) => {
+                let content = tokens?.[idx + 1] ?? LineTokens.createEmpty(l.content, this._languageService.languageIdCodec);
+                if (idx === additionalLines.length - 1 && additionalLinesOriginalSuffix) {
+                    const t = TokenWithTextArray.fromLineTokens(textModel.tokenization.getLineTokens(additionalLinesOriginalSuffix.lineNumber));
+                    const existingContent = t.slice(additionalLinesOriginalSuffix.columnRange.toZeroBasedOffsetRange());
+                    content = TokenWithTextArray.fromLineTokens(content).append(existingContent).toLineTokens(content.languageIdCodec);
+                }
+                return {
+                    content,
+                    decorations: l.decorations,
+                };
+            }));
             return {
                 replacedRange,
                 inlineTexts: inlineTextsWithTokens,
@@ -261,14 +271,16 @@ function computeGhostTextViewData(ghostText, textModel, ghostTextClassName) {
         }
         lastIdx = part.column - 1;
     }
+    let additionalLinesOriginalSuffix = undefined;
     if (hiddenTextStartColumn !== undefined) {
-        addToAdditionalLines([{ line: textBufferLine.substring(lastIdx), lineDecorations: [] }], undefined);
+        additionalLinesOriginalSuffix = ( new RangeSingleLine(ghostText.lineNumber, ( new ColumnRange(lastIdx + 1, textBufferLine.length + 1))));
     }
     const hiddenRange = hiddenTextStartColumn !== undefined ? ( new ColumnRange(hiddenTextStartColumn, textBufferLine.length + 1)) : undefined;
     return {
         inlineTexts,
         additionalLines,
         hiddenRange,
+        additionalLinesOriginalSuffix,
     };
 }
 class AdditionalLinesWidget extends Disposable {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineCompletionsView.js

@@ -37,7 +37,7 @@ let InlineCompletionsView = class InlineCompletionsView extends Disposable {
             targetTextModel: ( this._model.map(v => v?.textModel)),
         }, ( this._editorObs.getOption(EditorOption.inlineSuggest).map(v => ({ syntaxHighlightingEnabled: v.syntaxHighlightingEnabled }))), false, false)).recomputeInitiallyAndOnChange(store)).recomputeInitiallyAndOnChange(this._store);
         this._inlineEdit = derived(this, reader => this._model.read(reader)?.inlineEditState.read(reader)?.inlineEdit);
-        this._everHadInlineEdit = derivedObservableWithCache(this, (reader, last) => last || !!this._inlineEdit.read(reader) || !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineCompletion?.sourceInlineCompletion.showInlineEditMenu);
+        this._everHadInlineEdit = derivedObservableWithCache(this, (reader, last) => last || !!this._inlineEdit.read(reader) || !!this._model.read(reader)?.inlineCompletionState.read(reader)?.inlineCompletion?.showInlineEditMenu);
         this._inlineEditWidget = derivedDisposable(reader => {
             if (!this._everHadInlineEdit.read(reader)) {
                 return undefined;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '../../../../../../../../../../external/tsli
 import '../../../../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../../../../base/browser/ui/actionbar/actionbar.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
-import { KeybindingLabel, unthemedKeybindingLabelOptions } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
+import { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import '../../../../../../../base/common/observableInternal/index.js';
 import { OS } from '../../../../../../../base/common/platform.js';
@@ -13,11 +13,12 @@ import { ICommandService } from '../../../../../../../platform/commands/common/c
 import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.service.js';
 import { nativeHoverDelegate } from '../../../../../../../platform/hover/browser/hover.js';
 import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.service.js';
+import { defaultKeybindingLabelStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';
 import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
 import { descriptionForeground } from '../../../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../../../platform/theme/common/colors/chartsColors.js';
 import { editorHoverBorder } from '../../../../../../../platform/theme/common/colors/editorColors.js';
-import '../../../../../../../platform/theme/common/colors/inputColors.js';
+import { keybindingLabelBackground } from '../../../../../../../platform/theme/common/colors/inputColors.js';
 import { editorActionListForeground } from '../../../../../../../platform/theme/common/colors/listColors.js';
 import '../../../../../../../platform/theme/common/colors/menuColors.js';
 import '../../../../../../../platform/theme/common/colors/minimapColors.js';
@@ -64,7 +65,7 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1274, "Go To"))} / ${( localize(1275, "Accept"))}`,
+            title: `${( localize(1271, "Go To"))} / ${( localize(1272, "Accept"))}`,
             icon: ( this._model.tabAction.map(
                 action => action === InlineEditTabAction.Accept ? Codicon.check : Codicon.arrowRight
             )),
@@ -74,7 +75,7 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1276, "Reject")),
+            title: ( localize(1273, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -84,19 +85,19 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1277, "Show Expanded")),
+                title: ( localize(1274, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1278, "Show Collapsed")),
+                title: ( localize(1275, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1279, "Settings")),
+            title: ( localize(1276, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']
@@ -179,9 +180,16 @@ function option(props) {
         }, [ThemeIcon.isThemeIcon(props.icon) ? renderIcon(props.icon) : ( props.icon.map(icon => renderIcon(icon)))]),
         n.elem('span', {}, [props.title]),
         n.div({
-            style: { marginLeft: 'auto', opacity: '0.6' },
+            style: { marginLeft: 'auto' },
             ref: elem => {
-                const keybindingLabel = store.add(( new KeybindingLabel(elem, OS, { disableTitle: true, ...unthemedKeybindingLabelOptions })));
+                const keybindingLabel = store.add(( new KeybindingLabel(elem, OS, {
+                    disableTitle: true,
+                    ...defaultKeybindingLabelStyles,
+                    keybindingLabelShadow: undefined,
+                    keybindingLabelBackground: asCssVariable(keybindingLabelBackground),
+                    keybindingLabelBorder: 'transparent',
+                    keybindingLabelBottomBorder: undefined,
+                })));
                 store.add(autorun(reader => {
                     keybindingLabel.set(props.keybinding.read(reader));
                 }));

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.d.ts

@@ -2,48 +2,40 @@ import { Disposable } from "../../../../../../../base/common/lifecycle.js";
 import { IObservable, ISettableObservable } from "../../../../../../../base/common/observable.js";
 import { IAccessibilityService } from "../../../../../../../platform/accessibility/common/accessibility.service.js";
 import { IInstantiationService } from "../../../../../../../platform/instantiation/common/instantiation.js";
-import { IStorageService } from "../../../../../../../platform/storage/common/storage.service.js";
 import { IThemeService } from "../../../../../../../platform/theme/common/themeService.service.js";
 import { ObservableCodeEditor } from "../../../../../../browser/observableCodeEditor.js";
 import { HoverService } from "../../../../../../browser/services/hoverService/hoverService.js";
 import { LineRange } from "../../../../../../common/core/lineRange.js";
-import { InlineEditHost } from "../inlineEditsModel.js";
 import { IInlineEditModel } from "../inlineEditsViewInterface.js";
 export declare class InlineEditsGutterIndicator extends Disposable {
     private readonly _editorObs;
     private readonly _originalRange;
     private readonly _verticalOffset;
-    private readonly _host;
     private readonly _model;
     private readonly _isHoveringOverInlineEdit;
     private readonly _focusIsInMenu;
     private readonly _hoverService;
     private readonly _instantiationService;
-    private readonly _storageService;
     private readonly _accessibilityService;
     private get model();
-    private readonly _activeCompletionId;
     private readonly _gutterIndicatorStyles;
     private readonly _isHoveredOverInlineEditDebounced;
-    private readonly _newUserAnimationDisposable;
-    private readonly _firstToSecondTimeUserDisposable;
-    private readonly _secondTimeToActiveUserDisposable;
-    private get _newUserType();
-    private set _newUserType(value);
-    constructor(_editorObs: ObservableCodeEditor, _originalRange: IObservable<LineRange | undefined>, _verticalOffset: IObservable<number>, _host: IObservable<InlineEditHost | undefined>, _model: IObservable<IInlineEditModel | undefined>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _storageService: IStorageService, _accessibilityService: IAccessibilityService, themeService: IThemeService);
-    private setupNewUserExperience;
-    private _triggerAnimation;
+    constructor(_editorObs: ObservableCodeEditor, _originalRange: IObservable<LineRange | undefined>, _verticalOffset: IObservable<number>, _model: IObservable<IInlineEditModel | undefined>, _isHoveringOverInlineEdit: IObservable<boolean>, _focusIsInMenu: ISettableObservable<boolean>, _hoverService: HoverService, _instantiationService: IInstantiationService, _accessibilityService: IAccessibilityService, themeService: IThemeService);
+    triggerAnimation(): Promise<Animation>;
     private readonly _originalRangeObs;
     private readonly _state;
     private readonly _stickyScrollController;
     private readonly _stickyScrollHeight;
     private readonly _lineNumberToRender;
+    private readonly _availableWidthForIcon;
     private readonly _layout;
     private readonly _iconRef;
+    readonly isVisible: IObservable<boolean>;
     private readonly _hoverVisible;
     readonly isHoverVisible: IObservable<boolean>;
     private readonly _isHoveredOverIcon;
     private readonly _isHoveredOverIconDebounced;
+    readonly isHoveredOverIcon: IObservable<boolean>;
     private _showHover;
     private readonly _tabAction;
     private readonly _indicator;