@theia/plugin-ext 1.25.0-next.3 → 1.25.0-next.32

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/types-impl.ts

@@ -151,6 +151,11 @@ export class Disposable {
     }
 }
 
+export interface AccessibilityInformation {
+    label: string;
+    role?: string;
+}
+
 export enum StatusBarAlignment {
     Left = 1,
     Right = 2

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) {