Fix layering issue

Author: Tyriar

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

@@ -29,7 +29,7 @@ import { isIOS } from 'vs/base/common/platform';
 import Severity from 'vs/base/common/severity';
 import { isString, withNullAsUndefined } from 'vs/base/common/types';
 import { getIconClass } from 'vs/base/parts/quickinput/browser/quickInputUtils';
-import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickWillAcceptEvent, ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickPickInput } from 'vs/base/parts/quickinput/common/quickInput';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInput, IQuickInputButton, IQuickInputHideEvent, IQuickInputToggle, IQuickNavigateConfiguration, IQuickPick, IQuickPickDidAcceptEvent, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, IQuickPickWillAcceptEvent, ItemActivation, NO_KEY_MODS, QuickInputHideReason, QuickPickInput } from 'vs/base/parts/quickinput/common/quickInput';
 import 'vs/css!./media/quickInput';
 import { localize } from 'vs/nls';
 import { QuickInputBox } from './quickInputBox';
@@ -741,8 +741,12 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
 		this.update();
 	}
 
-	set additionalToggles(toggles: Toggle[] | undefined) {
-		this.ui.inputBox.additionalToggles = toggles;
+	set additionalToggles(toggles: IQuickInputToggle[] | undefined) {
+		// HACK: Filter out toggles here that are not concrete Toggle objects. This is to workaround
+		// a layering issue as quick input's interface is in common but Toggle is in browser and
+		// it requires a HTMLElement on its interface
+		const concreteToggles = toggles?.filter(opts => opts instanceof Toggle) as Toggle[];
+		this.ui.inputBox.additionalToggles = concreteToggles;
 	}
 
 	onDidChangeSelection = this.onDidChangeSelectionEmitter.event;

src/vs/base/parts/quickinput/common/quickInput.ts

@@ -3,7 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Toggle } from 'vs/base/browser/ui/toggle/toggle';
 import { Event } from 'vs/base/common/event';
 import { IMatch } from 'vs/base/common/filters';
 import { IItemAccessor } from 'vs/base/common/fuzzyScorer';
@@ -342,8 +341,14 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
 
 	hideCheckAll: boolean;
 
-	// TODO: Fix layering issue
-	additionalToggles: Toggle[] | undefined;
+	/**
+	 * A set of `Toggle` objects to add to the input box.
+	 */
+	additionalToggles: IQuickInputToggle[] | undefined;
+}
+
+export interface IQuickInputToggle {
+	onChange: Event<boolean /* via keyboard */>;
 }
 
 export interface IInputBox extends IQuickInput {