Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 03:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finalize InputBoxMessageSeverity API (#148961)

Browse Source
This commit is contained in:
Tyler James Leonhardt
2022-05-06 14:37:40 -07:00
committed by GitHub
parent 95a97e808a
commit 2d9244c330
5 changed files with 33 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/api/common/extHost.api.impl.ts
View File

@@ -659,9 +659,6 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
return extHostQuickOpen.showWorkspaceFolderPick(options);
},
showInputBox(options?: vscode.InputBoxOptions, token?: vscode.CancellationToken) {
if (options?.validateInput2) {
checkProposedApiEnabled(extension, 'inputBoxSeverity');
}
return extHostQuickOpen.showInput(options, token);
},
showOpenDialog(options) {

20
src/vs/workbench/api/common/extHostQuickOpen.ts
View File

@@ -17,7 +17,6 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio
import { coalesce } from 'vs/base/common/arrays';
import Severity from 'vs/base/common/severity';
import { ThemeIcon as ThemeIconUtils } from 'vs/platform/theme/common/themeService';
import { checkProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
export type Item = string | QuickPickItem;
@@ -147,7 +146,7 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
showInput(options?: InputBoxOptions, token: CancellationToken = CancellationToken.None): Promise<string | undefined> {
// global validate fn used in callback below
this._validateInput = options ? options.validateInput2 ?? options.validateInput : undefined;
this._validateInput = options?.validateInput;
return proxy.$input(options, typeof this._validateInput === 'function', token)
.then(undefined, err => {
@@ -698,10 +697,9 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
private _password = false;
private _prompt: string | undefined;
private _validationMessage: string | undefined;
private _validationMessage2: string | InputBoxValidationMessage | undefined;
private _validationMessage: string | InputBoxValidationMessage | undefined;
constructor(private readonly extension: IExtensionDescription, onDispose: () => void) {
constructor(extension: IExtensionDescription, onDispose: () => void) {
super(extension.identifier, onDispose);
this.update({ type: 'inputBox' });
}
@@ -728,18 +726,8 @@ export function createExtHostQuickOpen(mainContext: IMainContext, workspace: IEx
return this._validationMessage;
}
set validationMessage(validationMessage: string | undefined) {
set validationMessage(validationMessage: string | InputBoxValidationMessage | undefined) {
this._validationMessage = validationMessage;
this.update({ validationMessage, severity: validationMessage ? Severity.Error : Severity.Ignore });
}
get validationMessage2() {
return this._validationMessage2;
}
set validationMessage2(validationMessage: string | InputBoxValidationMessage | undefined) {
checkProposedApiEnabled(this.extension, 'inputBoxSeverity');
this._validationMessage2 = validationMessage;
if (!validationMessage) {
this.update({ validationMessage: undefined, severity: Severity.Ignore });
} else if (typeof validationMessage === 'string') {