@theia/core 1.53.0-next.55 → 1.53.0-next.64

package/src/browser/source-tree/source-tree-widget.tsx

@@ -1,107 +1,107 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as React from 'react';
-import { injectable, postConstruct, interfaces, Container } from 'inversify';
-import { DisposableCollection } from '../../common/disposable';
-import { TreeWidget, TreeNode, createTreeContainer, TreeProps, TreeModel, TREE_NODE_SEGMENT_GROW_CLASS } from '../tree';
-import { TreeSource, TreeElement } from './tree-source';
-import { SourceTree, TreeElementNode, TreeSourceNode } from './source-tree';
-
-@injectable()
-export class SourceTreeWidget extends TreeWidget {
-
-    static createContainer(parent: interfaces.Container, props?: Partial<TreeProps>): Container {
-        const child = createTreeContainer(parent, {
-            props,
-            tree: SourceTree,
-            widget: SourceTreeWidget,
-        });
-
-        return child;
-    }
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.addClass('theia-source-tree');
-        this.toDispose.push(this.model.onOpenNode(node => {
-            if (TreeElementNode.is(node) && node.element.open) {
-                node.element.open();
-            }
-        }));
-    }
-
-    protected readonly toDisposeOnSource = new DisposableCollection();
-    get source(): TreeSource | undefined {
-        const root = this.model.root;
-        return TreeSourceNode.is(root) ? root.source : undefined;
-    }
-    set source(source: TreeSource | undefined) {
-        if (this.source === source) {
-            return;
-        }
-        this.toDisposeOnSource.dispose();
-        this.toDispose.push(this.toDisposeOnSource);
-        this.model.root = TreeSourceNode.to(source);
-        if (source) {
-            this.toDisposeOnSource.push(source.onDidChange(() => this.model.refresh()));
-        }
-    }
-
-    get selectedElement(): TreeElement | undefined {
-        const node = this.model.selectedNodes[0];
-        return TreeElementNode.is(node) && node.element || undefined;
-    }
-
-    protected override renderTree(model: TreeModel): React.ReactNode {
-        if (TreeSourceNode.is(model.root) && model.root.children.length === 0) {
-            const { placeholder } = model.root.source;
-            if (placeholder) {
-                return <div className='theia-tree-source-node-placeholder noselect'>{placeholder}</div>;
-            }
-        }
-        return super.renderTree(model);
-
-    }
-
-    protected override renderCaption(node: TreeNode): React.ReactNode {
-        if (TreeElementNode.is(node)) {
-            const classNames = this.createTreeElementNodeClassNames(node);
-            return <div className={classNames.join(' ')}>{node.element.render(this)}</div>;
-        }
-        return undefined;
-    }
-    protected createTreeElementNodeClassNames(node: TreeElementNode): string[] {
-        return [TREE_NODE_SEGMENT_GROW_CLASS];
-    }
-
-    override storeState(): object {
-        // no-op
-        return {};
-    }
-    protected superStoreState(): object {
-        return super.storeState();
-    }
-    override restoreState(state: object): void {
-        // no-op
-    }
-    protected superRestoreState(state: object): void {
-        super.restoreState(state);
-        return;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as React from 'react';
+import { injectable, postConstruct, interfaces, Container } from 'inversify';
+import { DisposableCollection } from '../../common/disposable';
+import { TreeWidget, TreeNode, createTreeContainer, TreeProps, TreeModel, TREE_NODE_SEGMENT_GROW_CLASS } from '../tree';
+import { TreeSource, TreeElement } from './tree-source';
+import { SourceTree, TreeElementNode, TreeSourceNode } from './source-tree';
+
+@injectable()
+export class SourceTreeWidget extends TreeWidget {
+
+    static createContainer(parent: interfaces.Container, props?: Partial<TreeProps>): Container {
+        const child = createTreeContainer(parent, {
+            props,
+            tree: SourceTree,
+            widget: SourceTreeWidget,
+        });
+
+        return child;
+    }
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.addClass('theia-source-tree');
+        this.toDispose.push(this.model.onOpenNode(node => {
+            if (TreeElementNode.is(node) && node.element.open) {
+                node.element.open();
+            }
+        }));
+    }
+
+    protected readonly toDisposeOnSource = new DisposableCollection();
+    get source(): TreeSource | undefined {
+        const root = this.model.root;
+        return TreeSourceNode.is(root) ? root.source : undefined;
+    }
+    set source(source: TreeSource | undefined) {
+        if (this.source === source) {
+            return;
+        }
+        this.toDisposeOnSource.dispose();
+        this.toDispose.push(this.toDisposeOnSource);
+        this.model.root = TreeSourceNode.to(source);
+        if (source) {
+            this.toDisposeOnSource.push(source.onDidChange(() => this.model.refresh()));
+        }
+    }
+
+    get selectedElement(): TreeElement | undefined {
+        const node = this.model.selectedNodes[0];
+        return TreeElementNode.is(node) && node.element || undefined;
+    }
+
+    protected override renderTree(model: TreeModel): React.ReactNode {
+        if (TreeSourceNode.is(model.root) && model.root.children.length === 0) {
+            const { placeholder } = model.root.source;
+            if (placeholder) {
+                return <div className='theia-tree-source-node-placeholder noselect'>{placeholder}</div>;
+            }
+        }
+        return super.renderTree(model);
+
+    }
+
+    protected override renderCaption(node: TreeNode): React.ReactNode {
+        if (TreeElementNode.is(node)) {
+            const classNames = this.createTreeElementNodeClassNames(node);
+            return <div className={classNames.join(' ')}>{node.element.render(this)}</div>;
+        }
+        return undefined;
+    }
+    protected createTreeElementNodeClassNames(node: TreeElementNode): string[] {
+        return [TREE_NODE_SEGMENT_GROW_CLASS];
+    }
+
+    override storeState(): object {
+        // no-op
+        return {};
+    }
+    protected superStoreState(): object {
+        return super.storeState();
+    }
+    override restoreState(state: object): void {
+        // no-op
+    }
+    protected superRestoreState(state: object): void {
+        super.restoreState(state);
+        return;
+    }
+
+}

