@theia/core 1.62.1 → 1.62.2

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.tsx

@@ -38,7 +38,7 @@ abstract class AbstractToolbarMenuWrapper {
     }
 
     protected abstract menuPath?: MenuPath;
-    protected abstract menuNode: MenuNode;
+    protected abstract menuNode?: MenuNode;
     protected abstract id: string;
     protected abstract icon: string | undefined;
     protected abstract tooltip: string | undefined;
@@ -61,7 +61,7 @@ abstract class AbstractToolbarMenuWrapper {
         return this.renderMenuItem(widget);
     }
 
-    toMenuNode?(): MenuNode {
+    toMenuNode?(): MenuNode | undefined {
         return this.menuNode;
     }
 
@@ -194,7 +194,7 @@ export class ToolbarSubmenuWrapper extends AbstractToolbarMenuWrapper implements
         if (this.toolbarItem.isVisible && !this.toolbarItem.isVisible(widget)) {
             return false;
         }
-        if (!menuNode.isVisible(this.effectiveMenuPath, this.contextKeyService, widget.node, widget)) {
+        if (!menuNode?.isVisible(this.effectiveMenuPath, this.contextKeyService, widget.node, widget)) {
             return false;
         }
         if (this.toolbarItem.command) {
@@ -225,14 +225,14 @@ export class ToolbarSubmenuWrapper extends AbstractToolbarMenuWrapper implements
     get tooltip(): string | undefined { return this.toolbarItem.tooltip; }
     get text(): string | undefined { return (this.toolbarItem.group === NAVIGATION || this.toolbarItem.group === undefined) ? undefined : this.toolbarItem.text; }
     get onDidChange(): Event<void> | undefined {
-        return this.menuNode.onDidChange;
+        return this.menuNode?.onDidChange;
     }
 
     get menuPath(): MenuPath {
         return this.toolbarItem.menuPath!;
     }
 
-    get menuNode(): MenuNode {
+    get menuNode(): MenuNode | undefined {
         return this.menuRegistry.getMenu(this.menuPath);
     }
 }

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts

@@ -138,19 +138,22 @@ export class TabBarToolbarRegistry implements FrontendApplicationContribution {
 
         for (const delegate of this.menuDelegates.values()) {
             if (delegate.isVisible(widget)) {
-                const menu = this.menuRegistry.getMenu(delegate.menuPath)!;
-                for (const child of menu.children) {
-                    if (child.isVisible([...delegate.menuPath, child.id], this.contextKeyService, widget.node)) {
-                        if (CompoundMenuNode.is(child)) {
-                            for (const grandchild of child.children) {
-                                if (grandchild.isVisible([...delegate.menuPath, child.id, grandchild.id], this.contextKeyService, widget.node) && RenderedMenuNode.is(grandchild)) {
-                                    result.push(new ToolbarMenuNodeWrapper([...delegate.menuPath, child.id, grandchild.id], this.commandRegistry, this.menuRegistry,
-                                        this.contextKeyService, this.contextMenuRenderer, grandchild, child.id, delegate.menuPath));
+                const menu = this.menuRegistry.getMenu(delegate.menuPath);
+                if (menu) {
+                    for (const child of menu.children) {
+                        if (child.isVisible([...delegate.menuPath, child.id], this.contextKeyService, widget.node)) {
+                            if (CompoundMenuNode.is(child)) {
+                                for (const grandchild of child.children) {
+                                    if (grandchild.isVisible([...delegate.menuPath, child.id, grandchild.id],
+                                        this.contextKeyService, widget.node) && RenderedMenuNode.is(grandchild)) {
+                                        result.push(new ToolbarMenuNodeWrapper([...delegate.menuPath, child.id, grandchild.id], this.commandRegistry, this.menuRegistry,
+                                            this.contextKeyService, this.contextMenuRenderer, grandchild, child.id, delegate.menuPath));
+                                    }
                                 }
+                            } else if (CommandMenu.is(child)) {
+                                result.push(new ToolbarMenuNodeWrapper([...delegate.menuPath, child.id], this.commandRegistry, this.menuRegistry,
+                                    this.contextKeyService, this.contextMenuRenderer, child, undefined, delegate.menuPath));
                             }
-                        } else if (CommandMenu.is(child)) {
-                            result.push(new ToolbarMenuNodeWrapper([...delegate.menuPath, child.id], this.commandRegistry, this.menuRegistry,
-                                this.contextKeyService, this.contextMenuRenderer, child, undefined, delegate.menuPath));
                         }
                     }
                 }

package/src/browser/shell/tab-bar-toolbar/tab-toolbar-item.tsx

@@ -34,7 +34,7 @@ export interface TabBarToolbarItem {
     onDidChange?: Event<void>;
     group?: string;
     priority?: number;
-    toMenuNode?(): MenuNode;
+    toMenuNode?(): MenuNode | undefined;
 }
 
 /**

package/src/browser/shell/tab-bars.ts

@@ -871,7 +871,7 @@ export class ScrollableTabBar extends TabBar<Widget> {
             window.requestAnimationFrame(() => {
                 const tab = this.contentNode.children[index] as HTMLElement;
                 if (tab && this.isVisible) {
-                    const parent = this.contentNode;
+                    const parent = this.contentContainer;
                     if (this.orientation === 'horizontal') {
                         const scroll = parent.scrollLeft;
                         const left = tab.offsetLeft;

package/src/browser/window/default-secondary-window-service.ts

@@ -189,6 +189,10 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
         return [height, width, left, top];
     }
 
+    getWindows(): Window[] {
+        return this.secondaryWindows;
+    }
+
     focus(win: Window): void {
         win.focus();
     }

package/src/browser/window/secondary-window-service.ts

@@ -39,4 +39,5 @@ export interface SecondaryWindowService {
 
     /** Handles focussing the given secondary window in the browser and on Electron. */
     focus(win: Window): void;
+    getWindows(): Window[];
 }

package/src/common/index.ts

@@ -22,6 +22,7 @@ export * from './contribution-filter';
 export * from './contribution-provider';
 export * from './disposable';
 export * from './event';
+export * from './listener';
 export * from './logger';
 export * from './lsp-types';
 export * from './menu';

package/src/common/menu/menu-model-registry.ts

@@ -326,8 +326,11 @@ export class MenuModelRegistry {
         return this.findInNode(this.root, menuPath, 0);
     }
 
-    getMenu(menuPath: MenuPath): CompoundMenuNode {
+    getMenu(menuPath: MenuPath): CompoundMenuNode | undefined {
         const node = this.getMenuNode(menuPath);
+        if (!node) {
+            return undefined;
+        }
         if (!CompoundMenuNode.is(node)) {
             throw new Error(`not a compound menu node: ${JSON.stringify(menuPath)}`);
         }

package/src/common/menu/menu-types.ts

@@ -97,7 +97,7 @@ export interface RenderedMenuNode extends MenuNode {
 }
 
 export namespace RenderedMenuNode {
-    export function is(node: object): node is RenderedMenuNode {
+    export function is(node: unknown): node is RenderedMenuNode {
         return isObject<RenderedMenuNode>(node) && typeof node.label === 'string';
     }
 }
@@ -105,7 +105,7 @@ export namespace RenderedMenuNode {
 export type CommandMenu = MenuNode & RenderedMenuNode & Action;
 
 export namespace CommandMenu {
-    export function is(node: MenuNode): node is CommandMenu {
+    export function is(node: MenuNode | undefined): node is CommandMenu {
         return RenderedMenuNode.is(node) && Action.is(node);
     }
 }