Move css rules from inPlaceReplace.ts into inPlaceReplace.css (microsoft#166098)

* microsoft#165169 Move css rules from inPlaceReplace.ts into inPlaceReplace.css

* microsoft#165169 Move css rules from ghostTextWidget.ts into ghostTextWidget.css

* microsoft#165169 Move css rules from links.ts into links.css

* microsoft#165169 Move css rules from findOptionsWidget.ts into findOptionsWidget.css

* 💄

* supplement missing attributes for findOptionsWidget.css

* 💄

* 💄

* 💄

* Revert "💄"

This reverts commit 776684d.

* 💄

* rm the wrong assignment

Co-authored-by: Martin Aeschlimann <[email protected]>

Author: Kalmaegi

src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.css

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+.monaco-editor.vs .valueSetReplacement {
+	outline: solid 2px var(--vscode-editorBracketMatch-border);
+}

src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.ts

@@ -16,11 +16,10 @@ import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
 import { IInplaceReplaceSupportResult } from 'vs/editor/common/languages';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { editorBracketMatchBorder } from 'vs/editor/common/core/editorColorRegistry';
 import * as nls from 'vs/nls';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { InPlaceReplaceCommand } from './inPlaceReplaceCommand';
+import 'vs/css!./inPlaceReplace';
 
 class InPlaceReplaceController implements IEditorContribution {
 
@@ -181,9 +180,3 @@ registerEditorContribution(InPlaceReplaceController.ID, InPlaceReplaceController
 registerEditorAction(InPlaceReplaceUp);
 registerEditorAction(InPlaceReplaceDown);
 
-registerThemingParticipant((theme, collector) => {
-	const border = theme.getColor(editorBracketMatchBorder);
-	if (border) {
-		collector.addRule(`.monaco-editor.vs .valueSetReplacement { outline: solid 2px ${border}; }`);
-	}
-});

src/vs/editor/contrib/inlineCompletions/browser/ghostText.css

@@ -36,3 +36,11 @@
 	text-decoration: underline;
 	text-underline-position: under;
 }
+
+.monaco-editor .ghost-text-decoration,
+.monaco-editor .ghost-text-decoration-preview,
+.monaco-editor .suggest-preview-text .ghost-text {
+	color: var(--vscode-editorGhostText-foreground) !important;
+	background-color: var(--vscode-editorGhostText-background);
+	border: 1px solid var(--vscode-editorGhostText-border);
+}

src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.ts

@@ -17,13 +17,11 @@ import { StringBuilder } from 'vs/editor/common/core/stringBuilder';
 import { IModelDeltaDecoration, InjectedTextCursorStops, PositionAffinity } from 'vs/editor/common/model';
 import { ILanguageIdCodec } from 'vs/editor/common/languages';
 import { ILanguageService } from 'vs/editor/common/languages/language';
-import { ghostTextBackground, ghostTextBorder, ghostTextForeground } from 'vs/editor/common/core/editorColorRegistry';
 import { LineDecoration } from 'vs/editor/common/viewLayout/lineDecorations';
 import { RenderLineInput, renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { InlineDecorationType } from 'vs/editor/common/viewModel';
 import { GhostTextReplacement, GhostTextWidgetModel } from 'vs/editor/contrib/inlineCompletions/browser/ghostText';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 
 const ttPolicy = window.trustedTypes?.createPolicy('editorGhostText', { createHTML: value => value });
 
@@ -437,26 +435,3 @@ class ViewMoreLinesContentWidget extends Disposable implements IContentWidget {
 	}
 }
 
-registerThemingParticipant((theme, collector) => {
-	const foreground = theme.getColor(ghostTextForeground);
-	if (foreground) {
-		// `!important` ensures that other decorations don't cause a style conflict (#132017).
-		collector.addRule(`.monaco-editor .ghost-text-decoration { color: ${foreground.toString()} !important; }`);
-		collector.addRule(`.monaco-editor .ghost-text-decoration-preview { color: ${foreground.toString()} !important; }`);
-		collector.addRule(`.monaco-editor .suggest-preview-text .ghost-text { color: ${foreground.toString()} !important; }`);
-	}
-
-	const background = theme.getColor(ghostTextBackground);
-	if (background) {
-		collector.addRule(`.monaco-editor .ghost-text-decoration { background-color: ${background.toString()}; }`);
-		collector.addRule(`.monaco-editor .ghost-text-decoration-preview { background-color: ${background.toString()}; }`);
-		collector.addRule(`.monaco-editor .suggest-preview-text .ghost-text { background-color: ${background.toString()}; }`);
-	}
-
-	const border = theme.getColor(ghostTextBorder);
-	if (border) {
-		collector.addRule(`.monaco-editor .suggest-preview-text .ghost-text { border: 1px solid ${border}; }`);
-		collector.addRule(`.monaco-editor .ghost-text-decoration { border: 1px solid ${border}; }`);
-		collector.addRule(`.monaco-editor .ghost-text-decoration-preview { border: 1px solid ${border}; }`);
-	}
-});

src/vs/editor/contrib/links/browser/links.css

@@ -6,9 +6,9 @@
 .monaco-editor .detected-link-active {
 	text-decoration: underline;
 	text-underline-position: under;
-	color: var(--vscode-editorLink-activeForeground) !important;
 }
 
 .monaco-editor .detected-link-active {
 	cursor: pointer;
+	color: var(--vscode-editorLink-activeForeground) !important;
 }