@theia/plugin-ext 1.27.0-next.26 → 1.27.0-next.30

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.27.0-next.26+4e882720cfd",
+  "version": "1.27.0-next.30+b3adc5ae1b4",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.27.0-next.26+4e882720cfd",
-    "@theia/callhierarchy": "1.27.0-next.26+4e882720cfd",
-    "@theia/console": "1.27.0-next.26+4e882720cfd",
-    "@theia/core": "1.27.0-next.26+4e882720cfd",
-    "@theia/debug": "1.27.0-next.26+4e882720cfd",
-    "@theia/editor": "1.27.0-next.26+4e882720cfd",
-    "@theia/file-search": "1.27.0-next.26+4e882720cfd",
-    "@theia/filesystem": "1.27.0-next.26+4e882720cfd",
-    "@theia/markers": "1.27.0-next.26+4e882720cfd",
-    "@theia/messages": "1.27.0-next.26+4e882720cfd",
-    "@theia/monaco": "1.27.0-next.26+4e882720cfd",
+    "@theia/bulk-edit": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/callhierarchy": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/console": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/core": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/debug": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/editor": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/file-search": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/filesystem": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/markers": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/messages": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/monaco": "1.27.0-next.30+b3adc5ae1b4",
     "@theia/monaco-editor-core": "1.65.2",
-    "@theia/navigator": "1.27.0-next.26+4e882720cfd",
-    "@theia/output": "1.27.0-next.26+4e882720cfd",
-    "@theia/plugin": "1.27.0-next.26+4e882720cfd",
-    "@theia/preferences": "1.27.0-next.26+4e882720cfd",
-    "@theia/scm": "1.27.0-next.26+4e882720cfd",
-    "@theia/search-in-workspace": "1.27.0-next.26+4e882720cfd",
-    "@theia/task": "1.27.0-next.26+4e882720cfd",
-    "@theia/terminal": "1.27.0-next.26+4e882720cfd",
-    "@theia/timeline": "1.27.0-next.26+4e882720cfd",
-    "@theia/variable-resolver": "1.27.0-next.26+4e882720cfd",
-    "@theia/workspace": "1.27.0-next.26+4e882720cfd",
+    "@theia/navigator": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/output": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/plugin": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/preferences": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/scm": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/search-in-workspace": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/task": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/terminal": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/timeline": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/variable-resolver": "1.27.0-next.30+b3adc5ae1b4",
+    "@theia/workspace": "1.27.0-next.30+b3adc5ae1b4",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
     "escape-html": "^1.0.3",
