@codingame/monaco-vscode-api 15.0.3 → 16.0.0

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

@@ -1,10 +1,11 @@
 
-import { Color } from '../../../../../../base/common/color.js';
+import { BugIndicatingError } from '../../../../../../base/common/errors.js';
+import { observableFromEventOpts } from '../../../../../../base/common/observableInternal/utils.js';
 import { localize } from '../../../../../../nls.js';
-import { registerColor, transparent, darken, lighten, asCssVariable } from '../../../../../../platform/theme/common/colorUtils.js';
+import { registerColor, transparent, darken } from '../../../../../../platform/theme/common/colorUtils.js';
 import '../../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../../platform/theme/common/colors/chartsColors.js';
-import { diffRemoved, diffInsertedLine, diffInserted, editorHoverStatusBarBackground, editorHoverBorder } from '../../../../../../platform/theme/common/colors/editorColors.js';
+import { diffRemoved, diffInserted, diffInsertedLine, editorBackground } from '../../../../../../platform/theme/common/colors/editorColors.js';
 import { buttonForeground, buttonBackground, buttonSecondaryForeground, buttonSecondaryBackground } from '../../../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../../../platform/theme/common/colors/listColors.js';
 import '../../../../../../platform/theme/common/colors/menuColors.js';
@@ -12,85 +13,115 @@ import '../../../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../platform/theme/common/colors/searchColors.js';
-import { InlineEditTabAction } from './utils/utils.js';
+import { InlineEditTabAction } from './inlineEditsViewInterface.js';
 
