@theia/plugin-ext 1.29.0-next.31 → 1.29.0-next.32

package/src/common/plugin-api-rpc.ts

@@ -425,7 +425,7 @@ export type Item = string | theia.QuickPickItem;
 
 export interface QuickOpenExt {
     $onItemSelected(handle: number): void;
-    $validateInput(input: string): Promise<string | null | undefined> | undefined;
+    $validateInput(input: string): Promise<string | { content: string; severity: Severity; } | null | undefined> | undefined;
 
     $acceptOnDidAccept(sessionId: number): Promise<void>;
     $acceptDidChangeValue(sessionId: number, changedValue: string): Promise<void>;

package/src/plugin/plugin-context.ts

@@ -144,7 +144,8 @@ import {
     ExtensionMode,
     LinkedEditingRanges,
     LanguageStatusSeverity,
-    TextDocumentChangeReason
+    TextDocumentChangeReason,
+    InputBoxValidationSeverity
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -1025,7 +1026,8 @@ export function createAPIFactory(
             FileDecoration,
             CancellationError,
             ExtensionMode,
-            LinkedEditingRanges
+            LinkedEditingRanges,
+            InputBoxValidationSeverity
         };
     };
 }

package/src/plugin/quick-open.ts

@@ -24,13 +24,14 @@ import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { QuickInputButtons, QuickPickItemKind, ThemeIcon } from './types-impl';
+import { InputBoxValidationSeverity, QuickInputButtons, QuickPickItemKind, ThemeIcon } from './types-impl';
 import { URI } from '@theia/core/shared/vscode-uri';
 import * as path from 'path';
 import { convertToTransferQuickPickItems } from './type-converters';
 import { PluginPackage } from '../common/plugin-protocol';
 import { QuickInputButtonHandle } from '@theia/core/lib/browser';
 import { MaybePromise } from '@theia/core/lib/common/types';
+import Severity from '@theia/monaco-editor-core/esm/vs/base/common/severity';
 
 const canceledName = 'Canceled';
 /**
@@ -65,7 +66,7 @@ export function getDarkIconUri(iconPath: URI | { light: URI; dark: URI; }): URI
 export class QuickOpenExtImpl implements QuickOpenExt {
     private proxy: QuickOpenMain;
     private onDidSelectItem: undefined | ((handle: number) => void);
-    private validateInputHandler?: (input: string) => MaybePromise<string | null | undefined>;
+    private validateInputHandler?: (input: string) => MaybePromise<string | theia.InputBoxValidationMessage | null | undefined>;
     private _sessions = new Map<number, QuickInputExt>(); // Each quickinput will have a number so that we know where to fire events
     private _instances = 0;
 
@@ -155,11 +156,36 @@ export class QuickOpenExtImpl implements QuickOpenExt {
         return this.proxy.$showInputBox(options, typeof this.validateInputHandler === 'function');
     }
 
-    $validateInput(input: string): Promise<string | null | undefined> | undefined {
-        if (this.validateInputHandler) {
-            return Promise.resolve(this.validateInputHandler(input));
+    async $validateInput(input: string): Promise<string | { content: string; severity: Severity; } | null | undefined> {
+        if (!this.validateInputHandler) {
+            return;
+        }
+
+        const result = await this.validateInputHandler(input);
+        if (!result || typeof result === 'string') {
+            return result;
         }
-        return undefined;
+
+        let severity: Severity;
+        switch (result.severity) {
+            case InputBoxValidationSeverity.Info:
+                severity = Severity.Info;
+                break;
+            case InputBoxValidationSeverity.Warning:
+                severity = Severity.Warning;
+                break;
+            case InputBoxValidationSeverity.Error:
+                severity = Severity.Error;
+                break;
+            default:
+                severity = result.message ? Severity.Error : Severity.Ignore;
+                break;
+        }
+
+        return {
+            content: result.message,
+            severity
+        };
     }
 
     // ---- QuickInput

package/src/plugin/types-impl.ts

@@ -2772,4 +2772,10 @@ export class SemanticTokensEdits {
     }
 }
 
+export enum InputBoxValidationSeverity {
+    Info = 1,
+    Warning = 2,
+    Error = 3
+}
+
 // #endregion