@@ -93,5 +93,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "4e882720cfd1cdfc0f47a5bbd7b5a1f12d70ae1c"
+  "gitHead": "b3adc5ae1b46641c5429d171a03f6e9169307340"
 }

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -18,10 +18,10 @@ import { inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ApplicationShell, OpenHandler, Widget, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
-import * as glob from './glob';
 import { CustomEditorWidget } from './custom-editor-widget';
 import { v4 } from 'uuid';
 import { Emitter } from '@theia/core';
+import { match } from '@theia/core/lib/common/glob';
 
 export class CustomEditorOpener implements OpenHandler {
 
@@ -96,7 +96,7 @@ export class CustomEditorOpener implements OpenHandler {
 
     selectorMatches(selector: CustomEditorSelector, resource: URI): boolean {
         if (selector.filenamePattern) {
-            if (glob.match(selector.filenamePattern.toLowerCase(), resource.path.name.toLowerCase() + resource.path.ext.toLowerCase())) {
+            if (match(selector.filenamePattern.toLowerCase(), resource.path.name.toLowerCase() + resource.path.ext.toLowerCase())) {
                 return true;
             }
         }

package/src/main/browser/documents-main.ts

@@ -16,11 +16,10 @@
 import { DocumentsMain, MAIN_RPC_CONTEXT, DocumentsExt } from '../../common/plugin-api-rpc';
 import { UriComponents } from '../../common/uri-components';
 import { EditorsAndDocumentsMain } from './editors-and-documents-main';
-import { DisposableCollection, Disposable } from '@theia/core';
+import { DisposableCollection, Disposable, UntitledResourceResolver } from '@theia/core';
 import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { EditorModelService } from './text-editor-model-service';
-import { UntitledResourceResolver } from './editor/untitled-resource';
 import { EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
 import URI from '@theia/core/lib/common/uri';
 import { URI as CodeURI } from '@theia/core/shared/vscode-uri';

package/src/main/browser/main-context.ts

@@ -46,7 +46,6 @@ import { OpenerService } from '@theia/core/lib/browser/opener-service';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { MonacoBulkEditService } from '@theia/monaco/lib/browser/monaco-bulk-edit-service';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
-import { UntitledResourceResolver } from './editor/untitled-resource';
 import { MainFileSystemEventService } from './main-file-system-event-service';
 import { LabelServiceMainImpl } from './label-service-main';
 import { TimelineMainImpl } from './timeline-main';
@@ -58,6 +57,7 @@ import { SecretsMainImpl } from './secrets-main';
 import { WebviewViewsMainImpl } from './webview-views/webview-views-main';
 import { MonacoLanguages } from '@theia/monaco/lib/browser/monaco-languages';
 import { NotificationExtImpl } from '../../plugin/notification';
+import { UntitledResourceResolver } from '@theia/core/lib/common/resource';
 
 export function setUpPluginApi(rpc: RPCProtocol, container: interfaces.Container): void {
     const authenticationMain = new AuthenticationMainImpl(rpc, container);

package/src/main/browser/plugin-icon-theme-service.ts

@@ -30,7 +30,7 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 import { Emitter } from '@theia/core/lib/common/event';
 import { RecursivePartial } from '@theia/core/lib/common/types';
 import { LabelProviderContribution, DidChangeLabelEvent, LabelProvider, URIIconReference } from '@theia/core/lib/browser/label-provider';
-import { ThemeType } from '@theia/core/lib/browser/theming';
+import { ThemeType } from '@theia/core/lib/common/theme';
 import { FileStatNode, DirNode } from '@theia/filesystem/lib/browser';
 import { WorkspaceRootNode } from '@theia/navigator/lib/browser/navigator-tree';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';

package/src/main/browser/plugin-shared-style.ts

@@ -16,7 +16,8 @@
 
 import { injectable } from '@theia/core/shared/inversify';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ThemeService, Theme } from '@theia/core/lib/browser/theming';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { Theme } from '@theia/core/lib/common/theme';
 import { IconUrl } from '../../common/plugin-protocol';
 import { Reference, SyncReferenceCollection } from '@theia/core/lib/common/reference';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';

package/src/main/browser/view/plugin-view-registry.ts

@@ -35,7 +35,7 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 import { ViewContextKeyService } from './view-context-key-service';
 import { PROBLEMS_WIDGET_ID } from '@theia/markers/lib/browser/problem/problem-widget';
-import { OUTPUT_WIDGET_KIND } from '@theia/output/lib/browser/output-widget';
+import { OutputWidget } from '@theia/output/lib/browser/output-widget';
 import { DebugConsoleContribution } from '@theia/debug/lib/browser/console/debug-console-contribution';
 import { TERMINAL_WIDGET_FACTORY_ID } from '@theia/terminal/lib/browser/terminal-widget-impl';
 import { TreeViewWidget } from './tree-view-widget';
@@ -113,7 +113,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
         // VS Code Panels
         this.trackVisibleWidget(PROBLEMS_WIDGET_ID, { panelId: 'workbench.panel.markers' });
-        this.trackVisibleWidget(OUTPUT_WIDGET_KIND, { panelId: 'workbench.panel.output' });
+        this.trackVisibleWidget(OutputWidget.ID, { panelId: 'workbench.panel.output' });
         this.trackVisibleWidget(DebugConsoleContribution.options.id, { panelId: 'workbench.panel.repl' });
         this.trackVisibleWidget(TERMINAL_WIDGET_FACTORY_ID, { panelId: 'workbench.panel.terminal' });
         // TODO workbench.panel.comments - Theia does not have a proper comments view yet

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

@@ -369,7 +369,9 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             const inlineCommands = menu.children.filter((item): item is ActionMenuNode => item instanceof ActionMenuNode);
             const tailDecorations = super.renderTailDecorations(node, props);
             return <React.Fragment>
-                {inlineCommands.length > 0 && <div className={TREE_NODE_SEGMENT_CLASS}>{inlineCommands.map((item, index) => this.renderInlineCommand(item, index, arg))}</div>}
+                {inlineCommands.length > 0 && <div className={TREE_NODE_SEGMENT_CLASS}>
+                    {inlineCommands.map((item, index) => this.renderInlineCommand(item, index, this.focusService.hasFocus(node), arg))}
+                </div>}
                 {tailDecorations !== undefined && <div className={TREE_NODE_SEGMENT_CLASS}>{super.renderTailDecorations(node, props)}</div>}
             </React.Fragment>;
         });
@@ -380,13 +382,14 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected renderInlineCommand(node: ActionMenuNode, index: number, arg: any): React.ReactNode {
+    protected renderInlineCommand(node: ActionMenuNode, index: number, tabbable: boolean, arg: any): React.ReactNode {
         const { icon } = node;
         if (!icon || !this.commands.isVisible(node.action.commandId, arg) || !node.action.when || !this.contextKeys.match(node.action.when)) {
             return false;
         }
         const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, ACTION_ITEM, 'theia-tree-view-inline-action'].join(' ');
-        return <div key={index} className={className} title={node.label} onClick={e => {
+        const tabIndex = tabbable ? 0 : undefined;
+        return <div key={index} className={className} title={node.label} tabIndex={tabIndex} onClick={e => {
             e.stopPropagation();
             this.commands.executeCommand(node.action.commandId, arg);
         }} />;
@@ -415,13 +418,12 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         this.tryExecuteCommand();
     }
 
-    override handleClickEvent(node: TreeNode, event: React.MouseEvent<HTMLElement>): void {
-        super.handleClickEvent(node, event);
-        // If clicked on item (not collapsable icon) - execute command or toggle expansion if item has no command
+    protected override tapNode(node?: TreeNode): void {
+        super.tapNode(node);
         const commandMap = this.findCommands(node);
         if (commandMap.size > 0) {
             this.tryExecuteCommandMap(commandMap);
-        } else if (this.isExpandable(node) && !this.hasShiftMask(event) && !this.hasCtrlCmdMask(event)) {
+        } else if (node && this.isExpandable(node)) {
             this.model.toggleNodeExpansion(node);
         }
     }

package/src/main/browser/webview/webview-theme-data-provider.ts

@@ -22,7 +22,8 @@
 import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { EditorPreferences, EditorConfiguration } from '@theia/editor/lib/browser/editor-preferences';
-import { Theme, ThemeService } from '@theia/core/lib/browser/theming';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { Theme } from '@theia/core/lib/common/theme';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ColorApplicationContribution } from '@theia/core/lib/browser/color-application-contribution';
 

package/src/plugin/theming.ts

@@ -18,7 +18,7 @@ import { ColorTheme, ColorThemeKind } from './types-impl';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { ThemingExt } from '../common';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { ThemeType } from '@theia/core/lib/browser/theming';
+import { ThemeType } from '@theia/core/lib/common/theme';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.

package/lib/main/browser/custom-editors/glob.d.ts

@@ -1,51 +0,0 @@
-export interface IExpression {
-    [pattern: string]: boolean | SiblingClause | any;
-}
-export interface IRelativePattern {
-    base: string;
-    pattern: string;
-    pathToRelative(from: string, to: string): string;
-}
-export declare function getEmptyExpression(): IExpression;
-export interface SiblingClause {
-    when: string;
-}
-export declare function splitGlobAware(pattern: string, splitChar: string): string[];
-export declare type ParsedPattern = (path: string, basename?: string) => boolean;
-export declare type ParsedExpression = (path: string, basename?: string, hasSibling?: (name: string) => boolean | Promise<boolean>) => string | Promise<string>;
-export interface IGlobOptions {
-    /**
-     * Simplify patterns for use as exclusion filters during tree traversal to skip entire subtrees. Cannot be used outside of a tree traversal.
-     */
-    trimForExclusions?: boolean;
-}
-/**
- * Simplified glob matching. Supports a subset of glob patterns:
- * - * matches anything inside a path segment
- * - ? matches 1 character inside a path segment
- * - ** matches anything including an empty path segment
- * - simple brace expansion ({js,ts} => js or ts)
- * - character ranges (using [...])
- */
-export declare function match(pattern: string | IRelativePattern, path: string): boolean;
-export declare function match(expression: IExpression, path: string, hasSibling?: (name: string) => boolean): string;
-/**
- * Simplified glob matching. Supports a subset of glob patterns:
- * - * matches anything inside a path segment
- * - ? matches 1 character inside a path segment
- * - ** matches anything including an empty path segment
- * - simple brace expansion ({js,ts} => js or ts)
- * - character ranges (using [...])
- */
-export declare function parse(pattern: string | IRelativePattern, options?: IGlobOptions): ParsedPattern;
-export declare function parse(expression: IExpression, options?: IGlobOptions): ParsedExpression;
-export declare function hasSiblingPromiseFn(siblingsFn?: () => Promise<string[]>): ((name: string) => Promise<boolean>) | undefined;
-export declare function hasSiblingFn(siblingsFn?: () => string[]): ((name: string) => boolean) | undefined;
-export declare function isRelativePattern(obj: any): obj is IRelativePattern;
-/**
- * Same as `parse`, but the ParsedExpression is guaranteed to return a Promise
- */
-export declare function parseToAsync(expression: IExpression, options?: IGlobOptions): ParsedExpression;
-export declare function getBasenameTerms(patternOrExpression: ParsedPattern | ParsedExpression): string[];
-export declare function getPathTerms(patternOrExpression: ParsedPattern | ParsedExpression): string[];
-//# sourceMappingURL=glob.d.ts.map

package/lib/main/browser/custom-editors/glob.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"glob.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/custom-editors/glob.ts"],"names":[],"mappings":"AA4BA,MAAM,WAAW,WAAW;IAExB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,aAAa,GAAG,GAAG,CAAC;CACpD;AAED,MAAM,WAAW,gBAAgB;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACpD;AAED,wBAAgB,kBAAkB,IAAI,WAAW,CAEhD;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;CAChB;AAsBD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CA+C3E;AA2JD,oBAAY,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;AAIzE,oBAAY,gBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAA4B;AAEnL,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B;AA+KD;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;AACjF,wBAAgB,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAA4B;AAUxI;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC;AACjG,wBAAgB,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,gBAAgB,CAAC;AA+BzF,wBAAgB,mBAAmB,CAAC,UAAU,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAa1H;AAED,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,SAAS,CAajG;AAWD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,gBAAgB,CAInE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,gBAAgB,CAO9F;AAED,wBAAgB,gBAAgB,CAAC,mBAAmB,EAAE,aAAa,GAAG,gBAAgB,GAAG,MAAM,EAAE,CAEhG;AAED,wBAAgB,YAAY,CAAC,mBAAmB,EAAE,aAAa,GAAG,gBAAgB,GAAG,MAAM,EAAE,CAE5F"}