@codingame/monaco-vscode-api 15.0.2 → 16.0.0

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

@@ -13,7 +13,7 @@ import '../../../../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../../../../platform/theme/common/colors/listColors.js';
 import '../../../../../../../platform/theme/common/colors/menuColors.js';
 import '../../../../../../../platform/theme/common/colors/minimapColors.js';
-import { scrollbarShadow } from '../../../../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../../../platform/theme/common/colors/searchColors.js';
 import { Point } from '../../../../../../browser/point.js';
@@ -22,11 +22,10 @@ import { renderLines, LineSource, RenderOptions } from '../../../../../../browse
 import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { SingleOffsetEdit } from '../../../../../../common/core/offsetEdit.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
-import { Range } from '../../../../../../common/core/range.js';
 import { ILanguageService } from '../../../../../../common/languages/language.service.js';
 import { LineTokens } from '../../../../../../common/tokens/lineTokens.js';
 import { TokenArray } from '../../../../../../common/tokens/tokenArray.js';
-import { getModifiedBorderColor, modifiedChangedTextOverlayColor, originalChangedTextOverlayColor, replacementViewBackground } from '../theme.js';
+import { getOriginalBorderColor, getModifiedBorderColor, modifiedChangedTextOverlayColor, originalChangedTextOverlayColor } from '../theme.js';
 import { mapOutFalsy, rectToProps } from '../utils/utils.js';
 import { constObservable } from '../../../../../../../base/common/observableInternal/utils.js';
 import { observableValue } from '../../../../../../../base/common/observableInternal/base.js';
@@ -36,12 +35,11 @@ import { n } from '../../../../../../../base/browser/domImpl/n.js';
 let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extends Disposable {
     static { this.MAX_LENGTH = 100; }
     constructor(_editor,
-    _edit, _innerEdits, _host, _languageService) {
+    _edit, _tabAction, _languageService) {
         super();
         this._editor = _editor;
         this._edit = _edit;
-        this._innerEdits = _innerEdits;
-        this._host = _host;
+        this._tabAction = _tabAction;
         this._languageService = _languageService;
         this._onDidClick = this._register(( new Emitter()));
         this.onDidClick = this._onDidClick.event;
@@ -63,60 +61,30 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
             else {
                 tokens = LineTokens.createEmpty(this._edit.text, this._languageService.languageIdCodec);
             }
-            renderLines(( new LineSource([tokens])), RenderOptions.fromEditor(this._editor.editor).withSetWidth(false), [], this._line, true);
+            const res = renderLines(( new LineSource([tokens])), RenderOptions.fromEditor(this._editor.editor).withSetWidth(false).withScrollBeyondLastColumn(0), [], this._line, true);
+            this._line.style.width = `${res.minWidthInPx}px`;
         });
