Move css rules for #165169 (#165595)

* #165169 Move css rules from diffReview.ts into diffReview.css

* #165169 Move css rules from scrollDecoration.ts into scrollDecoration.css

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

* #165169 Move css rules from accessibilityHelp.ts into accessibilityHelp.css

* remove useless import

* #165169 Move css rules from BracketMatch.ts into BracketMatch.css

8 files changed, 13 insertions, 62 deletions

diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.css b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.css
index 1eabd692f83..4a31db23d0e 100644
--- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.css
+++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.css
@@ -8,4 +8,5 @@
 	top: 0;
 	left: 0;
 	height: 6px;
-}
\ No newline at end of file
+	box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
+}
diff --git a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
index 7e295754924..1fc3347948b 100644
--- a/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
+++ b/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.ts
@@ -9,8 +9,6 @@ import { ViewPart } from 'vs/editor/browser/view/viewPart';
 import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/browser/view/renderingContext';
 import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
 import * as viewEvents from 'vs/editor/common/viewEvents';
-import { scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 
 
@@ -91,10 +89,3 @@ export class ScrollDecorationViewPart extends ViewPart {
 		this._domNode.setClassName(this._shouldShow ? 'scroll-decoration' : '');
 	}
 }
-
-registerThemingParticipant((theme, collector) => {
-	const shadow = theme.getColor(scrollbarShadow);
-	if (shadow) {
-		collector.addRule(`.monaco-editor .scroll-decoration { box-shadow: ${shadow} 0 6px 6px -6px inset; }`);
-	}
-});
diff --git a/src/vs/editor/browser/widget/diffReview.ts b/src/vs/editor/browser/widget/diffReview.ts
index cb0cb1f935b..a615c329e05 100644
--- a/src/vs/editor/browser/widget/diffReview.ts
+++ b/src/vs/editor/browser/widget/diffReview.ts
@@ -22,13 +22,11 @@ import { LineTokens } from 'vs/editor/common/tokens/lineTokens';
 import { Position } from 'vs/editor/common/core/position';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { ITextModel, TextModelResolvedOptions } from 'vs/editor/common/model';
-import { editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry';
 import { RenderLineInput, renderViewLine2 as renderViewLine } from 'vs/editor/common/viewLayout/viewLineRenderer';
 import { ViewLineRenderingData } from 'vs/editor/common/viewModel';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { scrollbarShadow } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, ThemeIcon } from 'vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vs/platform/theme/common/themeService';
 import { Constants } from 'vs/base/common/uint';
 import { Codicon } from 'vs/base/common/codicons';
 import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
