From ba00f4ba6705870346b0d2714bbd1330c9647e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20Kein=C3=A4nen?= Date: Wed, 16 Nov 2022 00:33:16 +0200 Subject: [PATCH 1/2] Move css rules from selections.ts to selections.css --- .../browser/viewParts/selections/selections.css | 12 ++++++++++++ .../browser/viewParts/selections/selections.ts | 17 ----------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/vs/editor/browser/viewParts/selections/selections.css b/src/vs/editor/browser/viewParts/selections/selections.css index fa653a1500969..da2997f9c75c6 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.css +++ b/src/vs/editor/browser/viewParts/selections/selections.css @@ -11,6 +11,18 @@ position: absolute; } +.monaco-editor .focused .selected-text { + background-color: var(--vscode-editor-selectionBackground); +} + +.monaco-editor .selected-text { + background-color: var(--vscode-editor-inactiveSelectionBackground); +} + +.monaco-editor .view-line span.inline-selected-text { + color: var(--vscode-editor-selectionForeground); +} + .monaco-editor .top-left-radius { border-top-left-radius: 3px; } .monaco-editor .bottom-left-radius { border-bottom-left-radius: 3px; } .monaco-editor .top-right-radius { border-top-right-radius: 3px; } diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts index 4ddbbbf3824f4..707796304ee77 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.ts +++ b/src/vs/editor/browser/viewParts/selections/selections.ts @@ -9,8 +9,6 @@ import { Range } from 'vs/editor/common/core/range'; import { HorizontalRange, LineVisibleRanges, RenderingContext } from 'vs/editor/browser/view/renderingContext'; import { ViewContext } from 'vs/editor/common/viewModel/viewContext'; import * as viewEvents from 'vs/editor/common/viewEvents'; -import { editorInactiveSelection, editorSelectionBackground, editorSelectionForeground } from 'vs/platform/theme/common/colorRegistry'; -import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; const enum CornerStyle { @@ -402,21 +400,6 @@ export class SelectionsOverlay extends DynamicViewOverlay { } } -registerThemingParticipant((theme, collector) => { - const editorSelectionColor = theme.getColor(editorSelectionBackground); - if (editorSelectionColor) { - collector.addRule(`.monaco-editor .focused .selected-text { background-color: ${editorSelectionColor}; }`); - } - const editorInactiveSelectionColor = theme.getColor(editorInactiveSelection); - if (editorInactiveSelectionColor) { - collector.addRule(`.monaco-editor .selected-text { background-color: ${editorInactiveSelectionColor}; }`); - } - const editorSelectionForegroundColor = theme.getColor(editorSelectionForeground); - if (editorSelectionForegroundColor && !editorSelectionForegroundColor.isTransparent()) { - collector.addRule(`.monaco-editor .view-line span.inline-selected-text { color: ${editorSelectionForegroundColor}; }`); - } -}); - function abs(n: number): number { return n < 0 ? -n : n; } From 889afc475151d5bc42c1defe962041a5bb93a98e Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 18 Nov 2022 12:07:11 +0100 Subject: [PATCH 2/2] Move back rule from CSS to TypeScript --- .../editor/browser/viewParts/selections/selections.css | 4 ---- src/vs/editor/browser/viewParts/selections/selections.ts | 9 +++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/vs/editor/browser/viewParts/selections/selections.css b/src/vs/editor/browser/viewParts/selections/selections.css index da2997f9c75c6..bf9cf40272932 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.css +++ b/src/vs/editor/browser/viewParts/selections/selections.css @@ -19,10 +19,6 @@ background-color: var(--vscode-editor-inactiveSelectionBackground); } -.monaco-editor .view-line span.inline-selected-text { - color: var(--vscode-editor-selectionForeground); -} - .monaco-editor .top-left-radius { border-top-left-radius: 3px; } .monaco-editor .bottom-left-radius { border-bottom-left-radius: 3px; } .monaco-editor .top-right-radius { border-top-right-radius: 3px; } diff --git a/src/vs/editor/browser/viewParts/selections/selections.ts b/src/vs/editor/browser/viewParts/selections/selections.ts index 707796304ee77..efceef0e5c35e 100644 --- a/src/vs/editor/browser/viewParts/selections/selections.ts +++ b/src/vs/editor/browser/viewParts/selections/selections.ts @@ -9,6 +9,8 @@ import { Range } from 'vs/editor/common/core/range'; import { HorizontalRange, LineVisibleRanges, RenderingContext } from 'vs/editor/browser/view/renderingContext'; import { ViewContext } from 'vs/editor/common/viewModel/viewContext'; import * as viewEvents from 'vs/editor/common/viewEvents'; +import { editorSelectionForeground } from 'vs/platform/theme/common/colorRegistry'; +import { registerThemingParticipant } from 'vs/platform/theme/common/themeService'; import { EditorOption } from 'vs/editor/common/config/editorOptions'; const enum CornerStyle { @@ -400,6 +402,13 @@ export class SelectionsOverlay extends DynamicViewOverlay { } } +registerThemingParticipant((theme, collector) => { + const editorSelectionForegroundColor = theme.getColor(editorSelectionForeground); + if (editorSelectionForegroundColor && !editorSelectionForegroundColor.isTransparent()) { + collector.addRule(`.monaco-editor .view-line span.inline-selected-text { color: ${editorSelectionForegroundColor}; }`); + } +}); + function abs(n: number): number { return n < 0 ? -n : n; }