Move QuickInput to base layer (#69955)

microsoft · Feb 6, 2020 · db7795f · db7795f
1 parent 42d92b3
commit db7795f
Show file tree

Hide file tree

Showing 8 changed files with 136 additions and 269 deletions.
diff --git a/...arts/quickinput/media/arrow-left-dark.svg → ...ckinput/browser/media/arrow-left-dark.svg b/...arts/quickinput/media/arrow-left-dark.svg → ...ckinput/browser/media/arrow-left-dark.svg
diff --git a/...rts/quickinput/media/arrow-left-light.svg → ...kinput/browser/media/arrow-left-light.svg b/...rts/quickinput/media/arrow-left-light.svg → ...kinput/browser/media/arrow-left-light.svg
diff --git a/...ser/parts/quickinput/media/quickInput.css → ...s/quickinput/browser/media/quickInput.css b/...ser/parts/quickinput/media/quickInput.css → ...s/quickinput/browser/media/quickInput.css
diff --git a/...ch/browser/parts/quickinput/quickInput.ts → ...se/parts/quickinput/browser/quickInput.ts b/...ch/browser/parts/quickinput/quickInput.ts → ...se/parts/quickinput/browser/quickInput.ts
diff --git a/...browser/parts/quickinput/quickInputBox.ts → ...parts/quickinput/browser/quickInputBox.ts b/...browser/parts/quickinput/quickInputBox.ts → ...parts/quickinput/browser/quickInputBox.ts
@@ -5,9 +5,7 @@
 
 import 'vs/css!./media/quickInput';
 import * as dom from 'vs/base/browser/dom';
-import { InputBox, IRange, MessageType } from 'vs/base/browser/ui/inputbox/inputBox';
-import { inputBackground, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoForeground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningForeground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorForeground, inputValidationErrorBorder } from 'vs/platform/theme/common/colorRegistry';
-import { ITheme } from 'vs/platform/theme/common/themeService';
+import { InputBox, IRange, MessageType, IInputBoxStyles } from 'vs/base/browser/ui/inputbox/inputBox';
 import { IDisposable, Disposable } from 'vs/base/common/lifecycle';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import Severity from 'vs/base/common/severity';
@@ -112,20 +110,7 @@ export class QuickInputBox extends Disposable {
 		this.inputBox.layout();
 	}
 
-	style(theme: ITheme) {
-		this.inputBox.style({
-			inputForeground: theme.getColor(inputForeground),
-			inputBackground: theme.getColor(inputBackground),
-			inputBorder: theme.getColor(inputBorder),
-			inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground),
-			inputValidationInfoForeground: theme.getColor(inputValidationInfoForeground),
-			inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder),
-			inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground),
-			inputValidationWarningForeground: theme.getColor(inputValidationWarningForeground),
-			inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder),
-			inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground),
-			inputValidationErrorForeground: theme.getColor(inputValidationErrorForeground),
-			inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder),
-		});
+	style(styles: IInputBoxStyles) {
+		this.inputBox.style(styles);
 	}
 }
diff --git a/...rowser/parts/quickinput/quickInputList.ts → ...arts/quickinput/browser/quickInputList.ts b/...rowser/parts/quickinput/quickInputList.ts → ...arts/quickinput/browser/quickInputList.ts
@@ -7,9 +7,7 @@ import 'vs/css!./media/quickInput';
 import { IListVirtualDelegate, IListRenderer } from 'vs/base/browser/ui/list/list';
 import * as dom from 'vs/base/browser/dom';
 import { dispose, IDisposable } from 'vs/base/common/lifecycle';
-import { WorkbenchList, IWorkbenchListOptions } from 'vs/platform/list/browser/listService';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput';
+import { IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator } from 'vs/base/parts/quickinput/common/quickInput';
 import { IMatch } from 'vs/base/common/filters';
 import { matchesFuzzyCodiconAware, parseCodicons } from 'vs/base/common/codicon';
 import { compareAnything } from 'vs/base/common/comparers';
@@ -22,13 +20,12 @@ import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlighte
 import { memoize } from 'vs/base/common/decorators';
 import { range } from 'vs/base/common/arrays';
 import * as platform from 'vs/base/common/platform';
-import { listFocusBackground, pickerGroupBorder, pickerGroupForeground, activeContrastBorder, listFocusForeground } from 'vs/platform/theme/common/colorRegistry';
-import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { Action } from 'vs/base/common/actions';
-import { getIconClass } from 'vs/workbench/browser/parts/quickinput/quickInputUtils';
+import { getIconClass } from 'vs/base/parts/quickinput/browser/quickInputUtils';
 import { withNullAsUndefined } from 'vs/base/common/types';
-import { QUICK_INPUT_BACKGROUND } from 'vs/workbench/common/theme';
+import { IQuickInputOptions } from 'vs/base/parts/quickinput/browser/quickInput';
+import { IListOptions, List, IListStyles } from 'vs/base/browser/ui/list/listWidget';
 
 const $ = dom.$;
 
