@theia/plugin-ext 1.25.0-next.4 → 1.25.0-next.40

package/src/plugin/quick-open.ts

@@ -451,6 +451,7 @@ export class QuickInputExt implements QuickInput {
     }
 
     _fireChangedValue(changedValue: string): void {
+        this._value = changedValue;
         this._onDidChangeValueEmitter.fire(changedValue);
     }
 
@@ -533,39 +534,6 @@ export class InputBoxExt extends QuickInputExt implements InputBox {
             this.update({ validationMessage });
         }
     }
-
-    override async show(): Promise<void> {
-        super.show();
-
-        const update = (value: string) => {
-            this.value = value;
-            if (this.validationMessage && this.validationMessage.length > 0) {
-                return this.validationMessage;
-            }
-        };
-
-        this.quickOpen.showInputBox({
-            id: this._id,
-            busy: this.busy,
-            buttons: this.buttons,
-            enabled: this.enabled,
-            ignoreFocusOut: this.ignoreFocusOut,
-            password: this.password,
-            placeholder: this.placeholder,
-            prompt: this.prompt,
-            step: this.step,
-            title: this.title,
-            totalSteps: this.totalSteps,
-            validationMessage: this.validationMessage,
-            value: this.value,
-            visible: this.visible,
-            validateInput(value: string): string | undefined {
-                if (value.length > 0) {
-                    return update(value);
-                }
-            }
-        });
-    }
 }
 
 /**
@@ -580,6 +548,7 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
     private _matchOnDescription = true;
     private _matchOnDetail = true;
     private _sortByLabel = true;
+    private _keepScrollPosition = false;
     private _activeItems: T[] = [];
     private _selectedItems: T[] = [];
     private readonly _onDidChangeActiveEmitter = new Emitter<T[]>();
@@ -666,6 +635,15 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
         this.update({ sortByLabel });
     }
 
+    get keepScrollPosition(): boolean {
+        return this._keepScrollPosition;
+    }
+
+    set keepScrollPosition(keepScrollPosition: boolean) {
+        this._keepScrollPosition = keepScrollPosition;
+        this.update({ keepScrollPosition });
+    }
+
     get activeItems(): T[] {
         return this._activeItems;
     }

package/src/plugin/status-bar/status-bar-item.ts

@@ -20,15 +20,24 @@ import { UUID } from '@theia/core/shared/@phosphor/coreutils';
 
 export class StatusBarItemImpl implements theia.StatusBarItem {
 
+    /** Map from allowed background colors to corresponding foreground colors. */
+    private static BACKGROUND_COLORS = new Map<string, string>([
+        ['statusBarItem.errorBackground', 'statusBarItem.errorForeground'],
+        ['statusBarItem.warningBackground', 'statusBarItem.warningForeground']
+    ]);
+
     private _id: string;
 
     private _alignment: StatusBarAlignment;
     private _priority: number;
 
+    private _name: string | undefined;
     private _text: string;
     private _tooltip: string;
-    private _color: string | ThemeColor;
+    private _color: string | ThemeColor | undefined;
+    private _backgroundColor: ThemeColor | undefined;
     private _command: string | theia.Command;
+    private _accessibilityInformation: theia.AccessibilityInformation;
 
     private _isVisible: boolean;
     private _timeoutHandle: NodeJS.Timer | undefined;
@@ -57,6 +66,10 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
         return this._priority;
     }
 
+    public get name(): string | undefined {
+        return this._name;
+    }
+
     public get text(): string {
         return this._text;
     }
@@ -65,14 +78,27 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
         return this._tooltip;
     }
 