package/src/browser/source-tree/source-tree.ts

@@ -1,146 +1,146 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import { injectable } from 'inversify';
-import { MaybePromise } from '../../common/types';
-import { TreeImpl, CompositeTreeNode, TreeNode, SelectableTreeNode, ExpandableTreeNode } from '../tree';
-import { TreeElement, CompositeTreeElement, TreeSource } from './tree-source';
-
-@injectable()
-export class SourceTree extends TreeImpl {
-
-    override async resolveChildren(parent: TreeElementNodeParent): Promise<TreeNode[]> {
-        const elements = await this.resolveElements(parent);
-        const nodes: TreeNode[] = [];
-        let index = 0;
-        for (const element of elements) {
-            if (element.visible !== false) {
-                nodes.push(this.toNode(element, index++, parent));
-            }
-        }
-        return nodes;
-    }
-
-    protected resolveElements(parent: TreeElementNodeParent): MaybePromise<IterableIterator<TreeElement>> {
-        if (TreeSourceNode.is(parent)) {
-            return parent.source.getElements();
-        }
-        return parent.element.getElements();
-    }
-
-    protected toNode(element: TreeElement, index: number, parent: TreeElementNodeParent): TreeElementNode {
-        const id = element.id ? String(element.id) : (parent.id + ':' + index);
-        const name = id;
-        const existing = this.getNode(id);
-        const updated = existing && <TreeElementNode>Object.assign(existing, { element, parent });
-        if (CompositeTreeElement.hasElements(element)) {
-            if (updated) {
-                if (!ExpandableTreeNode.is(updated)) {
-                    Object.assign(updated, { expanded: false });
-                }
-                if (!CompositeTreeNode.is(updated)) {
-                    Object.assign(updated, { children: [] });
-                }
-                return updated;
-            }
-            return {
-                element,
-                parent,
-                id,
-                name,
-                selected: false,
-                expanded: false,
-                children: []
-            } as TreeElementNode;
-        }
-        if (CompositeTreeElementNode.is(updated)) {
-            delete (updated as any).expanded;
-            delete (updated as any).children;
-        }
-        if (updated) {
-            if (ExpandableTreeNode.is(updated)) {
-                delete (updated as any).expanded;
-            }
-            if (CompositeTreeNode.is(updated)) {
-                delete (updated as any).children;
-            }
-            return updated;
-        }
-        return {
-            element,
-            parent,
-            id,
-            name,
-            selected: false
-        };
-    }
-
-}
-
-export type TreeElementNodeParent = CompositeTreeElementNode | TreeSourceNode;
-
-export interface TreeElementNode extends TreeNode, SelectableTreeNode {
-    element: TreeElement
-    parent: TreeElementNodeParent
-}
-export namespace TreeElementNode {
-    export function is(node: TreeNode | undefined): node is TreeElementNode {
-        return SelectableTreeNode.is(node) && 'element' in node;
-    }
-}
-
-export interface CompositeTreeElementNode extends TreeElementNode, CompositeTreeNode, ExpandableTreeNode {
-    element: CompositeTreeElement
-    children: TreeElementNode[]
-    parent: TreeElementNodeParent
-}
-export namespace CompositeTreeElementNode {
-    export function is(node: TreeNode | undefined): node is CompositeTreeElementNode {
-        return TreeElementNode.is(node) && CompositeTreeNode.is(node) && ExpandableTreeNode.is(node) && !!node.visible;
-    }
-}
-
-export interface TreeSourceNode extends CompositeTreeNode, SelectableTreeNode {
-    visible: false
-    children: TreeElementNode[]
-    parent: undefined
-    source: TreeSource
-}
-export namespace TreeSourceNode {
-    export function is(node: TreeNode | undefined): node is TreeSourceNode {
-        return CompositeTreeNode.is(node) && !node.visible && 'source' in node;
-    }
-    export function to(source: undefined): undefined;
-    export function to(source: TreeSource): TreeSourceNode;
-    export function to(source: TreeSource | undefined): TreeSourceNode | undefined;
-    export function to(source: TreeSource | undefined): TreeSourceNode | undefined {
-        if (!source) {
-            return source;
-        }
-        const id = source.id || '__source__';
-        return {
-            id,
-            name: id,
-            visible: false,
-            children: [],
-            source,
-            parent: undefined,
-            selected: false
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { injectable } from 'inversify';
+import { MaybePromise } from '../../common/types';
+import { TreeImpl, CompositeTreeNode, TreeNode, SelectableTreeNode, ExpandableTreeNode } from '../tree';
+import { TreeElement, CompositeTreeElement, TreeSource } from './tree-source';
+
+@injectable()
+export class SourceTree extends TreeImpl {
+
+    override async resolveChildren(parent: TreeElementNodeParent): Promise<TreeNode[]> {
+        const elements = await this.resolveElements(parent);
+        const nodes: TreeNode[] = [];
+        let index = 0;
+        for (const element of elements) {
+            if (element.visible !== false) {
+                nodes.push(this.toNode(element, index++, parent));
+            }
+        }
+        return nodes;
+    }
+
+    protected resolveElements(parent: TreeElementNodeParent): MaybePromise<IterableIterator<TreeElement>> {
+        if (TreeSourceNode.is(parent)) {
+            return parent.source.getElements();
+        }
+        return parent.element.getElements();
+    }
+
+    protected toNode(element: TreeElement, index: number, parent: TreeElementNodeParent): TreeElementNode {
+        const id = element.id ? String(element.id) : (parent.id + ':' + index);
+        const name = id;
+        const existing = this.getNode(id);
+        const updated = existing && <TreeElementNode>Object.assign(existing, { element, parent });
+        if (CompositeTreeElement.hasElements(element)) {
+            if (updated) {
+                if (!ExpandableTreeNode.is(updated)) {
+                    Object.assign(updated, { expanded: false });
+                }
+                if (!CompositeTreeNode.is(updated)) {
+                    Object.assign(updated, { children: [] });
+                }
+                return updated;
+            }
+            return {
+                element,
+                parent,
+                id,
+                name,
+                selected: false,
+                expanded: false,
+                children: []
+            } as TreeElementNode;
+        }
+        if (CompositeTreeElementNode.is(updated)) {
+            delete (updated as any).expanded;
+            delete (updated as any).children;
+        }
+        if (updated) {
+            if (ExpandableTreeNode.is(updated)) {
+                delete (updated as any).expanded;
+            }
+            if (CompositeTreeNode.is(updated)) {
+                delete (updated as any).children;
+            }
+            return updated;
+        }
+        return {
+            element,
+            parent,
+            id,
+            name,
+            selected: false
+        };
+    }
+
+}
+
+export type TreeElementNodeParent = CompositeTreeElementNode | TreeSourceNode;
+
+export interface TreeElementNode extends TreeNode, SelectableTreeNode {
+    element: TreeElement
+    parent: TreeElementNodeParent
+}
+export namespace TreeElementNode {
+    export function is(node: TreeNode | undefined): node is TreeElementNode {
+        return SelectableTreeNode.is(node) && 'element' in node;
+    }
+}
+
+export interface CompositeTreeElementNode extends TreeElementNode, CompositeTreeNode, ExpandableTreeNode {
+    element: CompositeTreeElement
+    children: TreeElementNode[]
+    parent: TreeElementNodeParent
+}
+export namespace CompositeTreeElementNode {
+    export function is(node: TreeNode | undefined): node is CompositeTreeElementNode {
+        return TreeElementNode.is(node) && CompositeTreeNode.is(node) && ExpandableTreeNode.is(node) && !!node.visible;
+    }
+}
+
+export interface TreeSourceNode extends CompositeTreeNode, SelectableTreeNode {
+    visible: false
+    children: TreeElementNode[]
+    parent: undefined
+    source: TreeSource
+}
+export namespace TreeSourceNode {
+    export function is(node: TreeNode | undefined): node is TreeSourceNode {
+        return CompositeTreeNode.is(node) && !node.visible && 'source' in node;
+    }
+    export function to(source: undefined): undefined;
+    export function to(source: TreeSource): TreeSourceNode;
+    export function to(source: TreeSource | undefined): TreeSourceNode | undefined;
+    export function to(source: TreeSource | undefined): TreeSourceNode | undefined {
+        if (!source) {
+            return source;
+        }
+        const id = source.id || '__source__';
+        return {
+            id,
+            name: id,
+            visible: false,
+            children: [],
+            source,
+            parent: undefined,
+            selected: false
+        };
+    }
+}

package/src/browser/source-tree/tree-source.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// Copyright (C) 2018 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import { ReactNode } from 'react';
-import { injectable, unmanaged } from 'inversify';
-import { Disposable, DisposableCollection, Emitter, Event, isObject, MaybePromise } from '../../common';
-import { TreeWidget } from '../tree';
-
-export interface TreeElement {
-    /** default: parent id + position among siblings */
-    readonly id?: number | string | undefined
-    /** default: true */
-    readonly visible?: boolean
-    render(host: TreeWidget): ReactNode
-    open?(): MaybePromise<any>
-}
-
-export interface CompositeTreeElement extends TreeElement {
-    /** default: true */
-    readonly hasElements?: boolean
-    getElements(): MaybePromise<IterableIterator<TreeElement>>
-}
-export namespace CompositeTreeElement {
-    export function is(element: unknown): element is CompositeTreeElement {
-        return isObject(element) && 'getElements' in element;
-    }
-    export function hasElements(element: unknown): element is CompositeTreeElement {
-        return is(element) && element.hasElements !== false;
-    }
-}
-
-@injectable()
-export abstract class TreeSource implements Disposable {
-    protected readonly onDidChangeEmitter = new Emitter<void>();
-    readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
-    protected fireDidChange(): void {
-        this.onDidChangeEmitter.fire(undefined);
-    }
-
-    readonly id: string | undefined;
-    readonly placeholder: string | undefined;
-
-    constructor(@unmanaged() options: TreeSourceOptions = {}) {
-        this.id = options.id;
-        this.placeholder = options.placeholder;
-    }
-
-    protected readonly toDispose = new DisposableCollection(this.onDidChangeEmitter);
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    abstract getElements(): MaybePromise<IterableIterator<TreeElement>>;
-}
-export interface TreeSourceOptions {
-    id?: string
-    placeholder?: string
-}
+// *****************************************************************************
+// Copyright (C) 2018 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { ReactNode } from 'react';
+import { injectable, unmanaged } from 'inversify';
+import { Disposable, DisposableCollection, Emitter, Event, isObject, MaybePromise } from '../../common';
+import { TreeWidget } from '../tree';
+
+export interface TreeElement {
+    /** default: parent id + position among siblings */
+    readonly id?: number | string | undefined
+    /** default: true */
+    readonly visible?: boolean
+    render(host: TreeWidget): ReactNode
+    open?(): MaybePromise<any>
+}
+
+export interface CompositeTreeElement extends TreeElement {
+    /** default: true */
+    readonly hasElements?: boolean
+    getElements(): MaybePromise<IterableIterator<TreeElement>>
+}
+export namespace CompositeTreeElement {
+    export function is(element: unknown): element is CompositeTreeElement {
+        return isObject(element) && 'getElements' in element;
+    }
+    export function hasElements(element: unknown): element is CompositeTreeElement {
+        return is(element) && element.hasElements !== false;
+    }
+}
+
+@injectable()
+export abstract class TreeSource implements Disposable {
+    protected readonly onDidChangeEmitter = new Emitter<void>();
+    readonly onDidChange: Event<void> = this.onDidChangeEmitter.event;
+    protected fireDidChange(): void {
+        this.onDidChangeEmitter.fire(undefined);
+    }
+
+    readonly id: string | undefined;
+    readonly placeholder: string | undefined;
+
+    constructor(@unmanaged() options: TreeSourceOptions = {}) {
+        this.id = options.id;
+        this.placeholder = options.placeholder;
+    }
+
+    protected readonly toDispose = new DisposableCollection(this.onDidChangeEmitter);
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    abstract getElements(): MaybePromise<IterableIterator<TreeElement>>;
+}
+export interface TreeSourceOptions {
+    id?: string
+    placeholder?: string
+}