@@ -215,7 +212,7 @@ export class QuickInputList {
 
 	readonly id: string;
 	private container: HTMLElement;
-	private list: WorkbenchList<ListElement>;
+	private list: List<ListElement>;
 	private inputElements: Array<IQuickPickItem | IQuickPickSeparator> = [];
 	private elements: ListElement[] = [];
 	private elementsToIndexes = new Map<IQuickPickItem, number>();
@@ -242,21 +239,18 @@ export class QuickInputList {
 	constructor(
 		private parent: HTMLElement,
 		id: string,
-		@IInstantiationService private readonly instantiationService: IInstantiationService
+		options: IQuickInputOptions,
 	) {
 		this.id = id;
 		this.container = dom.append(this.parent, $('.quick-input-list'));
 		const delegate = new ListElementDelegate();
-		this.list = this.instantiationService.createInstance(WorkbenchList, 'QuickInput', this.container, delegate, [new ListElementRenderer()], {
+		this.list = options.createList('QuickInput', this.container, delegate, [new ListElementRenderer()], {
 			identityProvider: { getId: element => element.saneLabel },
 			openController: { shouldOpen: () => false }, // Workaround #58124
 			setRowLineHeight: false,
 			multipleSelectionSupport: false,
 			horizontalScrolling: false,
-			overrideStyles: {
-				listBackground: QUICK_INPUT_BACKGROUND
-			}
-		} as IWorkbenchListOptions<ListElement>);
+		} as IListOptions<ListElement>);
 		this.list.getHTMLElement().id = id;
 		this.disposables.push(this.list);
 		this.disposables.push(this.list.onKeyDown(e => {
@@ -577,6 +571,10 @@ export class QuickInputList {
 	private fireButtonTriggered(event: IQuickPickItemButtonEvent<IQuickPickItem>) {
 		this._onButtonTriggered.fire(event);
 	}
+
+	style(styles: IListStyles) {
+		this.list.style(styles);
+	}
 }
 
 function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: string): number {
@@ -593,30 +591,3 @@ function compareEntries(elementA: ListElement, elementB: ListElement, lookFor: s
 
 	return compareAnything(elementA.saneLabel, elementB.saneLabel, lookFor);
 }
-
-registerThemingParticipant((theme, collector) => {
-	// Override inactive focus foreground with active focus foreground for single-pick case.
-	const listInactiveFocusForeground = theme.getColor(listFocusForeground);
-	if (listInactiveFocusForeground) {
-		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused { color:  ${listInactiveFocusForeground}; }`);
-	}
-	// Override inactive focus background with active focus background for single-pick case.
-	const listInactiveFocusBackground = theme.getColor(listFocusBackground);
-	if (listInactiveFocusBackground) {
-		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused { background-color:  ${listInactiveFocusBackground}; }`);
-		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused:hover { background-color:  ${listInactiveFocusBackground}; }`);
-	}
-	// dotted instead of solid (as in listWidget.ts) to match QuickOpen
-	const activeContrast = theme.getColor(activeContrastBorder);
-	if (activeContrast) {
-		collector.addRule(`.quick-input-list .monaco-list .monaco-list-row.focused { outline: 1px dotted ${activeContrast}; outline-offset: -1px; }`);
-	}
-	const pickerGroupBorderColor = theme.getColor(pickerGroupBorder);
-	if (pickerGroupBorderColor) {
-		collector.addRule(`.quick-input-list .quick-input-list-entry { border-top-color:  ${pickerGroupBorderColor}; }`);
-	}
-	const pickerGroupForegroundColor = theme.getColor(pickerGroupForeground);
-	if (pickerGroupForegroundColor) {
-		collector.addRule(`.quick-input-list .quick-input-list-separator { color:  ${pickerGroupForegroundColor}; }`);
-	}
-});
diff --git a/...owser/parts/quickinput/quickInputUtils.ts → ...rts/quickinput/browser/quickInputUtils.ts b/...owser/parts/quickinput/quickInputUtils.ts → ...rts/quickinput/browser/quickInputUtils.ts
diff --git a/.../platform/quickinput/common/quickInput.ts → ...ase/parts/quickinput/common/quickInput.ts b/.../platform/quickinput/common/quickInput.ts → ...ase/parts/quickinput/common/quickInput.ts
@@ -3,8 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { CancellationToken } from 'vs/base/common/cancellation';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
 import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
@@ -253,42 +251,4 @@ export interface IQuickPickItemButtonContext<T extends IQuickPickItem> extends I
 	removeItem(): void;
 }
 
-export const IQuickInputService = createDecorator<IQuickInputService>('quickInputService');
-
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
 export type QuickPickInput<T = IQuickPickItem> = T | IQuickPickSeparator;
-
-export interface IQuickInputService {
-
-	_serviceBrand: undefined;
-
-	/**
-	 * Opens the quick input box for selecting items and returns a promise with the user selected item(s) if any.
-	 */
-	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: true }, token?: CancellationToken): Promise<T[]>;
-	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: IPickOptions<T> & { canPickMany: false }, token?: CancellationToken): Promise<T>;
-	pick<T extends IQuickPickItem>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: Omit<IPickOptions<T>, 'canPickMany'>, token?: CancellationToken): Promise<T>;
-
-	/**
-	 * Opens the quick input box for text input and returns a promise with the user typed value if any.
-	 */
-	input(options?: IInputOptions, token?: CancellationToken): Promise<string>;
-
-	backButton: IQuickInputButton;
-
-	createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
-	createInputBox(): IInputBox;
-
-	focus(): void;
-
-	toggle(): void;
-
-	navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void;
-
-	accept(): Promise<void>;
-
-	back(): Promise<void>;
-
-	cancel(): Promise<void>;
-}