-    public get color(): string | ThemeColor {
+    public get color(): string | ThemeColor | undefined {
         return this._color;
     }
 
+    public get backgroundColor(): ThemeColor | undefined {
+        return this._backgroundColor;
+    }
+
     public get command(): string | theia.Command {
         return this._command;
     }
 
+    public get accessibilityInformation(): theia.AccessibilityInformation {
+        return this._accessibilityInformation;
+    }
+
+    public set name(name: string | undefined) {
+        this._name = name;
+        this.update();
+    }
+
     public set text(text: string) {
         this._text = text;
         this.update();
@@ -83,16 +109,30 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
         this.update();
     }
 
-    public set color(color: string | ThemeColor) {
+    public set color(color: string | ThemeColor | undefined) {
         this._color = color;
         this.update();
     }
 
+    public set backgroundColor(backgroundColor: ThemeColor | undefined) {
+        if (backgroundColor && StatusBarItemImpl.BACKGROUND_COLORS.has(backgroundColor.id)) {
+            this._backgroundColor = backgroundColor;
+        } else {
+            this._backgroundColor = undefined;
+        }
+        this.update();
+    }
+
     public set command(command: string | theia.Command) {
         this._command = command;
         this.update();
     }
 
+    public set accessibilityInformation(information: theia.AccessibilityInformation) {
+        this._accessibilityInformation = information;
+        this.update();
+    }
+
     public show(): void {
         this._isVisible = true;
         this.update();
@@ -119,13 +159,25 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
 
             const commandId = typeof this.command === 'object' ? this.command.command : this.command;
             const args = typeof this.command === 'object' ? this.command.arguments : undefined;
+
+            let color = this.color;
+            if (this.backgroundColor) {
+                // If an error or warning background color is set, set the corresponding foreground color
+                color = StatusBarItemImpl.BACKGROUND_COLORS.get(this.backgroundColor.id);
+            }
+
             // Set to status bar
-            this._proxy.$setMessage(this.id, this.text,
+            this._proxy.$setMessage(
+                this.id,
+                this.name,
+                this.text,
                 this.priority,
                 this.alignment,
-                typeof this.color === 'string' ? this.color : this.color && this.color.id,
+                typeof color === 'string' ? color : color?.id,
+                this.backgroundColor?.id,
                 this.tooltip,
                 commandId,
+                this.accessibilityInformation,
                 args);
         }, 0);
     }

package/src/plugin/tree/tree-views.ts

@@ -262,7 +262,8 @@ class TreeViewExtImpl<T> implements Disposable {
             // root
             return [];
         }
-        const parent = this.treeDataProvider.getParent && await this.treeDataProvider.getParent(element);
+        const result = this.treeDataProvider.getParent && await this.treeDataProvider.getParent(element);
+        const parent = result ? result : undefined;
         const chain = await this.calculateRevealParentChain(parent);
         if (!chain) {
             // parents are inconsistent
@@ -386,7 +387,8 @@ class TreeViewExtImpl<T> implements Disposable {
                     tooltip: treeItem.tooltip,
                     collapsibleState: treeItem.collapsibleState,
                     contextValue: treeItem.contextValue,
-                    command: this.commandsConverter.toSafeCommand(treeItem.command, toDisposeElement)
+                    command: this.commandsConverter.toSafeCommand(treeItem.command, toDisposeElement),
+                    accessibilityInformation: treeItem.accessibilityInformation
                 } as TreeViewItem;
 
                 return treeViewItem;

package/src/plugin/type-converters.spec.ts

@@ -235,6 +235,19 @@ describe('Type converters:', () => {
             }
         };
 
+        const shellPluginTaskWithQuotedCommand: theia.Task = {
+            ...shellPluginTask, execution: {
+                command: {
+                    quoting: types.ShellQuoting.Strong,
+                    value: 'yarn'
+                },
+                args,
+                options: {
+                    cwd
+                }
+            }
+        };
+
         const pluginTaskWithCommandLine: theia.Task = {
             name: label,
             source,
@@ -278,7 +291,7 @@ describe('Type converters:', () => {
             }
         };
 
-        it('should convert to task dto', () => {
+        it('should convert to task dto with string command', () => {
             // when
             const result: TaskDto | undefined = Converter.fromTask(shellPluginTask);
 
@@ -287,6 +300,12 @@ describe('Type converters:', () => {
             assert.deepStrictEqual(result, shellTaskDto);
         });
 
+        it('should convert to task dto with ShellStringQuoted', () => {
+            const result: TaskDto | undefined = Converter.fromTask(shellPluginTaskWithQuotedCommand);
+            assert.notStrictEqual(result, undefined);
+            assert.deepStrictEqual(result, shellTaskDto);
+        });
+
         it('should convert from task dto', () => {
             // when
             const result: theia.Task = Converter.toTask(shellTaskDto);

package/src/plugin/type-converters.ts

@@ -675,7 +675,7 @@ export function toLocation(value: model.Location): types.Location {
     return new types.Location(URI.revive(value.uri), toRange(value.range));
 }
 
-export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.CallHierarchyItem {
+export function fromCallHierarchyItem(item: types.CallHierarchyItem): model.CallHierarchyItem {
     return <model.CallHierarchyItem>{
         kind: SymbolKind.fromSymbolKind(item.kind),
         name: item.name,
@@ -684,7 +684,8 @@ export function fromCallHierarchyItem(item: theia.CallHierarchyItem): model.Call
         range: fromRange(item.range),
         selectionRange: fromRange(item.selectionRange),
         tags: item.tags,
-        data: item.data,
+        _itemId: item._itemId,
+        _sessionId: item._sessionId,
     };
 }
 
@@ -698,7 +699,9 @@ export function toCallHierarchyItem(value: model.CallHierarchyItem): types.CallH
         toRange(value.selectionRange),
     );
     item.tags = value.tags;
-    item.data = value.data;
+    item._itemId = value._itemId;
+    item._sessionId = value._sessionId;
+
     return item;
 }
 
@@ -885,13 +888,12 @@ export function fromShellExecution(execution: theia.ShellExecution, taskDto: Tas
         return taskDto;
     }
 
-    const command = execution.command;
-    if (typeof command === 'string') {
-        taskDto.command = command;
+    if (execution.command) {
+        taskDto.command = getCommand(execution.command);
         taskDto.args = getShellArgs(execution.args);
         return taskDto;
     } else {
-        throw new Error('Converting ShellQuotedString command is not implemented');
+        throw new Error('Command is undefined');
     }
 }
 
@@ -949,6 +951,10 @@ export function getShellArgs(args: undefined | (string | theia.ShellQuotedString
     return result;
 }
 
+function getCommand(command: string | theia.ShellQuotedString): string {
+    return typeof command === 'string' ? command : command.value;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getShellExecutionOptions(options: theia.ShellExecutionOptions): { [key: string]: any } {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/plugin/types-impl.ts

@@ -151,6 +151,11 @@ export class Disposable {
     }
 }
 
+export interface AccessibilityInformation {
+    label: string;
+    role?: string;
+}
+
 export enum StatusBarAlignment {
     Left = 1,
     Right = 2
@@ -2432,7 +2437,6 @@ export class CallHierarchyItem {
     range: Range;
     selectionRange: Range;
     tags?: readonly SymbolTag[];
-    data?: unknown;
 
     constructor(kind: SymbolKind, name: string, detail: string, uri: URI, range: Range, selectionRange: Range) {
         this.kind = kind;
@@ -2443,7 +2447,7 @@ export class CallHierarchyItem {
         this.selectionRange = selectionRange;
     }
 
-    static isCallHierarchyItem(thing: {}): thing is theia.CallHierarchyItem {
+    static isCallHierarchyItem(thing: {}): thing is CallHierarchyItem {
         if (thing instanceof CallHierarchyItem) {
             return true;
         }

package/src/plugin/workspace.ts

@@ -276,7 +276,7 @@ export class WorkspaceExtImpl implements WorkspaceExt {
         };
     }
 
-    async $provideTextDocumentContent(documentURI: string): Promise<string | undefined> {
+    async $provideTextDocumentContent(documentURI: string): Promise<string | undefined | null> {
         const uri = URI.parse(documentURI);
         const provider = this.documentContentProviders.get(uri.scheme);
         if (provider) {