Merge branch 'main' into joh/rewrite-privates

Author: jrieken

package.json

@@ -140,7 +140,7 @@
     "css-loader": "^3.6.0",
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
-    "deemon": "^1.7.2",
+    "deemon": "^1.8.0",
     "electron": "19.1.3",
     "eslint": "8.7.0",
     "eslint-plugin-header": "3.1.1",

src/vs/base/browser/ui/button/button.ts

@@ -23,20 +23,19 @@ export interface IButtonOptions extends IButtonStyles {
 	readonly secondary?: boolean;
 }
 
-export type CSSValueString = string;
 
 export interface IButtonStyles {
-	readonly buttonBackground?: CSSValueString;
-	readonly buttonHoverBackground?: CSSValueString;
-	readonly buttonForeground?: CSSValueString;
-	readonly buttonSeparator?: CSSValueString;
-	readonly buttonSecondaryBackground?: CSSValueString;
-	readonly buttonSecondaryHoverBackground?: CSSValueString;
-	readonly buttonSecondaryForeground?: CSSValueString;
-	readonly buttonBorder?: CSSValueString;
+	readonly buttonBackground: string | undefined;
+	readonly buttonHoverBackground: string | undefined;
+	readonly buttonForeground: string | undefined;
+	readonly buttonSeparator: string | undefined;
+	readonly buttonSecondaryBackground: string | undefined;
+	readonly buttonSecondaryHoverBackground: string | undefined;
+	readonly buttonSecondaryForeground: string | undefined;
+	readonly buttonBorder: string | undefined;
 }
 