-const originalBackgroundColor = registerColor('inlineEdit.originalBackground', Color.transparent, ( localize(1253, 'Background color for the original text in inline edits.')), true);
-const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', Color.transparent, ( localize(1254, 'Background color for the modified text in inline edits.')), true);
-registerColor('inlineEdit.originalChangedLineBackground', Color.transparent, ( localize(
-    1255,
+const originalBackgroundColor = registerColor('inlineEdit.originalBackground', ( transparent(diffRemoved, 0.2)), ( localize(1281, 'Background color for the original text in inline edits.')), true);
+const modifiedBackgroundColor = registerColor('inlineEdit.modifiedBackground', ( transparent(diffInserted, 0.3)), ( localize(1282, 'Background color for the modified text in inline edits.')), true);
+registerColor('inlineEdit.originalChangedLineBackground', ( transparent(diffRemoved, 0.8)), ( localize(
+    1283,
     'Background color for the changed lines in the original text of inline edits.'
 )), true);
-const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', diffRemoved, ( localize(
-    1256,
+const originalChangedTextOverlayColor = registerColor('inlineEdit.originalChangedTextBackground', ( transparent(diffRemoved, 0.8)), ( localize(
+    1284,
     'Overlay color for the changed text in the original text of inline edits.'
 )), true);
 const modifiedChangedLineBackgroundColor = registerColor('inlineEdit.modifiedChangedLineBackground', {
-    light: ( transparent(diffInsertedLine, 0.5)),
-    dark: ( transparent(diffInsertedLine, 0.5)),
+    light: ( transparent(diffInsertedLine, 0.7)),
+    dark: ( transparent(diffInsertedLine, 0.7)),
     hcDark: diffInsertedLine,
     hcLight: diffInsertedLine
 }, ( localize(
-    1257,
+    1285,
     'Background color for the changed lines in the modified text of inline edits.'
 )), true);
-const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', diffInserted, ( localize(
-    1258,
+const modifiedChangedTextOverlayColor = registerColor('inlineEdit.modifiedChangedTextBackground', ( transparent(diffInserted, 0.7)), ( localize(
+    1286,
     'Overlay color for the changed text in the modified text of inline edits.'
 )), true);
-const replacementViewBackground = registerColor('inlineEdit.wordReplacementView.background', {
-    light: ( transparent(editorHoverStatusBarBackground, 0.1)),
-    dark: ( transparent(editorHoverStatusBarBackground, 0.1)),
-    hcLight: ( transparent(editorHoverStatusBarBackground, 0.1)),
-    hcDark: ( transparent(editorHoverStatusBarBackground, 0.1)),
-}, ( localize(1259, 'Background color for the inline edit word replacement view.')));
-const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1260, 'Foreground color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorPrimaryBackground = registerColor('inlineEdit.gutterIndicator.primaryBackground', buttonBackground, ( localize(1261, 'Background color for the primary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1262, 'Foreground color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', buttonSecondaryBackground, ( localize(1263, 'Background color for the secondary inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1264, 'Foreground color for the successful inline edit gutter indicator.')));
-const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', { light: '#2e825c', dark: '#2e825c', hcLight: '#2e825c', hcDark: '#2e825c' }, ( localize(1265, 'Background color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryForeground = registerColor('inlineEdit.gutterIndicator.primaryForeground', buttonForeground, ( localize(1287, 'Foreground color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorPrimaryBorder = registerColor('inlineEdit.gutterIndicator.primaryBorder', buttonBackground, ( localize(1288, '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(1289, 'Background color for the primary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryForeground = registerColor('inlineEdit.gutterIndicator.secondaryForeground', buttonSecondaryForeground, ( localize(1290, 'Foreground color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBorder = registerColor('inlineEdit.gutterIndicator.secondaryBorder', buttonSecondaryBackground, ( localize(1291, 'Border color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorSecondaryBackground = registerColor('inlineEdit.gutterIndicator.secondaryBackground', inlineEditIndicatorSecondaryBorder, ( localize(1292, 'Background color for the secondary inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulForeground = registerColor('inlineEdit.gutterIndicator.successfulForeground', buttonForeground, ( localize(1293, 'Foreground color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBorder = registerColor('inlineEdit.gutterIndicator.successfulBorder', buttonBackground, ( localize(1294, 'Border color for the successful inline edit gutter indicator.')));
+const inlineEditIndicatorsuccessfulBackground = registerColor('inlineEdit.gutterIndicator.successfulBackground', inlineEditIndicatorsuccessfulBorder, ( localize(1295, '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(1266, 'Background color for the inline edit gutter indicator.')));
+}, ( localize(1296, 'Background color for the inline edit gutter indicator.')));
 const originalBorder = registerColor('inlineEdit.originalBorder', {
-    light: editorHoverBorder,
-    dark: editorHoverBorder,
-    hcDark: editorHoverBorder,
-    hcLight: editorHoverBorder
-}, ( localize(1267, 'Border color for the original text in inline edits.')));
+    light: diffRemoved,
+    dark: diffRemoved,
+    hcDark: diffRemoved,
+    hcLight: diffRemoved
+}, ( localize(1297, 'Border color for the original text in inline edits.')));
 const modifiedBorder = registerColor('inlineEdit.modifiedBorder', {
-    light: editorHoverBorder,
-    dark: editorHoverBorder,
-    hcDark: editorHoverBorder,
-    hcLight: editorHoverBorder
-}, ( localize(1268, 'Border color for the modified text in inline edits.')));
-const tabWillAcceptModifiedBorder = registerColor('inlineEdit.tabWillAcceptBorder', {
-    light: ( darken(modifiedBorder, 0.25)),
-    dark: ( lighten(modifiedBorder, 0.25)),
-    hcDark: ( lighten(modifiedBorder, 0.5)),
-    hcLight: ( darken(modifiedBorder, 0.5))
-}, ( localize(1269, 'Border color for the inline edits widget when tab will accept it.')));
-const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptBorder', {
-    light: ( darken(originalBorder, 0.25)),
-    dark: ( lighten(originalBorder, 0.25)),
-    hcDark: ( lighten(originalBorder, 0.5)),
-    hcLight: ( darken(originalBorder, 0.5))
+    light: ( darken(diffInserted, 0.6)),
+    dark: diffInserted,
+    hcDark: diffInserted,
+    hcLight: diffInserted
+}, ( localize(1298, '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(
-    1270,
-    'Border color for the inline edits widget over the original text when tab will accept it.'
+    1299,
+    'Modified border color for the inline edits widget when tab will accept it.'
+)));
+const tabWillAcceptOriginalBorder = registerColor('inlineEdit.tabWillAcceptOriginalBorder', {
+    light: ( darken(originalBorder, 0)),
+    dark: ( darken(originalBorder, 0)),
+    hcDark: ( darken(originalBorder, 0)),
+    hcLight: ( darken(originalBorder, 0))
+}, ( localize(
+    1300,
+    'Original border color for the inline edits widget over the original text when tab will accept it.'
 )));
 function getModifiedBorderColor(tabAction) {
     return ( tabAction.map(
-        a => asCssVariable(a === InlineEditTabAction.Accept ? tabWillAcceptModifiedBorder : modifiedBorder)
+        a => a === InlineEditTabAction.Accept ? tabWillAcceptModifiedBorder : modifiedBorder
     ));
 }
 function getOriginalBorderColor(tabAction) {
     return ( tabAction.map(
-        a => asCssVariable(a === InlineEditTabAction.Accept ? tabWillAcceptOriginalBorder : originalBorder)
+        a => a === InlineEditTabAction.Accept ? tabWillAcceptOriginalBorder : originalBorder
     ));
 }
+function getEditorBlendedColor(colorIdentifier, themeService) {
+    let color;
+    if (typeof colorIdentifier === 'string') {
+        color = observeColor(colorIdentifier, themeService);
+    }
+    else {
+        color = ( colorIdentifier.map(
+            (identifier, reader) => observeColor(identifier, themeService).read(reader)
+        ));
+    }
+    const backgroundColor = observeColor(editorBackground, themeService);
+    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),
+    }, themeService.onDidColorThemeChange, () => {
+        const color = themeService.getColorTheme().getColor(colorIdentifier);
+        if (!color) {
+            throw ( new BugIndicatingError(`Missing color: ${colorIdentifier}`));
+        }
+        return color;
+    });
+}
 