-        this._editLocations = ( this._innerEdits.map(edit => {
-            const start = this._editor.observePosition(constObservable(edit.range.getStartPosition()), this._store);
-            const end = this._editor.observePosition(constObservable(edit.range.getEndPosition()), this._store);
-            return { start, end, edit };
-        }));
         this._layout = derived(this, reader => {
             this._renderTextEffect.read(reader);
             const widgetStart = this._start.read(reader);
             const widgetEnd = this._end.read(reader);
-            if (!widgetStart || !widgetEnd || widgetStart.x > widgetEnd.x) {
+            if (!widgetStart || !widgetEnd || widgetStart.x > widgetEnd.x || widgetStart.y > widgetEnd.y) {
                 return undefined;
             }
-            const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
             const lineHeight = this._editor.getOption(EditorOption.lineHeight).read(reader);
             const scrollLeft = this._editor.scrollLeft.read(reader);
             const w = this._editor.getOption(EditorOption.fontInfo).read(reader).typicalHalfwidthCharacterWidth;
-            const modifiedLeftOffset = 20;
-            const modifiedTopOffset = 5;
+            const modifiedLeftOffset = 3 * w;
+            const modifiedTopOffset = 4;
             const modifiedOffset = ( new Point(modifiedLeftOffset, modifiedTopOffset));
-            const PADDING = 4;
-            const originalLine = Rect.fromPoints(widgetStart, widgetEnd).withHeight(lineHeight).translateX(contentLeft - scrollLeft);
-            const modifiedLine = Rect.fromPointSize(originalLine.getLeftBottom().add(modifiedOffset), ( new Point(this._edit.text.length * w + 5, originalLine.height)));
-            const background = Rect.hull([originalLine, modifiedLine]).withMargin(PADDING);
-            let textLengthDelta = 0;
-            const innerEdits = [];
-            for (const editLocation of this._editLocations) {
-                const editStart = editLocation.start.read(reader);
-                const editEnd = editLocation.end.read(reader);
-                const edit = editLocation.edit;
-                if (!editStart || !editEnd || editStart.x > editEnd.x) {
-                    return undefined;
-                }
-                const original = Rect.fromLeftTopWidthHeight(editStart.x + contentLeft - scrollLeft, editStart.y, editEnd.x - editStart.x, lineHeight);
-                const modified = Rect.fromLeftTopWidthHeight(original.left + modifiedLeftOffset + textLengthDelta * w, original.bottom + modifiedTopOffset, edit.text.length * w + 5, original.height);
-                textLengthDelta += edit.text.length - (edit.range.endColumn - edit.range.startColumn);
-                innerEdits.push({ original, modified });
-            }
-            const lowerBackground = background.intersectVertical(( new OffsetRange(originalLine.bottom, Number.MAX_SAFE_INTEGER)));
-            const lowerText = ( new Rect(
-                lowerBackground.left + modifiedLeftOffset + 6,
-                lowerBackground.top + modifiedTopOffset,
-                lowerBackground.right,
-                lowerBackground.bottom
-            ));
+            const originalLine = Rect.fromPoints(widgetStart, widgetEnd).withHeight(lineHeight).translateX(-scrollLeft);
+            const modifiedLine = Rect.fromPointSize(originalLine.getLeftBottom().add(modifiedOffset), ( new Point(this._edit.text.length * w, originalLine.height)));
+            const lowerBackground = modifiedLine.withLeft(originalLine.left);
             return {
                 originalLine,
                 modifiedLine,
-                background,
-                innerEdits,
                 lowerBackground,
-                lowerText,
-                padding: PADDING
+                lineHeight,
             };
         });
         this._root = n.div({
@@ -127,27 +95,18 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                 if (!layout) {
                     return [];
                 }
-                const layoutProps = layout.read(reader);
-                const scrollLeft = this._editor.scrollLeft.read(reader);
-                let contentLeft = this._editor.layoutInfoContentLeft.read(reader);
-                let contentWidth = this._editor.contentWidth.read(reader);
-                const contentHeight = this._editor.editor.getContentHeight();
-                if (scrollLeft === 0) {
-                    contentLeft -= layoutProps.padding;
-                    contentWidth += layoutProps.padding;
-                }
-                const edits = ( layoutProps.innerEdits.map(
-                    edit => ({ modified: edit.modified.translateX(-contentLeft), original: edit.original.translateX(-contentLeft) })
-                ));
-                const modifiedBorderColor = getModifiedBorderColor(this._host.tabAction).read(reader);
+                const contentLeft = this._editor.layoutInfoContentLeft.read(reader);
+                const borderWidth = 1;
+                const originalBorderColor = ( getOriginalBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
+                const modifiedBorderColor = ( getModifiedBorderColor(this._tabAction).map(c => asCssVariable(c))).read(reader);
                 return [
                     n.div({
                         style: {
                             position: 'absolute',
                             top: 0,
                             left: contentLeft,
-                            width: contentWidth,
-                            height: contentHeight,
+                            width: this._editor.contentWidth,
+                            height: this._editor.editor.getContentHeight(),
                             overflow: 'hidden',
                             pointerEvents: 'none',
                         }
@@ -155,10 +114,8 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                         n.div({
                             style: {
                                 position: 'absolute',
-                                ...rectToProps(reader => layout.read(reader).lowerBackground.translateX(-contentLeft)),
-                                borderRadius: '4px',
+                                ...rectToProps(reader => layout.read(reader).lowerBackground.withMargin(borderWidth, 2 * borderWidth, borderWidth, 0)),
                                 background: asCssVariable(editorBackground),
-                                boxShadow: `${asCssVariable(scrollbarShadow)} 0 6px 6px -6px`,
                                 cursor: 'pointer',
                                 pointerEvents: 'auto',
                             },
@@ -173,68 +130,49 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
                         n.div({
                             style: {
                                 position: 'absolute',
-                                padding: '0px',
-                                boxSizing: 'border-box',
-                                ...rectToProps(reader => layout.read(reader).lowerText.translateX(-contentLeft)),
+                                ...rectToProps(reader => layout.read(reader).modifiedLine.withMargin(1, 2)),
                                 fontFamily: this._editor.getOption(EditorOption.fontFamily),
                                 fontSize: this._editor.getOption(EditorOption.fontSize),
                                 fontWeight: this._editor.getOption(EditorOption.fontWeight),
                                 pointerEvents: 'none',
-                            }
-                        }, [this._line]),
-                        ...( edits.map(edit => n.div({
-                            style: {
-                                position: 'absolute',
-                                top: edit.modified.top,
-                                left: edit.modified.left,
-                                width: edit.modified.width,
-                                height: edit.modified.height,
+                                boxSizing: 'border-box',
                                 borderRadius: '4px',
+                                border: `${borderWidth}px solid ${modifiedBorderColor}`,
                                 background: asCssVariable(modifiedChangedTextOverlayColor),
-                                pointerEvents: 'none',
+                                display: 'flex',
+                                justifyContent: 'center',
+                                alignItems: 'center',
+                                outline: `2px solid ${asCssVariable(editorBackground)}`,
                             }
-                        }), [])),
-                        ...( edits.map(edit => n.div({
-                            style: {
-                                position: 'absolute',
-                                top: edit.original.top,
-                                left: edit.original.left,
-                                width: edit.original.width,
-                                height: edit.original.height,
-                                borderRadius: '4px',
-                                boxSizing: 'border-box',
-                                background: asCssVariable(originalChangedTextOverlayColor),
-                                pointerEvents: 'none',
-                            }
-                        }, []))),
+                        }, [this._line]),
                         n.div({
                             style: {
                                 position: 'absolute',
-                                ...rectToProps(reader => layout.read(reader).background.translateX(-contentLeft)),
+                                ...rectToProps(reader => layout.read(reader).originalLine.withMargin(1)),
+                                boxSizing: 'border-box',
                                 borderRadius: '4px',
-                                border: `1px solid ${modifiedBorderColor}`,
-                                background: asCssVariable(replacementViewBackground),
+                                border: `${borderWidth}px solid ${originalBorderColor}`,
+                                background: asCssVariable(originalChangedTextOverlayColor),
                                 pointerEvents: 'none',
-                                boxSizing: 'border-box',
                             }
                         }, []),
                         n.svg({
                             width: 11,
-                            height: 13,
-                            viewBox: '0 0 11 13',
+                            height: 14,
+                            viewBox: '0 0 11 14',
                             fill: 'none',
                             style: {
                                 position: 'absolute',
-                                left: derived(reader => layout.read(reader).modifiedLine.translateX(-contentLeft).left - 15),
-                                top: derived(reader => layout.read(reader).modifiedLine.top),
+                                left: ( layout.map(l => l.modifiedLine.left - 16)),
+                                top: ( layout.map(l => l.modifiedLine.top + Math.round((l.lineHeight - 14 - 5) / 2))),
                             }
                         }, [
                             n.svgElem('path', {
-                                d: 'M1 0C1 2.98966 1 4.92087 1 7.49952C1 8.60409 1.89543 9.5 3 9.5H10.5',
+                                d: 'M1 0C1 2.98966 1 5.92087 1 8.49952C1 9.60409 1.89543 10.5 3 10.5H10.5',
                                 stroke: asCssVariable(editorHoverForeground),
                             }),
                             n.svgElem('path', {
-                                d: 'M6 6.5L9.99999 9.49998L6 12.5',
+                                d: 'M6 7.5L9.99999 10.49998L6 13.5',
                                 stroke: asCssVariable(editorHoverForeground),
                             })
                         ]),
@@ -251,24 +189,7 @@ let InlineEditsWordReplacementView = class InlineEditsWordReplacementView extend
     }
 };
 InlineEditsWordReplacementView = ( __decorate([
-    ( __param(4, ILanguageService))
+    ( __param(3, ILanguageService))
 ], InlineEditsWordReplacementView));
-function rangesToBubbleRanges(ranges) {
-    const result = [];
-    while (ranges.length) {
-        let range = ranges.shift();
-        if (range.startLineNumber !== range.endLineNumber) {
-            ranges.push(( new Range(range.startLineNumber + 1, 1, range.endLineNumber, range.endColumn)));
-            range = ( new Range(
-                range.startLineNumber,
-                range.startColumn,
-                range.startLineNumber,
-                Number.MAX_SAFE_INTEGER
-            ));
-        }
-        result.push(range);
-    }
-    return result;
-}
 
-export { InlineEditsWordReplacementView, rangesToBubbleRanges };
+export { InlineEditsWordReplacementView };

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

@@ -9,7 +9,7 @@ import { IInlineEditsView } from "../inlineEditsViewInterface.js";
 export interface IOriginalEditorInlineDiffViewState {
     diff: DetailedLineRangeMapping[];
     modifiedText: AbstractText;
-    mode: "mixedLines" | "insertionInline" | "interleavedLines" | "sideBySide" | "deletion";
+    mode: "insertionInline" | "sideBySide" | "deletion";
     modifiedCodeEditor: ICodeEditor;
 }
 export declare class OriginalEditorInlineDiffView extends Disposable implements IInlineEditsView {

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

@@ -5,15 +5,10 @@ import '../../../../../../../base/common/observableInternal/index.js';
 import { MouseTargetType } from '../../../../../../browser/editorBrowser.js';
 import { observableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';
 import { rangeIsSingleLine } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js';
-import { RenderOptions, LineSource, renderLines } from '../../../../../../browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
-import { diffAddDecoration } from '../../../../../../browser/widget/diffEditor/registrations.contribution.js';
-import { applyViewZones } from '../../../../../../browser/widget/diffEditor/utils.js';
-import { EditorOption } from '../../../../../../common/config/editorOptions.js';
 import { OffsetRange } from '../../../../../../common/core/offsetRange.js';
 import { Range } from '../../../../../../common/core/range.js';
 import { EndOfLinePreference, InjectedTextCursorStops } from '../../../../../../common/model.js';
 import { ModelDecorationOptions } from '../../../../../../common/model/textModel.js';
-import { InlineDecoration, InlineDecorationType } from '../../../../../../common/viewModel.js';
 import { classNames } from '../utils/utils.js';
 import { derived } from '../../../../../../../base/common/observableInternal/derived.js';
 import { autorunWithStore } from '../../../../../../../base/common/observableInternal/autorun.js';
@@ -30,7 +25,9 @@ class OriginalEditorInlineDiffView extends Disposable {
         this._modifiedTextModel = _modifiedTextModel;
         this._onDidClick = this._register(( new Emitter()));
         this.onDidClick = this._onDidClick.event;
-        this.isHovered = observableCodeEditor(this._originalEditor).isTargetHovered(p => p.target.type === MouseTargetType.CONTENT_TEXT && p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData, this._store);
+        this.isHovered = observableCodeEditor(this._originalEditor).isTargetHovered(p => p.target.type === MouseTargetType.CONTENT_TEXT &&
+            p.target.detail.injectedText?.options.attachedData instanceof InlineEditAttachedData &&
+            p.target.detail.injectedText.options.attachedData.owner === this, this._store);
         this._tokenizationFinished = modelTokenizationFinished(this._modifiedTextModel);
         this._decorations = derived(this, reader => {
             const diff = this._state.read(reader);
@@ -38,7 +35,8 @@ class OriginalEditorInlineDiffView extends Disposable {
                 return undefined;
             }
             const modified = diff.modifiedText;
-            const showInline = diff.mode === 'mixedLines' || diff.mode === 'insertionInline';
+            const showInline = diff.mode === 'insertionInline';
+            const hasOneInnerChange = diff.diff.length === 1 && diff.diff[0].innerChanges?.length === 1;
             const showEmptyDecorations = true;
             const originalDecorations = [];
             const modifiedDecorations = [];
@@ -74,7 +72,7 @@ class OriginalEditorInlineDiffView extends Disposable {
                 description: 'char-insert diff-range-empty',
             });
             for (const m of diff.diff) {
-                const showFullLineDecorations = diff.mode !== 'sideBySide';
+                const showFullLineDecorations = diff.mode !== 'sideBySide' && diff.mode !== 'deletion' && diff.mode !== 'insertionInline';
                 if (showFullLineDecorations) {
                     if (!m.original.isEmpty) {
                         originalDecorations.push({
@@ -107,7 +105,7 @@ class OriginalEditorInlineDiffView extends Disposable {
                                 options: {
                                     description: 'char-delete',
                                     shouldFillLineOnLineBreak: false,
-                                    className: classNames('inlineCompletions-char-delete', i.originalRange.isSingleLine() && diff.mode === 'insertionInline' && 'single-line-inline', i.originalRange.isEmpty() && 'empty', ((i.originalRange.isEmpty() || diff.mode === 'deletion' && replacedText === '\n') && showEmptyDecorations && !useInlineDiff) && 'diff-range-empty'),
+                                    className: classNames('inlineCompletions-char-delete', i.originalRange.isSingleLine() && diff.mode === 'insertionInline' && 'single-line-inline', i.originalRange.isEmpty() && 'empty', ((i.originalRange.isEmpty() && hasOneInnerChange || diff.mode === 'deletion' && replacedText === '\n') && showEmptyDecorations && !useInlineDiff) && 'diff-range-empty'),
                                     inlineClassName: useInlineDiff ? classNames('strike-through', 'inlineCompletions') : null,
                                     zIndex: 1
                                 }
@@ -116,7 +114,7 @@ class OriginalEditorInlineDiffView extends Disposable {
                         if (m.modified.contains(i.modifiedRange.startLineNumber)) {
                             modifiedDecorations.push({
                                 range: i.modifiedRange,
-                                options: (i.modifiedRange.isEmpty() && showEmptyDecorations && !useInlineDiff)
+                                options: (i.modifiedRange.isEmpty() && showEmptyDecorations && !useInlineDiff && hasOneInnerChange)
                                     ? diffAddDecorationEmpty
                                     : diffAddDecoration
                             });
@@ -145,7 +143,7 @@ class OriginalEditorInlineDiffView extends Disposable {
                                             inlineClassName: classNames('inlineCompletions-char-insert', i.modifiedRange.isSingleLine() && diff.mode === 'insertionInline' && 'single-line-inline', ...extraClasses
                                             ),
                                             cursorStops: InjectedTextCursorStops.None,
-                                            attachedData: ( new InlineEditAttachedData()),
+                                            attachedData: ( new InlineEditAttachedData(this)),
                                         },
                                         zIndex: 2,
                                         showIfCollapsed: true,
@@ -166,62 +164,21 @@ class OriginalEditorInlineDiffView extends Disposable {
                 store.add(observableCodeEditor(e).setDecorations(( this._decorations.map(d => d?.modifiedDecorations ?? []))));
             }
         }));
-        const editor = observableCodeEditor(this._originalEditor);
         this._register(this._originalEditor.onMouseUp(e => {
             if (e.target.type !== MouseTargetType.CONTENT_TEXT) {
                 return;
             }
             const a = e.target.detail.injectedText?.options.attachedData;
-            if (a instanceof InlineEditAttachedData) {
+            if (a instanceof InlineEditAttachedData && a.owner === this) {
                 this._onDidClick.fire(e.event);
             }
         }));
-        const originalViewZones = derived(this, (reader) => {
-            const originalModel = editor.model.read(reader);
-            if (!originalModel) {
-                return [];
-            }
-            const origViewZones = [];
-            const renderOptions = RenderOptions.fromEditor(this._originalEditor);
-            const modLineHeight = editor.getOption(EditorOption.lineHeight).read(reader);
-            const s = this._state.read(reader);
-            if (!s) {
-                return origViewZones;
-            }
-            for (const diff of s.diff) {
-                if (s.mode !== 'interleavedLines') {
-                    continue;
-                }
-                this._tokenizationFinished.read(reader);
-                const source = ( new LineSource(
-                    diff.modified.mapToLineArray(l => this._modifiedTextModel.tokenization.getLineTokens(l))
-                ));
-                const decorations = [];
-                for (const i of diff.innerChanges || []) {
-                    decorations.push(( new InlineDecoration(
-                        i.modifiedRange.delta(-(diff.original.startLineNumber - 1)),
-                        diffAddDecoration.className,
-                        InlineDecorationType.Regular
-                    )));
-                }
-                const deletedCodeDomNode = document.createElement('div');
-                deletedCodeDomNode.classList.add('view-lines', 'line-insert', 'monaco-mouse-cursor-text');
-                const result = renderLines(source, renderOptions, decorations, deletedCodeDomNode);
-                origViewZones.push({
-                    afterLineNumber: diff.original.endLineNumberExclusive - 1,
-                    domNode: deletedCodeDomNode,
-                    heightInPx: result.heightInLines * modLineHeight,
-                    minWidthInPx: result.minWidthInPx,
-                    showInHiddenAreas: true,
-                    suppressMouseDown: true,
-                });
-            }
-            return origViewZones;
-        });
-        this._register(applyViewZones(this._originalEditor, originalViewZones));
     }
 }
 class InlineEditAttachedData {
+    constructor(owner) {
+        this.owner = owner;
+    }
 }
 function allowsTrueInlineDiffRendering(mapping) {
     if (!mapping.innerChanges) {

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

@@ -1,18 +1,25 @@
+import { Color } from "../../../../../../base/common/color.js";
 import { IObservable } from "../../../../../../base/common/observable.js";
-import { InlineEditTabAction } from "./utils/utils.js";
+import { ColorIdentifier } from "../../../../../../platform/theme/common/colorUtils.js";
+import { IThemeService } from "../../../../../../platform/theme/common/themeService.service.js";
+import { InlineEditTabAction } from "./inlineEditsViewInterface.js";
 export declare const originalBackgroundColor: string;
 export declare const modifiedBackgroundColor: string;
 export declare const originalChangedLineBackgroundColor: string;
 export declare const originalChangedTextOverlayColor: string;
 export declare const modifiedChangedLineBackgroundColor: string;
 export declare const modifiedChangedTextOverlayColor: string;
-export declare const replacementViewBackground: string;
 export declare const inlineEditIndicatorPrimaryForeground: string;
+export declare const inlineEditIndicatorPrimaryBorder: string;
 export declare const inlineEditIndicatorPrimaryBackground: string;
 export declare const inlineEditIndicatorSecondaryForeground: string;
+export declare const inlineEditIndicatorSecondaryBorder: string;
 export declare const inlineEditIndicatorSecondaryBackground: string;
 export declare const inlineEditIndicatorsuccessfulForeground: string;
+export declare const inlineEditIndicatorsuccessfulBorder: string;
 export declare const inlineEditIndicatorsuccessfulBackground: string;
 export declare const inlineEditIndicatorBackground: string;
 export declare function getModifiedBorderColor(tabAction: IObservable<InlineEditTabAction>): IObservable<string>;
 export declare function getOriginalBorderColor(tabAction: IObservable<InlineEditTabAction>): IObservable<string>;
+export declare function getEditorBlendedColor(colorIdentifier: ColorIdentifier | IObservable<ColorIdentifier>, themeService: IThemeService): IObservable<Color>;
+export declare function observeColor(colorIdentifier: ColorIdentifier, themeService: IThemeService): IObservable<Color>;