-export const defaultOptions: IButtonStyles = {
+export const unthemedButtonStyles: IButtonStyles = {
 	buttonBackground: '#0E639C',
 	buttonHoverBackground: '#006BB3',
 	buttonSeparator: Color.white.toString(),
@@ -255,16 +254,11 @@ export class ButtonWithDropdown extends Disposable implements IButton {
 		// Separator styles
 		const border = options.buttonBorder;
 		if (border) {
-			this.separatorContainer.style.borderTopWidth = '1px';
-			this.separatorContainer.style.borderTopStyle = 'solid';
-			this.separatorContainer.style.borderTopColor = border;
-
-			this.separatorContainer.style.borderBottomWidth = '1px';
-			this.separatorContainer.style.borderBottomStyle = 'solid';
-			this.separatorContainer.style.borderBottomColor = border;
+			this.separatorContainer.style.borderTop = '1px solid ' + border;
+			this.separatorContainer.style.borderBottom = '1px solid ' + border;
 		}
-		this.separatorContainer.style.backgroundColor = options.buttonBackground?.toString() ?? '';
-		this.separator.style.backgroundColor = options.buttonSeparator?.toString() ?? '';
+		this.separatorContainer.style.backgroundColor = options.buttonBackground ?? '';
+		this.separator.style.backgroundColor = options.buttonSeparator ?? '';
 
 
 		this.dropdownButton = this._register(new Button(this.element, { ...options, title: false, supportIcons: true }));

src/vs/base/browser/ui/dialog/dialog.ts

@@ -38,6 +38,7 @@ export interface IDialogOptions {
 	readonly buttonDetails?: string[];
 	readonly disableCloseAction?: boolean;
 	readonly disableDefaultAction?: boolean;
+	readonly buttonStyles: IButtonStyles;
 }
 
 export interface IDialogResult {
@@ -46,7 +47,7 @@ export interface IDialogResult {
 	readonly values?: string[];
 }
 
-export interface IDialogStyles extends IButtonStyles, ICheckboxStyles {
+export interface IDialogStyles extends ICheckboxStyles {
 	readonly dialogForeground?: Color;
 	readonly dialogBackground?: Color;
 	readonly dialogShadow?: Color;
@@ -81,8 +82,9 @@ export class Dialog extends Disposable {
 	private focusToReturn: HTMLElement | undefined;
 	private readonly inputs: InputBox[];
 	private readonly buttons: string[];
+	private readonly buttonStyles: IButtonStyles;
 
-	constructor(private container: HTMLElement, private message: string, buttons: string[] | undefined, private options: IDialogOptions) {
+	constructor(private container: HTMLElement, private message: string, buttons: string[] | undefined, private readonly options: IDialogOptions) {
 		super();
 
 		this.modalElement = this.container.appendChild($(`.monaco-dialog-modal-block.dimmed`));
@@ -92,6 +94,8 @@ export class Dialog extends Disposable {
 		this.element.tabIndex = -1;
 		hide(this.element);
 
+		this.buttonStyles = options.buttonStyles;
+
 		if (Array.isArray(buttons) && buttons.length > 0) {
 			this.buttons = buttons;
 		} else if (!this.options.disableDefaultAction) {
@@ -202,7 +206,7 @@ export class Dialog extends Disposable {
 			// Handle button clicks
 			buttonMap.forEach((entry, index) => {
 				const primary = buttonMap[index].index === 0;
-				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ title: true, secondary: !primary })) : this._register(buttonBar.addButton({ title: true, secondary: !primary }));
+				const button = this.options.buttonDetails ? this._register(buttonBar.addButtonWithDescription({ title: true, secondary: !primary, ...this.buttonStyles })) : this._register(buttonBar.addButton({ title: true, secondary: !primary, ...this.buttonStyles }));
 				button.label = mnemonicButtonLabel(buttonMap[index].label, true);
 				if (button instanceof ButtonWithDescription) {
 					button.description = this.options.buttonDetails![buttonMap[index].index];

src/vs/base/common/diff/diff.ts

@@ -69,7 +69,7 @@ export interface IDiffResult {
 // The code below has been ported from a C# implementation in VS
 //
 
-export class Debug {
+class Debug {
 
 	public static Assert(condition: boolean, message: string): void {
 		if (!condition) {
@@ -78,7 +78,7 @@ export class Debug {
 	}
 }
 
-export class MyArray {
+class MyArray {
 	/**
 	 * Copies a range of elements from an Array starting at the specified source index and pastes
 	 * them to another Array starting at the specified destination index. The length and the indexes

src/vs/base/parts/quickinput/test/browser/quickinput.test.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import { unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
 import { IListRenderer, IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
 import { IListOptions, List } from 'vs/base/browser/ui/list/listWidget';
 import { raceTimeout } from 'vs/base/common/async';
@@ -52,7 +53,7 @@ suite('QuickInput', () => { // https://github.com/microsoft/vscode/issues/147543
 				options: IListOptions<T>,
 			) => new List<T>(user, container, delegate, renderers, options),
 			styles: {
-				button: {},
+				button: unthemedButtonStyles,
 				countBadge: {},
 				inputBox: {},
 				keybindingLabel: {},

src/vs/code/electron-sandbox/issue/issueReporterMain.ts

@@ -7,7 +7,7 @@ import 'vs/css!./media/issueReporter';
 import 'vs/base/browser/ui/codicons/codiconStyles'; // make sure codicon css is loaded
 import { localize } from 'vs/nls';
 import { $, reset, safeInnerHtml, windowOpenNoOpener } from 'vs/base/browser/dom';
-import { Button, defaultOptions } from 'vs/base/browser/ui/button/button';
+import { Button, unthemedButtonStyles } from 'vs/base/browser/ui/button/button';
 import { renderIcon } from 'vs/base/browser/ui/iconLabel/iconLabels';
 import { Delayer } from 'vs/base/common/async';
 import { Codicon } from 'vs/base/common/codicons';
@@ -88,7 +88,7 @@ export class IssueReporter extends Disposable {
 
 		const issueReporterElement = this.getElementById('issue-reporter');
 		if (issueReporterElement) {
-			this.previewButton = new Button(issueReporterElement, defaultOptions);
+			this.previewButton = new Button(issueReporterElement, unthemedButtonStyles);
 			this.updatePreviewButtonState();
 		}
 

src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css

@@ -23,3 +23,11 @@
 .monaco-editor .margin-view-overlays .line-numbers.lh-odd {
 	margin-top: 1px;
 }
+
+.monaco-editor .line-numbers {
+	color: var(--vscode-editorLineNumber-foreground);
+}
+
+.monaco-editor .line-numbers.active-line-number {
+	color: var(--vscode-editorLineNumber-activeForeground);
+}

src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts

@@ -8,11 +8,9 @@ import * as platform from 'vs/base/common/platform';
 import { DynamicViewOverlay } from 'vs/editor/browser/view/dynamicViewOverlay';
 import { RenderLineNumbersType, EditorOption } from 'vs/editor/common/config/editorOptions';
 import { Position } from 'vs/editor/common/core/position';
-import { editorActiveLineNumber, editorLineNumbers } from 'vs/editor/common/core/editorColorRegistry';
 import { RenderingContext } from 'vs/editor/browser/view/renderingContext';
 import { ViewContext } from 'vs/editor/common/viewModel/viewContext';
 import * as viewEvents from 'vs/editor/common/viewEvents';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 
 export class LineNumbersOverlay extends DynamicViewOverlay {
 
@@ -192,16 +190,3 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		return this._renderResult[lineIndex];
 	}
 }
-
-// theming
-
-registerThemingParticipant((theme, collector) => {
-	const lineNumbers = theme.getColor(editorLineNumbers);
-	if (lineNumbers) {
-		collector.addRule(`.monaco-editor .line-numbers { color: ${lineNumbers}; }`);
-	}
-	const activeLineNumber = theme.getColor(editorActiveLineNumber);
-	if (activeLineNumber) {
-		collector.addRule(`.monaco-editor .line-numbers.active-line-number { color: ${activeLineNumber}; }`);
-	}
-});

src/vs/editor/browser/viewParts/viewZones/viewZones.ts

@@ -14,7 +14,7 @@ import * as viewEvents from 'vs/editor/common/viewEvents';
 import { IEditorWhitespace, IViewWhitespaceViewportData, IWhitespaceChangeAccessor } from 'vs/editor/common/viewModel';
 import { EditorOption } from 'vs/editor/common/config/editorOptions';
 
-export interface IMyViewZone {
+interface IMyViewZone {
 	whitespaceId: string;
 	delegate: IViewZone;
 	isInHiddenArea: boolean;

src/vs/editor/contrib/find/browser/findOptionsWidget.css

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .findOptionsWidget {
+	background-color: var(--vscode-editorWidget-background);
+	color: var(--vscode-editorWidget-foreground);
+	box-shadow: 0 0 8px 2px var(--vscode-widget-shadow);
+	border: 2px solid var(--vscode-contrastBorder);
+}