@codingame/monaco-vscode-api 21.6.0 → 22.0.1

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.d.ts

@@ -1,4 +1,4 @@
-import { AsyncIterableObject } from "../../../../../base/common/async.js";
+import { AsyncIterableProducer } from "../../../../../base/common/async.js";
 import { CancellationToken } from "../../../../../base/common/cancellation.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ICommandService } from "../../../../../platform/commands/common/commands.service.js";
@@ -6,7 +6,7 @@ import { ISingleEditOperation } from "../../../../common/core/editOperation.js";
 import { Position } from "../../../../common/core/position.js";
 import { Range } from "../../../../common/core/range.js";
 import { TextReplacement } from "../../../../common/core/edits/textEdit.js";
-import { InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason } from "../../../../common/languages.js";
+import { InlineCompletionEndOfLifeReason, InlineCompletionDisplayLocationKind, InlineCompletion, InlineCompletionContext, InlineCompletions, InlineCompletionsProvider, PartialAcceptInfo, InlineCompletionsDisposeReason, ProviderId } from "../../../../common/languages.js";
 import { ILanguageConfigurationService } from "../../../../common/languages/languageConfigurationRegistry.service.js";
 import { ITextModel } from "../../../../common/model.js";
 import { InlineCompletionViewData, InlineCompletionViewKind } from "../view/inlineEdits/inlineEditsViewInterface.js";