@@ -817,18 +815,6 @@ export class DiffReview extends Disposable {
 
 // theming
 
-registerThemingParticipant((theme, collector) => {
-	const lineNumbers = theme.getColor(editorLineNumbers);
-	if (lineNumbers) {
-		collector.addRule(`.monaco-diff-editor .diff-review-line-number { color: ${lineNumbers}; }`);
-	}
-
-	const shadow = theme.getColor(scrollbarShadow);
-	if (shadow) {
-		collector.addRule(`.monaco-diff-editor .diff-review-shadow { box-shadow: ${shadow} 0 -6px 6px -6px inset; }`);
-	}
-});
-
 class DiffReviewNext extends EditorAction {
 	constructor() {
 		super({
diff --git a/src/vs/editor/browser/widget/media/diffReview.css b/src/vs/editor/browser/widget/media/diffReview.css
index a973e9f069e..24fe722bc98 100644
--- a/src/vs/editor/browser/widget/media/diffReview.css
+++ b/src/vs/editor/browser/widget/media/diffReview.css
@@ -6,6 +6,7 @@
 .monaco-diff-editor .diff-review-line-number {
 	text-align: right;
 	display: inline-block;
+	color: var(--vscode-editorLineNumber-foreground);
 }
 
 .monaco-diff-editor .diff-review {
@@ -20,6 +21,7 @@
 
 .monaco-diff-editor .diff-review-shadow {
 	position: absolute;
+	box-shadow: var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;
 }
 
 .monaco-diff-editor .diff-review-row {
diff --git a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css
index 3acf3fd25bf..7d8dcf3ca69 100644
--- a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css
+++ b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.css
@@ -5,4 +5,6 @@
 
 .monaco-editor .bracket-match {
 	box-sizing: border-box;
+	background-color: var(--vscode-editorBracketMatch-background);
+	border: var(--vscode-editorBracketMatch-border);
 }
diff --git a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
index d43fb6f30db..2068b85d0d8 100644
--- a/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
+++ b/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.ts
@@ -17,12 +17,11 @@ import { IEditorContribution, IEditorDecorationsCollection } from 'vs/editor/com
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { IModelDeltaDecoration, OverviewRulerLane, TrackedRangeStickiness } from 'vs/editor/common/model';
 import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
-import { editorBracketMatchBackground, editorBracketMatchBorder } from 'vs/editor/common/core/editorColorRegistry';
 import * as nls from 'vs/nls';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { registerColor } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant, themeColorFromId } from 'vs/platform/theme/common/themeService';
+import { themeColorFromId } from 'vs/platform/theme/common/themeService';
 
 const overviewRulerBracketMatchForeground = registerColor('editorOverviewRuler.bracketMatchForeground', { dark: '#A0A0A0', light: '#A0A0A0', hcDark: '#A0A0A0', hcLight: '#A0A0A0' }, nls.localize('overviewRulerBracketMatchForeground', 'Overview ruler marker color for matching brackets.'));
 
@@ -360,16 +359,6 @@ export class BracketMatchingController extends Disposable implements IEditorCont
 registerEditorContribution(BracketMatchingController.ID, BracketMatchingController);
 registerEditorAction(SelectToBracketAction);
 registerEditorAction(JumpToBracketAction);
-registerThemingParticipant((theme, collector) => {
-	const bracketMatchBackground = theme.getColor(editorBracketMatchBackground);
-	if (bracketMatchBackground) {
-		collector.addRule(`.monaco-editor .bracket-match { background-color: ${bracketMatchBackground}; }`);
-	}
-	const bracketMatchBorder = theme.getColor(editorBracketMatchBorder);
-	if (bracketMatchBorder) {
-		collector.addRule(`.monaco-editor .bracket-match { border: 1px solid ${bracketMatchBorder}; }`);
-	}
-});
 
 // Go to menu
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css
index 18d8c75a24a..56be1c3b003 100644
--- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css
+++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.css
@@ -7,4 +7,8 @@
 	padding: 10px;
 	vertical-align: middle;
 	overflow: scroll;
-}
\ No newline at end of file
+	color: var(--vscode-editorWidget-foreground);
+	background-color: var(--vscode-editorWidget-background);
+	box-shadow: 0 2px 8px var(--vscode-widget-shadow);
+	border: 2px solid var(--vscode-contrastBorder);
+}
diff --git a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
index 8601905af40..f0a3c0a2355 100644
--- a/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
+++ b/src/vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp.ts
@@ -26,8 +26,6 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { contrastBorder, editorWidgetBackground, widgetShadow, editorWidgetForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
 import { AccessibilityHelpNLS } from 'vs/editor/common/standaloneStrings';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
@@ -362,25 +360,3 @@ registerEditorCommand(
 		}
 	})
 );
-
-registerThemingParticipant((theme, collector) => {
-	const widgetBackground = theme.getColor(editorWidgetBackground);
-	if (widgetBackground) {
-		collector.addRule(`.monaco-editor .accessibilityHelpWidget { background-color: ${widgetBackground}; }`);
-	}
-	const widgetForeground = theme.getColor(editorWidgetForeground);
-	if (widgetForeground) {
-		collector.addRule(`.monaco-editor .accessibilityHelpWidget { color: ${widgetForeground}; }`);
-	}
-
-
-	const widgetShadowColor = theme.getColor(widgetShadow);
-	if (widgetShadowColor) {
-		collector.addRule(`.monaco-editor .accessibilityHelpWidget { box-shadow: 0 2px 8px ${widgetShadowColor}; }`);
-	}
-
-	const hcBorder = theme.getColor(contrastBorder);
-	if (hcBorder) {
-		collector.addRule(`.monaco-editor .accessibilityHelpWidget { border: 2px solid ${hcBorder}; }`);
-	}
-});