Naming: Select -> Pick (#49340)

microsoft · May 7, 2018 · 841f140 · 841f140
1 parent 9624859
commit 841f140
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/src/vs/platform/quickOpen/common/quickOpen.ts b/src/vs/platform/quickOpen/common/quickOpen.ts
@@ -89,7 +89,7 @@ export interface IPickOptions {
 	/**
 	 * an optional flag to make this picker multi-select (honoured by extension API)
 	 */
-	canSelectMany?: boolean;
+	canPickMany?: boolean;
 }
 
 export interface IInputOptions {

diff --git a/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts b/src/vs/workbench/api/electron-browser/mainThreadQuickOpen.ts
@@ -54,7 +54,7 @@ export class MainThreadQuickOpen implements MainThreadQuickOpenShape {
 			};
 		});
 
-		if (options.canSelectMany) {
+		if (options.canPickMany) {
 			return asWinJsPromise(token => this._quickInputService.pick(this._contents, options, token)).then(items => {
 				if (items) {
 					return items.map(item => item.handle);

diff --git a/src/vs/workbench/api/node/extHostQuickOpen.ts b/src/vs/workbench/api/node/extHostQuickOpen.ts
@@ -29,7 +29,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 		this._commands = commands;
 	}
 
-	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canSelectMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
+	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options: QuickPickOptions & { canPickMany: true; }, token?: CancellationToken): Thenable<QuickPickItem[] | undefined>;
 	showQuickPick(itemsOrItemsPromise: string[] | Thenable<string[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<string | undefined>;
 	showQuickPick(itemsOrItemsPromise: QuickPickItem[] | Thenable<QuickPickItem[]>, options?: QuickPickOptions, token?: CancellationToken): Thenable<QuickPickItem | undefined>;
 	showQuickPick(itemsOrItemsPromise: Item[] | Thenable<Item[]>, options?: QuickPickOptions, token: CancellationToken = CancellationToken.None): Thenable<Item | Item[] | undefined> {
@@ -45,7 +45,7 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
 			matchOnDescription: options && options.matchOnDescription,
 			matchOnDetail: options && options.matchOnDetail,
 			ignoreFocusLost: options && options.ignoreFocusOut,
-			canSelectMany: options && options.canPickMany
+			canPickMany: options && options.canPickMany
 		});
 
 		const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.css b/src/vs/workbench/browser/parts/quickinput/quickInput.css
@@ -32,7 +32,7 @@
 	flex-grow: 1;
 }
 
-.quick-input-widget[data-type=selectMany] .quick-input-box {
+.quick-input-widget[data-type=pickMany] .quick-input-box {
 	margin-left: 5px;
 }
 

diff --git a/src/vs/workbench/browser/parts/quickinput/quickInput.ts b/src/vs/workbench/browser/parts/quickinput/quickInput.ts
@@ -37,15 +37,15 @@ import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/edi
 
 const $ = dom.$;
 
-type InputParameters = SelectManyParameters | TextInputParameters;
+type InputParameters = PickManyParameters | TextInputParameters;
 
 export interface BaseInputParameters {
-	readonly type: 'selectMany' | 'textInput';
+	readonly type: 'pickMany' | 'textInput';
 	readonly ignoreFocusLost?: boolean;
 }
 
-export interface SelectManyParameters<T extends IPickOpenEntry = IPickOpenEntry> extends BaseInputParameters {
-	readonly type: 'selectMany';
+export interface PickManyParameters<T extends IPickOpenEntry = IPickOpenEntry> extends BaseInputParameters {
+	readonly type: 'pickMany';
 	readonly picks: TPromise<T[]>;
 	readonly matchOnDescription?: boolean;
 	readonly matchOnDetail?: boolean;
@@ -77,15 +77,15 @@ interface InputController<R> {
 	readonly resolve: (ok?: true | Thenable<never>) => void | TPromise<void>;
 }
 
-class SelectManyController<T extends IPickOpenEntry> implements InputController<T[]> {
+class PickManyController<T extends IPickOpenEntry> implements InputController<T[]> {
 	public showUI = { checkAll: true, inputBox: true, count: true, ok: true, checkboxList: true };
 	public result: TPromise<T[]>;
 	public ready: TPromise<void>;
 	public resolve: (ok?: true | Thenable<never>) => void;
 	public progress: (value: T) => void;
 	private closed = false;
 
-	constructor(ui: QuickInputUI, parameters: SelectManyParameters<T>) {
+	constructor(ui: QuickInputUI, parameters: PickManyParameters<T>) {
 		this.result = new TPromise<T[]>((resolve, reject, progress) => {
 			this.resolve = ok => resolve(ok === true ? <T[]>ui.checkboxList.getCheckedElements() : ok);
 			this.progress = progress;
@@ -315,7 +315,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 				.map(e => e[0])
 				.filter(e => !!e)
 				.latch()
-				.on(e => this.controller instanceof SelectManyController && this.controller.progress(e)) // TODO
+				.on(e => this.controller instanceof PickManyController && this.controller.progress(e)) // TODO
 		);
 
 		this.toUnbind.push(dom.addDisposableListener(this.container, 'focusout', (e: FocusEvent) => {
@@ -400,7 +400,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 
 	pick<T extends IPickOpenEntry>(picks: TPromise<T[]>, options: IPickOptions = {}, token?: CancellationToken): TPromise<T[]> {
 		return this.show({
-			type: 'selectMany',
+			type: 'pickMany',
 			picks,
 			placeHolder: options.placeHolder,
 			matchOnDescription: options.matchOnDescription,
@@ -422,7 +422,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		}, token);
 	}
 
-	show<T extends IPickOpenEntry>(parameters: SelectManyParameters<T>, token?: CancellationToken): TPromise<T[]>;
+	show<T extends IPickOpenEntry>(parameters: PickManyParameters<T>, token?: CancellationToken): TPromise<T[]>;
 	show(parameters: TextInputParameters, token?: CancellationToken): TPromise<string>;
 	show<R>(parameters: InputParameters, token: CancellationToken = CancellationToken.None): TPromise<R> {
 		this.create();
@@ -438,7 +438,7 @@ export class QuickInputService extends Component implements IQuickInputService {
 		this.progressBar.stop();
 		this.ready = false;
 
-		this.controller = parameters.type === 'selectMany' ? new SelectManyController(this.ui, parameters) : new TextInputController(this.ui, parameters);
+		this.controller = parameters.type === 'pickMany' ? new PickManyController(this.ui, parameters) : new TextInputController(this.ui, parameters);
 		this.ui.checkAll.style.display = this.controller.showUI.checkAll ? null : 'none';
 		this.filterContainer.style.display = this.controller.showUI.inputBox ? null : 'none';
 		this.ui.inputBox.showDecoration(Severity.Ignore);