@@ -16,8 +16,9 @@ export declare function provideInlineCompletions(providers: InlineCompletionsPro
 export declare function runWhenCancelled(token: CancellationToken, callback: () => void): IDisposable;
 export interface IInlineCompletionProviderResult {
     get didAllProvidersReturn(): boolean;
+    contextWithUuid: InlineCompletionContext;
     cancelAndDispose(reason: InlineCompletionsDisposeReason): void;
-    lists: AsyncIterableObject<InlineSuggestionList>;
+    lists: AsyncIterableProducer<InlineSuggestionList>;
 }
 export type InlineSuggestRequestInfo = {
     startTime: number;
@@ -26,6 +27,7 @@ export type InlineSuggestRequestInfo = {
     reason: string;
     typingInterval: number;
     typingIntervalCharacterCount: number;
+    availableProviders: ProviderId[];
 };
 export type InlineSuggestProviderRequestInfo = {
     startTime: number;
@@ -61,6 +63,7 @@ export declare class InlineSuggestData {
     private _shownDuration;
     private _showUncollapsedStartTime;
     private _showUncollapsedDuration;
+    private _notShownReason;
     private _viewData;
     private _didReportEndOfLife;
     private _lastSetEndOfLifeReason;
@@ -81,6 +84,7 @@ export declare class InlineSuggestData {
     reportEndOfLife(reason?: InlineCompletionEndOfLifeReason): void;
     reportInlineEditError(message: string): void;
     setIsPreceeded(partialAccepts: PartialAcceptance): void;
+    setNotShownReason(reason: string): void;
     /**
      * Sets the end of life reason, but does not send the event to the provider yet.
     */

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js

@@ -1,6 +1,6 @@
 
 import { assertNever } from '../../../../../base/common/assert.js';
-import { AsyncIterableObject } from '../../../../../base/common/async.js';
+import { AsyncIterableProducer } from '../../../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError } from '../../../../../base/common/errors.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
@@ -19,6 +19,7 @@ import { CachedFunction } from '../../../../../base/common/cache.js';
 import { InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
 import { isDefined } from '../../../../../base/common/types.js';
 import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
+import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
 
 function provideInlineCompletions(providers, position, model, context, requestInfo, languageConfigurationService) {
     const requestUuid = prefixedUuid('icr');
@@ -88,8 +89,9 @@ function provideInlineCompletions(providers, position, model, context, requestIn
             runningCount--;
         }
     }));
-    const inlineCompletionLists = AsyncIterableObject.fromPromisesResolveOrder(( providers.map(p => queryProvider.get(p)))).filter(isDefined);
+    const inlineCompletionLists = AsyncIterableProducer.fromPromisesResolveOrder(( providers.map(p => queryProvider.get(p)))).filter(isDefined);
     return {
+        contextWithUuid,
         get didAllProvidersReturn() { return runningCount === 0; },
         lists: inlineCompletionLists,
         cancelAndDispose: reason => {
@@ -204,6 +206,7 @@ class InlineSuggestData {
         this._shownDuration = 0;
         this._showUncollapsedStartTime = undefined;
         this._showUncollapsedDuration = 0;
+        this._notShownReason = undefined;
         this._didReportEndOfLife = false;
         this._lastSetEndOfLifeReason = undefined;
         this._isPreceeded = false;
@@ -225,7 +228,13 @@ class InlineSuggestData {
         this._viewData.viewKind = viewKind;
         this._viewData.renderData = viewData;
         this._timeUntilShown = Date.now() - this._requestInfo.startTime;
-        this.source.provider.handleItemDidShow?.(this.source.inlineSuggestions, this.sourceInlineCompletion, updatedInsertText);
+        const editDeltaInfo = ( new EditDeltaInfo(
+            viewData.lineCountModified,
+            viewData.lineCountOriginal,
+            viewData.characterCountModified,
+            viewData.characterCountOriginal
+        ));
+        this.source.provider.handleItemDidShow?.(this.source.inlineSuggestions, this.sourceInlineCompletion, updatedInsertText, editDeltaInfo);
         if (this.sourceInlineCompletion.shownCommand) {
             await commandService.executeCommand(this.sourceInlineCompletion.shownCommand.id, ...(this.sourceInlineCompletion.shownCommand.arguments || []));
         }
@@ -253,6 +262,7 @@ class InlineSuggestData {
             const summary = {
                 requestUuid: this.context.requestUuid,
                 correlationId: this._correlationId,
+                selectedSuggestionInfo: !!this.context.selectedSuggestionInfo,
                 partiallyAccepted: this._partiallyAcceptedCount,
                 partiallyAcceptedCountSinceOriginal: this._partiallyAcceptedSinceOriginal.count,
                 partiallyAcceptedRatioSinceOriginal: this._partiallyAcceptedSinceOriginal.ratio,
@@ -268,9 +278,11 @@ class InlineSuggestData {
                 languageId: this._requestInfo.languageId,
                 requestReason: this._requestInfo.reason,
                 viewKind: this._viewData.viewKind,
+                notShownReason: this._notShownReason,
                 error: this._viewData.error,
                 typingInterval: this._requestInfo.typingInterval,
                 typingIntervalCharacterCount: this._requestInfo.typingIntervalCharacterCount,
+                availableProviders: ( this._requestInfo.availableProviders.map(p => ( p.toString()))).join(','),
                 ...this._viewData.renderData,
             };
             this.source.provider.handleEndOfLifetime(this.source.inlineSuggestions, this.sourceInlineCompletion, reason, summary);
@@ -291,6 +303,9 @@ class InlineSuggestData {
         }
         this._partiallyAcceptedSinceOriginal = partialAccepts;
     }
+    setNotShownReason(reason) {
+        this._notShownReason ??= reason;
+    }
     setEndOfLifeReason(reason) {
         this.reportInlineEditHidden();
         this._lastSetEndOfLifeReason = reason;

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/telemetry.d.ts

@@ -0,0 +1,45 @@
+import { DataChannelForwardingTelemetryService } from "../../../../platform/dataChannel/browser/forwardingTelemetryService.js";
+export declare function sendInlineCompletionsEndOfLifeTelemetry(dataChannel: DataChannelForwardingTelemetryService, endOfLifeSummary: InlineCompletionEndOfLifeEvent): void;
+export type InlineCompletionEndOfLifeEvent = {
+    /**
+     * @deprecated To be removed at one point in favor of opportunityId
+     */
+    id: string;
+    opportunityId: string;
+    requestReason: string;
+    editorType: string;
+    languageId: string;
+    typingInterval: number;
+    typingIntervalCharacterCount: number;
+    selectedSuggestionInfo: boolean;
+    availableProviders: string;
+    correlationId: string | undefined;
+    extensionId: string;
+    extensionVersion: string;
+    groupId: string | undefined;
+    shown: boolean;
+    shownDuration: number | undefined;
+    shownDurationUncollapsed: number | undefined;
+    timeUntilShown: number | undefined;
+    timeUntilProviderRequest: number | undefined;
+    timeUntilProviderResponse: number | undefined;
+    reason: "accepted" | "rejected" | "ignored" | undefined;
+    partiallyAccepted: number | undefined;
+    partiallyAcceptedCountSinceOriginal: number | undefined;
+    partiallyAcceptedRatioSinceOriginal: number | undefined;
+    partiallyAcceptedCharactersSinceOriginal: number | undefined;
+    preceeded: boolean | undefined;
+    superseded: boolean | undefined;
+    error: string | undefined;
+    notShownReason: string | undefined;
+    viewKind: string | undefined;
+    cursorColumnDistance: number | undefined;
+    cursorLineDistance: number | undefined;
+    lineCountOriginal: number | undefined;
+    lineCountModified: number | undefined;
+    characterCountOriginal: number | undefined;
+    characterCountModified: number | undefined;
+    disjointReplacements: number | undefined;
+    sameShapeReplacements: boolean | undefined;
+    noSuggestionReason: string | undefined;
+};

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

@@ -0,0 +1,7 @@
+
+
+function sendInlineCompletionsEndOfLifeTelemetry(dataChannel, endOfLifeSummary) {
+    dataChannel.publicLog2('inlineCompletion.endOfLife', endOfLifeSummary);
+}
+
+export { sendInlineCompletionsEndOfLifeTelemetry };

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

@@ -18,7 +18,7 @@ import { asCssVariable } from '../../../../../../../platform/theme/common/colorU
 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 { keybindingLabelBackground } from '../../../../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../../../../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,13 +64,13 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const title = header(this._model.displayName);
         const gotoAndAccept = option(createOptionArgs({
             id: 'gotoAndAccept',
-            title: `${( localize(1298, "Go To"))} / ${( localize(1299, "Accept"))}`,
+            title: `${( localize(1301, "Go To"))} / ${( localize(1302, "Accept"))}`,
             icon: Codicon.check,
             commandId: inlineSuggestCommitId
         }));
         const reject = option(createOptionArgs({
             id: 'reject',
-            title: ( localize(1300, "Reject")),
+            title: ( localize(1303, "Reject")),
             icon: Codicon.close,
             commandId: hideInlineCompletionId
         }));
@@ -84,19 +84,19 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const toggleCollapsedMode = ( this._inlineEditsShowCollapsed.map(showCollapsed => showCollapsed ?
             option(createOptionArgs({
                 id: 'showExpanded',
-                title: ( localize(1301, "Show Expanded")),
+                title: ( localize(1304, "Show Expanded")),
                 icon: Codicon.expandAll,
                 commandId: toggleShowCollapsedId
             }))
             : option(createOptionArgs({
                 id: 'showCollapsed',
-                title: ( localize(1302, "Show Collapsed")),
+                title: ( localize(1305, "Show Collapsed")),
                 icon: Codicon.collapseAll,
                 commandId: toggleShowCollapsedId
             }))));
         const settings = option(createOptionArgs({
             id: 'settings',
-            title: ( localize(1303, "Settings")),
+            title: ( localize(1306, "Settings")),
             icon: Codicon.gear,
             commandId: 'workbench.action.openSettings',
             commandArgs: ['@tag:nextEditSuggestions']
@@ -104,7 +104,7 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
         const actions = this._model.action ? [this._model.action] : [];
         const actionBarFooter = actions.length > 0 ? actionBar(( actions.map(action => ({
             id: action.id,
-            label: action.title,
+            label: action.title + '...',
             enabled: true,
             run: () => this._commandService.executeCommand(action.id, ...(action.arguments ?? [])),
             class: undefined,
@@ -115,8 +115,8 @@ let GutterIndicatorMenuContent = class GutterIndicatorMenuContent {
             gotoAndAccept,
             reject,
             toggleCollapsedMode,
-            settings,
             extensionCommands.length ? separator() : undefined,
+            settings,
             ...extensionCommands,
             actionBarFooter ? separator() : undefined,
             actionBarFooter
@@ -139,7 +139,7 @@ function hoverContent(content) {
         class: 'content',
         style: {
             margin: 4,
-            minWidth: 150,
+            minWidth: 180,
         }
     }, content);
 }
@@ -148,10 +148,10 @@ function header(title) {
         class: 'header',
         style: {
             color: asCssVariable(descriptionForeground),
-            fontSize: '12px',
+            fontSize: '13px',
             fontWeight: '600',
-            padding: '0 10px',
-            lineHeight: 26,
+            padding: '0 4px',
+            lineHeight: 28,
         }
     }, [title]);
 }
@@ -185,7 +185,8 @@ function option(props) {
                     disableTitle: true,
                     ...defaultKeybindingLabelStyles,
                     keybindingLabelShadow: undefined,
-                    keybindingLabelBackground: asCssVariable(keybindingLabelBackground),
+                    keybindingLabelForeground: asCssVariable(descriptionForeground),
+                    keybindingLabelBackground: 'transparent',
                     keybindingLabelBorder: 'transparent',
                     keybindingLabelBottomBorder: undefined,
                 })));
@@ -200,7 +201,7 @@ function actionBar(actions, options) {
     return derived({ name: 'inlineEdits.actionBar' }, (_reader) => n.div({
         class: ['action-widget-action-bar'],
         style: {
-            padding: '0 10px',
+            padding: '3px 24px',
         }
     }, [
         n.div({
@@ -217,7 +218,7 @@ function separator() {
         class: 'menu-separator',
         style: {
             color: asCssVariable(editorActionListForeground),
-            padding: '4px 0',
+            padding: '2px 0',
         }
     }, n.div({
         style: {

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

@@ -20,6 +20,7 @@ import { InlineEditTabAction } from '../inlineEditsViewInterface.js';
 import { getEditorBlendedColor, inlineEditIndicatorsuccessfulBorder, inlineEditIndicatorsuccessfulForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorBackground } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { GutterIndicatorMenuContent } from './gutterIndicatorMenu.js';
+import { assertNever } from '../../../../../../../base/common/assert.js';
 import { debouncedObservable } from '../../../../../../../base/common/observableInternal/utils/utils.js';
 import { derived } from '../../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/observables/observableValue.js';
@@ -60,7 +61,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
         this._isHoveredOverIconDebounced = debouncedObservable(this._isHoveredOverIcon, 100);
         this.isHoveredOverIcon = this._isHoveredOverIconDebounced;
         this._isHoveredOverInlineEditDebounced = debouncedObservable(this._isHoveringOverInlineEdit, 100);
-        this._gutterIndicatorStyles = ( this._tabAction.map((v, reader) => {
+        this._gutterIndicatorStyles = ( this._tabAction.map(this, (v, reader) => {
             switch (v) {
                 case InlineEditTabAction.Inactive: return {
                     background: ( getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, themeService).read(reader).toString()),
@@ -77,6 +78,8 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
                     foreground: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulForeground, themeService).read(reader).toString()),
                     border: ( getEditorBlendedColor(inlineEditIndicatorsuccessfulBorder, themeService).read(reader).toString())
                 };
+                default:
+                    assertNever();
             }
         }));
         this._originalRangeObs = mapOutFalsy(this._originalRange);
@@ -202,7 +205,7 @@ let InlineEditsGutterIndicator = class InlineEditsGutterIndicator extends Dispos
             const idealIconWidth = 22;
             const minimalIconWidth = 16;
             const iconWidth = (pillRect) => {
-                const availableWidth = this._availableWidthForIcon.get()(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPadding;
+                const availableWidth = this._availableWidthForIcon.read(undefined)(pillRect.bottom + this._editorObs.editor.getScrollTop()) - gutterViewPortPadding;
                 return Math.max(Math.min(availableWidth, idealIconWidth), minimalIconWidth);
             };
             if (pillIsFullyDocked) {

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

@@ -14,7 +14,7 @@ class InlineEditModel {
         this.inlineEdit = inlineEdit;
         this.tabAction = tabAction;
         this.action = this.inlineEdit.inlineCompletion.action;
-        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1304, "Inline Edit"));
+        this.displayName = this.inlineEdit.inlineCompletion.source.provider.displayName ?? ( localize(1307, "Inline Edit"));
         this.extensionCommands = this.inlineEdit.inlineCompletion.source.inlineSuggestions.commands ?? [];
         this.isInDiffEditor = this._model.isInDiffEditor;
         this.displayLocation = this.inlineEdit.inlineCompletion.displayLocation;

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

@@ -38,7 +38,7 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
             if (!textModel) {
                 return undefined;
             }
-            const editOffset = model.inlineEditState.get()?.inlineCompletion.updatedEdit;
+            const editOffset = model.inlineEditState.read(undefined)?.inlineCompletion.updatedEdit;
             if (!editOffset) {
                 return undefined;
             }
@@ -51,7 +51,7 @@ let InlineEditsViewAndDiffProducer = class InlineEditsViewAndDiffProducer extend
             return ( new InlineEditWithChanges(
                 text,
                 diffEdits,
-                model.primaryPosition.get(),
+                model.primaryPosition.read(undefined),
                 inlineEdit.commands,
                 inlineEdit.inlineCompletion
             ));

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

@@ -16,14 +16,14 @@ import '../../../../../../platform/theme/common/colors/searchColors.js';
 import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1305, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1306, 'Background color for the modified text in inline edits.')), true);
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1308, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1309, 'Background color for the modified text in inline edits.')), true);
 registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1307,
+    1310,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
 const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
-    1308,
+    1311,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
@@ -32,52 +32,52 @@ const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedCha
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1309,
+    1312,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
 const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
-    1310,
+    1313,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1311, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1312, 'Border color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1314, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1315, 'Border color for the primary inline edit gutter indicator.')));
 const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', {
     light: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
     dark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcDark: ( transparent(inlineEditIndicatorPrimaryBorder, 0.4)),
     hcLight: ( transparent(inlineEditIndicatorPrimaryBorder, 0.5)),
-}, ( localize(1313, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1314, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1315, 'Border color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1316, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1317, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1318, 'Border color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1319, 'Background color for the successful inline edit gutter indicator.')));
+}, ( localize(1316, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1317, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1318, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1319, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1320, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1321, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1322, 'Background color for the successful inline edit gutter indicator.')));
 const inlineEditIndicatorBackground = registerColor('inlineEdit.gutterIndicator.background', {
     hcDark: ( transparent('tab.inactiveBackground', 0.5)),
     hcLight: ( transparent('tab.inactiveBackground', 0.5)),
     dark: ( transparent('tab.inactiveBackground', 0.5)),
     light: '#5f5f5f18',
-}, ( localize(1320, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1323, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
     light: diffRemoved,
     dark: diffRemoved,
     hcDark: diffRemoved,
     hcLight: diffRemoved
-}, ( localize(1321, 'Border color for the original text in inline edits.')));
+}, ( localize(1324, 'Border color for the original text in inline edits.')));
 const modifiedBorder = registerColor('inlineEdit.modifiedBorder', {
     light: ( darken(diffInserted, 0.6)),
     dark: diffInserted,
     hcDark: diffInserted,
     hcLight: diffInserted
-}, ( localize(1322, 'Border color for the modified text in inline edits.')));
+}, ( localize(1325, 'Border color for the modified text in inline edits.')));
 const tabWillAcceptModifiedBorder = registerColor('inlineEdit.tabWillAcceptModifiedBorder', {
     light: ( darken(modifiedBorder, 0)),
     dark: ( darken(modifiedBorder, 0)),
     hcDark: ( darken(modifiedBorder, 0)),
     hcLight: ( darken(modifiedBorder, 0))
 }, ( localize(
-    1323,
+    1326,
     'Modified border color for the inline edits widget when tab will accept it.'
 )));
 const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
@@ -86,7 +86,7 @@ const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOrigi
     hcDark: ( darken(originalBorder, 0)),
     hcLight: ( darken(originalBorder, 0))
 }, ( localize(
-    1324,
+    1327,
     'Original border color for the inline edits widget over the original text when tab will accept it.'
 )));
 function getModifiedBorderColor(tabAction) {
@@ -110,12 +110,15 @@ function getEditorBlendedColor(colorIdentifier, themeService) {
         ));
     }
     const backgroundColor = observeColor(editorBackground, themeService);
-    return ( color.map((c, reader) => c.makeOpaque(backgroundColor.read(reader))));
+    return ( color.map(
+        (c, reader) =>  c.makeOpaque(backgroundColor.read(reader))
+    ));
 }
 function observeColor(colorIdentifier, themeService) {
     return observableFromEventOpts({
         owner: { observeColor: colorIdentifier },
         equalsFn: (a, b) => a.equals(b),
+        debugName: () => `observeColor(${colorIdentifier})`
     }, themeService.onDidColorThemeChange, () => {
         const color = themeService.getColorTheme().getColor(colorIdentifier);
         if (!color) {

package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css

@@ -193,18 +193,27 @@
 .monaco-menu-option {
 	color: var(--vscode-editorActionList-foreground);
 	font-size: 13px;
-	padding: 0 10px;
-	line-height: 26px;
+	padding: 0 4px;
+	line-height: 28px;
 	display: flex;
-	gap: 8px;
+	gap: 4px;
 	align-items: center;
-	border-radius: 4px;
+	border-radius: 3px;
 	cursor: pointer;
 
+	.monaco-keybinding-key {
+		font-size: 13px;
+		opacity: 0.7;
+	}
+
 	&.active {
 		background: var(--vscode-editorActionList-focusBackground);
 		color: var(--vscode-editorActionList-focusForeground);
 		outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
 		outline-offset: -1px;
+
+		.monaco-keybinding-key {
+			color: var(--vscode-editorActionList-focusForeground);
+		}
 	}
 }

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

@@ -9,7 +9,7 @@ class InsertFinalNewLineAction extends EditorAction {
     constructor() {
         super({
             id: InsertFinalNewLineAction.ID,
-            label: ( localize2(1325, "Insert Final New Line")),
+            label: ( localize2(1328, "Insert Final New Line")),
             precondition: EditorContextKeys.writable
         });
     }

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

@@ -11,7 +11,7 @@ class ExpandLineSelectionAction extends EditorAction {
     constructor() {
         super({
             id: 'expandLineSelection',
-            label: ( localize2(1326, "Expand Line Selection")),
+            label: ( localize2(1329, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,

package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.d.ts

@@ -106,7 +106,8 @@ export declare class SnakeCaseAction extends AbstractCaseAction {
     protected _modifyText(text: string, wordSeparators: string): string;
 }
 export declare class CamelCaseAction extends AbstractCaseAction {
-    static wordBoundary: BackwardsCompatibleRegExp;
+    static singleLineWordBoundary: BackwardsCompatibleRegExp;
+    static multiLineWordBoundary: BackwardsCompatibleRegExp;
     static validWordStart: BackwardsCompatibleRegExp;
     constructor();
     protected _modifyText(text: string, wordSeparators: string): string;