-export { getModifiedBorderColor, getOriginalBorderColor, inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorsuccessfulForeground, modifiedBackgroundColor, modifiedChangedLineBackgroundColor, modifiedChangedTextOverlayColor, originalBackgroundColor, originalChangedTextOverlayColor, replacementViewBackground };
+export { getEditorBlendedColor, getModifiedBorderColor, getOriginalBorderColor, inlineEditIndicatorBackground, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSecondaryBorder, inlineEditIndicatorSecondaryForeground, inlineEditIndicatorsuccessfulBackground, inlineEditIndicatorsuccessfulBorder, inlineEditIndicatorsuccessfulForeground, modifiedBackgroundColor, modifiedChangedLineBackgroundColor, modifiedChangedTextOverlayColor, observeColor, originalBackgroundColor, originalChangedTextOverlayColor };

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

@@ -11,17 +11,14 @@ import { Position } from "../../../../../../common/core/position.js";
 import { Range } from "../../../../../../common/core/range.js";
 import { TextEdit } from "../../../../../../common/core/textEdit.js";
 import { RangeMapping } from "../../../../../../common/diff/rangeMapping.js";
-export declare enum InlineEditTabAction {
-    Jump = "jump",
-    Accept = "accept",
-    Inactive = "inactive"
-}
+import { ITextModel } from "../../../../../../common/model.js";
 export declare function maxContentWidthInRange(editor: ObservableCodeEditor, range: LineRange, reader: IReader | undefined): number;
 export declare function getOffsetForPos(editor: ObservableCodeEditor, pos: Position, reader: IReader): number;
 export declare function getPrefixTrim(diffRanges: Range[], originalLinesRange: LineRange, modifiedLines: string[], editor: ICodeEditor): {
     prefixTrim: number;
     prefixLeftOffset: number;
 };
