From 6eed4af2d4cf22b9cac5b4710a6b19ec3b7d44b2 Mon Sep 17 00:00:00 2001
From: Aiday Marlen Kyzy <amarlenkyzy@microsoft.com>
Date: Mon, 8 Jan 2024 16:11:02 +0100
Subject: [PATCH] Add colors to the output editor in the sidebar with CSS
 (#201292)

* removing the registration of theming participant and instead adding the css rules into output.css

* removing the imports which we no longer need
---
 .../contrib/output/browser/output.css          |  4 ++++
 .../contrib/output/browser/outputView.ts       | 18 +-----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/vs/workbench/contrib/output/browser/output.css b/src/vs/workbench/contrib/output/browser/output.css
index 89848f4f595..5235694247c 100644
--- a/src/vs/workbench/contrib/output/browser/output.css
+++ b/src/vs/workbench/contrib/output/browser/output.css
@@ -3,12 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+.monaco-workbench .part.sidebar .output-view .monaco-editor,
+.monaco-workbench .part.sidebar .output-view .monaco-editor .margin,
+.monaco-workbench .part.sidebar .output-view .monaco-editor .monaco-editor-background,
 .monaco-workbench .part.panel > .content .pane-body.output-view .monaco-editor,
 .monaco-workbench .part.panel > .content .pane-body.output-view .monaco-editor .margin,
 .monaco-workbench .part.panel > .content .pane-body.output-view .monaco-editor .monaco-editor-background {
 	background-color: var(--vscode-outputView-background);
 }
 
+.monaco-workbench .part.sidebar .output-view .sticky-widget,
 .monaco-workbench .part.panel > .content .pane-body.output-view .sticky-widget {
 	background-color: var(--vscode-outputViewStickyScroll-background, var(--vscode-panel-background));
 }
diff --git a/src/vs/workbench/contrib/output/browser/outputView.ts b/src/vs/workbench/contrib/output/browser/outputView.ts
index b72381a8a26..b7484919efa 100644
--- a/src/vs/workbench/contrib/output/browser/outputView.ts
+++ b/src/vs/workbench/contrib/output/browser/outputView.ts
@@ -14,7 +14,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
 import { IEditorOpenContext } from 'vs/workbench/common/editor';
 import { AbstractTextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
 import { OUTPUT_VIEW_ID, CONTEXT_IN_OUTPUT, IOutputChannel, CONTEXT_OUTPUT_SCROLL_LOCK } from 'vs/workbench/services/output/common/output';
-import { IThemeService, registerThemingParticipant, IColorTheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
+import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { CancellationToken } from 'vs/base/common/cancellation';
@@ -26,8 +26,6 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
 import { IViewDescriptorService } from 'vs/workbench/common/views';
 import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
-import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
-import { editorBackground } from 'vs/platform/theme/common/colorRegistry';
 import { Dimension } from 'vs/base/browser/dom';
 import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
 import { CancelablePromise, createCancelablePromise } from 'vs/base/common/async';
@@ -257,17 +255,3 @@ class OutputEditor extends AbstractTextResourceEditor {
 		}
 	}
 }
-
-registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) => {
-	// Sidebar background for the output view
-	const sidebarBackground = theme.getColor(SIDE_BAR_BACKGROUND);
-	if (sidebarBackground && sidebarBackground !== theme.getColor(editorBackground)) {
-		collector.addRule(`
-			.monaco-workbench .part.sidebar .output-view .monaco-editor,
-			.monaco-workbench .part.sidebar .output-view .monaco-editor .margin,
-			.monaco-workbench .part.sidebar .output-view .monaco-editor .monaco-editor-background {
-				background-color: ${sidebarBackground};
-			}
-		`);
-	}
-});