@theia/plugin-ext 1.61.0 → 1.62.0

package/src/main/browser/view/tree-view-widget.tsx

@@ -35,7 +35,7 @@ import {
     ApplicationShell,
     KeybindingRegistry
 } from '@theia/core/lib/browser';
-import { MenuPath, MenuModelRegistry, ActionMenuNode } from '@theia/core/lib/common/menu';
+import { MenuPath, MenuModelRegistry, CommandMenu, AcceleratorSource } from '@theia/core/lib/common/menu';
 import * as React from '@theia/core/shared/react';
 import { PluginSharedStyle } from '../plugin-shared-style';
 import { ACTION_ITEM, Widget } from '@theia/core/lib/browser/widgets/widget';
@@ -763,7 +763,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         return this.contextKeys.with({ view: this.id, viewItem: treeViewNode.contextValue }, () => {
             const menu = this.menus.getMenu(VIEW_ITEM_INLINE_MENU);
             const args = this.toContextMenuArgs(treeViewNode);
-            const inlineCommands = menu.children.filter((item): item is ActionMenuNode => item instanceof ActionMenuNode);
+            const inlineCommands = menu.children.filter((item): item is CommandMenu => CommandMenu.is(item));
             const tailDecorations = super.renderTailDecorations(treeViewNode, props);
             return <React.Fragment>
                 {inlineCommands.length > 0 && <div className={TREE_NODE_SEGMENT_CLASS + ' flex'}>
@@ -796,17 +796,18 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected renderInlineCommand(actionMenuNode: ActionMenuNode, index: number, tabbable: boolean, args: any[]): React.ReactNode {
-        if (!actionMenuNode.icon || !this.commands.isVisible(actionMenuNode.command, ...args) || !actionMenuNode.when || !this.contextKeys.match(actionMenuNode.when)) {
+    protected renderInlineCommand(actionMenuNode: CommandMenu, index: number, tabbable: boolean, args: any[]): React.ReactNode {
+        const nodePath = [...VIEW_ITEM_INLINE_MENU, actionMenuNode.id];
+        if (!actionMenuNode.icon || !actionMenuNode.isVisible(nodePath, this.contextKeys, undefined)) {
             return false;
         }
         const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, actionMenuNode.icon, ACTION_ITEM, 'theia-tree-view-inline-action'].join(' ');
         const tabIndex = tabbable ? 0 : undefined;
-        const titleString = actionMenuNode.label + this.resolveKeybindingForCommand(actionMenuNode.command);
+        const titleString = actionMenuNode.label + (AcceleratorSource.is(actionMenuNode) ? actionMenuNode.getAccelerator(undefined).join('+') : '');
 
         return <div key={index} className={className} title={titleString} tabIndex={tabIndex} onClick={e => {
             e.stopPropagation();
-            this.commands.executeCommand(actionMenuNode.command, ...args);
+            actionMenuNode.run(nodePath, ...args);
         }} />;
     }
 

package/src/plugin/comments.ts

@@ -201,7 +201,7 @@ type CommentThreadModification = Partial<{
     comments: theia.Comment[],
     collapsibleState: theia.CommentThreadCollapsibleState
     state: theia.CommentThreadState
-    canReply: boolean;
+    canReply: boolean | theia.CommentAuthorInformation;
 }>;
 
 export class ExtHostCommentThread implements theia.CommentThread, theia.Disposable {
@@ -315,12 +315,12 @@ export class ExtHostCommentThread implements theia.CommentThread, theia.Disposab
         return this._isDisposed;
     }
 
-    private _canReply: boolean = true;
-    get canReply(): boolean {
+    private _canReply: boolean | theia.CommentAuthorInformation = true;
+    get canReply(): boolean | theia.CommentAuthorInformation {
         return this._canReply;
     }
 
-    set canReply(canReply: boolean) {
+    set canReply(canReply: boolean | theia.CommentAuthorInformation) {
         this._canReply = canReply;
         this.modifications.canReply = canReply;
         this._onDidUpdateCommentThread.fire();

package/src/plugin/terminal-ext.ts

@@ -161,13 +161,24 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         terminal.emitOnInput(data);
     }
 
-    $terminalStateChanged(id: string): void {
+    $terminalOnInteraction(id: string): void {
         const terminal = this._terminals.get(id);
         if (!terminal) {
             return;
         }
         if (!terminal.state.isInteractedWith) {
-            terminal.state = { isInteractedWith: true };
+            terminal.state = { ...terminal.state, isInteractedWith: true };
+            this.onDidChangeTerminalStateEmitter.fire(terminal);
+        }
+    }
+
+    $terminalShellTypeChanged(id: string, shellType: string): void {
+        const terminal = this._terminals.get(id);
+        if (!terminal) {
+            return;
+        }
+        if (terminal.state.shell !== shellType) {
+            terminal.state = { ...terminal.state, shell: shellType };
             this.onDidChangeTerminalStateEmitter.fire(terminal);
         }
     }
@@ -472,7 +483,7 @@ export class TerminalExtImpl implements theia.Terminal {
 
     readonly creationOptions: Readonly<theia.TerminalOptions | theia.ExtensionTerminalOptions>;
 
-    state: theia.TerminalState = { isInteractedWith: false };
+    state: theia.TerminalState = { isInteractedWith: false, shell: undefined };
 
     constructor(private readonly proxy: TerminalServiceMain, private readonly options: theia.TerminalOptions | theia.ExtensionTerminalOptions) {
         this.creationOptions = this.options;

package/lib/main/browser/comments/comments-context-key-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"comments-context-key-service.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/comments/comments-context-key-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,qBACa,yBAAyB;IAGlC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IACxD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,+CAAiC;IACrD,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/C,SAAS,CAAC,kBAAkB,EAAE,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC7D,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEnD,IAAI,iBAAiB,IAAI,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAEtD;IAED,IAAI,OAAO,IAAI,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,CAE5C;IAED,IAAI,cAAc,IAAI,UAAU,CAAC,OAAO,CAAC,CAExC;IAGD,SAAS,CAAC,IAAI,IAAI,IAAI;IAYtB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAMvC,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAIjD"}

package/lib/main/browser/comments/comments-context-key-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"comments-context-key-service.js","sourceRoot":"","sources":["../../../../src/main/browser/comments/comments-context-key-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,qFAA4F;AAC5F,mDAAiD;AAG1C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QAIgB,gBAAW,GAAgB,IAAI,GAAG,EAAE,CAAC;QACrC,uBAAkB,GAAG,IAAI,gBAAO,EAAQ,CAAC;QACnD,gBAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IAwCzD,CAAC;IAnCG,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACnC,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAGS,IAAI;QACV,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACvC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAqB,mBAAmB,EAAE,SAAS,CAAC,CAAC;QAC/G,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAqB,SAAS,EAAE,SAAS,CAAC,CAAC;QAC3F,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAU,gBAAgB,EAAE,IAAI,CAAC,CAAC;QACzF,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YACvC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,UAAkB;;QAC5B,MAAA,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,UAAU,CAAC,0CAAE,OAAO,CAAC,GAAG,CAAC,EAAE;YACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,UAA8B;QAChC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnE,CAAC;CAEJ,CAAA;AA9CY,8DAAyB;AAGf;IADlB,IAAA,kBAAM,EAAC,uCAAiB,CAAC;;oEAC8B;AAqB9C;IADT,IAAA,yBAAa,GAAE;;;;qDAWf;oCAlCQ,yBAAyB;IADrC,IAAA,sBAAU,GAAE;GACA,yBAAyB,CA8CrC"}