+export declare function getContentRenderWidth(content: string, editor: ICodeEditor, textModel: ITextModel): number;
 export declare class StatusBarViewItem extends MenuEntryActionViewItem {
     protected readonly _updateLabelListener: import("../../../../../../../base/common/lifecycle.js").IDisposable;
     protected updateLabel(): void;

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

@@ -3,7 +3,7 @@ import '../../../../../../../base/browser/dom.js';
 import '../../../../../../../base/common/lifecycle.js';
 import '../../../../../../../base/common/platform.js';
 import '../../../../../../../nls.js';
-import '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.css.js';
+import '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.css';
 import { numberComparator } from '../../../../../../../base/common/arrays.js';
 import { findFirstMin } from '../../../../../../../base/common/arraysFind.js';
 import '../../../../../../../base/common/observableInternal/index.js';
@@ -22,12 +22,6 @@ import { indentOfLine } from '../../../../../../common/model/textModel.js';
 import { derivedOpts, derived } from '../../../../../../../base/common/observableInternal/derived.js';
 import { derivedObservableWithCache } from '../../../../../../../base/common/observableInternal/utils.js';
 
-var InlineEditTabAction;
-(function (InlineEditTabAction) {
-    InlineEditTabAction["Jump"] = "jump";
-    InlineEditTabAction["Accept"] = "accept";
-    InlineEditTabAction["Inactive"] = "inactive";
-})(InlineEditTabAction || (InlineEditTabAction = {}));
 function maxContentWidthInRange(editor, range, reader) {
     editor.layoutInfo.read(reader);
     editor.value.read(reader);
@@ -78,15 +72,21 @@ function getPrefixTrim(diffRanges, originalLinesRange, modifiedLines, editor) {
     if (startLineIndent >= prefixTrim + 1) {
         prefixLeftOffset = editor.getOffsetForColumn(originalLinesRange.startLineNumber, prefixTrim + 1);
     }
-    else if (startLineIndent !== 1) {
-        const startLineIndentOffset = editor.getOffsetForColumn(originalLinesRange.startLineNumber, startLineIndent);
-        prefixLeftOffset = startLineIndentOffset / (startLineIndent - 1) * prefixTrim;
+    else if (modifiedLines.length > 0) {
+        prefixLeftOffset = getContentRenderWidth(modifiedLines[0].slice(0, prefixTrim), editor, textModel);
     }
     else {
         return { prefixTrim: 0, prefixLeftOffset: 0 };
     }
     return { prefixTrim, prefixLeftOffset };
 }
+function getContentRenderWidth(content, editor, textModel) {
+    const w = editor.getOption(EditorOption.fontInfo).typicalHalfwidthCharacterWidth;
+    const tabSize = textModel.getOptions().tabSize * w;
+    const numTabs = content.split('\t').length - 1;
+    const numNoneTabs = content.length - numTabs;
+    return numNoneTabs * w + numTabs * tabSize;
+}
 function applyEditToModifiedRangeMappings(rangeMapping, edit) {
     const updatedMappings = [];
     for (const m of rangeMapping) {
@@ -139,70 +139,6 @@ class PathBuilder {
         return this._data;
     }
 }
-function createRectangle(layout, padding, borderRadius, options = {}) {
-    const topLeftInner = layout.topLeft;
-    const topRightInner = topLeftInner.deltaX(layout.width);
-    const bottomLeftInner = topLeftInner.deltaY(layout.height);
-    const bottomRightInner = bottomLeftInner.deltaX(layout.width);
-    const { top: paddingTop, bottom: paddingBottom, left: paddingLeft, right: paddingRight } = typeof padding === 'number' ?
-        { top: padding, bottom: padding, left: padding, right: padding }
-        : padding;
-    const { topLeft: radiusTL, topRight: radiusTR, bottomLeft: radiusBL, bottomRight: radiusBR } = typeof borderRadius === 'number' ?
-        { topLeft: borderRadius, topRight: borderRadius, bottomLeft: borderRadius, bottomRight: borderRadius } :
-        borderRadius;
-    const totalHeight = layout.height + paddingTop + paddingBottom;
-    const totalWidth = layout.width + paddingLeft + paddingRight;
-    const topLeft = topLeftInner.deltaX(-paddingLeft).deltaY(-paddingTop);
-    const topRight = topRightInner.deltaX(paddingRight).deltaY(-paddingTop);
-    const topLeftBefore = topLeft.deltaY(Math.min(radiusTL, totalHeight / 2));
-    const topLeftAfter = topLeft.deltaX(Math.min(radiusTL, totalWidth / 2));
-    const topRightBefore = topRight.deltaX(-Math.min(radiusTR, totalWidth / 2));
-    const topRightAfter = topRight.deltaY(Math.min(radiusTR, totalHeight / 2));
-    const bottomLeft = bottomLeftInner.deltaX(-paddingLeft).deltaY(paddingBottom);
-    const bottomRight = bottomRightInner.deltaX(paddingRight).deltaY(paddingBottom);
-    const bottomLeftBefore = bottomLeft.deltaX(Math.min(radiusBL, totalWidth / 2));
-    const bottomLeftAfter = bottomLeft.deltaY(-Math.min(radiusBL, totalHeight / 2));
-    const bottomRightBefore = bottomRight.deltaY(-Math.min(radiusBR, totalHeight / 2));
-    const bottomRightAfter = bottomRight.deltaX(-Math.min(radiusBR, totalWidth / 2));
-    const path = ( new PathBuilder());
-    if (!options.hideLeft) {
-        path.moveTo(bottomLeftAfter).lineTo(topLeftBefore);
-    }
-    if (!options.hideLeft && !options.hideTop) {
-        path.curveTo(topLeft, topLeftAfter);
-    }
-    else {
-        path.moveTo(topLeftAfter);
-    }
-    if (!options.hideTop) {
-        path.lineTo(topRightBefore);
-    }
-    if (!options.hideTop && !options.hideRight) {
-        path.curveTo(topRight, topRightAfter);
-    }
-    else {
-        path.moveTo(topRightAfter);
-    }
-    if (!options.hideRight) {
-        path.lineTo(bottomRightBefore);
-    }
-    if (!options.hideRight && !options.hideBottom) {
-        path.curveTo(bottomRight, bottomRightAfter);
-    }
-    else {
-        path.moveTo(bottomRightAfter);
-    }
-    if (!options.hideBottom) {
-        path.lineTo(bottomLeftBefore);
-    }
-    if (!options.hideBottom && !options.hideLeft) {
-        path.curveTo(bottomLeft, bottomLeftAfter);
-    }
-    else {
-        path.moveTo(bottomLeftAfter);
-    }
-    return path.build();
-}
 function mapOutFalsy(obs) {
     const nonUndefinedObs = derivedObservableWithCache(undefined, (reader, lastValue) => obs.read(reader) || lastValue);
     return derivedOpts({
@@ -225,4 +161,4 @@ function rectToProps(fn) {
     };
 }
 
-export { InlineEditTabAction, PathBuilder, applyEditToModifiedRangeMappings, classNames, createRectangle, createReindentEdit, getOffsetForPos, getPrefixTrim, mapOutFalsy, maxContentWidthInRange, rectToProps };
+export { PathBuilder, applyEditToModifiedRangeMappings, classNames, createReindentEdit, getContentRenderWidth, getOffsetForPos, getPrefixTrim, mapOutFalsy, maxContentWidthInRange, rectToProps };

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

@@ -0,0 +1,156 @@
+.monaco-editor {
+	.inline-edits-view-indicator {
+		display: flex;
+		z-index: 34;
+		height: 20px;
+		color: var(--vscode-inlineEdit-indicator-foreground);
+		background-color: var(--vscode-inlineEdit-indicator-background);
+		border: 1px solid var(--vscode-inlineEdit-indicator-border);
+		border-radius: 3px;
+		align-items: center;
+		padding: 2px;
+		padding-right: 10px;
+		margin: 0 4px;
+		opacity: 0;
+		&.contained {
+			transition: opacity 0.2s ease-in-out;
+			transition-delay: 0.4s;
+		}
+		&.visible {
+			opacity: 1;
+		}
+		&.top {
+			opacity: 1;
+			.icon {
+				transform: rotate(90deg);
+			}
+		}
+		&.bottom {
+			opacity: 1;
+			.icon {
+				transform: rotate(-90deg);
+			}
+		}
+		.icon {
+			display: flex;
+			align-items: center;
+			margin: 0 2px;
+			transform: none;
+			transition: transform 0.2s ease-in-out;
+			.codicon {
+				color: var(--vscode-inlineEdit-indicator-foreground);
+			}
+		}
+		.label {
+			margin: 0 2px;
+			display: flex;
+			justify-content: center;
+			width: 100%;
+		}
+	}
+	.inline-edits-view .editorContainer {
+		.preview .monaco-editor {
+			.view-overlays .current-line-exact {
+				border: none;
+			}
+			.current-line-margin {
+				border: none;
+			}
+		}
+		.inline-edits-view-zone.diagonal-fill {
+			opacity: 0.5;
+		}
+	}
+	.strike-through {
+		text-decoration: line-through;
+	}
+	.inlineCompletions-line-insert {
+		background: var(--vscode-inlineEdit-modifiedChangedLineBackground);
+	}
+	.inlineCompletions-line-delete {
+		background: var(--vscode-inlineEdit-originalChangedLineBackground);
+	}
+	.inlineCompletions-char-insert {
+		background: var(--vscode-inlineEdit-modifiedChangedTextBackground);
+		cursor: pointer;
+	}
+	.inlineCompletions-char-delete {
+		background: var(--vscode-inlineEdit-originalChangedTextBackground);
+	}
+	.inlineCompletions-char-delete.diff-range-empty {
+		margin-left: -1px;
+		border-left: solid var(--vscode-inlineEdit-originalChangedTextBackground) 3px;
+	}
+	.inlineCompletions-char-insert.diff-range-empty {
+		border-left: solid var(--vscode-inlineEdit-modifiedChangedTextBackground) 3px;
+	}
+	.inlineCompletions-char-delete.single-line-inline {
+		border: 1px solid var(--vscode-editorHoverWidget-border);
+		margin: -2px 0 0 -2px;
+	}
+	.inlineCompletions-char-insert.single-line-inline {
+		border-top: 1px solid var(--vscode-inlineEdit-modifiedBorder);
+		border-bottom: 1px solid var(--vscode-inlineEdit-modifiedBorder);
+	}
+	.inlineCompletions-char-insert.single-line-inline.start {
+		border-top-left-radius: 4px;
+		border-bottom-left-radius: 4px;
+		border-left: 1px solid var(--vscode-inlineEdit-modifiedBorder);
+	}
+	.inlineCompletions-char-insert.single-line-inline.end {
+		border-top-right-radius: 4px;
+		border-bottom-right-radius: 4px;
+		border-right: 1px solid var(--vscode-inlineEdit-modifiedBorder);
+	}
+	.inlineCompletions-char-delete.single-line-inline.empty,
+	.inlineCompletions-char-insert.single-line-inline.empty {
+		display: none;
+	}
+	.inlineCompletions.strike-through {
+		text-decoration-thickness: 1px;
+	}
+	.inlineCompletions-modified-bubble{
+		background: var(--vscode-inlineEdit-modifiedChangedTextBackground);
+	}
+	.inlineCompletions-original-bubble{
+		background: var(--vscode-inlineEdit-originalChangedTextBackground);
+	}
+	.inlineCompletions-modified-bubble,
+	.inlineCompletions-original-bubble {
+		pointer-events: none;
+		display: inline-block;
+	}
+	.inline-edit.ghost-text,
+	.inline-edit.ghost-text-decoration,
+	.inline-edit.ghost-text-decoration-preview,
+	.inline-edit.suggest-preview-text .ghost-text {
+		&.syntax-highlighted {
+			opacity: 1 !important;
+		}
+		font-style: normal !important;
+	}
+	.inline-edit.modified-background.ghost-text,
+	.inline-edit.modified-background.ghost-text-decoration,
+	.inline-edit.modified-background.ghost-text-decoration-preview,
+	.inline-edit.modified-background.suggest-preview-text .ghost-text{
+		background: var(--vscode-inlineEdit-modifiedChangedTextBackground) !important;
+		display: inline-block !important;
+	}
+}
+.monaco-menu-option {
+	color: var(--vscode-editorActionList-foreground);
+	font-size: 13px;
+	padding: 0 10px;
+	line-height: 26px;
+	display: flex;
+	gap: 8px;
+	align-items: center;
+	border-radius: 4px;
+	cursor: pointer;
+	&.active {
+		background: var(--vscode-editorActionList-focusBackground);
+		color: var(--vscode-editorActionList-focusForeground);
+		outline: 1px solid var(--vscode-menu-selectionBorder, transparent);
+		outline-offset: -1px;
+	}
+}

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

@@ -6,7 +6,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { noBreakWhitespace } from '../../../../base/common/strings.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import './inlineProgressWidget.css.js';
+import './inlineProgressWidget.css';
 import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';

package/vscode/src/vs/editor/contrib/inlineProgress/browser/inlineProgressWidget.css

@@ -0,0 +1,21 @@
+.inline-editor-progress-decoration {
+	display: inline-block;
+	width: 1em;
+	height: 1em;
+}
+.inline-progress-widget  {
+	display: flex !important;
+	justify-content: center;
+	align-items: center;
+}
+.inline-progress-widget .icon {
+	font-size: 80% !important;
+}
+.inline-progress-widget:hover .icon {
+	font-size: 90% !important;
+	animation: none;
+}
+.inline-progress-widget:hover .icon::before {
+	content: var(--vscode-icon-x-content);
+	font-family: var(--vscode-icon-x-font-family);
+}

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(1271, "Insert Final New Line")),
+            label: ( localize2(1301, "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(1272, "Expand Line Selection")),
+            label: ( localize2(1302, "Expand Line Selection")),
             precondition: undefined,
             kbOpts: {
                 weight: KeybindingWeight.EditorCore,